From e081df5fecc6e844a68b1c2602305c30c0881e91 Mon Sep 17 00:00:00 2001 From: Louis Parkin Date: Fri, 26 Jan 2024 07:59:02 +0100 Subject: [PATCH 1/3] These two services don't run as 'nobofy' due to root user alone having read/write permission on opentelemetry-javaagent.jar. This commit fixes it. --- src/adservice/Dockerfile | 2 +- src/frauddetectionservice/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/adservice/Dockerfile b/src/adservice/Dockerfile index 425960e9c0..4986ebb172 100644 --- a/src/adservice/Dockerfile +++ b/src/adservice/Dockerfile @@ -24,7 +24,7 @@ ARG version=1.31.0 WORKDIR /usr/src/app/ COPY --from=builder /usr/src/app/ ./ -ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$version/opentelemetry-javaagent.jar /usr/src/app/opentelemetry-javaagent.jar +ADD --chmod=644 https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$version/opentelemetry-javaagent.jar /usr/src/app/opentelemetry-javaagent.jar ENV JAVA_TOOL_OPTIONS=-javaagent:/usr/src/app/opentelemetry-javaagent.jar EXPOSE ${AD_SERVICE_PORT} diff --git a/src/frauddetectionservice/Dockerfile b/src/frauddetectionservice/Dockerfile index 925728a30c..c95b435338 100644 --- a/src/frauddetectionservice/Dockerfile +++ b/src/frauddetectionservice/Dockerfile @@ -18,7 +18,7 @@ ARG version=1.31.0 WORKDIR /usr/src/app/ COPY --from=builder /usr/src/app/build/libs/frauddetectionservice-1.0-all.jar ./ -ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$version/opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar +ADD --chmod=644 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 ENTRYPOINT [ "java", "-jar", "frauddetectionservice-1.0-all.jar" ] From eabce33be2834e2662721dbfffad91f950ae30e8 Mon Sep 17 00:00:00 2001 From: Louis Parkin Date: Fri, 26 Jan 2024 08:06:22 +0100 Subject: [PATCH 2/3] Updated CHANGELOG.md --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 327347a5dc..3bef4a094c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,10 @@ content of "Unreleased" section content will generate release notes for the release. ## Unreleased - +* [adservice] added group and anonymous read permission to opentelemetry-javaagent.jar + ([#1348](https://github.com/open-telemetry/opentelemetry-demo/pull/1348)) +* [frauddetectionservice] added group and anonymous read permission to opentelemetry-javaagent.jar + ([#1348](https://github.com/open-telemetry/opentelemetry-demo/pull/1348)) * [grafana] update grafana to 10.2.3 ([#1332](https://github.com/open-telemetry/opentelemetry-demo/pull/1332)) * [frontendproxy] Enable envoy environment resource detector From 13d27fda51af84589bcc9c7154324018b2fc411c Mon Sep 17 00:00:00 2001 From: Juliano Costa Date: Fri, 26 Jan 2024 09:49:06 +0100 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bef4a094c..c6f27a4114 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,7 @@ content of "Unreleased" section content will generate release notes for the release. ## Unreleased -* [adservice] added group and anonymous read permission to opentelemetry-javaagent.jar - ([#1348](https://github.com/open-telemetry/opentelemetry-demo/pull/1348)) -* [frauddetectionservice] added group and anonymous read permission to opentelemetry-javaagent.jar - ([#1348](https://github.com/open-telemetry/opentelemetry-demo/pull/1348)) + * [grafana] update grafana to 10.2.3 ([#1332](https://github.com/open-telemetry/opentelemetry-demo/pull/1332)) * [frontendproxy] Enable envoy environment resource detector @@ -26,6 +23,10 @@ release. ([#1346](https://github.com/open-telemetry/opentelemetry-demo/pull/1346)) * [productcatalogservice] update wiki link ([#1346](https://github.com/open-telemetry/opentelemetry-demo/pull/1346)) +* [adservice] added group and anonymous read permission to opentelemetry-javaagent.jar + ([#1348](https://github.com/open-telemetry/opentelemetry-demo/pull/1348)) +* [frauddetectionservice] added group and anonymous read permission to opentelemetry-javaagent.jar + ([#1348](https://github.com/open-telemetry/opentelemetry-demo/pull/1348)) ## 1.7.2