Merge branch 'main' into x-bar-1-sfn

Author: laurit

.github/workflows/auto-update-pull-request.yml

@@ -55,11 +55,22 @@ jobs:
           git config user.name otelbot
           git config user.email [email protected]
 
+      - id: gradle-task
+        if: steps.unzip-patch.outputs.exists == 'true'
+        run: |
+          if [[ "${{ github.event.workflow_run.name }}" == "Auto spotless" ]]; then
+            echo "name=spotlessApply" >> $GITHUB_OUTPUT
+          elif [[ "${{ github.event.workflow_run.name }}" == "Auto license report" ]]; then
+            echo "name=generateLicenseReport" >> $GITHUB_OUTPUT
+          else
+            echo "name=unknown" >> $GITHUB_OUTPUT
+          fi
+
       - name: Apply patch and push
         if: steps.unzip-patch.outputs.exists == 'true'
         run: |
           git apply "${{ runner.temp }}/patch"
-          git commit -a -m "./gradlew spotlessApply"
+          git commit -a -m "./gradlew ${{ steps.gradle-task.outputs.name }}"
           git push
 
       - id: get-pr
@@ -84,12 +95,12 @@ jobs:
           GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
           PR_NUMBER: ${{ steps.get-pr.outputs.number }}
         run: |
-          gh pr comment $PR_NUMBER --body "🔧 The result from spotlessApply was committed to the PR branch."
+          gh pr comment $PR_NUMBER --body "🔧 The result from ${{ steps.gradle-task.outputs.name }} was committed to the PR branch."
 
       - if: steps.unzip-patch.outputs.exists == 'true' && failure()
         env:
           GH_REPO: ${{ github.repository }}
           GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
           PR_NUMBER: ${{ steps.get-pr.outputs.number }}
         run: |
-          gh pr comment $PR_NUMBER --body "❌ The result from spotlessApply could not be committed to the PR branch, see logs: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID."
+          gh pr comment $PR_NUMBER --body "❌ The result from ${{ steps.gradle-task.outputs.name }} could not be committed to the PR branch, see logs: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID."

.github/workflows/reusable-markdown-link-check.yml

@@ -22,5 +22,6 @@ jobs:
             --exclude "^http://code.google.com/p/concurrentlinkedhashmap$"
             --exclude "^https://softwareengineering.stackexchange.com/questions/29727"
             --max-retries 6
-            --max-concurrency 1
+            --max-concurrency 4
+            --github-token ${{ github.token }}
             .

conventions/build.gradle.kts

@@ -60,7 +60,7 @@ dependencies {
   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:4.0.2")
-  implementation("org.owasp:dependency-check-gradle:12.1.2")
+  implementation("org.owasp:dependency-check-gradle:12.1.3")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
   implementation("org.spdx:spdx-gradle-plugin:0.9.0")
   // When updating, also update dependencyManagement/build.gradle.kts

instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate7Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v7_0/SessionTest.java

@@ -52,14 +52,15 @@ class SessionTest extends AbstractHibernateTest {
   @MethodSource("provideHibernateActionParameters")
   void testHibernateAction(Parameter parameter) {
     Session session = sessionFactory.openSession();
+    session.beginTransaction();
+
     Value value = session.merge(prepopulated.get(0));
     testing.waitForTraces(1);
     testing.clearData();
 
     testing.runWithSpan(
         "parent",
         () -> {
-          session.beginTransaction();
           try {
             parameter.sessionMethodTest.accept(session, value);
           } catch (RuntimeException e) {

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java

@@ -41,6 +41,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.core.env.Environment;
 
 /**
@@ -62,18 +63,26 @@ public class OpenTelemetryAutoConfiguration {
 
   public OpenTelemetryAutoConfiguration() {}
 
+  @Bean
+  @ConfigurationPropertiesBinding
+  OtelMapConverter otelMapConverter() {
+    // This is needed for otlp exporter headers and OtelResourceProperties.
+
+    // We need this converter, even if the SDK is disabled,
+    // because the properties are parsed before the SDK is disabled.
+
+    // We also need this converter if the OpenTelemetry bean is user supplied,
+    // because the environment variables may still contain a value that needs to be converted,
+    // even if the SDK is disabled (and the value thus ignored).
+    return new OtelMapConverter();
+  }
+
   @Configuration
   @Conditional(SdkEnabled.class)
+  @DependsOn("otelMapConverter")
   @ConditionalOnMissingBean(OpenTelemetry.class)
   static class OpenTelemetrySdkConfig {
 
-    @Bean
-    @ConfigurationPropertiesBinding
-    public OtelMapConverter otelMapConverter() {
-      // needed for otlp exporter headers and OtelResourceProperties
-      return new OtelMapConverter();
-    }
-
     @Bean
     public OpenTelemetrySdkComponentLoader openTelemetrySdkComponentLoader(
         ApplicationContext applicationContext) {
@@ -139,21 +148,10 @@ public ConfigProperties otelProperties(
   }
 
   @Configuration
+  @DependsOn("otelMapConverter")
   @ConditionalOnMissingBean(OpenTelemetry.class)
   @ConditionalOnProperty(name = "otel.sdk.disabled", havingValue = "true")
   static class DisabledOpenTelemetrySdkConfig {
-
-    @Bean
-    @ConfigurationPropertiesBinding
-    // Duplicated in OpenTelemetrySdkConfig and DisabledOpenTelemetrySdkConfig to not expose the
-    // converter in the public API
-    public OtelMapConverter otelMapConverter() {
-      // needed for otlp exporter headers and OtelResourceProperties
-      // we need this converter, even if the SDK is disabled,
-      // because the properties are parsed before the SDK is disabled
-      return new OtelMapConverter();
-    }
-
     @Bean
     public OpenTelemetry openTelemetry() {
       logger.info("OpenTelemetry Spring Boot starter has been disabled");

instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/properties/SpringConfigPropertiesTest.java

@@ -8,6 +8,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 
+import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
@@ -77,6 +78,19 @@ void mapFlatHeaders(String key) {
                     .containsExactly(entry("a", "1"), entry("b", "2")));
   }
 
+  @ParameterizedTest
+  @MethodSource("headerKeys")
+  @DisplayName("should map headers from spring properties with user supplied OpenTelemetry bean")
+  void mapFlatHeadersWithUserSuppliedOtelBean(String key) {
+    this.contextRunner
+        .withSystemProperties(key + "=a=1,b=2")
+        .withBean(OpenTelemetry.class, OpenTelemetry::noop)
+        .run(
+            context ->
+                assertThat(getConfig(context).getMap(key))
+                    .containsExactly(entry("a", "1"), entry("b", "2")));
+  }
+
   @ParameterizedTest
   @MethodSource("headerKeys")
   @DisplayName("should map headers from spring application.yaml")

test-report/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
   implementation("com.google.api-client:google-api-client:2.8.0")
-  implementation("com.google.apis:google-api-services-sheets:v4-rev20250513-2.0.0")
+  implementation("com.google.apis:google-api-services-sheets:v4-rev20250603-2.0.0")
   implementation("com.google.auth:google-auth-library-oauth2-http:1.37.0")
 }