Merge branch 'main' into declarative-config-improvements

Author: robsunday

build.gradle.kts

@@ -167,34 +167,33 @@ tasks {
   val uploadReleaseBundle by registering {
     dependsOn(generateReleaseBundle)
 
-    val bundle = generateReleaseBundle.get().outputs.files.singleFile
-    val httpClient = OkHttpClient()
     val username = System.getenv("SONATYPE_USER") ?: throw GradleException("Sonatype user not set")
     val password = System.getenv("SONATYPE_KEY") ?: throw GradleException("Sonatype key not set")
     val token = Base64.getEncoder().encodeToString("$username:$password".toByteArray())
 
     var query = "?name=opentelemetry-java-instrumentation-$stableVersion"
-    // uncomment to automatically publish the release
-    // query += "&publishingType=AUTOMATIC"
-
-    val request = okhttp3.Request.Builder()
-      .url("https://central.sonatype.com/api/v1/publisher/upload$query")
-      .post(
-        okhttp3.MultipartBody.Builder().addFormDataPart(
-          "bundle",
-          bundle.name,
-          bundle.asRequestBody("application/zip".toMediaType())
-        ).build()
-      )
-      .header("authorization", "Bearer $token")
-      .build()
-    httpClient.newCall(request).execute().use { response ->
-      response.body!!.string()
-    }
-
-    httpClient.newCall(request).execute().use { response ->
-      if (response.code != 201) throw GradleException("Unexpected response status ${response.code} while uploading the release bundle")
-      println("Uploaded deployment ${response.body!!.string()}")
+    query += "&publishingType=AUTOMATIC"
+
+    doFirst {
+      val bundle = generateReleaseBundle.get().outputs.files.singleFile
+      val httpClient = OkHttpClient()
+
+      val request = okhttp3.Request.Builder()
+        .url("https://central.sonatype.com/api/v1/publisher/upload$query")
+        .post(
+          okhttp3.MultipartBody.Builder().addFormDataPart(
+            "bundle",
+            bundle.name,
+            bundle.asRequestBody("application/zip".toMediaType())
+          ).build()
+        )
+        .header("authorization", "Bearer $token")
+        .build()
+
+      httpClient.newCall(request).execute().use { response ->
+        if (response.code != 201) throw GradleException("Unexpected response status ${response.code} while uploading the release bundle")
+        println("Uploaded deployment ${response.body.string()}")
+      }
     }
   }
 }

dependencyManagement/build.gradle.kts

@@ -38,7 +38,7 @@ val DEPENDENCY_BOMS = listOf(
 
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.11.0"
-val errorProneVersion = "2.39.0"
+val errorProneVersion = "2.40.0"
 val byteBuddyVersion = "1.17.6"
 val asmVersion = "9.8"
 val jmhVersion = "1.37"
@@ -100,7 +100,7 @@ val DEPENDENCIES = listOf(
   "commons-io:commons-io:2.19.0",
   "commons-lang:commons-lang:2.6",
   "commons-logging:commons-logging:1.3.5",
-  "commons-validator:commons-validator:1.9.0",
+  "commons-validator:commons-validator:1.10.0",
   "io.netty:netty:3.10.6.Final",
   "io.opentelemetry.contrib:opentelemetry-azure-resources:${otelContribVersion}",
   "io.opentelemetry.contrib:opentelemetry-aws-resources:${otelContribVersion}",

docs/apidiffs/2.17.1_vs_2.17.0/opentelemetry-instrumentation-annotations.txt

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

docs/apidiffs/2.17.1_vs_2.17.0/opentelemetry-instrumentation-api.txt

@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-instrumentation-api-2.17.1.jar against opentelemetry-instrumentation-api-2.17.0.jar
+No changes.

docs/apidiffs/2.17.1_vs_2.17.0/opentelemetry-spring-boot-autoconfigure.txt

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

docs/apidiffs/2.17.1_vs_2.17.0/opentelemetry-spring-boot-starter.txt

@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-spring-boot-starter-2.17.1.jar against opentelemetry-spring-boot-starter-2.17.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.18.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.17.0.jar
+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.18.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.17.1.jar
 No changes.

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

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-instrumentation-api-2.18.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.17.0.jar
+Comparing source compatibility of opentelemetry-instrumentation-api-2.18.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.17.1.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.18.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.17.0.jar
+Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.18.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.17.1.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.18.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.17.0.jar
+Comparing source compatibility of opentelemetry-spring-boot-starter-2.18.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.17.1.jar
 No changes.