fix: inject otel agent when building images on CI

Author: wolf4ood

.github/workflows/build-docker.yaml

@@ -76,8 +76,9 @@ jobs:
       - name: Build and push image
         uses: docker/build-push-action@v7
         with:
-          build-args:
+          build-args: |
             JAR=build/libs/${{ matrix.name }}.jar
+            OTEL_AGENT=build/otel/opentelemetry-javaagent.jar
           context: ${{ matrix.context }}
           file: ${{ matrix.dockerfile }}
           push: true

build.gradle.kts

@@ -13,7 +13,6 @@
  */
 
 import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage
-import java.net.URI
 
 plugins {
     `java-library`
@@ -32,19 +31,16 @@ buildscript {
 val edcBuildId = libs.plugins.edc.build.get().pluginId
 val jadVersion: String by project
 
-val downloadOtelAgent by tasks.registering {
-    val outputFile = layout.buildDirectory.file("otel/opentelemetry-javaagent.jar")
-    outputs.file(outputFile)
-    doLast {
-        val url = URI("https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar").toURL()
-        val destFile = outputFile.get().asFile
-        destFile.parentFile.mkdirs()
-        url.openStream().use { input ->
-            destFile.outputStream().use { output ->
-                input.copyTo(output)
-            }
-        }
+val downloadOtelAgent by tasks.register("downloadOtelAgent", Copy::class) {
+    val openTelemetry = configurations.create("open-telemetry")
+
+    dependencies {
+        openTelemetry(libs.opentelemetry.javaagent)
     }
+
+    from(openTelemetry)
+    into("build/otel")
+    rename { "opentelemetry-javaagent.jar" }
 }
 
 allprojects {
@@ -70,6 +66,8 @@ subprojects {
                 from(rootProject.layout.buildDirectory.dir("otel"))
                 into(project.layout.buildDirectory.dir("otel"))
             }
+            var shadowJarTask = tasks.named("shadowJar").get();
+            shadowJarTask.dependsOn(copyOtelAgent)
 
             // configure the "dockerize" task
             val dockerTask: DockerBuildImage = tasks.create("dockerize", DockerBuildImage::class) {
@@ -87,7 +85,6 @@ subprojects {
                 inputDir.set(file(dockerContextDir))
             }
             dockerTask.dependsOn(tasks.named("shadowJar"))
-            dockerTask.dependsOn(copyOtelAgent)
         }
     }
 }

gradle/libs.versions.toml

@@ -13,6 +13,7 @@ rsApi = "4.0.0"
 swagger = "2.2.47"
 jersey = "3.1.11"
 postgres = "42.7.10"
+opentelemetry = "2.26.1"
 
 [libraries]
 # upstream EDC dependencies
@@ -88,6 +89,7 @@ jakarta-rsApi = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref = "rsA
 jersey-multipart = { module = "org.glassfish.jersey.media:jersey-media-multipart", version.ref = "jersey" }
 postgres = { module = "org.postgresql:postgresql", version.ref = "postgres" }
 opentelemetry-exporter-otlp = { module = "io.opentelemetry:opentelemetry-exporter-otlp", version = "1.61.0" }
+opentelemetry-javaagent = { module = "io.opentelemetry.javaagent:opentelemetry-javaagent", version.ref = "opentelemetry" }
 
 [plugins]
 shadow = { id = "com.gradleup.shadow", version = "9.4.1" }