Skip to content

Commit ffb06cf

Browse files
julianocosta89julianocosta89
authored
Merge branch 'main' into better-apm-dashboard
2 parents a946ba5 + 5118d8d commit ffb06cf

File tree

16 files changed

+249
-218
lines changed

16 files changed

+249
-218
lines changed

‎CHANGELOG.md‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,22 +78,29 @@ the release.
7878
([#2369](https://github.com/open-telemetry/opentelemetry-demo/pull/2369))
7979
* [load-generator] Fix Playwright wait until load state error
8080
([#2374](https://github.com/open-telemetry/opentelemetry-demo/pull/2374))
81-
* [grafana] Update OpenSearch logs index in APM Dashboards
82-
([#2419](https://github.com/open-telemetry/opentelemetry-demo/pull/2419))
8381
* [flagd] Bump Flagd to v0.12.8 and get compliant `http.Server.request.duration`
8482
OTel metrics that can be used in the APM dashboard
8583
([#2392](https://github.com/open-telemetry/opentelemetry-demo/pull/2392))
86-
* [frontend-proxy] Add redirects for web UI paths to ensure proper asset loading
87-
([#2476](https://github.com/open-telemetry/opentelemetry-demo/pull/2476))
88-
* [cart] Enable automatic generation of `service.instance.id`
89-
([#2402](https://github.com/open-telemetry/opentelemetry-demo/pull/2402))
84+
* [prometheus / grafana] Add Linux monitoring dashboard
85+
([#2395](https://github.com/open-telemetry/opentelemetry-demo/pull/2395))
9086
* [prometheus /grafana] Add alerting demo through the `CartAddItemHighLatency`
9187
alert rule
9288
([#2401](https://github.com/open-telemetry/opentelemetry-demo/pull/2401))
89+
* [cart] Enable automatic generation of `service.instance.id`
90+
([#2402](https://github.com/open-telemetry/opentelemetry-demo/pull/2402))
91+
* [grafana] Update OpenSearch logs index in APM Dashboards
92+
([#2419](https://github.com/open-telemetry/opentelemetry-demo/pull/2419))
93+
* [frontend-proxy] Add redirects for web UI paths to ensure proper asset loading
94+
([#2476](https://github.com/open-telemetry/opentelemetry-demo/pull/2476))
9395
* [chore] Bump dependent images
9496
([#2477](https://github.com/open-telemetry/opentelemetry-demo/pull/2477))
95-
* [prometheus / grafana] Add Linux monitoring dashboard
96-
([#2395](https://github.com/open-telemetry/opentelemetry-demo/pull/2395))
97+
* [email] Add memory leak scenario to email service
98+
([#2481](https://github.com/open-telemetry/opentelemetry-demo/pull/2481))
99+
* [checkout] Add graceful shutdown to checkout service
100+
([#2491](https://github.com/open-telemetry/opentelemetry-demo/pull/2491))
101+
* [shipping] Use cumulative metrics in shipping service to be consistent
102+
with the other services of the demo
103+
([#2503](https://github.com/open-telemetry/opentelemetry-demo/pull/2503))
97104
* [grafana] APM dashboard: Add host metrics per service instance
98105
([#2507](https://github.com/open-telemetry/opentelemetry-demo/pull/2507))
99106

@@ -111,6 +118,9 @@ the release.
111118
([#2120](https://github.com/open-telemetry/opentelemetry-demo/pull/2120))
112119
* [cartservice] change custom metrics to use seconds
113120
([#2135](https://github.com/open-telemetry/opentelemetry-demo/pull/2135))
121+
* [otel-collector] Fix OTel Collector meta-monitoring, export metrics using
122+
the HTTP port
123+
([#2502](https://github.com/open-telemetry/opentelemetry-demo/pull/2502))
114124

115125
## 2.0.1
116126

‎docker-compose.minimal.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,9 +494,10 @@ services:
494494
environment:
495495
- SHIPPING_PORT
496496
- QUOTE_ADDR
497-
- OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
497+
- OTEL_EXPORTER_OTLP_ENDPOINT
498498
- OTEL_RESOURCE_ATTRIBUTES
499499
- OTEL_SERVICE_NAME=shipping
500+
- OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
500501
healthcheck:
501502
test: ["CMD-SHELL", "timeout 1 bash -c '>/dev/tcp/localhost/${SHIPPING_PORT}'"]
502503
start_period: 10s

‎docker-compose.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,8 @@ services:
216216
environment:
217217
- APP_ENV=production
218218
- EMAIL_PORT
219+
- FLAGD_HOST
220+
- FLAGD_PORT
219221
- OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}/v1/traces
220222
- OTEL_RESOURCE_ATTRIBUTES
221223
- OTEL_SERVICE_NAME=email
@@ -584,6 +586,7 @@ services:
584586
- OTEL_EXPORTER_OTLP_ENDPOINT
585587
- OTEL_RESOURCE_ATTRIBUTES
586588
- OTEL_SERVICE_NAME=shipping
589+
- OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
587590
healthcheck:
588591
test: ["CMD-SHELL", "timeout 1 bash -c '>/dev/tcp/localhost/${SHIPPING_PORT}'"]
589592
start_period: 10s

‎src/ad/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ version = "0.1.0-SNAPSHOT"
1919
def opentelemetryVersion = "1.53.0"
2020
def opentelemetryInstrumentationVersion = "2.19.0"
2121
def grpcVersion = "1.75.0"
22-
def jacksonVersion = "2.19.2"
22+
def jacksonVersion = "2.20.0"
2323
def protocVersion = "4.32.0"
2424

2525
tasks.withType(JavaCompile).configureEach {

‎src/checkout/go.mod‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ require (
88
github.com/open-feature/go-sdk v1.15.1
99
github.com/open-feature/go-sdk-contrib/hooks/open-telemetry v0.3.6
1010
github.com/open-feature/go-sdk-contrib/providers/flagd v0.3.0
11-
go.opentelemetry.io/contrib/bridges/otelslog v0.12.0
12-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0
13-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0
14-
go.opentelemetry.io/contrib/instrumentation/runtime v0.62.0
15-
go.opentelemetry.io/otel v1.37.0
16-
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.13.0
17-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.37.0
18-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0
19-
go.opentelemetry.io/otel/log v0.13.0
20-
go.opentelemetry.io/otel/sdk v1.37.0
21-
go.opentelemetry.io/otel/sdk/log v0.13.0
22-
go.opentelemetry.io/otel/sdk/metric v1.37.0
23-
go.opentelemetry.io/otel/trace v1.37.0
11+
go.opentelemetry.io/contrib/bridges/otelslog v0.13.0
12+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0
13+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0
14+
go.opentelemetry.io/contrib/instrumentation/runtime v0.63.0
15+
go.opentelemetry.io/otel v1.38.0
16+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.14.0
17+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0
18+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0
19+
go.opentelemetry.io/otel/log v0.14.0
20+
go.opentelemetry.io/otel/sdk v1.38.0
21+
go.opentelemetry.io/otel/sdk/log v0.14.0
22+
go.opentelemetry.io/otel/sdk/metric v1.38.0
23+
go.opentelemetry.io/otel/trace v1.38.0
2424
google.golang.org/grpc v1.75.0
2525
google.golang.org/protobuf v1.36.8
2626
)
@@ -32,7 +32,7 @@ require (
3232
connectrpc.com/connect v1.18.1 // indirect
3333
connectrpc.com/otelconnect v0.7.2 // indirect
3434
github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df // indirect
35-
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
35+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
3636
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3737
github.com/diegoholiveira/jsonlogic/v3 v3.7.4 // indirect
3838
github.com/eapache/go-resiliency v1.7.0 // indirect
@@ -43,7 +43,7 @@ require (
4343
github.com/go-logr/logr v1.4.3 // indirect
4444
github.com/go-logr/stdr v1.2.2 // indirect
4545
github.com/golang/snappy v0.0.4 // indirect
46-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
46+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
4747
github.com/hashicorp/go-uuid v1.0.3 // indirect
4848
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
4949
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
@@ -63,9 +63,9 @@ require (
6363
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
6464
github.com/zeebo/xxh3 v1.0.2 // indirect
6565
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
66-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
67-
go.opentelemetry.io/otel/metric v1.37.0 // indirect
68-
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
66+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
67+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
68+
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
6969
go.uber.org/mock v0.5.2 // indirect
7070
go.uber.org/multierr v1.11.0 // indirect
7171
go.uber.org/zap v1.27.0 // indirect
@@ -75,8 +75,8 @@ require (
7575
golang.org/x/net v0.43.0 // indirect
7676
golang.org/x/sys v0.35.0 // indirect
7777
golang.org/x/text v0.28.0 // indirect
78-
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
79-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
78+
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
79+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
8080
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 // indirect
8181
gopkg.in/yaml.v3 v3.0.1 // indirect
8282
)

0 commit comments

Comments
 (0)