Skip to content

Commit ac38d10

Browse files
authored
Merge pull request #2509 from fermyon/backport-2501-to-v2.5
[Backport v2.5] ref(telemetry): Provide the abililty to turn off the tracing-log compat layer in tracing-subscriber dep of telemetry
2 parents 83eb68d + ad68577 commit ac38d10

File tree

4 files changed

+8
-20
lines changed

4 files changed

+8
-20
lines changed

Cargo.lock

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ spin-locked-app = { path = "crates/locked-app" }
6161
spin-manifest = { path = "crates/manifest" }
6262
spin-oci = { path = "crates/oci" }
6363
spin-plugins = { path = "crates/plugins" }
64-
spin-telemetry = { path = "crates/telemetry" }
64+
spin-telemetry = { path = "crates/telemetry", features = ["tracing-log-compat"] }
6565
spin-templates = { path = "crates/templates" }
6666
spin-trigger = { path = "crates/trigger" }
6767
spin-trigger-http = { path = "crates/trigger-http" }
@@ -72,7 +72,6 @@ tempfile = "3.8.0"
7272
tokio = { version = "1.23", features = ["full"] }
7373
toml = "0.6"
7474
tracing = { workspace = true }
75-
tracing-subscriber = { version = "0.3.7", features = ["env-filter"] }
7675
url = "2.2.2"
7776
uuid = { version = "^1.0", features = ["v4"] }
7877
wasmtime = { workspace = true }

crates/telemetry/Cargo.toml

+7-4
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@ http0 = { version = "0.2.9", package = "http" }
1010
http1 = { version = "1.0.0", package = "http" }
1111
opentelemetry = { version = "0.22.0", features = [ "metrics", "trace"] }
1212
opentelemetry_sdk = { version = "0.22.1", features = ["rt-tokio"] }
13-
opentelemetry-otlp = { version = "0.15.0", default_features=false, features = ["http-proto", "trace", "http", "reqwest-client", "metrics", "grpc-tonic"] }
13+
opentelemetry-otlp = { version = "0.15.0", default-features=false, features = ["http-proto", "trace", "http", "reqwest-client", "metrics", "grpc-tonic"] }
1414
opentelemetry-semantic-conventions = "0.14.0"
1515
tracing = { version = "0.1.37", features = ["log"] }
1616
tracing-appender = "0.2.2"
17-
tracing-opentelemetry = "0.23.0"
18-
tracing-subscriber = { version = "0.3.17", features = ["env-filter", "json", "registry"] }
17+
tracing-opentelemetry = { version = "0.23.0", default-features = false, features = ["metrics"] }
18+
tracing-subscriber = { version = "0.3.17", default-features = false, features = ["smallvec", "fmt", "ansi", "std", "env-filter", "json", "registry"] }
1919
url = "2.2.2"
20-
terminal = { path = "../terminal" }
20+
terminal = { path = "../terminal" }
21+
22+
[features]
23+
tracing-log-compat = ["tracing-subscriber/tracing-log", "tracing-opentelemetry/tracing-log"]

examples/spin-timer/Cargo.lock

-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)