Prepare 0.0.4 release (#12)

* Prepare 0.0.4 release

* Update gradle, fix build issues

* Rollback gradle changes

Author: iRevive

README.md

@@ -16,8 +16,8 @@ See https://github.com/iRevive/otel4s-showcase demo.
 
 ## Versions
 
-- OpenTelemetry SDK: 1.53.0
-- OpenTelemetry Java Agent: 2.19.0
+- OpenTelemetry SDK: 1.54.0
+- OpenTelemetry Java Agent: 2.20.0
 
 ## Getting started
 
@@ -28,7 +28,7 @@ lazy val service = project
   .in(file("service"))
   .settings(
     name := "service",
-    javaAgents += "io.github.irevive" % "otel4s-opentelemetry-javaagent" % "0.0.3", // <1>
+    javaAgents += "io.github.irevive" % "otel4s-opentelemetry-javaagent" % "0.0.4", // <1>
     run / fork  := true,                                                            // <2>
     javaOptions += "-Dcats.effect.trackFiberContext=true",                          // <3>
     libraryDependencies ++= Seq(                                                    // <4>
@@ -114,12 +114,12 @@ $ ./gradlew smoke-tests:build
 ## New version release
 
 ```shell
-$ SDK_VERSION="1.52.0"
-$ AGENT_VERSION="2.18.2"
-$ RELEASE_VERSION="0.0.2"
+$ SDK_VERSION="1.54.0"
+$ AGENT_VERSION="2.20.0"
+$ RELEASE_VERSION="0.0.3"
 $ ./scripts/update-sdk-version.sh $SDK_VERSION
 $ ./scripts/update-agent-version.sh $AGENT_VERSION
-$ ./scripts/update-release-version.sh RELEASE_VERSION
+$ ./scripts/update-release-version.sh $RELEASE_VERSION
 ```
 
 Once the CI is green, you can publish a tag:

agent/build.gradle

@@ -45,8 +45,7 @@ CopySpec isolateClasses(Iterable<File> jars) {
       from(zipTree(it)) {
         into("inst")
         rename("^(.*)\\.class\$", "\$1.classdata")
-        // Rename LICENSE file since it clashes with license dir on non-case sensitive FSs (i.e. Mac)
-        rename("^LICENSE\$", "LICENSE.renamed")
+        exclude("^LICENSE\$")
         exclude("META-INF/INDEX.LIST")
         exclude("META-INF/*.DSA")
         exclude("META-INF/*.SF")
@@ -73,11 +72,15 @@ tasks {
   task relocateJavaagentLibs(type: ShadowJar) {
     configurations = [project.configurations.javaagentLibs]
 
-    duplicatesStrategy = DuplicatesStrategy.FAIL
-
     archiveFileName.set("javaagentLibs-relocated.jar")
 
+    duplicatesStrategy = DuplicatesStrategy.FAIL
     mergeServiceFiles()
+    // mergeServiceFiles requires that duplicate strategy is set to include
+    filesMatching("META-INF/services/**") {
+      duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    }
+
     exclude("**/module-info.class")
     relocatePackages(it)
 
@@ -115,10 +118,12 @@ tasks {
     archiveClassifier.set("all")
 
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-
-    mergeServiceFiles {
-      include("inst/META-INF/services/*")
+    mergeServiceFiles("inst/META-INF/services")
+    // mergeServiceFiles requires that duplicate strategy is set to include
+    filesMatching("inst/META-INF/services/**") {
+      duplicatesStrategy = DuplicatesStrategy.INCLUDE
     }
+
     exclude("**/module-info.class")
     relocatePackages(it)
 

build.gradle

@@ -10,8 +10,8 @@ buildscript {
   }
   dependencies {
     classpath "com.diffplug.spotless:spotless-plugin-gradle:7.2.1"
-    classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.8"
-    classpath "io.opentelemetry.instrumentation:gradle-plugins:2.19.0-alpha"
+    classpath "com.gradleup.shadow:shadow-gradle-plugin:9.1.0"
+    classpath "io.opentelemetry.instrumentation:gradle-plugins:2.20.0-alpha"
     classpath("org.apache.httpcomponents:httpclient:4.5.14")
   }
 }
@@ -23,7 +23,7 @@ plugins {
 group "io.github.irevive"
 
 // this line is managed by ./scripts/update-release-version.sh
-version "0.0.3"
+version "0.0.4"
 
 nexusPublishing {
   packageGroup.set(rootProject.group.toString())
@@ -49,11 +49,11 @@ subprojects {
   ext {
     versions = [
       // this line is managed by ./scripts/update-sdk-version.sh
-      opentelemetrySdk           : "1.53.0",
+      opentelemetrySdk           : "1.54.0",
 
       // these lines are managed by ./scripts/update-agent-version.sh
-      opentelemetryJavaagent     : "2.19.0",
-      opentelemetryJavaagentAlpha: "2.19.0-alpha",
+      opentelemetryJavaagent     : "2.20.0",
+      opentelemetryJavaagentAlpha: "2.20.0-alpha",
 
       autoservice                : "1.1.1"
     ]

gradle/instrumentation.gradle

@@ -36,6 +36,10 @@ dependencies {
 shadowJar {
   configurations = [project.configurations.runtimeClasspath, project.configurations.testInstrumentation]
   mergeServiceFiles()
+  // mergeServiceFiles requires that duplicate strategy is set to include
+  filesMatching("inst/META-INF/services/**") {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+  }
 
   archiveFileName = 'agent-testing.jar'
 
@@ -46,13 +50,16 @@ tasks.withType(Test).configureEach {
   inputs.file(shadowJar.archiveFile)
 
   jvmArgs "-Dotel.javaagent.debug=true"
-  jvmArgs "-javaagent:${configurations.testAgent.files.first().absolutePath}"
   jvmArgs "-Dotel.javaagent.experimental.initializer.jar=${shadowJar.archiveFile.get().asFile.absolutePath}"
   jvmArgs "-Dotel.javaagent.testing.additional-library-ignores.enabled=false"
   jvmArgs "-Dotel.javaagent.testing.fail-on-context-leak=true"
   // prevent sporadic gradle deadlocks, see SafeLogger for more details
   jvmArgs "-Dotel.javaagent.testing.transform-safe-logging.enabled=true"
 
+  jvmArgumentProviders.add(new JavaagentProvider(project.providers.provider {
+    configurations.testAgent.files.first()
+  }))
+
   dependsOn shadowJar
   dependsOn configurations.testAgent.buildDependencies
 
@@ -65,3 +72,18 @@ tasks.withType(Test).configureEach {
     return true
   }
 }
+
+class JavaagentProvider implements CommandLineArgumentProvider {
+  @InputFile
+  @PathSensitive(PathSensitivity.RELATIVE)
+  Provider<File> agentJar
+
+  JavaagentProvider(Provider<File> agentJar) {
+    this.agentJar = agentJar
+  }
+
+  @Override
+  Iterable<String> asArguments() {
+    return ["-javaagent:${agentJar.get().absolutePath}"]
+  }
+}

testing/agent-for-testing/build.gradle

@@ -59,11 +59,15 @@ tasks {
   task relocateJavaagentLibs(type: ShadowJar) {
     configurations = [project.configurations.javaagentLibs]
 
-    duplicatesStrategy = DuplicatesStrategy.FAIL
-
     archiveFileName.set("javaagentLibs-relocated.jar")
 
+    duplicatesStrategy = DuplicatesStrategy.FAIL
     mergeServiceFiles()
+    // mergeServiceFiles requires that duplicate strategy is set to include
+    filesMatching("META-INF/services/**") {
+      duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    }
+
     exclude("**/module-info.class")
     relocatePackages(it)
 
@@ -101,10 +105,12 @@ tasks {
     archiveClassifier.set("")
 
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-
-    mergeServiceFiles {
-      include("inst/META-INF/services/*")
+    mergeServiceFiles("inst/META-INF/services")
+    // mergeServiceFiles requires that duplicate strategy is set to include
+    filesMatching("inst/META-INF/services/**") {
+      duplicatesStrategy = DuplicatesStrategy.INCLUDE
     }
+
     exclude("**/module-info.class")
     relocatePackages(it)