Skip to content

chore: Switch from unmaintained hex dependency to const-hex #3053

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

Merged
merged 1 commit into from
Jul 9, 2025
+20 −17
Merged

chore: Switch from unmaintained hex dependency to const-hex #3053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ tonic = { version = "0.13", default-features = false }
tonic-build = "0.13"
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,
# Using `tracing 0.1.40` because 0.1.39 (which is yanked) introduces the ability to set event names in macros,
# required for OpenTelemetry's internal logging macros.
tracing = { version = ">=0.1.40", default-features = false }
# `tracing-core >=0.1.33` is required for compatibility with `tracing >=0.1.40`.
tracing-core = { version = ">=0.1.33", default-features = false }
tracing-core = { version = ">=0.1.33", default-features = false }
tracing-subscriber = { version = "0.3", default-features = false }
url = { version = "2.5", default-features = false }
anyhow = "1.0.94"
Expand All @@ -59,7 +59,7 @@ ctor = "0.2.9"
ctrlc = "3.2.5"
futures-channel = "0.3"
futures-sink = "0.3"
hex = "0.4.3"
const-hex = "1.14.1"
lazy_static = "1.4.0"
num-format = "0.4.4"
num_cpus = "1.15.0"
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ testing = ["opentelemetry/testing"]
# add ons
internal-logs = ["opentelemetry/internal-logs"]
with-schemars = ["schemars"]
with-serde = ["serde", "hex", "base64"]
with-serde = ["serde", "const-hex", "base64"]

[dependencies]
tonic = { workspace = true, optional = true, features = ["codegen", "prost"] }
Expand All @@ -58,7 +58,7 @@ opentelemetry = { version = "0.30", default-features = false, path = "../opentel
opentelemetry_sdk = { version = "0.30", default-features = false, path = "../opentelemetry-sdk" }
schemars = { workspace = true, optional = true }
serde = { workspace = true, optional = true, features = ["serde_derive"] }
hex = { workspace = true, optional = true }
const-hex = { workspace = true, optional = true }
base64 = { workspace = true, optional = true }

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions opentelemetry-proto/src/proto.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pub(crate) mod serializers {
where
S: Serializer,
{
let hex_string = hex::encode(bytes);
let hex_string = const_hex::encode(bytes);
serializer.serialize_str(&hex_string)
}

Expand All @@ -37,7 +37,7 @@ pub(crate) mod serializers {
where
E: de::Error,
{
hex::decode(value).map_err(E::custom)
const_hex::decode(value).map_err(E::custom)
}
}

Expand Down
23 changes: 13 additions & 10 deletions opentelemetry-proto/tests/json_serde.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,11 @@ mod json_serde {
dropped_attributes_count: 0,
}),
spans: vec![Span {
trace_id: hex::decode("5b8efff798038103d269b633813fc60c").unwrap(),
span_id: hex::decode("eee19b7ec3c1b174").unwrap(),
trace_id: const_hex::decode("5b8efff798038103d269b633813fc60c")
.unwrap(),
span_id: const_hex::decode("eee19b7ec3c1b174").unwrap(),
trace_state: String::new(),
parent_span_id: hex::decode("eee19b7ec3c1b173").unwrap(),
parent_span_id: const_hex::decode("eee19b7ec3c1b173").unwrap(),
flags: 0,
name: String::from("I'm a server span"),
kind: 2,
Expand Down Expand Up @@ -267,10 +268,11 @@ mod json_serde {
dropped_attributes_count: 1,
}),
spans: vec![Span {
trace_id: hex::decode("5b8efff798038103d269b633813fc60c").unwrap(),
span_id: hex::decode("eee19b7ec3c1b174").unwrap(),
trace_id: const_hex::decode("5b8efff798038103d269b633813fc60c")
.unwrap(),
span_id: const_hex::decode("eee19b7ec3c1b174").unwrap(),
trace_state: String::from("browser=firefox,os=linux"),
parent_span_id: hex::decode("eee19b7ec3c1b173").unwrap(),
parent_span_id: const_hex::decode("eee19b7ec3c1b173").unwrap(),
flags: 1,
name: String::from("I'm a server span"),
kind: 2,
Expand Down Expand Up @@ -308,9 +310,9 @@ mod json_serde {
}],
dropped_events_count: 1,
links: vec![Link {
trace_id: hex::decode("5b8efff798038103d269b633813fc60b")
trace_id: const_hex::decode("5b8efff798038103d269b633813fc60b")
.unwrap(),
span_id: hex::decode("eee19b7ec3c1b172").unwrap(),
span_id: const_hex::decode("eee19b7ec3c1b172").unwrap(),
trace_state: String::from("food=pizza,color=red"),
attributes: vec![KeyValue {
key: String::from("my.link.attr"),
Expand Down Expand Up @@ -1272,8 +1274,9 @@ mod json_serde {
],
dropped_attributes_count: 0,
flags: 0,
trace_id: hex::decode("5b8efff798038103d269b633813fc60c").unwrap(),
span_id: hex::decode("eee19b7ec3c1b174").unwrap(),
trace_id: const_hex::decode("5b8efff798038103d269b633813fc60c")
.unwrap(),
span_id: const_hex::decode("eee19b7ec3c1b174").unwrap(),
}],
schema_url: String::new(),
}],
Expand Down