Skip to content

Commit 986d122

Browse files
Merge branch 'main' into main
2 parents 854d441 + 120381a commit 986d122

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

CHANGELOG.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,18 @@ release.
1717
([#1335](https://github.com/open-telemetry/opentelemetry-demo/pull/1335))
1818
* [ffspostgres] define and use demo specific postgres image
1919
([#1338](https://github.com/open-telemetry/opentelemetry-demo/pull/1338))
20+
* [loadgenerator, frontend] enable browser traffic in loadgenerator using playwright
21+
([#1345](https://github.com/open-telemetry/opentelemetry-demo/pull/1345))
2022
* [accountingservice] update wiki link
2123
([#1346](https://github.com/open-telemetry/opentelemetry-demo/pull/1346))
2224
* [checkoutservice] update wiki link
2325
([#1346](https://github.com/open-telemetry/opentelemetry-demo/pull/1346))
2426
* [productcatalogservice] update wiki link
2527
([#1346](https://github.com/open-telemetry/opentelemetry-demo/pull/1346))
26-
* [loadgenerator, frontend] enable browser traffic in loadgenerator using playwright
27-
([#1345](https://github.com/open-telemetry/opentelemetry-demo/pull/1345))
28+
* [adservice] added group and anonymous read permission to opentelemetry-javaagent.jar
29+
([#1348](https://github.com/open-telemetry/opentelemetry-demo/pull/1348))
30+
* [frauddetectionservice] added group and anonymous read permission to opentelemetry-javaagent.jar
31+
([#1348](https://github.com/open-telemetry/opentelemetry-demo/pull/1348))
2832

2933
## 1.7.2
3034

src/adservice/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ARG version=1.31.0
2424
WORKDIR /usr/src/app/
2525

2626
COPY --from=builder /usr/src/app/ ./
27-
ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$version/opentelemetry-javaagent.jar /usr/src/app/opentelemetry-javaagent.jar
27+
ADD --chmod=644 https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$version/opentelemetry-javaagent.jar /usr/src/app/opentelemetry-javaagent.jar
2828
ENV JAVA_TOOL_OPTIONS=-javaagent:/usr/src/app/opentelemetry-javaagent.jar
2929

3030
EXPOSE ${AD_SERVICE_PORT}

src/frauddetectionservice/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ARG version=1.31.0
1818
WORKDIR /usr/src/app/
1919

2020
COPY --from=builder /usr/src/app/build/libs/frauddetectionservice-1.0-all.jar ./
21-
ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$version/opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
21+
ADD --chmod=644 https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$version/opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
2222
ENV JAVA_TOOL_OPTIONS=-javaagent:/app/opentelemetry-javaagent.jar
2323

2424
ENTRYPOINT [ "java", "-jar", "frauddetectionservice-1.0-all.jar" ]

0 commit comments

Comments
 (0)