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

Author: SylvainJuge

.github/renovate.json5

@@ -78,6 +78,12 @@
         'com.gradleup.shadow{/,}**',
       ],
     },
+    {
+      groupName: 'guava packages',
+      matchPackageNames: [
+        'com.google.guava{/,}**',
+      ],
+    },
     {
       groupName: 'jackson packages',
       matchPackageNames: [

conventions/build.gradle.kts

@@ -55,7 +55,7 @@ dependencies {
 
   // When updating, update above in plugins too
   implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.2")
-  implementation("com.google.guava:guava:33.4.5-jre")
+  implementation("com.google.guava:guava:33.4.6-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")

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.0-jre",
+  "com.google.guava:guava-bom:33.4.6-jre",
   "org.apache.groovy:groovy-bom:${groovyVersion}",
   "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",
   "io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}",

docs/contributing/style-guideline.md

@@ -108,18 +108,7 @@ All parameters and fields which can be `null` should be annotated with `@Nullabl
 (specifically `javax.annotation.Nullable`, which is included by the
 `otel.java-conventions` gradle plugin as a `compileOnly` dependency).
 
-There is no need to use `@NonNull`, as this is the default, which should be declared in a
-`package-info.java` file on the root package of each module, e.g.
-
-```java
-@DefaultQualifier(
-    value = NonNull.class,
-    locations = {TypeUseLocation.FIELD, TypeUseLocation.PARAMETER, TypeUseLocation.RETURN})
-package io.opentelemetry.instrumentation.api;
-
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.framework.qual.DefaultQualifier;
-```
+There is no need to use `@NonNull`, as this is the default.
 
 Public APIs should still defensively check for `null` parameters, even if the parameter is not
 annotated with `@Nullable`. Internal APIs do not need to defensively check for `null` parameters.

examples/distro/smoke-tests/build.gradle

@@ -5,7 +5,7 @@ plugins {
 dependencies {
   testImplementation("org.testcontainers:testcontainers:1.20.6")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.3")
-  testImplementation("com.google.protobuf:protobuf-java-util:4.30.1")
+  testImplementation("com.google.protobuf:protobuf-java-util:4.30.2")
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha")
   testImplementation("io.opentelemetry:opentelemetry-api")

examples/extension/build.gradle

@@ -99,7 +99,7 @@ dependencies {
   //All dependencies below are only for tests
   testImplementation("org.testcontainers:testcontainers:1.20.6")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.3")
-  testImplementation("com.google.protobuf:protobuf-java-util:4.30.1")
+  testImplementation("com.google.protobuf:protobuf-java-util:4.30.2")
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
   testImplementation("io.opentelemetry:opentelemetry-api")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha")

gradle-plugins/build.gradle.kts

@@ -29,7 +29,7 @@ val byteBuddyVersion = "1.17.4"
 val aetherVersion = "1.1.0"
 
 dependencies {
-  implementation("com.google.guava:guava:33.4.5-jre")
+  implementation("com.google.guava:guava:33.4.6-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/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/Instrumenter.java

@@ -190,7 +190,8 @@ private Context doStart(Context parentContext, REQUEST request, @Nullable Instan
       context = contextCustomizer.onStart(context, request, attributes);
     }
 
-    boolean localRoot = LocalRootSpan.isLocalRoot(context);
+    boolean localRoot = LocalRootSpan.isLocalRoot(parentContext);
+    boolean hasLocalRoot = LocalRootSpan.fromContextOrNull(context) != null;
 
     spanBuilder.setAllAttributes(attributes);
     Span span = spanBuilder.setParent(context).startSpan();
@@ -216,9 +217,9 @@ private Context doStart(Context parentContext, REQUEST request, @Nullable Instan
 
     if (localRoot) {
       context = LocalRootSpan.store(context, span);
-      if (spanKind == SpanKind.SERVER) {
-        HttpRouteState.updateSpan(context, span);
-      }
+    }
+    if (!hasLocalRoot && spanKind == SpanKind.SERVER) {
+      HttpRouteState.updateSpan(context, span);
     }
 
     return spanSuppressor.storeInContext(context, spanKind, span);

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/HttpRouteState.java

@@ -27,7 +27,7 @@ public static HttpRouteState fromContextOrNull(Context context) {
 
   public static void updateSpan(Context context, Span span) {
     HttpRouteState state = fromContextOrNull(context);
-    if (state != null) {
+    if (state != null && state.span == null) {
       state.span = span;
     }
   }

instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerRouteTest.java

@@ -44,7 +44,7 @@ void setUp() {
   }
 
   @Test
-  void noLocalRootSpan() {
+  void nonInstrumenerParentLocalRootSpan() {
     Span parentSpan =
         testing.getOpenTelemetry().getTracer("test").spanBuilder("parent").startSpan();
     parentSpan.end();
@@ -56,10 +56,11 @@ void noLocalRootSpan() {
 
     instrumenter.end(context, "test", null, null);
 
-    assertNull(HttpServerRoute.get(context));
+    assertEquals("/get/:id", HttpServerRoute.get(context));
     assertThat(testing.getSpans())
         .satisfiesExactly(
-            span -> assertThat(span).hasName("parent"), span -> assertThat(span).hasName("test"));
+            span -> assertThat(span).hasName("parent"),
+            span -> assertThat(span).hasName("HTTP /get/:id"));
   }
 
   @Test