Skip to content

Commit 34c1c6b

Browse files
[shippingservice] add resource data (#504)
* Add resource data to shipping service * add changelog * Update shippingservice docs * Cargo update and formatting
1 parent 45cedad commit 34c1c6b

File tree

6 files changed

+247
-224
lines changed

6 files changed

+247
-224
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ significant modifications will be credited to OpenTelemetry Authors.
124124
([#455](https://github.com/open-telemetry/opentelemetry-demo/pull/455))
125125
* Update cartservice Dockerfile to support ARM64
126126
([#439](https://github.com/open-telemetry/opentelemetry-demo/pull/439))
127+
* Update shippingservice to add resource data to spans
128+
([#504](https://github.com/open-telemetry/opentelemetry-demo/pull/504))
127129
* Add Envoy as reverse proxy for all user-facing services
128130
([#508](https://github.com/open-telemetry/opentelemetry-demo/pull/508))
129131
* Envoy: Grafana, Load Generator, Jaeger exposed.

docs/services/shippingservice.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ The OpenTelemetry SDK is initialized from `main`.
2525
```rust
2626
fn init_tracer() -> Result<sdktrace::Tracer, TraceError> {
2727
global::set_text_map_propagator(TraceContextPropagator::new());
28+
let os_resource = OsResourceDetector.detect(Duration::from_secs(0));
29+
let process_resource = ProcessResourceDetector.detect(Duration::from_secs(0));
30+
let sdk_resource = SdkProvidedResourceDetector.detect(Duration::from_secs(0));
2831
opentelemetry_otlp::new_pipeline()
2932
.tracing()
3033
.with_exporter(
@@ -38,6 +41,10 @@ fn init_tracer() -> Result<sdktrace::Tracer, TraceError> {
3841
)), // TODO: assume this ^ is true from config when opentelemetry crate > v0.17.0
3942
// https://github.com/open-telemetry/opentelemetry-rust/pull/806 includes the environment variable.
4043
)
44+
.with_trace_config(
45+
sdktrace::config()
46+
.with_resource(os_resource.merge(&process_resource).merge(&sdk_resource)),
47+
)
4148
.install_batch(opentelemetry::runtime::Tokio)
4249
}
4350
```

0 commit comments

Comments
 (0)