Merge branch 'main' into feature/helidon

laurit · laurit · commit cfcfeff0e2b0 · 2025-10-09T12:59:54.000+03:00
diff --git a/.github/config/lychee.toml b/.github/config/lychee.toml
diff --git a/.github/scripts/dependencies.dockerfile b/.github/scripts/dependencies.dockerfile
diff --git a/.github/scripts/link-check.sh b/.github/scripts/link-check.sh
diff --git a/.github/workflows/issue-management-stale-action.yml b/.github/workflows/issue-management-stale-action.yml
@@ -47,9 +47,9 @@ jobs:
           exempt-issue-labels: "needs author feedback"
           days-before-pr-stale: -1
           days-before-pr-close: -1
-          days-before-stale: 365
-          days-before-close: 0
-          close-issue-label: stale
+          days-before-issue-stale: 365
+          days-before-issue-close: 0
+          stale-issue-label: stale
           close-issue-message: >
             Since there has been no activity on this enhancement for the past year we are closing it to help maintain our backlog.
             Anyone who would like to work on it is still welcome to do so, and we can re-open it at that time.
diff --git a/.github/workflows/reusable-link-check.yml b/.github/workflows/reusable-link-check.yml
@@ -11,8 +11,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          fetch-depth: 0 # needed for merge-base used in lint:links-in-modified-files
 
-      - name: Link check
+      - uses: jdx/mise-action@e3d7b8d67a7958d1207f6ed871e83b1ea780e7b0 # v3.3.1
+
+      - name: Link check - relative links (all files)
+        if: github.event_name == 'pull_request'
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        run: mise run lint:local-links
+
+      - name: Link check (modified files only)
         env:
           GITHUB_TOKEN: ${{ github.token }}
-        run: ./.github/scripts/link-check.sh
+        run: mise run lint:links-in-modified-files --base origin/${{ github.base_ref }} --head ${{ github.event.pull_request.head.sha }} --event ${{ github.event_name }}
diff --git a/benchmark-overhead/build.gradle.kts b/benchmark-overhead/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
   testImplementation("org.testcontainers:postgresql:1.21.3")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testImplementation("org.junit.jupiter:junit-jupiter-params")
-  testImplementation("com.squareup.okhttp3:okhttp:5.1.0")
+  testImplementation("com.squareup.okhttp3:okhttp:5.2.0")
   testImplementation("org.jooq:joox:2.0.1")
   testImplementation("com.jayway.jsonpath:json-path:2.9.0")
   testImplementation("org.slf4j:slf4j-simple:2.0.17")
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -22,7 +22,7 @@ plugins {
 
 buildscript {
   dependencies {
-    classpath("com.squareup.okhttp3:okhttp:5.1.0")
+    classpath("com.squareup.okhttp3:okhttp:5.2.0")
   }
 }
 
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -116,7 +116,7 @@ val DEPENDENCIES = listOf(
   "com.google.code.findbugs:jsr305:3.0.2",
   "org.apache.groovy:groovy:${groovyVersion}",
   "org.apache.groovy:groovy-json:${groovyVersion}",
-  "org.codehaus.mojo:animal-sniffer-annotations:1.24",
+  "org.codehaus.mojo:animal-sniffer-annotations:1.26",
   "org.junit-pioneer:junit-pioneer:1.9.1",
   "org.objenesis:objenesis:3.4",
   "javax.validation:validation-api:2.0.1.Final",
diff --git a/docs/instrumentation-list.yaml b/docs/instrumentation-list.yaml
@@ -3361,7 +3361,11 @@ libraries:
     - when: otel.instrumentation.common.experimental.controller-telemetry.enabled=true
       spans:
       - span_kind: INTERNAL
-        attributes: []
+        attributes:
+        - name: code.function
+          type: STRING
+        - name: code.namespace
+          type: STRING
   graphql:
   - name: graphql-java-12.0
     description: This instrumentation enables spans for GraphQL Java operations.
diff --git a/examples/distro/instrumentation/servlet-3/build.gradle b/examples/distro/instrumentation/servlet-3/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     exclude group: 'org.eclipse.jetty', module: 'jetty-server'
   }
 
-  testImplementation "com.squareup.okhttp3:okhttp:5.1.0"
+  testImplementation "com.squareup.okhttp3:okhttp:5.2.0"
   testImplementation "javax.servlet:javax.servlet-api:3.0.1"
   testImplementation "org.eclipse.jetty:jetty-server:8.2.0.v20160908"
   testImplementation "org.eclipse.jetty:jetty-servlet:8.2.0.v20160908"
diff --git a/examples/distro/smoke-tests/build.gradle b/examples/distro/smoke-tests/build.gradle
@@ -6,7 +6,7 @@ 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.1")
-  testImplementation("com.squareup.okhttp3:okhttp:5.1.0")
+  testImplementation("com.squareup.okhttp3:okhttp:5.2.0")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha")
   testImplementation("io.opentelemetry:opentelemetry-api")
 
diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle
@@ -101,7 +101,7 @@ 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.1")
-  testImplementation("com.squareup.okhttp3:okhttp:5.1.0")
+  testImplementation("com.squareup.okhttp3:okhttp:5.2.0")
   testImplementation("io.opentelemetry:opentelemetry-api")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha")
 
diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionFactoryInstrumentation.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionFactoryInstrumentation.java
@@ -45,7 +45,8 @@ public void transform(TypeTransformer transformer) {
                     namedOneOf(
                         "org.hibernate.Session",
                         "org.hibernate.StatelessSession",
-                        "org.hibernate.internal.SessionImpl"))),
+                        "org.hibernate.internal.SessionImpl",
+                        "org.hibernate.engine.spi.SessionImplementor"))),
         SessionFactoryInstrumentation.class.getName() + "$SessionFactoryAdvice");
   }
 
