Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into yaml-jmx-metrics-test

Author: SylvainJuge

README.md

@@ -136,11 +136,6 @@ Debug logging negatively impacts the performance of your application.
 
 See [CONTRIBUTING.md](CONTRIBUTING.md).
 
-Triagers ([@open-telemetry/java-instrumentation-triagers](https://github.com/orgs/open-telemetry/teams/java-instrumentation-triagers)):
-
-- [Jonas Kunz](https://github.com/JonasKunz), Elastic
-- [Sylvain Juge](https://github.com/SylvainJuge), Elastic
-
 Approvers ([@open-telemetry/java-instrumentation-approvers](https://github.com/orgs/open-telemetry/teams/java-instrumentation-approvers)):
 
 - [Gregor Zeitlinger](https://github.com/zeitlinger), Grafana
@@ -149,7 +144,9 @@ Approvers ([@open-telemetry/java-instrumentation-approvers](https://github.com/o
 - [Jay DeLuca](https://github.com/jaydeluca)
 - [Jean Bisutti](https://github.com/jeanbisutti), Microsoft
 - [John Watson](https://github.com/jkwatson), Cloudera
+- [Jonas Kunz](https://github.com/JonasKunz), Elastic
 - [Steve Rao](https://github.com/steverao), Alibaba
+- [Sylvain Juge](https://github.com/SylvainJuge), Elastic
 
 Maintainers ([@open-telemetry/java-instrumentation-maintainers](https://github.com/orgs/open-telemetry/teams/java-instrumentation-maintainers)):
 

benchmark-overhead/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
   id("java")
-  id("com.diffplug.spotless") version "7.0.2"
+  id("com.diffplug.spotless") version "7.0.3"
 }
 
 spotless {

conventions/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
   `kotlin-dsl`
   // When updating, update below in dependencies too
-  id("com.diffplug.spotless") version "7.0.2"
+  id("com.diffplug.spotless") version "7.0.3"
 }
 
 spotless {
@@ -54,12 +54,12 @@ dependencies {
   implementation("org.apache.maven:maven-aether-provider:3.3.9")
 
   // When updating, update above in plugins too
-  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.2")
-  implementation("com.google.guava:guava:33.4.6-jre")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.3")
+  implementation("com.google.guava:guava:33.4.7-jre")
   implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
   implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.6")
   implementation("org.apache.httpcomponents:httpclient:4.5.14")
-  implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:3.19.2")
+  implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.0")
   implementation("org.owasp:dependency-check-gradle:12.1.1")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.0")
   implementation("org.spdx:spdx-gradle-plugin:0.9.0")

dependencyManagement/build.gradle.kts

@@ -29,7 +29,7 @@ val DEPENDENCY_BOMS = listOf(
 
   "com.fasterxml.jackson:jackson-bom:2.18.3",
   "com.squareup.okio:okio-bom:3.10.2", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
-  "com.google.guava:guava-bom:33.4.6-jre",
+  "com.google.guava:guava-bom:33.4.7-jre",
   "org.apache.groovy:groovy-bom:${groovyVersion}",
   "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",
   "io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}",

examples/distro/build.gradle

@@ -12,7 +12,7 @@ buildscript {
     }
   }
   dependencies {
-    classpath "com.diffplug.spotless:spotless-plugin-gradle:7.0.2"
+    classpath "com.diffplug.spotless:spotless-plugin-gradle:7.0.3"
     classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.6"
     classpath "io.opentelemetry.instrumentation:gradle-plugins:2.15.0-alpha-SNAPSHOT"
   }

examples/extension/build.gradle

@@ -11,7 +11,7 @@ plugins {
   See https://imperceptiblethoughts.com/shadow/ for more details about Shadow plugin.
    */
   id "com.gradleup.shadow" version "8.3.6"
-  id "com.diffplug.spotless" version "7.0.2"
+  id "com.diffplug.spotless" version "7.0.3"
 
   id "io.opentelemetry.instrumentation.muzzle-generation" version "2.15.0-alpha-SNAPSHOT"
   id "io.opentelemetry.instrumentation.muzzle-check" version "2.15.0-alpha-SNAPSHOT"

gradle-plugins/build.gradle.kts

@@ -29,7 +29,7 @@ val byteBuddyVersion = "1.17.5"
 val aetherVersion = "1.1.0"
 
 dependencies {
-  implementation("com.google.guava:guava:33.4.6-jre")
+  implementation("com.google.guava:guava:33.4.7-jre")
   // we need to use byte buddy variant that does not shade asm
   implementation("net.bytebuddy:byte-buddy-gradle-plugin:${byteBuddyVersion}") {
     exclude(group = "net.bytebuddy", module = "byte-buddy")

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingProducerMetrics.java

@@ -47,7 +47,7 @@ private MessagingProducerMetrics(Meter meter) {
   }
 
   public static OperationMetrics get() {
-    return OperationMetricsUtil.create("messaging produce", MessagingProducerMetrics::new);
+    return OperationMetricsUtil.create("messaging producer", MessagingProducerMetrics::new);
   }
 
   @Override

instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/OpenTelemetryClientFilter.java

@@ -11,7 +11,9 @@
 import org.apache.dubbo.rpc.Invoker;
 import org.apache.dubbo.rpc.Result;
 
-@Activate(group = {"consumer"})
+@Activate(
+    group = {"consumer"},
+    order = -1)
 public final class OpenTelemetryClientFilter implements Filter {
 
   private final Filter delegate;

instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/OpenTelemetryServerFilter.java

@@ -11,7 +11,9 @@
 import org.apache.dubbo.rpc.Invoker;
 import org.apache.dubbo.rpc.Result;
 
-@Activate(group = {"provider"})
+@Activate(
+    group = {"provider"},
+    order = -1)
 public final class OpenTelemetryServerFilter implements Filter {
 
   private final Filter delegate;