Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-java into renovate-config

Author: jack-berg

.github/scripts/update-version.sh

@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+version=$1
+
+sed -Ei "s/[0-9]+\.[0-9]+\.[0-9]+/$version/" version.gradle.kts
+
+sed -Ei "1 s/(Comparing source compatibility of [a-z-]+)-[0-9]+\.[0-9]+\.[0-9]+(-SNAPSHOT)?.jar/\1-$version.jar/" docs/apidiffs/current_vs_latest/*.txt

.github/workflows/prepare-patch-release.yml

@@ -37,7 +37,7 @@ jobs:
           echo "VERSION=$major_minor.$((patch + 1))" >> $GITHUB_ENV
 
       - name: Update version
-        run: sed -Ei "s/[0-9]+\.[0-9]+\.[0-9]+/$VERSION/" version.gradle.kts
+        run: .github/scripts/update-version.sh $VERSION
 
       - name: Update the change log with the approximate release date
         run: |

.github/workflows/prepare-release-branch.yml

@@ -100,11 +100,11 @@ jobs:
             echo "unexpected version: $version"
             exit 1
           fi
-          echo "NEXT_VERSION=$next_version" >> $GITHUB_ENV
+          echo "NEXT_VERSION=${next_version}-SNAPSHOT" >> $GITHUB_ENV
           echo "VERSION=$version" >> $GITHUB_ENV
 
       - name: Update version
-        run: sed -Ei "s/[0-9]+\.[0-9]+\.[0-9]+/$NEXT_VERSION/" version.gradle.kts
+        run: .github/scripts/update-version.sh $NEXT_VERSION
 
       - name: Update the change log on main
         run: |

.github/workflows/release.yml

@@ -188,7 +188,7 @@ jobs:
           git add docs/apidiffs
 
       - name: Use CLA approved bot
-        run: .github/scripts/use-cla-approved-bot.sh
+        run: .github/scripts/use-cla-approved-github-bot.sh
 
       - uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
         id: otelbot-token

buildSrc/build.gradle.kts

@@ -64,7 +64,7 @@ dependencies {
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.2.0")
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")
-  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.20")
+  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21")
   implementation("org.owasp:dependency-check-gradle:12.1.1")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
 }

docs/apidiffs/current_vs_latest/opentelemetry-api.txt

@@ -1,4 +1,2 @@
-Comparing source compatibility of opentelemetry-api-1.51.0-SNAPSHOT.jar against opentelemetry-api-1.49.0.jar
-***  MODIFIED INTERFACE: PUBLIC ABSTRACT io.opentelemetry.api.logs.LogRecordBuilder  (not serializable)
-	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
-	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.api.logs.LogRecordBuilder setEventName(java.lang.String)
+Comparing source compatibility of opentelemetry-api-1.51.0-SNAPSHOT.jar against opentelemetry-api-1.50.0.jar
+No changes.

docs/apidiffs/current_vs_latest/opentelemetry-context.txt

@@ -1,5 +1,2 @@
-Comparing source compatibility of opentelemetry-context-1.51.0-SNAPSHOT.jar against opentelemetry-context-1.49.0.jar
-***  MODIFIED INTERFACE: PUBLIC ABSTRACT io.opentelemetry.context.propagation.TextMapGetter  (not serializable)
-	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
-	GENERIC TEMPLATES: === C:java.lang.Object
-	+++  NEW METHOD: PUBLIC(+) java.util.Iterator<java.lang.String> getAll(java.lang.Object, java.lang.String)
+Comparing source compatibility of opentelemetry-context-1.51.0-SNAPSHOT.jar against opentelemetry-context-1.50.0.jar
+No changes.

docs/apidiffs/current_vs_latest/opentelemetry-exporter-common.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-exporter-common-1.51.0-SNAPSHOT.jar against opentelemetry-exporter-common-1.49.0.jar
+Comparing source compatibility of opentelemetry-exporter-common-1.51.0-SNAPSHOT.jar against opentelemetry-exporter-common-1.50.0.jar
 No changes.

docs/apidiffs/current_vs_latest/opentelemetry-exporter-logging-otlp.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-exporter-logging-otlp-1.51.0-SNAPSHOT.jar against opentelemetry-exporter-logging-otlp-1.49.0.jar
+Comparing source compatibility of opentelemetry-exporter-logging-otlp-1.51.0-SNAPSHOT.jar against opentelemetry-exporter-logging-otlp-1.50.0.jar
 No changes.

docs/apidiffs/current_vs_latest/opentelemetry-exporter-logging.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-exporter-logging-1.51.0-SNAPSHOT.jar against opentelemetry-exporter-logging-1.49.0.jar
+Comparing source compatibility of opentelemetry-exporter-logging-1.51.0-SNAPSHOT.jar against opentelemetry-exporter-logging-1.50.0.jar
 No changes.