Update to 1.15.0 (#358)

* Update to 1.15.0

* Fix

* Upgrade to opentelemetry-instrumentation 1.15.0

* Fix jmx-metrics integration test

* Fix InstrumenterHelperTest

Co-authored-by: Trask Stalnaker <[email protected]>

Author: jack-berg

dependencyManagement/build.gradle.kts

@@ -18,9 +18,9 @@ val DEPENDENCY_BOMS = listOf(
     "org.junit:junit-bom:5.8.2",
     "com.linecorp.armeria:armeria-bom:1.9.1",
     "io.grpc:grpc-bom:1.42.1",
-    "io.opentelemetry:opentelemetry-bom:1.14.0",
-    "io.opentelemetry:opentelemetry-bom-alpha:1.14.0-alpha",
-    "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha",
+    "io.opentelemetry:opentelemetry-bom:1.15.0",
+    "io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha",
+    "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha",
     "org.testcontainers:testcontainers-bom:1.16.3"
 )
 

jmx-metrics/build.gradle.kts

@@ -40,7 +40,7 @@ dependencies {
   implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   implementation("io.opentelemetry:opentelemetry-sdk-testing")
   implementation("io.opentelemetry:opentelemetry-exporter-logging")
-  implementation("io.opentelemetry:opentelemetry-exporter-otlp-metrics")
+  implementation("io.opentelemetry:opentelemetry-exporter-otlp")
   implementation("io.opentelemetry:opentelemetry-exporter-prometheus")
   implementation("org.slf4j:slf4j-api")
   implementation("org.slf4j:slf4j-simple")

jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/AbstractIntegrationTest.java

@@ -36,8 +36,11 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestInstance;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.utility.MountableFile;
@@ -46,6 +49,8 @@
 @Testcontainers(disabledWithoutDocker = true)
 public abstract class AbstractIntegrationTest {
 
+  private static final Logger logger = LoggerFactory.getLogger(AbstractIntegrationTest.class);
+
   private final boolean configFromStdin;
   private final String configName;
 
@@ -110,6 +115,7 @@ protected GenericContainer<?> buildScraper(String otlpEndpoint) {
         .withCopyFileToContainer(
             MountableFile.forClasspathResource(configName), "/app/" + configName)
         .withCommand(scraperCommand.toArray(new String[0]))
+        .withLogConsumer(new Slf4jLogConsumer(logger))
         .withStartupTimeout(Duration.ofMinutes(2))
         .waitingFor(Wait.forLogMessage(".*Started GroovyRunner.*", 1));
   }

jmx-metrics/src/integrationTest/resources/activemq/Dockerfile

@@ -1,4 +1,4 @@
-FROM rmohr/activemq:5.15.9-alpine
+FROM rmohr/activemq:5.15.9
 
 
 COPY --chown=activemq config/env /opt/activemq/bin/env

jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/InstrumentHelper.groovy

@@ -118,7 +118,7 @@ class InstrumentHelper {
             def description = tuple.getAt(2)
             def unit = tuple.getAt(3)
 
-            if (instrumentIsObserver(instrument)) {
+            if (instrumentIsDoubleObserver(instrument) || instrumentIsLongObserver(instrument)) {
                 // Though the instrument updater is only set at build time,
                 // our GroovyMetricEnvironment helpers ensure the updater
                 // uses the Closure specified here.
@@ -149,9 +149,13 @@ class InstrumentHelper {
 
     private static Closure prepareUpdateClosure(inst, value, labels) {
         def labelMap = GroovyMetricEnvironment.mapToAttributes(labels)
-        if (instrumentIsObserver(inst)) {
+        if (instrumentIsLongObserver(inst)) {
             return { result ->
-                result.record(value, labelMap)
+                result.record((long) value, labelMap)
+            }
+        } else if (instrumentIsDoubleObserver(inst)) {
+            return { result ->
+                result.record((double) value, labelMap)
             }
         } else if (instrumentIsCounter(inst)) {
             return { i -> i.add(value, labelMap) }
@@ -160,14 +164,19 @@ class InstrumentHelper {
         }
     }
 
-    @PackageScope static boolean instrumentIsObserver(inst) {
+    @PackageScope static boolean instrumentIsDoubleObserver(inst) {
         return [
             "doubleCounterCallback",
             "doubleUpDownCounterCallback",
+            "doubleValueCallback",
+        ].contains(inst.method)
+    }
+
+    @PackageScope static boolean instrumentIsLongObserver(inst) {
+        return [
             "longCounterCallback",
             "longUpDownCounterCallback",
-            "doubleValueCallback" ,
-            "longValueCallback"
+            "longValueCallback",
         ].contains(inst.method)
     }
 

jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/InstrumenterHelperTest.java

@@ -612,22 +612,27 @@ void handlesNulls(boolean isSingle) throws Exception {
 
   @ParameterizedTest
   @CsvSource({
-    "doubleCounter,false,true",
-    "longCounter,false,true",
-    "doubleCounterCallback,true,false",
-    "longCounterCallback,true,false",
-    "doubleUpDownCounter,false,true",
-    "longUpDownCounter,false,true",
-    "doubleUpDownCounterCallback,true,false",
-    "longUpDownCounterCallback,true,false",
-    "doubleValueCallback,true,false",
-    "longValueCallback,true,false",
-    "doubleHistogram,false,false",
-    "longHistogram,false,false",
+    "doubleCounter,false,false,true",
+    "longCounter,false,false,true",
+    "doubleCounterCallback,true,false,false",
+    "longCounterCallback,false,true,false",
+    "doubleUpDownCounter,false,false,true",
+    "longUpDownCounter,false,false,true",
+    "doubleUpDownCounterCallback,true,false,false",
+    "longUpDownCounterCallback,false,true,false",
+    "doubleValueCallback,true,false,false",
+    "longValueCallback,false,true,false",
+    "doubleHistogram,false,false,false",
+    "longHistogram,false,false,false",
   })
-  void correctlyClassified(String instrumentMethod, boolean isObserver, boolean isCounter) {
+  void correctlyClassified(
+      String instrumentMethod,
+      boolean isDoubleObserver,
+      boolean isLongObserver,
+      boolean isCounter) {
     Closure<?> instrument = (Closure<?>) Eval.me("otel", otel, "otel.&" + instrumentMethod);
-    assertThat(InstrumentHelper.instrumentIsObserver(instrument)).isEqualTo(isObserver);
+    assertThat(InstrumentHelper.instrumentIsDoubleObserver(instrument)).isEqualTo(isDoubleObserver);
+    assertThat(InstrumentHelper.instrumentIsLongObserver(instrument)).isEqualTo(isLongObserver);
     assertThat(InstrumentHelper.instrumentIsCounter(instrument)).isEqualTo(isCounter);
   }
 

maven-extension/build.gradle.kts

@@ -21,8 +21,6 @@ dependencies {
   implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   implementation("io.opentelemetry:opentelemetry-semconv")
   implementation("io.opentelemetry:opentelemetry-exporter-otlp")
-  implementation("io.opentelemetry:opentelemetry-exporter-otlp-metrics")
-  implementation("io.opentelemetry:opentelemetry-exporter-otlp-trace")
 
   implementation("io.grpc:grpc-netty-shaded")