Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into indy-reactor-2

Author: SylvainJuge

examples/distro/smoke-tests/build.gradle

@@ -5,7 +5,7 @@ plugins {
 dependencies {
   testImplementation("org.testcontainers:testcontainers:1.21.3")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.0")
-  testImplementation("com.google.protobuf:protobuf-java-util:4.32.0")
+  testImplementation("com.google.protobuf:protobuf-java-util:4.32.1")
   testImplementation("com.squareup.okhttp3:okhttp:5.1.0")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha")
   testImplementation("io.opentelemetry:opentelemetry-api")

examples/extension/build.gradle

@@ -100,7 +100,7 @@ dependencies {
   //All dependencies below are only for tests
   testImplementation("org.testcontainers:testcontainers:1.21.3")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.0")
-  testImplementation("com.google.protobuf:protobuf-java-util:4.32.0")
+  testImplementation("com.google.protobuf:protobuf-java-util:4.32.1")
   testImplementation("com.squareup.okhttp3:okhttp:5.1.0")
   testImplementation("io.opentelemetry:opentelemetry-api")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha")

instrumentation/mongo/mongo-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/v4_0/DefaultConnectionPoolTaskInstrumentation.java

@@ -34,6 +34,10 @@ public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(
         isConstructor().and(takesArgument(3, Consumer.class)),
         this.getClass().getName() + "$TaskArg3Advice");
+    // since 5.6.0
+    transformer.applyAdviceToMethod(
+        isConstructor().and(takesArgument(4, Consumer.class)),
+        this.getClass().getName() + "$TaskArg4Advice");
   }
 
   @SuppressWarnings("unused")
@@ -55,4 +59,14 @@ public static void wrapCallback(
       action = new TaskWrapper(Java8BytecodeBridge.currentContext(), action);
     }
   }
+
+  @SuppressWarnings("unused")
+  public static class TaskArg4Advice {
+
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void wrapCallback(
+        @Advice.Argument(value = 4, readOnly = false) Consumer<Object> action) {
+      action = new TaskWrapper(Java8BytecodeBridge.currentContext(), action);
+    }
+  }
 }

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstaller.java

@@ -76,19 +76,19 @@ private static boolean defaultEnabled(ConfigProvider configProvider) {
       return true;
     }
 
-    String profile =
+    String mode =
         instrumentationConfig
             .getStructured("java", empty())
             .getStructured("agent", empty())
             .getString("instrumentation_mode", "default");
 
-    switch (profile) {
+    switch (mode) {
       case "none":
         return false;
       case "default":
         return true;
       default:
-        throw new ConfigurationException("Unknown instrumentation profile: " + profile);
+        throw new ConfigurationException("Unknown instrumentation mode: " + mode);
     }
   }
 

javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstallerTest.java

@@ -51,14 +51,14 @@ void globalOpenTelemetry() {
   })
   void defaultEnabledInDeclarativeConfigPropertiesBridge(
       String propertyValue, boolean expected, boolean fail) {
-    String profile = propertyValue == null ? "" : "instrumentation_mode: \"" + propertyValue + "\"";
+    String mode = propertyValue == null ? "" : "instrumentation_mode: \"" + propertyValue + "\"";
     String yaml =
         "file_format: \"1.0-rc.1\"\n"
             + "instrumentation/development:\n"
             + "  java:\n"
             + "    agent:\n"
             + "      "
-            + profile;
+            + mode;
 
     Supplier<ConfigProperties> configPropertiesSupplier =
         () ->
@@ -71,7 +71,7 @@ void defaultEnabledInDeclarativeConfigPropertiesBridge(
     if (fail) {
       assertThatCode(() -> configPropertiesSupplier.get())
           .isInstanceOf(ConfigurationException.class)
-          .hasMessage("Unknown instrumentation profile: invalid");
+          .hasMessage("Unknown instrumentation mode: invalid");
     } else {
       assertThat(
               configPropertiesSupplier

smoke-tests/build.gradle.kts

@@ -29,7 +29,7 @@ dependencies {
   implementation("io.opentelemetry.proto:opentelemetry-proto")
   implementation("org.testcontainers:testcontainers")
   implementation("com.fasterxml.jackson.core:jackson-databind")
-  implementation("com.google.protobuf:protobuf-java-util:4.32.0")
+  implementation("com.google.protobuf:protobuf-java-util:4.32.1")
   implementation("io.grpc:grpc-netty-shaded")
   implementation("io.grpc:grpc-protobuf")
   implementation("io.grpc:grpc-stub")

smoke-tests/src/test/groovy/io/opentelemetry/smoketest/DeclarativeConfigurationSmokeTest.groovy

@@ -48,7 +48,11 @@ class DeclarativeConfigurationSmokeTest extends SmokeTest {
     Collection<ExportTraceServiceRequest> traces = waitForTraces()
 
     then: "There is one trace"
-    traces.size() > 0
+    traces.size() == 1
+
+    then: "There is one span (io.opentelemetry.opentelemetry-instrumentation-annotations-1.16 " +
+        "is not used, because instrumentation_mode=none)"
+    getSpanStream(traces).count() == 1
 
     then: "explicitly set attribute is present"
     hasResourceAttribute(traces, "service.name", "declarative-config-smoke-test")

smoke-tests/src/test/resources/declarative-config.yaml

@@ -19,3 +19,10 @@ resource:
   attributes:
     - name: service.name
       value: declarative-config-smoke-test
+
+instrumentation/development:
+  java:
+    agent:
+      instrumentation_mode: none
+    tomcat:
+      enabled: true