From d65fb3bea16773581e1275302c0047843649acec Mon Sep 17 00:00:00 2001 From: "jian.tan" Date: Mon, 1 Aug 2022 12:47:05 +0800 Subject: [PATCH 1/2] enhancement_java_agent_inject_way --- src/adservice/Dockerfile | 1 + src/adservice/build.gradle | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) 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') { From 45c6755668a6d2471846b4f3db9708a3b272d118 Mon Sep 17 00:00:00 2001 From: "jian.tan" Date: Mon, 1 Aug 2022 12:52:34 +0800 Subject: [PATCH 2/2] add changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee0eba8147..58dfc39868 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,3 +41,5 @@ significant modifications will be credited to OpenTelemetry Authors. ([#189](https://github.com/open-telemetry/opentelemetry-demo/pull/189)) * Simplified repo name and dropped the '-webstore' suffix in every place ([#225](https://github.com/open-telemetry/opentelemetry-demo/pull/225)) +* Support override java agent jar +([#244](https://github.com/open-telemetry/opentelemetry-demo/pull/244))