From 68a9eee031d1fde16d44b00da93872b988c0554b Mon Sep 17 00:00:00 2001 From: Jean SIMARD Date: Thu, 30 May 2024 19:23:32 +0200 Subject: [PATCH] editoast: update opentelemetry dependencies --- editoast/Cargo.lock | 58 +++++++++++++++++---------------------------- editoast/Cargo.toml | 14 +++++------ 2 files changed, 29 insertions(+), 43 deletions(-) diff --git a/editoast/Cargo.lock b/editoast/Cargo.lock index 14768b6e21d..79f922a697b 100644 --- a/editoast/Cargo.lock +++ b/editoast/Cargo.lock @@ -282,9 +282,9 @@ dependencies = [ [[package]] name = "actix-web-opentelemetry" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6e0327e7b731c61b77fb54b278477aa3ebd09752bde38d169863167636e2d48" +checksum = "923b53a2a54dd0b6fb3e737a036b497321b693d16c120806ba4009478f06109b" dependencies = [ "actix-http", "actix-web", @@ -1101,15 +1101,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" version = "0.8.5" @@ -2804,9 +2795,9 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf" +checksum = "1b69a91d4893e713e06f724597ad630f1fa76057a5e1026c0ca67054a9032a76" dependencies = [ "futures-core", "futures-sink", @@ -2814,19 +2805,20 @@ dependencies = [ "once_cell", "pin-project-lite", "thiserror", - "urlencoding", ] [[package]] name = "opentelemetry-datadog" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "157dbb3739d0a29158aae6c94a43aa842e1f07e6205992ca92a32005e4e77c5d" +checksum = "c22ae4b7a629f09b09307530e4dda7c37c37631c3d2ce27ce29d1402f57a0265" dependencies = [ + "ahash", "futures-core", "http 0.2.12", "indexmap 2.2.6", "itertools 0.11.0", + "itoa", "once_cell", "opentelemetry", "opentelemetry-http", @@ -2834,15 +2826,16 @@ dependencies = [ "opentelemetry_sdk", "reqwest", "rmp", + "ryu", "thiserror", "url", ] [[package]] name = "opentelemetry-http" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7690dc77bf776713848c4faa6501157469017eaf332baccd4eb1cea928743d94" +checksum = "b0ba633e55c5ea6f431875ba55e71664f2fa5d3a90bd34ec9302eecc41c865dd" dependencies = [ "async-trait", "bytes", @@ -2853,16 +2846,15 @@ dependencies = [ [[package]] name = "opentelemetry-otlp" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a016b8d9495c639af2145ac22387dcb88e44118e45320d9238fbf4e7889abcb" +checksum = "a94c69209c05319cdf7460c6d4c055ed102be242a0a6245835d7bc42c6ec7f54" dependencies = [ "async-trait", "futures-core", "http 0.2.12", "opentelemetry", "opentelemetry-proto", - "opentelemetry-semantic-conventions", "opentelemetry_sdk", "prost", "thiserror", @@ -2872,9 +2864,9 @@ dependencies = [ [[package]] name = "opentelemetry-proto" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8fddc9b68f5b80dae9d6f510b88e02396f006ad48cac349411fbecc80caae4" +checksum = "984806e6cf27f2b49282e2a05e288f30594f3dbc74eb7a6e99422bc48ed78162" dependencies = [ "opentelemetry", "opentelemetry_sdk", @@ -2884,22 +2876,22 @@ dependencies = [ [[package]] name = "opentelemetry-semantic-conventions" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9ab5bd6c42fb9349dcf28af2ba9a0667f697f9bdcca045d39f2cec5543e2910" +checksum = "1869fb4bb9b35c5ba8a1e40c9b128a7b4c010d07091e864a29da19e4fe2ca4d7" [[package]] name = "opentelemetry_sdk" -version = "0.22.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e" +checksum = "ae312d58eaa90a82d2e627fd86e075cf5230b3f11794e2ed74199ebbe572d4fd" dependencies = [ "async-trait", - "crossbeam-channel", "futures-channel", "futures-executor", "futures-util", "glob", + "lazy_static", "once_cell", "opentelemetry", "ordered-float", @@ -4631,9 +4623,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284" +checksum = "f68803492bf28ab40aeccaecc7021096bd256baf7ca77c3d425d89b35a7be4e4" dependencies = [ "js-sys", "once_cell", @@ -4725,12 +4717,6 @@ dependencies = [ "serde", ] -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - [[package]] name = "utf8parse" version = "0.2.1" diff --git a/editoast/Cargo.toml b/editoast/Cargo.toml index 88c608d7ae3..8d1a8ea9246 100644 --- a/editoast/Cargo.toml +++ b/editoast/Cargo.toml @@ -45,7 +45,7 @@ actix-files = "0.6.6" actix-http = "3.8.0" actix-multipart = "0.6.2" actix-web = "4.8.0" -actix-web-opentelemetry = { version = "0.17.0", features = ["awc"] } +actix-web-opentelemetry = { version = "0.18.0", features = ["awc"] } async-trait = "0.1.80" cfg-if = "1.0.0" chashmap = "2.2.2" @@ -76,11 +76,11 @@ itertools = "0.13.0" json-patch = { version = "2.0.0", features = ["utoipa"] } mvt.workspace = true openssl = "*" -opentelemetry = "0.22.0" -opentelemetry-datadog = { version = "0.10.0", features = ["reqwest-client"] } -opentelemetry-otlp = "0.15.0" -opentelemetry-semantic-conventions = "0.14.0" -opentelemetry_sdk = { version = "0.22.1", features = ["rt-tokio", "trace"] } +opentelemetry = "0.23.0" +opentelemetry-datadog = { version = "0.11.0", features = ["reqwest-client"] } +opentelemetry-otlp = "0.16.0" +opentelemetry-semantic-conventions = "0.15.0" +opentelemetry_sdk = { version = "0.23.0", features = ["rt-tokio", "trace"] } osm_to_railjson = { path = "./osm_to_railjson" } paste.workspace = true pathfinding = "4.10.0" @@ -108,7 +108,7 @@ thiserror.workspace = true tokio = "*" tokio-postgres = "*" tracing.workspace = true -tracing-opentelemetry = "0.23.0" +tracing-opentelemetry = "0.24.0" tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } url = { version = "2.5.2", features = ["serde"] } utoipa.workspace = true