chore: fix `opentelemetry-jeager` upgrade

pull/24376/head
Marco Neumann 2021-08-30 13:46:59 +02:00
parent 29b13ad2a6
commit 7ff28405ea
3 changed files with 7 additions and 4 deletions

5
Cargo.lock generated
View File

@ -2723,6 +2723,8 @@ dependencies = [
"pin-project 1.0.8", "pin-project 1.0.8",
"rand 0.8.4", "rand 0.8.4",
"thiserror", "thiserror",
"tokio",
"tokio-stream",
] ]
[[package]] [[package]]
@ -2737,6 +2739,7 @@ dependencies = [
"opentelemetry-semantic-conventions", "opentelemetry-semantic-conventions",
"thiserror", "thiserror",
"thrift", "thrift",
"tokio",
] ]
[[package]] [[package]]
@ -4890,7 +4893,7 @@ dependencies = [
"chrono", "chrono",
"futures", "futures",
"observability_deps", "observability_deps",
"opentelemetry 0.15.0", "opentelemetry 0.16.0",
"opentelemetry-jaeger", "opentelemetry-jaeger",
"snafu", "snafu",
"structopt", "structopt",

View File

@ -11,8 +11,8 @@ async-trait = "0.1"
chrono = { version = "0.4" } chrono = { version = "0.4" }
futures = "0.3" futures = "0.3"
observability_deps = { path = "../observability_deps" } observability_deps = { path = "../observability_deps" }
opentelemetry = "0.15" opentelemetry = { version = "0.16", features = ["rt-tokio"] }
opentelemetry-jaeger = { version = "0.15", optional = true } opentelemetry-jaeger = { version = "0.15", optional = true, features = ["rt-tokio"] }
snafu = "0.6" snafu = "0.6"
structopt = { version = "0.3.21" } structopt = { version = "0.3.21" }
tokio = { version = "1.0", features = ["macros", "time", "sync", "rt"] } tokio = { version = "1.0", features = ["macros", "time", "sync", "rt"] }

View File

@ -119,7 +119,7 @@ fn jaeger_exporter(config: &TracingConfig) -> Result<Arc<dyn TraceCollector>> {
let exporter = opentelemetry_jaeger::new_pipeline() let exporter = opentelemetry_jaeger::new_pipeline()
.with_agent_endpoint(agent_endpoint) .with_agent_endpoint(agent_endpoint)
.with_service_name(&config.traces_exporter_jaeger_service_name) .with_service_name(&config.traces_exporter_jaeger_service_name)
.init_exporter() .init_async_exporter(opentelemetry::runtime::Tokio {})
.map_err(|source| Error::TraceExporter { source })?; .map_err(|source| Error::TraceExporter { source })?;
Ok(Arc::new(otel::OtelExporter::new(exporter))) Ok(Arc::new(otel::OtelExporter::new(exporter)))