Skip to content

Commit 98dee17

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 4b93ae0 + 986d122 commit 98dee17

File tree

7 files changed

+16
-6
lines changed

7 files changed

+16
-6
lines changed

CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@ release.
1919
([#1338](https://github.com/open-telemetry/opentelemetry-demo/pull/1338))
2020
* [loadgenerator, frontend] enable browser traffic in loadgenerator using playwright
2121
([#1345](https://github.com/open-telemetry/opentelemetry-demo/pull/1345))
22+
* [accountingservice] update wiki link
23+
([#1346](https://github.com/open-telemetry/opentelemetry-demo/pull/1346))
24+
* [checkoutservice] update wiki link
25+
([#1346](https://github.com/open-telemetry/opentelemetry-demo/pull/1346))
26+
* [productcatalogservice] update wiki link
27+
([#1346](https://github.com/open-telemetry/opentelemetry-demo/pull/1346))
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))
2232

2333
## 1.7.2
2434

internal/tools/tools.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package tools
77

88
// This file follows the recommendation at
9-
// https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
9+
// https://go.dev/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
1010
// on how to pin tooling dependencies to a go.mod file.
1111
// This ensures that all systems use the same version of tools in addition to regular dependencies.
1212

src/accountingservice/tools.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
package tools
88

99
// This file follows the recommendation at
10-
// https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
10+
// https://go.dev/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
1111
// on how to pin tooling dependencies to a go.mod file.
1212
// This ensures that all systems use the same version of tools in addition to regular dependencies.
1313

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/checkoutservice/tools.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
package tools
88

99
// This file follows the recommendation at
10-
// https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
10+
// https://go.dev/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
1111
// on how to pin tooling dependencies to a go.mod file.
1212
// This ensures that all systems use the same version of tools in addition to regular dependencies.
1313

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" ]

src/productcatalogservice/tools.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
package tools
88

99
// This file follows the recommendation at
10-
// https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
10+
// https://go.dev/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
1111
// on how to pin tooling dependencies to a go.mod file.
1212
// This ensures that all systems use the same version of tools in addition to regular dependencies.
1313

0 commit comments

Comments
 (0)