Skip to content

Commit 4d64f2d

Browse files
[shipping] Use cumulative metrics in shipping service to be consistent with the other services of the demo (#2503)
* Use cumulative metrics to be consistent with the other apps of the demo * Use cumulative metrics to be consistent with the other apps of the demo * Add OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE to shipping --------- Co-authored-by: Juliano Costa <julianocosta89@outlook.com> Co-authored-by: Juliano Costa <juliano.costa@datadoghq.com>
1 parent 99c69a3 commit 4d64f2d

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

CHANGELOG.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,21 +83,24 @@ the release.
8383
([#2392](https://github.com/open-telemetry/opentelemetry-demo/pull/2392))
8484
* [prometheus / grafana] Add Linux monitoring dashboard
8585
([#2395](https://github.com/open-telemetry/opentelemetry-demo/pull/2395))
86+
* [prometheus /grafana] Add alerting demo through the `CartAddItemHighLatency`
87+
alert rule
88+
([#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))
8691
* [grafana] Update OpenSearch logs index in APM Dashboards
8792
([#2419](https://github.com/open-telemetry/opentelemetry-demo/pull/2419))
8893
* [frontend-proxy] Add redirects for web UI paths to ensure proper asset loading
8994
([#2476](https://github.com/open-telemetry/opentelemetry-demo/pull/2476))
90-
* [cart] Enable automatic generation of `service.instance.id`
91-
([#2402](https://github.com/open-telemetry/opentelemetry-demo/pull/2402))
92-
* [prometheus /grafana] Add alerting demo through the `CartAddItemHighLatency`
93-
alert rule
94-
([#2401](https://github.com/open-telemetry/opentelemetry-demo/pull/2401))
9595
* [chore] Bump dependent images
9696
([#2477](https://github.com/open-telemetry/opentelemetry-demo/pull/2477))
9797
* [email] Add memory leak scenario to email service
9898
([#2481](https://github.com/open-telemetry/opentelemetry-demo/pull/2481))
9999
* [checkout] Add graceful shutdown to checkout service
100100
([#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))
101104

102105
## 2.0.2
103106

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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,7 @@ services:
586586
- OTEL_EXPORTER_OTLP_ENDPOINT
587587
- OTEL_RESOURCE_ATTRIBUTES
588588
- OTEL_SERVICE_NAME=shipping
589+
- OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
589590
healthcheck:
590591
test: ["CMD-SHELL", "timeout 1 bash -c '>/dev/tcp/localhost/${SHIPPING_PORT}'"]
591592
start_period: 10s

src/shipping/src/telemetry_conf.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ fn init_meter_provider() -> opentelemetry_sdk::metrics::SdkMeterProvider {
4242
.with_resource(get_resource())
4343
.with_periodic_exporter(
4444
opentelemetry_otlp::MetricExporter::builder()
45-
.with_temporality(opentelemetry_sdk::metrics::Temporality::Delta)
4645
.with_tonic()
4746
.build()
4847
.expect("Failed to initialize metric exporter"),

0 commit comments

Comments
 (0)