Skip to content

Commit

Permalink
Merge pull request #2509 from fermyon/backport-2501-to-v2.5
Browse files Browse the repository at this point in the history
[Backport v2.5] ref(telemetry): Provide the abililty to turn off the tracing-log compat layer in tracing-subscriber dep of telemetry
  • Loading branch information
calebschoepp authored May 14, 2024
2 parents 83eb68d + ad68577 commit ac38d10
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 20 deletions.
1 change: 0 additions & 1 deletion Cargo.lock

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

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ spin-locked-app = { path = "crates/locked-app" }
spin-manifest = { path = "crates/manifest" }
spin-oci = { path = "crates/oci" }
spin-plugins = { path = "crates/plugins" }
spin-telemetry = { path = "crates/telemetry" }
spin-telemetry = { path = "crates/telemetry", features = ["tracing-log-compat"] }
spin-templates = { path = "crates/templates" }
spin-trigger = { path = "crates/trigger" }
spin-trigger-http = { path = "crates/trigger-http" }
Expand All @@ -72,7 +72,6 @@ tempfile = "3.8.0"
tokio = { version = "1.23", features = ["full"] }
toml = "0.6"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3.7", features = ["env-filter"] }
url = "2.2.2"
uuid = { version = "^1.0", features = ["v4"] }
wasmtime = { workspace = true }
Expand Down
11 changes: 7 additions & 4 deletions crates/telemetry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@ http0 = { version = "0.2.9", package = "http" }
http1 = { version = "1.0.0", package = "http" }
opentelemetry = { version = "0.22.0", features = [ "metrics", "trace"] }
opentelemetry_sdk = { version = "0.22.1", features = ["rt-tokio"] }
opentelemetry-otlp = { version = "0.15.0", default_features=false, features = ["http-proto", "trace", "http", "reqwest-client", "metrics", "grpc-tonic"] }
opentelemetry-otlp = { version = "0.15.0", default-features=false, features = ["http-proto", "trace", "http", "reqwest-client", "metrics", "grpc-tonic"] }
opentelemetry-semantic-conventions = "0.14.0"
tracing = { version = "0.1.37", features = ["log"] }
tracing-appender = "0.2.2"
tracing-opentelemetry = "0.23.0"
tracing-subscriber = { version = "0.3.17", features = ["env-filter", "json", "registry"] }
tracing-opentelemetry = { version = "0.23.0", default-features = false, features = ["metrics"] }
tracing-subscriber = { version = "0.3.17", default-features = false, features = ["smallvec", "fmt", "ansi", "std", "env-filter", "json", "registry"] }
url = "2.2.2"
terminal = { path = "../terminal" }
terminal = { path = "../terminal" }

[features]
tracing-log-compat = ["tracing-subscriber/tracing-log", "tracing-opentelemetry/tracing-log"]
13 changes: 0 additions & 13 deletions examples/spin-timer/Cargo.lock

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

0 comments on commit ac38d10

Please sign in to comment.