Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Pulling java agent from the Java instrumentation releases instead. #253

Merged
merged 3 commits into from
Aug 3, 2022
Merged

Pulling java agent from the Java instrumentation releases instead. #253

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c530253
fix
JaredTan95 Aug 3, 2022
302f872
update cenglog
JaredTan95 Aug 3, 2022
d97805e
Merge branch 'main' into pull_agent_jar_from_release
cartersocha Aug 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,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
View file
Open in desktop
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
View file
Open in desktop
Binary file not shown.