Merge branch 'main' into add_metric_annotation_instrument

Author: Duncan-tree-zhou

build.gradle.kts

@@ -166,15 +166,14 @@ tasks {
 
   val uploadReleaseBundle by registering {
     dependsOn(generateReleaseBundle)
+    doFirst {
+      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())
 
-    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"
-    query += "&publishingType=AUTOMATIC"
+      var query = "?name=opentelemetry-java-instrumentation-$stableVersion"
+      query += "&publishingType=AUTOMATIC"
 
-    doFirst {
       val bundle = generateReleaseBundle.get().outputs.files.singleFile
       val httpClient = OkHttpClient()