Pulling java agent from the Java instrumentation releases instead. (o…

…pen-telemetry#253) * fix Signed-off-by: jian.tan <[email protected]> * update cenglog Co-authored-by: Carter Socha <[email protected]>
jmichalak9 · Aug 3, 2022 · 9e95c9d · 9e95c9d
1 parent 2eca91e
commit 9e95c9d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -49,3 +49,5 @@ significant modifications will be credited to OpenTelemetry Authors.
 ([#237](https://github.com/open-telemetry/opentelemetry-demo/pull/237))
 * Support override java agent jar
 ([#244](https://github.com/open-telemetry/opentelemetry-demo/pull/244))
+* Pulling java agent from the Java instrumentation releases instead.
+([#253](https://github.com/open-telemetry/opentelemetry-demo/pull/253))
diff --git a/src/adservice/Dockerfile b/src/adservice/Dockerfile
@@ -26,10 +26,11 @@ RUN ./gradlew installDist
 
 FROM openjdk:18-slim
 
+ARG version=1.16.0
 WORKDIR /usr/src/app/
 
 COPY --from=builder /usr/src/app/ ./
-COPY ./src/adservice/agent/opentelemetry-javaagent.jar /app/
+ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$version/opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
 ENV JAVA_TOOL_OPTIONS=-javaagent:/app/opentelemetry-javaagent.jar
 
 EXPOSE ${AD_SERVICE_PORT}

diff --git a/src/adservice/agent/opentelemetry-javaagent.jar b/src/adservice/agent/opentelemetry-javaagent.jar