Skip to content

Commit

Permalink
Pulling java agent from the Java instrumentation releases instead. (#253
Browse files Browse the repository at this point in the history
)

* fix

Signed-off-by: jian.tan <[email protected]>

* update cenglog

Co-authored-by: Carter Socha <[email protected]>
  • Loading branch information
JaredTan95 and cartersocha authored Aug 3, 2022
1 parent c32e394 commit aad6e02
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
3 changes: 2 additions & 1 deletion src/adservice/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Binary file removed src/adservice/agent/opentelemetry-javaagent.jar
Binary file not shown.

0 comments on commit aad6e02

Please sign in to comment.