diff options
| author | Yureka <tvl@yuka.dev> | 2024-07-22T12·09+0200 |
|---|---|---|
| committer | yuka <tvl@yuka.dev> | 2024-07-22T13·36+0000 |
| commit | 6774d9c59ce201864b2af05365b8a7ea2fa1066e (patch) | |
| tree | 5037eca857f7ecf28148c6156e4d0fdd065eea28 /tvix | |
| parent | 8342f70c60a2045e4422d77a06baa187d7ff6c28 (diff) | |
chore(tvix/tracing): switch tracing-opentelemetry from git to release r/8398
Change-Id: Ib830c8b642496a6cdf3d4b9093f0343f5fb80622 Reviewed-on: https://cl.tvl.fyi/c/depot/+/12018 Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix')
| -rw-r--r-- | tvix/Cargo.lock | 3 | ||||
| -rw-r--r-- | tvix/Cargo.nix | 7 | ||||
| -rw-r--r-- | tvix/crate-hashes.json | 1 | ||||
| -rw-r--r-- | tvix/default.nix | 1 | ||||
| -rw-r--r-- | tvix/tracing/Cargo.toml | 2 |
5 files changed, 4 insertions, 10 deletions
diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock index 605695a33c6d..3d0ba837d8a3 100644 --- a/tvix/Cargo.lock +++ b/tvix/Cargo.lock @@ -4641,7 +4641,8 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" version = "0.25.0" -source = "git+https://github.com/tokio-rs/tracing-opentelemetry?branch=otel-0.24#6fb2ba4c8b5b5b00e2566256c3ce80d7ebbe59ec" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9784ed4da7d921bc8df6963f8c80a0e4ce34ba6ba76668acadd3edbd985ff3b" dependencies = [ "js-sys", "once_cell", diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index 08d1f728548b..b1821b09d21c 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -14969,12 +14969,7 @@ rec { crateName = "tracing-opentelemetry"; version = "0.25.0"; edition = "2021"; - workspace_member = null; - src = pkgs.fetchgit { - url = "https://github.com/tokio-rs/tracing-opentelemetry"; - rev = "6fb2ba4c8b5b5b00e2566256c3ce80d7ebbe59ec"; - sha256 = "1b0qw6jv1dws2s8vmk1m0zryhihsd4n1vp0yvbbwx5qjqdsny3i1"; - }; + sha256 = "0fzzhpcxngnxra56cxmslr5y6k0f1b4ghqv9vz41p4kxvba4wy59"; dependencies = [ { name = "js-sys"; diff --git a/tvix/crate-hashes.json b/tvix/crate-hashes.json index bcd929c7bc6f..11679cb2ebdd 100644 --- a/tvix/crate-hashes.json +++ b/tvix/crate-hashes.json @@ -1,4 +1,3 @@ { - "git+https://github.com/tokio-rs/tracing-opentelemetry?branch=otel-0.24#0.25.0": "1b0qw6jv1dws2s8vmk1m0zryhihsd4n1vp0yvbbwx5qjqdsny3i1", "git+https://github.com/tvlfyi/wu-manber.git#wu-manber@0.1.0": "1zhk83lbq99xzyjwphv2qrb8f8qgfqwa5bbbvyzm0z0bljsjv0pd" } \ No newline at end of file diff --git a/tvix/default.nix b/tvix/default.nix index a37b28ca7fc7..f8aa47a108c5 100644 --- a/tvix/default.nix +++ b/tvix/default.nix @@ -19,7 +19,6 @@ let (lib.nameValuePair "${crates.internal.crates.${k}.crateName}-${crates.internal.crates.${k}.version}" crates.internal.crates.${k}.src.outputHash) ) [ "wu-manber" - "tracing-opentelemetry 0.25.0" ]); }; diff --git a/tvix/tracing/Cargo.toml b/tvix/tracing/Cargo.toml index cdcbf4968230..3f3e5330c621 100644 --- a/tvix/tracing/Cargo.toml +++ b/tvix/tracing/Cargo.toml @@ -12,7 +12,7 @@ tracing-indicatif = "0.3.6" tokio = { version = "1.32.0" , features = ["sync", "rt"] } thiserror = "1.0.38" -tracing-opentelemetry = { git = "https://github.com/tokio-rs/tracing-opentelemetry", branch = "otel-0.24", version = "0.25.0", optional = true } +tracing-opentelemetry = { version = "0.25.0", optional = true } opentelemetry = { version = "0.24.0", optional = true } opentelemetry-otlp = { version = "0.17.0", optional = true } opentelemetry_sdk = { version = "0.24.1", features = ["rt-tokio"], optional = true } |