diff --git a/instrumentation/hystrix-1.4/javaagent/build.gradle.kts b/instrumentation/hystrix-1.4/javaagent/build.gradle.kts
@@ -24,7 +24,6 @@ tasks {
   withType<Test>().configureEach {
     // Disable so failure testing below doesn't inadvertently change the behavior.
     jvmArgs("-Dhystrix.command.default.circuitBreaker.enabled=false")
-    jvmArgs("-Dio.opentelemetry.javaagent.shaded.io.opentelemetry.context.enableStrictContext=false")
 
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
 
diff --git a/instrumentation/kotlinx-coroutines/kotlinx-coroutines-flow-1.3/javaagent/build.gradle.kts b/instrumentation/kotlinx-coroutines/kotlinx-coroutines-flow-1.3/javaagent/build.gradle.kts
@@ -41,7 +41,3 @@ kotlin {
     jvmTarget.set(JvmTarget.JVM_1_8)
   }
 }
-
-tasks.withType<Test>().configureEach {
-  jvmArgs("-Dio.opentelemetry.javaagent.shaded.io.opentelemetry.context.enableStrictContext=false")
-}
diff --git a/instrumentation/logback/logback-appender-1.0/javaagent/build.gradle.kts b/instrumentation/logback/logback-appender-1.0/javaagent/build.gradle.kts
@@ -46,6 +46,8 @@ dependencies {
 
   implementation(project(":instrumentation:logback:logback-appender-1.0:library"))
 
+  testInstrumentation(project(":instrumentation:logback:logback-mdc-1.0:javaagent"))
+
   testImplementation("org.awaitility:awaitility")
 }
 
diff --git a/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java b/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java
@@ -17,6 +17,7 @@
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.logs.Severity;
 import io.opentelemetry.api.trace.SpanContext;
+import io.opentelemetry.api.trace.TraceFlags;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
@@ -167,6 +168,15 @@ private static void test(
                       satisfies(
                           EXCEPTION_STACKTRACE, v -> v.contains(LogbackTest.class.getName()))));
             }
