Compare commits

...

3 Commits

Author SHA1 Message Date
Ning Sun
8853e08a7d chore: use pinned prost 0.14.1 2026-01-15 16:58:24 +08:00
Ning Sun
9cba14f904 chore: update otel librarires 2026-01-15 16:12:34 +08:00
Ning Sun
09ba24b7a9 chore: update otel-arrow 2026-01-15 15:46:40 +08:00
4 changed files with 90 additions and 155 deletions

227
Cargo.lock generated
View File

@@ -725,7 +725,7 @@ dependencies = [
"memchr",
"num",
"regex",
"regex-syntax 0.8.7",
"regex-syntax",
]
[[package]]
@@ -742,7 +742,7 @@ dependencies = [
"memchr",
"num-traits",
"regex",
"regex-syntax 0.8.7",
"regex-syntax",
]
[[package]]
@@ -1482,7 +1482,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
dependencies = [
"memchr",
"regex-automata 0.4.13",
"regex-automata",
"serde",
]
@@ -2013,7 +2013,7 @@ dependencies = [
"humantime",
"meta-client",
"meta-srv",
"nu-ansi-term",
"nu-ansi-term 0.46.0",
"object-store",
"operator",
"paste",
@@ -2155,7 +2155,7 @@ dependencies = [
"metric-engine",
"mito2",
"moka",
"nu-ansi-term",
"nu-ansi-term 0.46.0",
"object-store",
"parquet",
"plugins",
@@ -2844,10 +2844,10 @@ dependencies = [
"humantime-serde",
"lazy_static",
"once_cell",
"opentelemetry 0.30.0",
"opentelemetry",
"opentelemetry-otlp",
"opentelemetry-semantic-conventions",
"opentelemetry_sdk 0.30.0",
"opentelemetry_sdk",
"parking_lot 0.12.4",
"prometheus",
"serde",
@@ -4074,7 +4074,7 @@ dependencies = [
"log",
"recursive",
"regex",
"regex-syntax 0.8.7",
"regex-syntax",
]
[[package]]
@@ -4976,8 +4976,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e24cb5a94bcae1e5408b0effca5cd7172ea3c5755049c5f3af4cd283a165298"
dependencies = [
"bit-set",
"regex-automata 0.4.13",
"regex-syntax 0.8.7",
"regex-automata",
"regex-syntax",
]
[[package]]
@@ -5323,7 +5323,7 @@ dependencies = [
"meta-client",
"meta-srv",
"num_cpus",
"opentelemetry-proto 0.31.0",
"opentelemetry-proto",
"operator",
"otel-arrow-rust",
"partition",
@@ -6526,8 +6526,8 @@ dependencies = [
"rand 0.9.1",
"rand_chacha 0.9.0",
"regex",
"regex-automata 0.4.13",
"roaring",
"regex-automata",
"roaring 0.10.12",
"serde",
"serde_json",
"snafu 0.8.6",
@@ -7119,7 +7119,7 @@ dependencies = [
"lalrpop-util",
"petgraph 0.7.1",
"regex",
"regex-syntax 0.8.7",
"regex-syntax",
"sha3",
"string_cache",
"term",
@@ -7133,7 +7133,7 @@ version = "0.22.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5baa5e9ff84f1aefd264e6869907646538a52147a755d494517a8007fb48733"
dependencies = [
"regex-automata 0.4.13",
"regex-automata",
"rustversion",
]
@@ -7527,7 +7527,7 @@ dependencies = [
"num-traits",
"quote",
"regex",
"regex-syntax 0.8.7",
"regex-syntax",
"serde",
"vergen",
]
@@ -7653,11 +7653,11 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
[[package]]
name = "matchers"
version = "0.1.0"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
dependencies = [
"regex-automata 0.1.10",
"regex-automata",
]
[[package]]
@@ -8061,7 +8061,7 @@ dependencies = [
"rand 0.9.1",
"rayon",
"regex",
"roaring",
"roaring 0.10.12",
"rskafka",
"rstest 0.25.0",
"rstest_reuse",
@@ -8523,6 +8523,15 @@ dependencies = [
"winapi",
]
[[package]]
name = "nu-ansi-term"
version = "0.50.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
dependencies = [
"windows-sys 0.61.2",
]
[[package]]
name = "num"
version = "0.4.3"
@@ -8942,20 +8951,6 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
[[package]]
name = "opentelemetry"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aaf416e4cb72756655126f7dd7bb0af49c674f4c1b9903e80c009e0c37e552e6"
dependencies = [
"futures-core",
"futures-sink",
"js-sys",
"pin-project-lite",
"thiserror 2.0.17",
"tracing",
]
[[package]]
name = "opentelemetry"
version = "0.31.0"
@@ -8972,48 +8967,36 @@ dependencies = [
[[package]]
name = "opentelemetry-http"
version = "0.30.0"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50f6639e842a97dbea8886e3439710ae463120091e2e064518ba8e716e6ac36d"
checksum = "d7a6d09a73194e6b66df7c8f1b680f156d916a1a942abf2de06823dd02b7855d"
dependencies = [
"async-trait",
"bytes",
"http 1.3.1",
"opentelemetry 0.30.0",
"opentelemetry",
"reqwest",
]
[[package]]
name = "opentelemetry-otlp"
version = "0.30.0"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbee664a43e07615731afc539ca60c6d9f1a9425e25ca09c57bc36c87c55852b"
checksum = "7a2366db2dca4d2ad033cad11e6ee42844fd727007af5ad04a1730f4cb8163bf"
dependencies = [
"http 1.3.1",
"opentelemetry 0.30.0",
"opentelemetry",
"opentelemetry-http",
"opentelemetry-proto 0.30.0",
"opentelemetry_sdk 0.30.0",
"prost 0.13.5",
"opentelemetry-proto",
"opentelemetry_sdk",
"prost 0.14.1",
"reqwest",
"thiserror 2.0.17",
"tokio",
"tonic 0.13.1",
"tonic 0.14.2",
"tracing",
]
[[package]]
name = "opentelemetry-proto"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e046fd7660710fe5a05e8748e70d9058dc15c94ba914e7c4faa7c728f0e8ddc"
dependencies = [
"opentelemetry 0.30.0",
"opentelemetry_sdk 0.30.0",
"prost 0.13.5",
"tonic 0.13.1",
]
[[package]]
name = "opentelemetry-proto"
version = "0.31.0"
@@ -9022,8 +9005,8 @@ checksum = "a7175df06de5eaee9909d4805a3d07e28bb752c34cab57fa9cff549da596b30f"
dependencies = [
"base64 0.22.1",
"const-hex",
"opentelemetry 0.31.0",
"opentelemetry_sdk 0.31.0",
"opentelemetry",
"opentelemetry_sdk",
"prost 0.14.1",
"serde",
"serde_json",
@@ -9033,27 +9016,9 @@ dependencies = [
[[package]]
name = "opentelemetry-semantic-conventions"
version = "0.30.0"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83d059a296a47436748557a353c5e6c5705b9470ef6c95cfc52c21a8814ddac2"
[[package]]
name = "opentelemetry_sdk"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11f644aa9e5e31d11896e024305d7e3c98a88884d9f8919dbf37a9991bc47a4b"
dependencies = [
"futures-channel",
"futures-executor",
"futures-util",
"opentelemetry 0.30.0",
"percent-encoding",
"rand 0.9.1",
"serde_json",
"thiserror 2.0.17",
"tokio",
"tokio-stream",
]
checksum = "e62e29dfe041afb8ed2a6c9737ab57db4907285d999ef8ad3a59092a36bdc846"
[[package]]
name = "opentelemetry_sdk"
@@ -9064,10 +9029,12 @@ dependencies = [
"futures-channel",
"futures-executor",
"futures-util",
"opentelemetry 0.31.0",
"opentelemetry",
"percent-encoding",
"rand 0.9.1",
"thiserror 2.0.17",
"tokio",
"tokio-stream",
]
[[package]]
@@ -9227,7 +9194,7 @@ checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
[[package]]
name = "otel-arrow-rust"
version = "0.1.0"
source = "git+https://github.com/GreptimeTeam/otel-arrow?rev=5da284414e9b14f678344b51e5292229e4b5f8d2#5da284414e9b14f678344b51e5292229e4b5f8d2"
source = "git+https://github.com/GreptimeTeam/otel-arrow?rev=452821e455b16e9a397a09d299340e197eb91571#452821e455b16e9a397a09d299340e197eb91571"
dependencies = [
"ahash 0.8.12",
"arrow 56.2.0",
@@ -9243,6 +9210,7 @@ dependencies = [
"prost-build 0.14.1",
"rand 0.9.1",
"replace_with",
"roaring 0.11.3",
"serde",
"smallvec",
"snafu 0.8.6",
@@ -9255,7 +9223,7 @@ dependencies = [
[[package]]
name = "otlp-derive"
version = "0.1.0"
source = "git+https://github.com/GreptimeTeam/otel-arrow?rev=5da284414e9b14f678344b51e5292229e4b5f8d2#5da284414e9b14f678344b51e5292229e4b5f8d2"
source = "git+https://github.com/GreptimeTeam/otel-arrow?rev=452821e455b16e9a397a09d299340e197eb91571#452821e455b16e9a397a09d299340e197eb91571"
dependencies = [
"convert_case 0.8.0",
"otlp-model",
@@ -9267,7 +9235,7 @@ dependencies = [
[[package]]
name = "otlp-model"
version = "0.1.0"
source = "git+https://github.com/GreptimeTeam/otel-arrow?rev=5da284414e9b14f678344b51e5292229e4b5f8d2#5da284414e9b14f678344b51e5292229e4b5f8d2"
source = "git+https://github.com/GreptimeTeam/otel-arrow?rev=452821e455b16e9a397a09d299340e197eb91571#452821e455b16e9a397a09d299340e197eb91571"
dependencies = [
"tonic-prost-build",
]
@@ -10281,7 +10249,7 @@ dependencies = [
"rand 0.9.1",
"rand_chacha 0.9.0",
"rand_xorshift",
"regex-syntax 0.8.7",
"regex-syntax",
"unarray",
]
@@ -11041,17 +11009,8 @@ checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
dependencies = [
"aho-corasick",
"memchr",
"regex-automata 0.4.13",
"regex-syntax 0.8.7",
]
[[package]]
name = "regex-automata"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
dependencies = [
"regex-syntax 0.6.29",
"regex-automata",
"regex-syntax",
]
[[package]]
@@ -11062,7 +11021,7 @@ checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
dependencies = [
"aho-corasick",
"memchr",
"regex-syntax 0.8.7",
"regex-syntax",
]
[[package]]
@@ -11076,7 +11035,7 @@ dependencies = [
"itertools 0.13.0",
"nohash",
"regex",
"regex-syntax 0.8.7",
"regex-syntax",
]
[[package]]
@@ -11085,12 +11044,6 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a"
[[package]]
name = "regex-syntax"
version = "0.6.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "regex-syntax"
version = "0.8.7"
@@ -11295,6 +11248,16 @@ dependencies = [
"byteorder",
]
[[package]]
name = "roaring"
version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ba9ce64a8f45d7fc86358410bb1a82e8c987504c0d4900e9141d69a9f26c885"
dependencies = [
"bytemuck",
"byteorder",
]
[[package]]
name = "robust"
version = "1.2.0"
@@ -12174,7 +12137,7 @@ dependencies = [
"once_cell",
"openmetrics-parser",
"opensrv-mysql",
"opentelemetry-proto 0.31.0",
"opentelemetry-proto",
"operator",
"otel-arrow-rust",
"parking_lot 0.12.4",
@@ -13434,7 +13397,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d60769b80ad7953d8a7b2c70cdfe722bbcdcac6bccc8ac934c40c034d866fc18"
dependencies = [
"byteorder",
"regex-syntax 0.8.7",
"regex-syntax",
"utf8-ranges",
]
@@ -13659,7 +13622,7 @@ dependencies = [
"moka",
"mysql_async",
"object-store",
"opentelemetry-proto 0.31.0",
"opentelemetry-proto",
"operator",
"otel-arrow-rust",
"partition",
@@ -14124,32 +14087,6 @@ dependencies = [
"tracing",
]
[[package]]
name = "tonic"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e581ba15a835f4d9ea06c55ab1bd4dce26fc53752c69a04aac00703bfb49ba9"
dependencies = [
"async-trait",
"base64 0.22.1",
"bytes",
"http 1.3.1",
"http-body 1.0.1",
"http-body-util",
"hyper 1.6.0",
"hyper-timeout 0.5.2",
"hyper-util",
"percent-encoding",
"pin-project",
"prost 0.13.5",
"tokio",
"tokio-stream",
"tower 0.5.2",
"tower-layer",
"tower-service",
"tracing",
]
[[package]]
name = "tonic"
version = "0.14.2"
@@ -14340,9 +14277,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
[[package]]
name = "tracing"
version = "0.1.41"
version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
dependencies = [
"log",
"pin-project-lite",
@@ -14364,9 +14301,9 @@ dependencies = [
[[package]]
name = "tracing-attributes"
version = "0.1.28"
version = "0.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
dependencies = [
"proc-macro2",
"quote",
@@ -14375,9 +14312,9 @@ dependencies = [
[[package]]
name = "tracing-core"
version = "0.1.34"
version = "0.1.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
dependencies = [
"once_cell",
"valuable",
@@ -14396,14 +14333,12 @@ dependencies = [
[[package]]
name = "tracing-opentelemetry"
version = "0.31.0"
version = "0.32.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddcf5959f39507d0d04d6413119c04f33b623f4f951ebcbdddddfad2d0623a9c"
checksum = "1ac28f2d093c6c477eaa76b23525478f38de514fa9aeb1285738d4b97a9552fc"
dependencies = [
"js-sys",
"once_cell",
"opentelemetry 0.30.0",
"opentelemetry_sdk 0.30.0",
"opentelemetry",
"smallvec",
"tracing",
"tracing-core",
@@ -14424,14 +14359,14 @@ dependencies = [
[[package]]
name = "tracing-subscriber"
version = "0.3.19"
version = "0.3.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
dependencies = [
"matchers",
"nu-ansi-term",
"nu-ansi-term 0.50.3",
"once_cell",
"regex",
"regex-automata",
"serde",
"serde_json",
"sharded-slab",

View File

@@ -181,7 +181,7 @@ opentelemetry-proto = { version = "0.31", features = [
"logs",
] }
ordered-float = { version = "4.3", features = ["serde"] }
otel-arrow-rust = { git = "https://github.com/GreptimeTeam/otel-arrow", rev = "5da284414e9b14f678344b51e5292229e4b5f8d2", features = [
otel-arrow-rust = { git = "https://github.com/GreptimeTeam/otel-arrow", rev = "452821e455b16e9a397a09d299340e197eb91571", features = [
"server",
] }
parking_lot = "0.12"
@@ -191,8 +191,8 @@ pin-project = "1.0"
pretty_assertions = "1.4.0"
prometheus = { version = "0.13.3", features = ["process"] }
promql-parser = { version = "0.7.1", features = ["ser"] }
prost = { version = "0.14", features = ["no-recursion-limit"] }
prost-types = "0.14"
prost = { version = "=0.14.1", features = ["no-recursion-limit"] }
prost-types = "=0.14.1"
raft-engine = { version = "0.4.1", default-features = false }
rand = "0.9"
ratelimit = "0.10"
@@ -240,7 +240,7 @@ tower = "0.5"
tower-http = "0.6"
tracing = "0.1"
tracing-appender = "0.2"
tracing-opentelemetry = "0.31.0"
tracing-opentelemetry = "0.32.1"
tracing-subscriber = { version = "0.3", features = ["env-filter", "json", "fmt"] }
typetag = "0.2"
uuid = { version = "1.17", features = ["serde", "v4", "fast-rng"] }

View File

@@ -21,12 +21,12 @@ greptime-proto.workspace = true
humantime-serde.workspace = true
lazy_static.workspace = true
once_cell.workspace = true
opentelemetry = { version = "0.30.0", default-features = false, features = [
opentelemetry = { version = "0.31.0", default-features = false, features = [
"trace",
] }
opentelemetry-otlp = { version = "0.30.0", features = ["trace", "grpc-tonic", "http-proto"] }
opentelemetry-semantic-conventions = { version = "0.30.0", features = ["semconv_experimental"] }
opentelemetry_sdk = { version = "0.30.0", features = ["rt-tokio", "trace"] }
opentelemetry-otlp = { version = "0.31.0", features = ["trace", "grpc-tonic", "http-proto"] }
opentelemetry-semantic-conventions = { version = "0.31.0", features = ["semconv_experimental"] }
opentelemetry_sdk = { version = "0.31.0", features = ["rt-tokio", "trace"] }
parking_lot.workspace = true
prometheus.workspace = true
serde.workspace = true

View File

@@ -73,7 +73,7 @@ impl TracingContext {
/// Attach the given span as a child of the context. Returns the attached span.
pub fn attach(&self, span: tracing::Span) -> tracing::Span {
span.set_parent(self.0.clone());
let _ = span.set_parent(self.0.clone());
span
}