Merge branch 'main' into otelbot/merge-change-log-updates-from-release-v2.13.x

Author: laurit

.github/repository-settings.md

@@ -32,21 +32,26 @@ settings](https://github.com/open-telemetry/community/blob/main/docs/how-to-conf
   - `release/*`
 - Branch rules
   - Restrict deletions: CHECKED
-  - Require linear history: CHECKED
   - Require a pull request before merging: CHECKED
     - Required approvals: 1
     - Require review from Code Owners: CHECKED
     - Allowed merge methods: Squash
   - Require status checks to pass
-    - EasyCLA
-    - `required-status-check`
-    - `gradle-wrapper-validation`
+    - Do not require status checks on creation: CHECKED
+    - Status checks that are required
+      - EasyCLA
+      - `required-status-check`
+      - `gradle-wrapper-validation`
   - Block force pushes: CHECKED
   - Require code scanning results: CHECKED
     - CodeQL
       - Security alerts: High or higher
       - Alerts: Errors
 
+> [!NOTE]
+> This repository can't "require linear history" because there is an old merge commit on `main`
+> (and so also on the release branches).
+
 ### `cloudfoundry` branch
 
 - Targeted branches:

.github/workflows/build-common.yml

@@ -310,7 +310,6 @@ jobs:
           -Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }}
           -Porg.gradle.java.installations.auto-download=false
           ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
-          ${{ inputs.max-test-retries && format(' -PmaxTestRetries={0}', inputs.max-test-retries) || '' }}
 
       - name: Build scan
         if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}

.github/workflows/reusable-test-indy.yml

@@ -9,9 +9,6 @@ on:
       no-build-cache:
         type: boolean
         required: false
-      max-test-retries:
-        type: string
-        required: false
     secrets:
       FLAKY_TEST_REPORTER_ACCESS_KEY:
         required: false
@@ -82,7 +79,6 @@ jobs:
           ${{ env.test-tasks }}
           -PtestIndy=true
           ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
-          ${{ inputs.max-test-retries && format(' -PmaxTestRetries={0}', inputs.max-test-retries) || '' }}
 
       - name: Build scan
         if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}

.github/workflows/reusable-test-latest-deps.yml

@@ -9,9 +9,6 @@ on:
       no-build-cache:
         type: boolean
         required: false
-      max-test-retries:
-        type: string
-        required: false
     secrets:
       FLAKY_TEST_REPORTER_ACCESS_KEY:
         required: false
@@ -80,7 +77,6 @@ jobs:
           ${{ env.test-tasks }}
           -PtestLatestDeps=true
           ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
-          ${{ inputs.max-test-retries && format(' -PmaxTestRetries={0}', inputs.max-test-retries) || '' }}
 
       - name: Build scan
         if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -160,7 +160,7 @@ dependencies {
   compileOnly("com.google.code.findbugs:jsr305")
   compileOnly("com.google.errorprone:error_prone_annotations")
 
-  codenarc("org.codenarc:CodeNarc:3.5.0")
+  codenarc("org.codenarc:CodeNarc:3.6.0")
   codenarc(platform("org.codehaus.groovy:groovy-bom:3.0.23"))
 
   modules {

docs/apidiffs/2.13.0_vs_2.12.0/opentelemetry-instrumentation-annotations.txt

@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.13.0.jar against opentelemetry-instrumentation-annotations-2.12.0.jar
+No changes.

docs/apidiffs/2.13.0_vs_2.12.0/opentelemetry-instrumentation-api.txt

@@ -0,0 +1,6 @@
+Comparing source compatibility of opentelemetry-instrumentation-api-2.13.0.jar against opentelemetry-instrumentation-api-2.12.0.jar
++++  NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.instrumentation.api.semconv.util.SpanNames  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) java.lang.String fromMethod(java.lang.reflect.Method)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) java.lang.String fromMethod(java.lang.Class<?>, java.lang.String)

docs/apidiffs/2.13.0_vs_2.12.0/opentelemetry-spring-boot-autoconfigure.txt

@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.13.0.jar against opentelemetry-spring-boot-autoconfigure-2.12.0.jar
+No changes.

docs/apidiffs/2.13.0_vs_2.12.0/opentelemetry-spring-boot-starter.txt

@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-spring-boot-starter-2.13.0.jar against opentelemetry-spring-boot-starter-2.12.0.jar
+No changes.

docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-instrumentation-annotations-2.14.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.12.0.jar
+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.14.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.13.0.jar
 No changes.

docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt

@@ -1,6 +1,2 @@
-Comparing source compatibility of opentelemetry-instrumentation-api-2.14.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.12.0.jar
-+++  NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.instrumentation.api.semconv.util.SpanNames  (not serializable)
-	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
-	+++  NEW SUPERCLASS: java.lang.Object
-	+++  NEW METHOD: PUBLIC(+) STATIC(+) java.lang.String fromMethod(java.lang.reflect.Method)
-	+++  NEW METHOD: PUBLIC(+) STATIC(+) java.lang.String fromMethod(java.lang.Class<?>, java.lang.String)
+Comparing source compatibility of opentelemetry-instrumentation-api-2.14.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.13.0.jar
+No changes.

docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.14.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.12.0.jar
+Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.14.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.13.0.jar
 No changes.

docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-starter.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-spring-boot-starter-2.14.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.12.0.jar
+Comparing source compatibility of opentelemetry-spring-boot-starter-2.14.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.13.0.jar
 No changes.