diff --git a/CHANGELOG.md b/CHANGELOG.md index d5284f8ed2..d47bd70e4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,3 +43,5 @@ significant modifications will be credited to OpenTelemetry Authors. ([#225](https://github.com/open-telemetry/opentelemetry-demo/pull/225)) * Add metrics endpoint in adservice to send metrics from java agent ([#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)) diff --git a/src/adservice/Dockerfile b/src/adservice/Dockerfile index 2cb6a4d917..29a110d4ac 100644 --- a/src/adservice/Dockerfile +++ b/src/adservice/Dockerfile @@ -30,6 +30,7 @@ WORKDIR /usr/src/app/ COPY --from=builder /usr/src/app/ ./ COPY ./src/adservice/agent/opentelemetry-javaagent.jar /app/ +ENV JAVA_TOOL_OPTIONS=-javaagent:/app/opentelemetry-javaagent.jar EXPOSE ${AD_SERVICE_PORT} ENTRYPOINT [ "./build/install/hipstershop/bin/AdService" ] diff --git a/src/adservice/build.gradle b/src/adservice/build.gradle index 916a4941df..4ea9a10464 100644 --- a/src/adservice/build.gradle +++ b/src/adservice/build.gradle @@ -99,8 +99,6 @@ task adService(type: CreateStartScripts) { applicationName = 'AdService' outputDir = new File(project.buildDir, 'tmp') classpath = startScripts.classpath - defaultJvmOpts = - ["-javaagent:/app/opentelemetry-javaagent.jar"] } task adServiceClient(type: CreateStartScripts) { @@ -108,8 +106,6 @@ task adServiceClient(type: CreateStartScripts) { applicationName = 'AdServiceClient' outputDir = new File(project.buildDir, 'tmp') classpath = startScripts.classpath - defaultJvmOpts = - ["-javaagent:/app/opentelemetry-javaagent.jar"] } applicationDistribution.into('bin') {