Merge branch '1.11.x' into 1.12.x

micrometer-metrics · May 8, 2024 · 0de9dcd · 0de9dcd
2 parents 7623a0d + a9c08d8
commit 0de9dcd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpMeterRegistry.java b/...micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpMeterRegistry.java
@@ -312,7 +312,7 @@ Metric writeGauge(Gauge gauge) {
         return getMetricBuilder(gauge.getId())
             .setGauge(io.opentelemetry.proto.metrics.v1.Gauge.newBuilder()
                 .addDataPoints(NumberDataPoint.newBuilder()
-                    .setTimeUnixNano(getTimeUnixNano())
+                    .setTimeUnixNano(TimeUnit.MILLISECONDS.toNanos(clock.wallTime()))
                     .setAsDouble(gauge.value())
                     .addAllAttributes(getTagsForId(gauge.getId()))
                     .build()))

diff --git a/...r-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpDeltaMeterRegistryTest.java b/...r-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpDeltaMeterRegistryTest.java
@@ -78,7 +78,9 @@ void gauge() {
         Metric metric = writeToMetric(gauge);
         assertThat(metric.getGauge()).isNotNull();
         assertThat(metric.getGauge().getDataPoints(0).getAsDouble()).isEqualTo(5);
-        assertThat(metric.getGauge().getDataPoints(0).getTimeUnixNano()).isEqualTo(TimeUnit.MINUTES.toNanos(1));
+        assertThat(metric.getGauge().getDataPoints(0).getTimeUnixNano())
+            .describedAs("Gauges should have timestamp of the instant when data is sampled")
+            .isEqualTo(otlpConfig().step().plus(Duration.ofMillis(1)).toNanos());
     }
 
     @Test
@@ -88,7 +90,9 @@ void timeGauge() {
         Metric metric = writeToMetric(timeGauge);
         assertThat(metric.getGauge()).isNotNull();
         assertThat(metric.getGauge().getDataPoints(0).getAsDouble()).isEqualTo(0.024);
-        assertThat(metric.getGauge().getDataPoints(0).getTimeUnixNano()).isEqualTo(TimeUnit.MINUTES.toNanos(1));
+        assertThat(metric.getGauge().getDataPoints(0).getTimeUnixNano())
+            .describedAs("Gauges should have timestamp of the instant when data is sampled")
+            .isEqualTo(otlpConfig().step().plus(Duration.ofMillis(1)).toNanos());
     }
 
     @Test