Skip to content

Commit b1ce675

Browse files
committed
Update dependencies
Only the tracing support required changes as the API had changed (or been deprecated).
1 parent 6b1f42c commit b1ce675

File tree

2 files changed

+29
-31
lines changed

2 files changed

+29
-31
lines changed

Cargo.toml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@ license = "Apache-2.0"
88
unwrap_used = "deny"
99

1010
[dependencies]
11-
async-graphql = { version = "7.0.12", features = ["tracing"] }
12-
async-graphql-axum = "7.0.12"
13-
axum = "0.7.5"
14-
chrono = "0.4.38"
15-
clap = { version = "4.5.16", features = ["cargo", "derive", "env"] }
16-
futures = "0.3.30"
17-
opentelemetry = "0.24.0"
18-
opentelemetry-otlp = "0.17.0"
19-
opentelemetry-semantic-conventions = "0.16.0"
20-
opentelemetry-stdout = "0.5.0"
21-
opentelemetry_sdk = { version = "0.24.1", features = ["rt-tokio"] }
22-
sqlx = { version = "0.8.0", features = ["runtime-tokio", "sqlite"] }
23-
tokio = { version = "1.39.2", features = ["full"] }
24-
tracing = "0.1.40"
25-
tracing-opentelemetry = "0.25.0"
26-
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
27-
url = "2.5.2"
11+
async-graphql = { version = "7.0.13", features = ["tracing"] }
12+
async-graphql-axum = "7.0.13"
13+
axum = "0.7.9"
14+
chrono = "0.4.39"
15+
clap = { version = "4.5.23", features = ["cargo", "derive", "env"] }
16+
futures = "0.3.31"
17+
opentelemetry = "0.27.1"
18+
opentelemetry-otlp = "0.27.0"
19+
opentelemetry-semantic-conventions = "0.27.0"
20+
opentelemetry-stdout = "0.27.0"
21+
opentelemetry_sdk = { version = "0.27.1", features = ["rt-tokio"] }
22+
sqlx = { version = "0.8.2", features = ["runtime-tokio", "sqlite"] }
23+
tokio = { version = "1.42.0", features = ["full"] }
24+
tracing = "0.1.41"
25+
tracing-opentelemetry = "0.28.0"
26+
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
27+
url = "2.5.4"
2828

2929
[dev-dependencies]
3030
async-std = { version = "1.13.0", features = ["attributes"], default-features = false }

src/logging.rs

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@
1414

1515
use opentelemetry::trace::{TraceError, TracerProvider as _};
1616
use opentelemetry::{global, KeyValue};
17-
use opentelemetry_otlp::{new_pipeline, WithExportConfig};
18-
use opentelemetry_sdk::trace::Config;
17+
use opentelemetry_otlp::{SpanExporter, WithExportConfig as _};
18+
use opentelemetry_sdk::trace::TracerProvider;
1919
use opentelemetry_sdk::{runtime, Resource};
20-
use opentelemetry_semantic_conventions::resource::{
21-
DEPLOYMENT_ENVIRONMENT, SERVICE_NAME, SERVICE_VERSION,
22-
};
20+
use opentelemetry_semantic_conventions::resource::{SERVICE_NAME, SERVICE_VERSION};
2321
use opentelemetry_semantic_conventions::SCHEMA_URL;
2422
use tracing::{Level, Subscriber};
2523
use tracing_opentelemetry::OpenTelemetryLayer;
@@ -37,7 +35,6 @@ fn resource() -> Resource {
3735
[
3836
KeyValue::new(SERVICE_NAME, env!("CARGO_PKG_NAME")),
3937
KeyValue::new(SERVICE_VERSION, env!("CARGO_PKG_VERSION")),
40-
KeyValue::new(DEPLOYMENT_ENVIRONMENT, "dev"),
4138
],
4239
SCHEMA_URL,
4340
)
@@ -59,15 +56,16 @@ where
5956
S: Subscriber + for<'s> LookupSpan<'s>,
6057
{
6158
if let Some(endpoint) = endpoint {
62-
let provider = new_pipeline()
63-
.tracing()
64-
.with_trace_config(Config::default().with_resource(resource()))
65-
.with_exporter(
66-
opentelemetry_otlp::new_exporter()
67-
.tonic()
68-
.with_endpoint(endpoint),
59+
let provider = TracerProvider::builder()
60+
.with_batch_exporter(
61+
SpanExporter::builder()
62+
.with_tonic()
63+
.with_endpoint(endpoint)
64+
.build()?,
65+
runtime::Tokio,
6966
)
70-
.install_batch(runtime::Tokio)?;
67+
.with_resource(resource())
68+
.build();
7169
global::set_tracer_provider(provider.clone());
7270
let tracer = provider.tracer("visit-service");
7371
Ok(Some(

0 commit comments

Comments
 (0)