Skip to content

Commit 0640933

Browse files
Copilotcijothomas
andauthored
fix: Remove unnecessary serde_json dependency from logs feature and ensure opentelemetry-proto compatibility (#3114)
Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: cijothomas <[email protected]>
1 parent e0dd566 commit 0640933

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

opentelemetry-proto/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ testing = ["opentelemetry/testing"]
4949
# add ons
5050
internal-logs = ["opentelemetry/internal-logs"]
5151
with-schemars = ["schemars"]
52-
with-serde = ["serde", "const-hex", "base64"]
52+
with-serde = ["serde", "const-hex", "base64", "serde_json"]
5353

5454
[dependencies]
5555
tonic = { workspace = true, optional = true, features = ["codegen", "prost"] }
@@ -58,6 +58,7 @@ opentelemetry = { workspace = true }
5858
opentelemetry_sdk = { workspace = true }
5959
schemars = { workspace = true, optional = true }
6060
serde = { workspace = true, optional = true, features = ["serde_derive"] }
61+
serde_json = { workspace = true, optional = true }
6162
const-hex = { workspace = true, optional = true }
6263
base64 = { workspace = true, optional = true }
6364

opentelemetry-sdk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pprof = { version = "0.14", features = ["flamegraph", "criterion"] }
4242
default = ["trace", "metrics", "logs", "internal-logs"]
4343
trace = ["opentelemetry/trace", "rand", "percent-encoding"]
4444
jaeger_remote_sampler = ["trace", "opentelemetry-http", "http", "serde", "serde_json", "url", "experimental_async_runtime"]
45-
logs = ["opentelemetry/logs", "serde_json"]
45+
logs = ["opentelemetry/logs"]
4646
spec_unstable_logs_enabled = ["logs", "opentelemetry/spec_unstable_logs_enabled"]
4747
metrics = ["opentelemetry/metrics"]
4848
testing = ["opentelemetry/testing", "trace", "metrics", "logs", "rt-tokio", "rt-tokio-current-thread", "tokio/macros", "tokio/rt-multi-thread"]

0 commit comments

Comments
 (0)