Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: tonic with no default deps #2721

Closed
wants to merge 8 commits into from
Closed

chore: tonic with no default deps #2721

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ff17923
tonic with no default deps
dzmitry-lahoda Feb 26, 2025
37af26e
build explicit config
dzmitry-lahoda Feb 26, 2025
f24cc9d
fixed diff
dzmitry-lahoda Feb 26, 2025
d61a53c
Merge branch 'main' into dz/axum
dzmitry-lahoda Feb 26, 2025
e1b2c72
no grpc at all
dzmitry-lahoda Feb 26, 2025
3cf2f8e
more sync with other PR
dzmitry-lahoda Feb 26, 2025
38cde26
Merge branch 'main' into dz/axum
dzmitry-lahoda Feb 26, 2025
75c1610
removed non needed attr
dzmitry-lahoda Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ serde_json = "1.0"
temp-env = "0.3.6"
thiserror = { version = "2", default-features = false }
tonic = { version = "0.12.3", default-features = false }
tonic-build = "0.12"
tonic-build = { version = "0.12", default-features = false, features = ["prost", "transport"]}
tokio = { version = "1", default-features = false }
tokio-stream = "0.1"
# Using `tracing 0.1.40` because 0.1.39 (which is yanked) introduces the ability to set event names in macros,
Expand Down
2 changes: 1 addition & 1 deletion examples/tracing-grpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["rt-tokio"]
opentelemetry-stdout = { workspace = true, features = ["trace"] }
prost = { workspace = true }
tokio = { workspace = true, features = ["full"] }
tonic = { workspace = true, features = ["server"] }
tonic = { workspace = true, default-features = false, features = ["server"] }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit - this would conflict with #2710 based on whichever is merged first.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

commented, may be these can be made in sync. "server" seems conflicts on deeper "tonic" level and not fix possible without tonic patch.


[build-dependencies]
tonic-build = { workspace = true }
2 changes: 1 addition & 1 deletion opentelemetry-otlp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ opentelemetry-proto = { version = "0.28", path = "../opentelemetry-proto", defau
tracing = {workspace = true, optional = true}

prost = { workspace = true, optional = true }
tonic = { workspace = true, optional = true }
tonic = { workspace = true, default-features = false, optional = true }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it required to state defaut-features=false here, given it is already in the workspace?

tokio = { workspace = true, features = ["sync", "rt"], optional = true }

reqwest = { workspace = true, optional = true }
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-proto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ with-schemars = ["schemars"]
with-serde = ["serde", "hex", "base64"]

[dependencies]
tonic = { workspace = true, optional = true, features = ["codegen", "prost"] }
tonic = { workspace = true, optional = true, default-features = false, features = ["codegen", "prost"] }
prost = { workspace = true, optional = true }
opentelemetry = { version = "0.28", default-features = false, path = "../opentelemetry" }
opentelemetry_sdk = { version = "0.28", default-features = false, path = "../opentelemetry-sdk" }
Expand Down
Loading