Merge branch 'main' into declarative-config-improvements

Author: robsunday

.github/workflows/release.yml

@@ -100,7 +100,8 @@ jobs:
           SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
           GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
-        run: ./gradlew assemble spdxSbom publishToSonatype closeAndReleaseSonatypeStagingRepository
+        # run: ./gradlew assemble spdxSbom publishToSonatype closeAndReleaseSonatypeStagingRepository
+        run: ./gradlew assemble spdxSbom publishAllPublicationToReleaseRepoRepository generateReleaseBundle uploadReleaseBundle
 
       - name: Build and publish gradle plugins
         env:

benchmark-overhead/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
   testImplementation("org.testcontainers:postgresql:1.21.3")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testImplementation("org.junit.jupiter:junit-jupiter-params")
-  testImplementation("com.squareup.okhttp3:okhttp:5.0.0")
+  testImplementation("com.squareup.okhttp3:okhttp:5.1.0")
   testImplementation("org.jooq:joox:2.0.1")
   testImplementation("com.jayway.jsonpath:json-path:2.9.0")
   testImplementation("org.slf4j:slf4j-simple:2.0.17")

build.gradle.kts

@@ -1,4 +1,8 @@
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.RequestBody.Companion.asRequestBody
 import java.time.Duration
+import java.util.Base64
 
 plugins {
   id("idea")
@@ -16,6 +20,12 @@ plugins {
   id("org.graalvm.buildtools.native") apply false
 }
 
+buildscript {
+  dependencies {
+    classpath("com.squareup.okhttp3:okhttp:5.1.0")
+  }
+}
+
 apply(from = "version.gradle.kts")
 
 nexusPublishing {
@@ -111,6 +121,8 @@ if (gradle.startParameter.taskNames.contains("listTestsInPartition")) {
 }
 
 tasks {
+  val stableVersion = version.toString().replace("-alpha", "")
+
   val generateFossaConfiguration by registering {
     group = "Help"
     description = "Generate .fossa.yml configuration file"
@@ -141,4 +153,48 @@ tasks {
       }
     }
   }
+
+  val generateReleaseBundle by registering(Zip::class) {
+    dependsOn(getTasksByName("publishAllPublicationToReleaseRepoRepository", true))
+    from("releaseRepo")
+
+    exclude("**/maven-metadata.*")
+    duplicatesStrategy = DuplicatesStrategy.FAIL
+    includeEmptyDirs = false
+    archiveFileName.set("release-bundle-$stableVersion.zip")
+  }
+
+  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()}")
+    }
+  }
 }

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

@@ -65,6 +65,13 @@ publishing {
       }
     }
   }
+
+  repositories {
+    maven {
+      name = "ReleaseRepo"
+      url = File(project.rootDir.path, "releaseRepo").toURI()
+    }
+  }
 }
 
 fun artifactPrefix(p: Project, archivesBaseName: String): String {

examples/distro/instrumentation/servlet-3/build.gradle

@@ -27,7 +27,7 @@ dependencies {
     exclude group: 'org.eclipse.jetty', module: 'jetty-server'
   }
 
-  testImplementation "com.squareup.okhttp3:okhttp:5.0.0"
+  testImplementation "com.squareup.okhttp3:okhttp:5.1.0"
   testImplementation "javax.servlet:javax.servlet-api:3.0.1"
   testImplementation "org.eclipse.jetty:jetty-server:8.2.0.v20160908"
   testImplementation "org.eclipse.jetty:jetty-servlet:8.2.0.v20160908"

examples/distro/smoke-tests/build.gradle

@@ -6,7 +6,7 @@ dependencies {
   testImplementation("org.testcontainers:testcontainers:1.21.3")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.19.1")
   testImplementation("com.google.protobuf:protobuf-java-util:4.31.1")
-  testImplementation("com.squareup.okhttp3:okhttp:5.0.0")
+  testImplementation("com.squareup.okhttp3:okhttp:5.1.0")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha")
   testImplementation("io.opentelemetry:opentelemetry-api")
 

examples/extension/build.gradle

@@ -100,7 +100,7 @@ dependencies {
   testImplementation("org.testcontainers:testcontainers:1.21.3")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.19.1")
   testImplementation("com.google.protobuf:protobuf-java-util:4.31.1")
-  testImplementation("com.squareup.okhttp3:okhttp:5.0.0")
+  testImplementation("com.squareup.okhttp3:okhttp:5.1.0")
   testImplementation("io.opentelemetry:opentelemetry-api")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha")