Adopt OTel 1.62.0

Author: tjquinno

dependencies/pom.xml

@@ -96,8 +96,8 @@
         <!-- Force upgrade okhttp3 for dependency convergence -->
         <version.lib.okhttp3>4.12.0</version.lib.okhttp3>
         <version.lib.opentelemetry.semconv>1.37.0</version.lib.opentelemetry.semconv>
-        <version.lib.opentelemetry>1.58.0</version.lib.opentelemetry>
-        <version.lib.opentelemetry.instrumentation.annotations>2.24.0</version.lib.opentelemetry.instrumentation.annotations>
+        <version.lib.opentelemetry>1.62.0</version.lib.opentelemetry>
+        <version.lib.opentelemetry.instrumentation.annotations>2.27.0</version.lib.opentelemetry.instrumentation.annotations>
         <version.lib.parsson>1.1.7</version.lib.parsson>
         <version.lib.postgresql>42.7.11</version.lib.postgresql>
         <version.lib.prometheus>0.16.0</version.lib.prometheus>

telemetry/opentelemetry-config/src/main/java/io/helidon/telemetry/otelconfig/Base2ExponentialHistogramAggregationConfigBlueprint.java

@@ -27,6 +27,7 @@
 @Prototype.Configured
 @Prototype.Blueprint(decorator = Base2ExponentialHistogramAggregationSupport.BuilderDecorator.class)
 @Prototype.CustomMethods(Base2ExponentialHistogramAggregationSupport.CustomMethods.class)
+@Prototype.IncludeDefaultMethods
 interface Base2ExponentialHistogramAggregationConfigBlueprint {
 
     /**
@@ -45,4 +46,15 @@ interface Base2ExponentialHistogramAggregationConfigBlueprint {
     @Option.Configured
     Optional<Integer> maxScale();
 
+    /**
+     * Whether the min and max should be recorded.
+     *
+     * @return whether to record min and max
+     */
+    @Option.DefaultBoolean(Base2ExponentialHistogramAggregationSupport.DEFAULT_RECORD_MIN_MAX)
+    @Option.Configured
+    default boolean recordMinMax() {
+        return Base2ExponentialHistogramAggregationSupport.DEFAULT_RECORD_MIN_MAX;
+    }
+
 }

telemetry/opentelemetry-config/src/main/java/io/helidon/telemetry/otelconfig/Base2ExponentialHistogramAggregationSupport.java

