diff --git a/CHANGELOG.md b/CHANGELOG.md index bded718a15..ea51adbe27 100644 --- 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 index 29a110d4ac..cb847defd0 100644 --- 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 deleted file mode 100644 index 94cdbb60a3..0000000000 Binary files a/src/adservice/agent/opentelemetry-javaagent.jar and /dev/null differ