Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[shippingservice] Update Rust deps and add TelemetryResourceDetector #972

Merged
merged 4 commits into from
Jul 17, 2023
Merged

[shippingservice] Update Rust deps and add TelemetryResourceDetector #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd77ef7
Update Rust deps and add TelemetryResourceDetector
Jul 12, 2023
337c83e
Changelog
Jul 12, 2023
5168a29
Merge branch 'main' into shippingservice-update-rust-dependencies
austinlparker Jul 13, 2023
38683fd
Update min versions
Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ release.
([#872](https://github.com/open-telemetry/opentelemetry-demo/pull/872))
* [frontendproxy]Envoy expose a route for the collector to route frontend spans
([#938](https://github.com/open-telemetry/opentelemetry-demo/pull/938))
* [shippingservice] Update Rust dependencies and add TelemetryResourceDetector
([#972](https://github.com/open-telemetry/opentelemetry-demo/pull/972))

## 1.4.0

Expand Down
124 changes: 88 additions & 36 deletions src/shippingservice/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions src/shippingservice/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ reqwest = { version = "0.11", default-features = false, features = ["json"] }
prost = "0.11"
prost-types = "0.11"
tokio = { version = "1.28", features = ["macros", "rt-multi-thread"] }
opentelemetry = { version = "0.18", features = ["rt-tokio", "trace"] }
opentelemetry-semantic-conventions = "0.10.0"
opentelemetry_api = { version = "0.18" }
opentelemetry-http = "0.7.0"
opentelemetry-otlp = "0.11.0"
log = "0.4.17"
opentelemetry = { version = "0.19", features = ["rt-tokio", "trace"] }
opentelemetry-semantic-conventions = "0.11.0"
opentelemetry_api = { version = "0.19" }
opentelemetry-http = "0.8.0"
opentelemetry-otlp = "0.12.0"
log = "0.4.19"
simplelog = "0.12"
reqwest-middleware = "0.2.0"
reqwest-tracing = { version = "0.4.0", features = ["opentelemetry_0_18"] }
reqwest-middleware = "0.2.2"
reqwest-tracing = { version = "0.4.5", features = ["opentelemetry_0_18"] }
tracing = { version = "0.1", features = ["max_level_debug", "release_max_level_info"] }
tracing-opentelemetry = "0.18.0"
tracing-opentelemetry = "0.19.0"
tracing-subscriber = "0.3"

[dependencies.uuid]
Expand Down
5 changes: 3 additions & 2 deletions src/shippingservice/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use opentelemetry::{
propagation::TraceContextPropagator,
resource::{
OsResourceDetector, ProcessResourceDetector, ResourceDetector,
EnvResourceDetector,
EnvResourceDetector, TelemetryResourceDetector,
SdkProvidedResourceDetector,
},
trace as sdktrace,
Expand Down Expand Up @@ -46,6 +46,7 @@ fn init_tracer() -> Result<sdktrace::Tracer, TraceError> {
let process_resource = ProcessResourceDetector.detect(Duration::from_secs(0));
let sdk_resource = SdkProvidedResourceDetector.detect(Duration::from_secs(0));
let env_resource = EnvResourceDetector::new().detect(Duration::from_secs(0));
let telemetry_resource = TelemetryResourceDetector.detect(Duration::from_secs(0));
opentelemetry_otlp::new_pipeline()
.tracing()
.with_exporter(
Expand All @@ -61,7 +62,7 @@ fn init_tracer() -> Result<sdktrace::Tracer, TraceError> {
)
.with_trace_config(
sdktrace::config()
.with_resource(os_resource.merge(&process_resource).merge(&sdk_resource).merge(&env_resource)),
.with_resource(os_resource.merge(&process_resource).merge(&sdk_resource).merge(&env_resource).merge(&telemetry_resource)),
)
.install_batch(opentelemetry::runtime::Tokio)
}
Expand Down