@@ -23,6 +23,13 @@
 import io.opentelemetry.sdk.metrics.internal.view.Base2ExponentialHistogramAggregation;
 
 class Base2ExponentialHistogramAggregationSupport {
+    /**
+     * Helidon-supplied default value for {@code recordMinMax} for backward compatibility.
+     */
+    static final boolean DEFAULT_RECORD_MIN_MAX = true;
+
+    private Base2ExponentialHistogramAggregationSupport() {
+    }
 
     static class BuilderDecorator implements Prototype.BuilderDecorator<Base2ExponentialHistogramAggregationConfig.BuilderBase<?, ?>> {
 
@@ -53,7 +60,8 @@ private CustomMethods() {
         static Aggregation aggregation(Base2ExponentialHistogramAggregationConfig config) {
             return config.maxBuckets().isPresent()
                     ? Base2ExponentialHistogramAggregation.create(config.maxBuckets().get(),
-                                                                  config.maxScale().get())
+                                                                  config.maxScale().get(),
+                                                                  config.recordMinMax())
                     : Base2ExponentialHistogramAggregation.getDefault();
         }
     }

telemetry/opentelemetry-config/src/main/java/io/helidon/telemetry/otelconfig/ExplicitBucketHistogramAggregationConfigBlueprint.java

@@ -27,6 +27,7 @@
 @Prototype.Blueprint
 @Prototype.Configured
 @Prototype.CustomMethods(ExplicitBucketHistogramAggregationSupport.CustomMethods.class)
+@Prototype.IncludeDefaultMethods
 interface ExplicitBucketHistogramAggregationConfigBlueprint {
 
     /**
@@ -36,4 +37,15 @@ interface ExplicitBucketHistogramAggregationConfigBlueprint {
      */
     @Option.Configured
     List<Double> bucketBoundaries();
+
+    /**
+     * Whether the min and max should be recorded.
+     *
+     * @return whether to record min and max
+     */
+    @Option.Configured
+    @Option.DefaultBoolean(ExplicitBucketHistogramAggregationSupport.DEFAULT_RECORD_MIN_MAX)
+    default boolean recordMinMax() {
+        return ExplicitBucketHistogramAggregationSupport.DEFAULT_RECORD_MIN_MAX;
+    }
 }

telemetry/opentelemetry-config/src/main/java/io/helidon/telemetry/otelconfig/ExplicitBucketHistogramAggregationSupport.java

@@ -23,6 +23,14 @@
 
 class ExplicitBucketHistogramAggregationSupport {
 
+    private ExplicitBucketHistogramAggregationSupport() {
+    }
+
+    /**
+     * Helidon-supplied default value for {@code recordMinMax} for backward compatibility.
+     */
+    static final boolean DEFAULT_RECORD_MIN_MAX = true;
+
     static class CustomMethods {
 
         /**
@@ -35,7 +43,8 @@ static class CustomMethods {
         static Aggregation aggregation(ExplicitBucketHistogramAggregationConfig config) {
             return config.bucketBoundaries().isEmpty()
                     ? ExplicitBucketHistogramAggregation.getDefault()
-                    : ExplicitBucketHistogramAggregation.create(config.bucketBoundaries());
+                    : ExplicitBucketHistogramAggregation.create(config.bucketBoundaries(),
+                                                                config.recordMinMax());
         }
     }
 }

telemetry/opentelemetry-config/src/test/java/io/helidon/telemetry/otelconfig/TestBasicConfig.java

@@ -116,4 +116,37 @@ void testTelemetryDefaults() {
         assertThat("Global", openTelemetry.global(), is(true));
         assertThat("Enabled", openTelemetry.enabled(), is(true));
     }
+
+    @Test
+    void testBase2ExponentialHistogramRecordMinMaxDefault() {
+        var config = Config.just(ConfigSources.create(
+                """
+                        aggregation:
+                          max-buckets: 152
+                          max-scale: 19
+                        """,
+                MediaTypes.APPLICATION_YAML));
+
+        var aggregationConfig = Base2ExponentialHistogramAggregationConfig.create(config.get("aggregation"));
+
+        assertThat("Record min/max default",
+                   aggregationConfig.recordMinMax(),
+                   is(true));
+    }
+
+    @Test
+    void testExplicitBucketHistogramRecordMinMaxDefault() {
+        var config = Config.just(ConfigSources.create(
+                """
+                        aggregation:
+                          bucket-boundaries: [3, 5, 7]
+                        """,
+                MediaTypes.APPLICATION_YAML));
+
+        var aggregationConfig = ExplicitBucketHistogramAggregationConfig.create(config.get("aggregation"));
+
+        assertThat("Record min/max default",
+                   aggregationConfig.recordMinMax(),
+                   is(true));
+    }
 }

webserver/observe/telemetry/metrics/src/test/java/io/helidon/webserver/observe/telemetry/metrics/TestLogHandler.java

@@ -25,6 +25,8 @@
 
 import io.helidon.common.testing.junit5.MatcherWithRetry;
 
+import org.hamcrest.Matcher;
+
 import static org.hamcrest.Matchers.hasSize;
 
 /**
@@ -65,4 +67,12 @@ List<String> messages(int expectedCount) {
         messages.clear();
         return result;
     }
+
+    List<String> messages(Matcher<Iterable<? super String>> matcher) {
+        var result = MatcherWithRetry.assertThatWithRetry("Logged messages",
+                                                          () -> List.copyOf(messages),
+                                                          matcher);
+        messages.clear();
+        return result;
+    }
 }

webserver/observe/telemetry/metrics/src/test/java/io/helidon/webserver/observe/telemetry/metrics/TestOpenTelemetrySemanticConventions.java

@@ -50,6 +50,7 @@
 import static io.helidon.webserver.observe.telemetry.metrics.OpenTelemetryMetricsHttpSemanticConventions.SOCKET_NAME;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.hasItem;
@@ -162,7 +163,8 @@ void checkAutoMetrics() {
             and the timer's count is 1.
              */
 
-            List<String> jsonText = testLogHandler.messages(2);
+            List<String> jsonText = testLogHandler.messages(
+                    hasItem(containsString(OpenTelemetryMetricsHttpSemanticConventions.TIMER_NAME)));
 
             var root = JsonParser.create(jsonText.getFirst()).readJsonObject();
 
@@ -197,6 +199,16 @@ void checkAutoMetrics() {
 
             for (JsonObject metricsEntry : metricsEntries) {
 
+                /*
+                OTel can insert some of its own messages, which we can ignore for this test. Skip any for which the
+                metric name is not the name of our timer.
+                 */
+                var metricEntryName = metricsEntry.stringValue("name");
+                if (metricEntryName.isEmpty()
+                        || !metricEntryName.get().equals(OpenTelemetryMetricsHttpSemanticConventions.TIMER_NAME)) {
+                    continue;
+                }
+
                 var dataPoints = metricsEntry.objectValue("histogram").orElseThrow()
                         .arrayValue("dataPoints").orElseThrow()
                         .values()