Skip to content

Commit 248fbd7

Browse files
committed
Remove traces/logs exporters
1 parent bec6e06 commit 248fbd7

4 files changed

Lines changed: 6 additions & 104 deletions

File tree

Cargo-minimal.lock

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2521,18 +2521,6 @@ dependencies = [
25212521
"tracing",
25222522
]
25232523

2524-
[[package]]
2525-
name = "opentelemetry-appender-tracing"
2526-
version = "0.31.1"
2527-
source = "registry+https://github.com/rust-lang/crates.io-index"
2528-
checksum = "ef6a1ac5ca3accf562b8c306fa8483c85f4390f768185ab775f242f7fe8fdcc2"
2529-
dependencies = [
2530-
"opentelemetry",
2531-
"tracing",
2532-
"tracing-core",
2533-
"tracing-subscriber",
2534-
]
2535-
25362524
[[package]]
25372525
name = "opentelemetry-http"
25382526
version = "0.31.0"
@@ -2589,6 +2577,8 @@ dependencies = [
25892577
"percent-encoding",
25902578
"rand 0.9.1",
25912579
"thiserror 2.0.17",
2580+
"tokio",
2581+
"tokio-stream",
25922582
]
25932583

25942584
[[package]]
@@ -2789,7 +2779,6 @@ dependencies = [
27892779
"config",
27902780
"ohttp-relay",
27912781
"opentelemetry",
2792-
"opentelemetry-appender-tracing",
27932782
"opentelemetry-otlp",
27942783
"opentelemetry_sdk",
27952784
"payjoin-directory",
@@ -2805,7 +2794,6 @@ dependencies = [
28052794
"tokio-stream",
28062795
"tower",
28072796
"tracing",
2808-
"tracing-opentelemetry",
28092797
"tracing-subscriber",
28102798
]
28112799

@@ -4444,25 +4432,6 @@ dependencies = [
44444432
"tracing-core",
44454433
]
44464434

4447-
[[package]]
4448-
name = "tracing-opentelemetry"
4449-
version = "0.32.0"
4450-
source = "registry+https://github.com/rust-lang/crates.io-index"
4451-
checksum = "1e6e5658463dd88089aba75c7791e1d3120633b1bfde22478b28f625a9bb1b8e"
4452-
dependencies = [
4453-
"js-sys",
4454-
"opentelemetry",
4455-
"opentelemetry_sdk",
4456-
"rustversion",
4457-
"smallvec",
4458-
"thiserror 2.0.17",
4459-
"tracing",
4460-
"tracing-core",
4461-
"tracing-log",
4462-
"tracing-subscriber",
4463-
"web-time",
4464-
]
4465-
44664435
[[package]]
44674436
name = "tracing-serde"
44684437
version = "0.2.0"

Cargo-recent.lock

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2521,18 +2521,6 @@ dependencies = [
25212521
"tracing",
25222522
]
25232523

2524-
[[package]]
2525-
name = "opentelemetry-appender-tracing"
2526-
version = "0.31.1"
2527-
source = "registry+https://github.com/rust-lang/crates.io-index"
2528-
checksum = "ef6a1ac5ca3accf562b8c306fa8483c85f4390f768185ab775f242f7fe8fdcc2"
2529-
dependencies = [
2530-
"opentelemetry",
2531-
"tracing",
2532-
"tracing-core",
2533-
"tracing-subscriber",
2534-
]
2535-
25362524
[[package]]
25372525
name = "opentelemetry-http"
25382526
version = "0.31.0"
@@ -2589,6 +2577,8 @@ dependencies = [
25892577
"percent-encoding",
25902578
"rand 0.9.1",
25912579
"thiserror 2.0.17",
2580+
"tokio",
2581+
"tokio-stream",
25922582
]
25932583

25942584
[[package]]
@@ -2789,7 +2779,6 @@ dependencies = [
27892779
"config",
27902780
"ohttp-relay",
27912781
"opentelemetry",
2792-
"opentelemetry-appender-tracing",
27932782
"opentelemetry-otlp",
27942783
"opentelemetry_sdk",
27952784
"payjoin-directory",
@@ -2805,7 +2794,6 @@ dependencies = [
28052794
"tokio-stream",
28062795
"tower",
28072796
"tracing",
2808-
"tracing-opentelemetry",
28092797
"tracing-subscriber",
28102798
]
28112799

@@ -4444,25 +4432,6 @@ dependencies = [
44444432
"tracing-core",
44454433
]
44464434

4447-
[[package]]
4448-
name = "tracing-opentelemetry"
4449-
version = "0.32.0"
4450-
source = "registry+https://github.com/rust-lang/crates.io-index"
4451-
checksum = "1e6e5658463dd88089aba75c7791e1d3120633b1bfde22478b28f625a9bb1b8e"
4452-
dependencies = [
4453-
"js-sys",
4454-
"opentelemetry",
4455-
"opentelemetry_sdk",
4456-
"rustversion",
4457-
"smallvec",
4458-
"thiserror 2.0.17",
4459-
"tracing",
4460-
"tracing-core",
4461-
"tracing-log",
4462-
"tracing-subscriber",
4463-
"web-time",
4464-
]
4465-
44664435
[[package]]
44674436
name = "tracing-serde"
44684437
version = "0.2.0"

payjoin-service/Cargo.toml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ acme = [
2222
"dep:rustls",
2323
"dep:tokio-stream",
2424
]
25-
telemetry = [
26-
"dep:opentelemetry-otlp",
27-
"dep:tracing-opentelemetry",
28-
"dep:opentelemetry-appender-tracing",
29-
]
25+
telemetry = ["dep:opentelemetry-otlp"]
3026

3127
[dependencies]
3228
anyhow = "1.0"
@@ -38,7 +34,6 @@ clap = { version = "4.5", features = ["derive", "env"] }
3834
config = "0.15"
3935
ohttp-relay = { path = "../ohttp-relay", features = ["bootstrap"] }
4036
opentelemetry = "0.31"
41-
opentelemetry-appender-tracing = { version = "0.31", optional = true }
4237
opentelemetry-otlp = { version = "0.31", optional = true }
4338
opentelemetry_sdk = "0.31"
4439
payjoin-directory = { path = "../payjoin-directory" }
@@ -53,7 +48,6 @@ tokio-rustls-acme = { version = "0.9.0", features = ["axum"], optional = true }
5348
tokio-stream = { version = "0.1.17", optional = true }
5449
tower = "0.5"
5550
tracing = "0.1"
56-
tracing-opentelemetry = { version = "0.32", optional = true }
5751
tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
5852

5953
[dev-dependencies]

payjoin-service/src/main.rs

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ fn init_tracing() -> Option<SdkMeterProvider> {
3636
use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge;
3737
use opentelemetry_otlp::WithHttpConfig;
3838
use opentelemetry_sdk::Resource;
39-
use tracing_subscriber::layer::SubscriberExt;
40-
use tracing_subscriber::util::SubscriberInitExt;
4139

4240
let mut resource_builder = Resource::builder().with_service_name("payjoin-service");
4341
if let Ok(domain) = std::env::var("OPERATOR_DOMAIN") {
@@ -52,28 +50,6 @@ fn init_tracing() -> Option<SdkMeterProvider> {
5250
.map(|token| [("Authorization".to_string(), format!("Basic {}", token))].into())
5351
.unwrap_or_default();
5452

55-
// Initialize trace exporter and provider
56-
let span_exporter = opentelemetry_otlp::SpanExporter::builder()
57-
.with_http()
58-
.with_headers(headers.clone())
59-
.build()
60-
.expect("Failed to build OTLP span exporter");
61-
let tracer_provider = opentelemetry_sdk::trace::SdkTracerProvider::builder()
62-
.with_batch_exporter(span_exporter)
63-
.with_resource(resource.clone())
64-
.build();
65-
66-
// Initialize log exporter and provider
67-
let log_exporter = opentelemetry_otlp::LogExporter::builder()
68-
.with_http()
69-
.with_headers(headers.clone())
70-
.build()
71-
.expect("Failed to build OTLP log exporter");
72-
let logger_provider = opentelemetry_sdk::logs::SdkLoggerProvider::builder()
73-
.with_batch_exporter(log_exporter)
74-
.with_resource(resource.clone())
75-
.build();
76-
7753
// Initialize metric exporter and provider
7854
let metric_exporter = opentelemetry_otlp::MetricExporter::builder()
7955
.with_http()
@@ -88,14 +64,8 @@ fn init_tracing() -> Option<SdkMeterProvider> {
8864
let env_filter =
8965
EnvFilter::builder().with_default_directive(LevelFilter::INFO.into()).from_env_lossy();
9066

91-
tracing_subscriber::registry()
92-
.with(env_filter)
93-
.with(tracing_subscriber::fmt::layer().json().with_target(true))
94-
.with(tracing_opentelemetry::layer().with_tracer(tracer_provider.tracer("payjoin-service")))
95-
.with(OpenTelemetryTracingBridge::new(&logger_provider))
96-
.init();
67+
tracing_subscriber::fmt().json().with_target(true).with_env_filter(env_filter).init();
9768

98-
opentelemetry::global::set_tracer_provider(tracer_provider);
9969
opentelemetry::global::set_meter_provider(meter_provider.clone());
10070

10171
Some(meter_provider)

0 commit comments

Comments
 (0)