Merge branch 'open-telemetry:main' into main

Author: hilmarf

.github/scripts/generate-release-contributors.sh

@@ -1,8 +1,5 @@
 #!/bin/bash -e
 
-# shellcheck disable=SC2016
-# shellcheck disable=SC2086
-
 # this should be run on the release branch
 
 # NOTE if you need to run this script locally, you will need to first:
@@ -55,6 +52,8 @@ query($q: String!, $endCursor: String) {
 
 # this query captures authors of issues which have had PRs in the current range reference the issue
 # but not necessarily through closingIssuesReferences (e.g. addressing just a part of an issue)
+#
+# note: [^0-9<&#;] below excludes HTML entity markers to avoid matching &#1234; as issue #1234
 contributors2=$(gh api graphql --paginate -F q="repo:$GITHUB_REPOSITORY is:pr base:main is:merged merged:$from..$to" -f query='
 query($q: String!, $endCursor: String) {
   search(query: $q, type: ISSUE, first: 100, after: $endCursor) {
@@ -72,8 +71,8 @@ query($q: String!, $endCursor: String) {
   }
 }
 ' --jq '.data.search.edges.[].node.body' \
-  | grep -oE "#[0-9]{4,}$|#[0-9]{4,}[^0-9<]|$GITHUB_REPOSITORY/issues/[0-9]{4,}" \
-  | grep -oE "[0-9]{4,}" \
+  | grep -oE "#[0-9]{3,}$|#[0-9]{3,}[^0-9<&#;]|$GITHUB_REPOSITORY/issues/[0-9]{3,}" \
+  | grep -oE "[0-9]{3,}" \
   | xargs -I{} gh issue view {} --json 'author,url' --jq '[.author.login,.url]' \
   | grep -v '/pull/' \
   | sed 's/^\["//' \

api/all/src/test/java/io/opentelemetry/api/baggage/propagation/PercentEscaperFuzzTest.java

@@ -13,6 +13,7 @@
 import edu.berkeley.cs.jqf.fuzz.random.NoGuidance;
 import io.opentelemetry.api.internal.PercentEscaper;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import org.junit.jupiter.api.Test;
 import org.junit.runner.Result;
 import org.junit.runner.RunWith;
@@ -22,10 +23,11 @@ class PercentEscaperFuzzTest {
   public static class TestCases {
     private final PercentEscaper percentEscaper = new PercentEscaper();
 
+    @SuppressWarnings("JdkObsolete") // Recommended alternative was introduced in java 10
     @Fuzz
     public void roundTripWithUrlDecoder(String value) throws Exception {
       String escaped = percentEscaper.escape(value);
-      String decoded = URLDecoder.decode(escaped, "UTF-8");
+      String decoded = URLDecoder.decode(escaped, StandardCharsets.UTF_8.name());
       assertThat(decoded).isEqualTo(value);
     }
   }

buildSrc/src/main/kotlin/otel.japicmp-conventions.gradle.kts

@@ -74,7 +74,7 @@ fun getAllPublishedModules(): List<Project> {
   }.toList()
 }
 
-fun getOldClassPath(version: String): List<File> {
+fun getClasspathForVersion(version: String): List<File> {
   // Temporarily change the group name because we want to fetch an artifact with the same
   // Maven coordinates as the project, which Gradle would not allow otherwise.
   val existingGroup = group
@@ -95,7 +95,7 @@ fun getOldClassPath(version: String): List<File> {
   }
 }
 
-fun getNewClassPath(): List<File> {
+fun getCurrentClassPath(): List<File> {
   return getAllPublishedModules().map {
     val archiveFile = it.tasks.getByName<Jar>("jar").archiveFile
     archiveFile.get().asFile
@@ -125,8 +125,8 @@ if (!project.hasProperty("otel.release") && !project.name.startsWith("bom")) {
         // and generates false positive compatibility errors when methods are lifted into superclasses,
         // superinterfaces.
         val archiveName = base.archivesName.get()
-        val newClassPath = getNewClassPath()
-        val oldClassPath = getOldClassPath(baselineVersion)
+        val newClassPath = apiNewVersion?.let { getClasspathForVersion(it) } ?: getCurrentClassPath()
+        val oldClassPath = getClasspathForVersion(baselineVersion)
         val pattern = (archiveName + "-([0-9\\.]*)(-SNAPSHOT)?.jar").toRegex()
         val newArchive = newClassPath.singleOrNull { it.name.matches(pattern) }
         val oldArchive = oldClassPath.singleOrNull { it.name.matches(pattern) }

dependencyManagement/build.gradle.kts

@@ -9,7 +9,7 @@ rootProject.extra["versions"] = dependencyVersions
 
 
 val autoValueVersion = "1.11.1"
-val errorProneVersion = "2.46.0"
+val errorProneVersion = "2.47.0"
 val jmhVersion = "1.37"
 // Mockito 5.x.x requires Java 11 https://github.com/mockito/mockito/releases/tag/v5.0.0
 val mockitoVersion = "4.11.0"

docs/apidiffs/1.59.0_vs_1.58.0/opentelemetry-api.txt

@@ -1,4 +1,4 @@
-Comparing source compatibility of opentelemetry-api-1.60.0-SNAPSHOT.jar against opentelemetry-api-1.58.0.jar
+Comparing source compatibility of opentelemetry-api-1.59.0.jar against opentelemetry-api-1.58.0.jar
 ***  MODIFIED INTERFACE: PUBLIC ABSTRACT io.opentelemetry.api.common.AttributeKey  (not serializable)
 	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
 	GENERIC TEMPLATES: === T:java.lang.Object

docs/apidiffs/1.59.0_vs_1.58.0/opentelemetry-common.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-common-1.60.0-SNAPSHOT.jar against opentelemetry-common-1.58.0.jar
+Comparing source compatibility of opentelemetry-common-1.59.0.jar against opentelemetry-common-1.58.0.jar
 No changes.

docs/apidiffs/1.59.0_vs_1.58.0/opentelemetry-context.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-context-1.60.0-SNAPSHOT.jar against opentelemetry-context-1.58.0.jar
+Comparing source compatibility of opentelemetry-context-1.59.0.jar against opentelemetry-context-1.58.0.jar
 No changes.

docs/apidiffs/1.59.0_vs_1.58.0/opentelemetry-exporter-common.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-exporter-common-1.60.0-SNAPSHOT.jar against opentelemetry-exporter-common-1.58.0.jar
+Comparing source compatibility of opentelemetry-exporter-common-1.59.0.jar against opentelemetry-exporter-common-1.58.0.jar
 No changes.

docs/apidiffs/1.59.0_vs_1.58.0/opentelemetry-exporter-logging-otlp.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-exporter-logging-otlp-1.60.0-SNAPSHOT.jar against opentelemetry-exporter-logging-otlp-1.58.0.jar
+Comparing source compatibility of opentelemetry-exporter-logging-otlp-1.59.0.jar against opentelemetry-exporter-logging-otlp-1.58.0.jar
 No changes.

docs/apidiffs/1.59.0_vs_1.58.0/opentelemetry-exporter-logging.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-exporter-logging-1.60.0-SNAPSHOT.jar against opentelemetry-exporter-logging-1.58.0.jar
+Comparing source compatibility of opentelemetry-exporter-logging-1.59.0.jar against opentelemetry-exporter-logging-1.58.0.jar
 No changes.