+            if (withParent) {
+              SpanContext spanContext = testing.spans().get(0).getSpanContext();
+              attributeAsserts.addAll(
+                  Arrays.asList(
+                      equalTo(AttributeKey.stringKey("trace_id"), spanContext.getTraceId()),
+                      equalTo(AttributeKey.stringKey("span_id"), spanContext.getSpanId()),
+                      equalTo(
+                          AttributeKey.stringKey("trace_flags"), TraceFlags.getSampled().asHex())));
+            }
             logRecord.hasAttributesSatisfyingExactly(attributeAsserts);
           });
     } else {
diff --git a/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapperTest.java b/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapperTest.java
@@ -17,7 +17,9 @@
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledInNativeImage;
 
+@DisabledInNativeImage // conflict with Mockito
 class LoggingEventMapperTest {
 
   @Test
diff --git a/instrumentation/logback/logback-mdc-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/mdc/v1_0/LogbackMdcInstrumentationModule.java b/instrumentation/logback/logback-mdc-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/mdc/v1_0/LogbackMdcInstrumentationModule.java
@@ -29,4 +29,11 @@ public List<TypeInstrumentation> typeInstrumentations() {
   public boolean isIndyReady() {
     return true;
   }
+
+  @Override
+  public int order() {
+    // run before logback appender instrumentation so that the appender instrumentation can observe
+    // the attributes added to the mdc by this instrumentation
+    return -1;
+  }
 }
diff --git a/instrumentation/rxjava/rxjava-2.0/library/build.gradle.kts b/instrumentation/rxjava/rxjava-2.0/library/build.gradle.kts
@@ -14,6 +14,4 @@ tasks.withType<Test>().configureEach {
   // required on jdk17, uses spock Mock that needs access to jdk internals
   jvmArgs("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED")
   jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
-
-  jvmArgs("-Dio.opentelemetry.context.enableStrictContext=false")
 }
diff --git a/instrumentation/rxjava/rxjava-3.0/library/build.gradle.kts b/instrumentation/rxjava/rxjava-3.0/library/build.gradle.kts
@@ -11,7 +11,3 @@ dependencies {
 
   latestDepTestLibrary("io.reactivex.rxjava3:rxjava:3.1.0") // see rxjava-3.1.1 module
 }
-
-tasks.withType<Test>().configureEach {
-  jvmArgs("-Dio.opentelemetry.context.enableStrictContext=false")
-}
diff --git a/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/RpcCodeAttributesGetter.java b/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/RpcCodeAttributesGetter.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.vaadin;
+
+import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesGetter;
+
+public class RpcCodeAttributesGetter implements CodeAttributesGetter<VaadinRpcRequest> {
+
+  @Override
+  public Class<?> getCodeClass(VaadinRpcRequest request) {
+    return request.getRpcInvocationHandler().getClass();
+  }
+
+  @Override
+  public String getMethodName(VaadinRpcRequest request) {
+    return request.getMethodName();
+  }
+}
diff --git a/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/VaadinSingletons.java b/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/VaadinSingletons.java
@@ -50,10 +50,12 @@ public class VaadinSingletons {
                     context.with(REQUEST_HANDLER_CONTEXT_KEY, true))
             .buildInstrumenter();
 
+    RpcCodeAttributesGetter rpcCodeAttributesGetter = new RpcCodeAttributesGetter();
     RPC_INSTRUMENTER =
         Instrumenter.<VaadinRpcRequest, Void>builder(
                 GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, VaadinSingletons::rpcSpanName)
             .setEnabled(ExperimentalConfig.get().controllerTelemetryEnabled())
+            .addAttributesExtractor(CodeAttributesExtractor.create(rpcCodeAttributesGetter))
             .buildInstrumenter();
 
     SERVICE_INSTRUMENTER =
diff --git a/instrumentation/vaadin-14.2/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/AbstractVaadinTest.java b/instrumentation/vaadin-14.2/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/AbstractVaadinTest.java
@@ -5,6 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.vaadin;
 
+import static io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil.codeFunctionAssertions;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
@@ -170,7 +171,11 @@ private void assertButtonClick() {
                         assertThat(spans.get(spans.size() - 1))
                             .hasName("EventRpcHandler.handle/click")
                             .hasParent(spans.get(spans.size() - 2))
-                            .hasKind(SpanKind.INTERNAL);
+                            .hasKind(SpanKind.INTERNAL)
+                            .hasAttributesSatisfyingExactly(
+                                codeFunctionAssertions(
+                                    "com.vaadin.flow.server.communication.rpc.EventRpcHandler",
+                                    "handle"));
                       });
             });
   }
diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/SpanLoggingCustomizerProvider.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/SpanLoggingCustomizerProvider.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.tooling;
+
+import com.google.auto.service.AutoService;
+import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizer;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ConsoleExporterModel;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SimpleSpanProcessorModel;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterModel;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel;
+
+/** Adds span logging exporter for debug mode */
+@AutoService(DeclarativeConfigurationCustomizerProvider.class)
+public class SpanLoggingCustomizerProvider implements DeclarativeConfigurationCustomizerProvider {
+
+  @Override
+  public void customize(DeclarativeConfigurationCustomizer customizer) {
+    customizer.addModelCustomizer(
+        model -> {
+          maybeEnableLoggingExporter(model);
+          return model;
+        });
+  }
+
+  private static void maybeEnableLoggingExporter(OpenTelemetryConfigurationModel model) {
+    // read from system properties as it's an early init property and the config bridge is not
+    // available here
+    if (!ConfigPropertiesUtil.getBoolean("otel.javaagent.debug", false)) {
+      return;
+    }
+    // don't install another instance if the user has already explicitly requested it.
+    if (loggingExporterIsAlreadyConfigured(model)) {
+      return;
+    }
+    TracerProviderModel tracerProvider = model.getTracerProvider();
+    if (tracerProvider == null) {
+      tracerProvider = new TracerProviderModel();
+      model.withTracerProvider(tracerProvider);
+    }
+    SpanProcessorModel processor =
+        new SpanProcessorModel()
+            .withSimple(
+                new SimpleSpanProcessorModel()
+                    .withExporter(new SpanExporterModel().withConsole(new ConsoleExporterModel())));
+    tracerProvider.getProcessors().add(processor);
+  }
+
+  private static boolean loggingExporterIsAlreadyConfigured(OpenTelemetryConfigurationModel model) {
+    TracerProviderModel tracerProvider = model.getTracerProvider();
+    if (tracerProvider == null) {
+      return false;
+    }
+    for (SpanProcessorModel processor : tracerProvider.getProcessors()) {
+      SimpleSpanProcessorModel simple = processor.getSimple();
+      if (simple == null) {
+        continue;
+      }
+      SpanExporterModel exporter = simple.getExporter();
+      if (exporter == null) {
+        continue;
+      }
+      if (exporter.getConsole() != null) {
+        return true;
+      }
+    }
+    return false;
+  }
+}
diff --git a/javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/test/HelperInjectionTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/test/HelperInjectionTest.groovy
diff --git a/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/test/HelperInjectionTest.java b/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/test/HelperInjectionTest.java
diff --git a/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/SpanLoggingCustomizerProviderTest.java b/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/SpanLoggingCustomizerProviderTest.java
diff --git a/mise.toml b/mise.toml
diff --git a/smoke-tests/build.gradle.kts b/smoke-tests/build.gradle.kts
diff --git a/smoke-tests/images/grpc/build.gradle.kts b/smoke-tests/images/grpc/build.gradle.kts
diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/provider/TestExporterCustomizerProvider.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/provider/TestExporterCustomizerProvider.java
diff --git a/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/provider/AgentTestExporterCustomizerProvider.java b/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/provider/AgentTestExporterCustomizerProvider.java

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ plugins {`
`22`	`22`
`23`	`23`	`buildscript {`
`24`	`24`	`dependencies {`
`25`		`- classpath("com.squareup.okhttp3:okhttp:5.1.0")`
	`25`	`+ classpath("com.squareup.okhttp3:okhttp:5.2.0")`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ dependencies {`
`27`	`27`	`exclude group: 'org.eclipse.jetty', module: 'jetty-server'`
`28`	`28`	`}`
`29`	`29`
`30`		`- testImplementation "com.squareup.okhttp3:okhttp:5.1.0"`
	`30`	`+ testImplementation "com.squareup.okhttp3:okhttp:5.2.0"`
`31`	`31`	`testImplementation "javax.servlet:javax.servlet-api:3.0.1"`
`32`	`32`	`testImplementation "org.eclipse.jetty:jetty-server:8.2.0.v20160908"`
`33`	`33`	`testImplementation "org.eclipse.jetty:jetty-servlet:8.2.0.v20160908"`