Merge branch 'main' into flaky-test-reporter

Author: laurit

benchmark-overhead-jmh/build.gradle.kts

@@ -13,7 +13,7 @@ otelJava {
 }
 
 dependencies {
-  jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.4.1")
+  jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.4.2")
 }
 
 tasks {

conventions/build.gradle.kts

@@ -59,7 +59,7 @@ dependencies {
   implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
   implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.5")
   implementation("org.apache.httpcomponents:httpclient:4.5.14")
-  implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:3.19")
+  implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:3.19.1")
   implementation("org.owasp:dependency-check-gradle:12.0.1")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:1.7.2")
   implementation("org.spdx:spdx-gradle-plugin:0.8.0")

docs/supported-libraries.md

@@ -35,23 +35,13 @@ public static DubboTelemetryBuilder builder(OpenTelemetry openTelemetry) {
     this.clientInstrumenter = clientInstrumenter;
   }
 
-  /**
-   * Returns a new Dubbo {@link Filter} that traces Dubbo RPC invocations.
-   *
-   * @deprecated Use {@link #newClientFilter} and {@link #newServerFilter} instead.
-   */
-  @Deprecated
-  public Filter newFilter() {
-    return TracingFilter.newFilter(serverInstrumenter, clientInstrumenter);
-  }
-
   /** Returns a new Dubbo client {@link Filter} that traces Dubbo RPC invocations. */
   public Filter newClientFilter() {
-    return TracingFilter.newClientFilter(clientInstrumenter);
+    return new TracingFilter(clientInstrumenter, true);
   }
 
   /** Returns a new Dubbo server {@link Filter} that traces Dubbo RPC invocations. */
   public Filter newServerFilter() {
-    return TracingFilter.newServerFilter(serverInstrumenter);
+    return new TracingFilter(serverInstrumenter, false);
   }
 }

instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTelemetry.java

@@ -18,52 +18,13 @@
 
 final class TracingFilter implements Filter {
 
-  private final InstrumenterSupplier instrumenterSupplier;
+  private final Instrumenter<DubboRequest, Result> instrumenter;
 
-  private TracingFilter(InstrumenterSupplier instrumenterSupplier) {
-    this.instrumenterSupplier = instrumenterSupplier;
-  }
-
-  static TracingFilter newClientFilter(Instrumenter<DubboRequest, Result> clientInstrumenter) {
-    return newFilter(clientInstrumenter, true);
-  }
-
-  static TracingFilter newServerFilter(Instrumenter<DubboRequest, Result> serverInstrumenter) {
-    return newFilter(serverInstrumenter, false);
-  }
-
-  private static TracingFilter newFilter(
-      Instrumenter<DubboRequest, Result> instrumenter, boolean isClientSide) {
-    return new TracingFilter(
-        new InstrumenterSupplier() {
-
-          @Override
-          public Instrumenter<DubboRequest, Result> get(RpcContext rpcContext) {
-            return instrumenter;
-          }
+  private final boolean isClientSide;
 
-          @Override
-          public boolean isClientSide(RpcContext rpcContext) {
-            return isClientSide;
-          }
-        });
-  }
-
-  static TracingFilter newFilter(
-      Instrumenter<DubboRequest, Result> serverInstrumenter,
-      Instrumenter<DubboRequest, Result> clientInstrumenter) {
-    return new TracingFilter(
-        new InstrumenterSupplier() {
-          @Override
-          public Instrumenter<DubboRequest, Result> get(RpcContext rpcContext) {
-            return rpcContext.isConsumerSide() ? clientInstrumenter : serverInstrumenter;
-          }
-
-          @Override
-          public boolean isClientSide(RpcContext rpcContext) {
-            return rpcContext.isConsumerSide();
-          }
-        });
+  TracingFilter(Instrumenter<DubboRequest, Result> instrumenter, boolean isClientSide) {
+    this.instrumenter = instrumenter;
+    this.isClientSide = isClientSide;
   }
 
   @Override
@@ -78,7 +39,6 @@ public Result invoke(Invoker<?> invoker, Invocation invocation) {
       return invoker.invoke(invocation);
     }
 
-    Instrumenter<DubboRequest, Result> instrumenter = instrumenterSupplier.get(rpcContext);
     Context parentContext = Context.current();
     DubboRequest request = DubboRequest.create((RpcInvocation) invocation, rpcContext);
 
@@ -91,7 +51,7 @@ public Result invoke(Invoker<?> invoker, Invocation invocation) {
     boolean isSynchronous = true;
     try (Scope ignored = context.makeCurrent()) {
       result = invoker.invoke(invocation);
-      if (instrumenterSupplier.isClientSide(rpcContext)) {
+      if (isClientSide) {
         CompletableFuture<Object> future = rpcContext.getCompletableFuture();
         if (future != null) {
           isSynchronous = false;
@@ -108,10 +68,4 @@ public Result invoke(Invoker<?> invoker, Invocation invocation) {
     }
     return result;
   }
-
-  private interface InstrumenterSupplier {
-    Instrumenter<DubboRequest, Result> get(RpcContext rpcContext);
-
-    boolean isClientSide(RpcContext rpcContext);
-  }
 }

instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/TracingFilter.java

@@ -50,6 +50,12 @@ private ContainerResource() {
 
   // Visible for testing
   Resource buildResource() {
+    // disable container id detection on z/os
+    // https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/12418
+    String osName = System.getProperty("os.name");
+    if (osName.equalsIgnoreCase("z/OS") || osName.equalsIgnoreCase("OS/390")) {
+      return Resource.empty();
+    }
     return getContainerId()
         .map(id -> Resource.create(Attributes.of(CONTAINER_ID, id)))
         .orElseGet(Resource::empty);

instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ContainerResource.java

@@ -59,7 +59,6 @@ dependencies {
   testLibrary("org.springframework.boot:spring-boot-starter-webflux:2.0.0.RELEASE")
   testLibrary("org.springframework.boot:spring-boot-starter-test:2.0.0.RELEASE")
   testLibrary("org.springframework.boot:spring-boot-starter-reactor-netty:2.0.0.RELEASE")
-  testImplementation("org.spockframework:spock-spring:2.4-M1-groovy-4.0")
 }
 
 tasks.withType<Test>().configureEach {

instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/build.gradle.kts

@@ -14,8 +14,6 @@ dependencies {
   testLibrary("org.springframework.boot:spring-boot-starter-webflux:2.4.0")
   testLibrary("org.springframework.boot:spring-boot-starter-test:2.4.0")
   testLibrary("org.springframework.boot:spring-boot-starter-reactor-netty:2.4.0")
-  // can be remove after starter is update to depend on spring 6.1
-  latestDepTestLibrary("org.springframework:spring-context:+")
 }
 
 val latestDepTest = findProperty("testLatestDeps") as Boolean

instrumentation/spring/spring-webflux/spring-webflux-5.3/library/build.gradle.kts

@@ -13,15 +13,15 @@ pluginManagement {
 }
 
 plugins {
-  id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0.2"
+  id("com.gradle.common-custom-user-data-gradle-plugin") version "2.1"
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
   // this can't live in pluginManagement currently due to
   // https://github.com/bmuschko/gradle-docker-plugin/issues/1123
   // in particular, these commands are failing (reproducible locally):
   // ./gradlew :smoke-tests:images:servlet:buildLinuxTestImages pushMatrix -PsmokeTestServer=jetty
   // ./gradlew :smoke-tests:images:servlet:buildWindowsTestImages pushMatrix -PsmokeTestServer=jetty
   id("com.bmuschko.docker-remote-api") version "9.4.0" apply false
-  id("com.gradle.develocity") version "3.19"
+  id("com.gradle.develocity") version "3.19.1"
 }
 
 dependencyResolutionManagement {

settings.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
   api("org.spockframework:spock-core")
   api(project(":testing-common"))
 
-  implementation(platform("io.grpc:grpc-bom:1.69.1"))
+  implementation(platform("io.grpc:grpc-bom:1.70.0"))
   implementation("org.slf4j:slf4j-api")
   implementation("io.opentelemetry:opentelemetry-api")
   implementation("io.opentelemetry.proto:opentelemetry-proto")