Skip to content

Commit ac3e227

Browse files
committed
linera_base::tracing: move into linera-service and linera-web respectively
1 parent 8b70ce2 commit ac3e227

File tree

22 files changed

+123
-433
lines changed

22 files changed

+123
-433
lines changed

.github/workflows/rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ jobs:
170170
- uses: actions-rust-lang/setup-rust-toolchain@v1
171171
- name: Run metrics tests
172172
run: |
173-
cargo test --locked -p linera-base --features metrics,opentelemetry
173+
cargo test --locked -p linera-base --features metrics
174174
175175
wasm-application-test:
176176
needs: changed-files

Cargo.lock

Lines changed: 7 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ARG binaries=
2525
ARG copy=${binaries:+_copy}
2626
ARG build_flag=--release
2727
ARG build_folder=release
28-
ARG build_features=scylladb,metrics,memory-profiling,opentelemetry
28+
ARG build_features=scylladb,metrics,memory-profiling
2929
ARG rustflags="-C force-frame-pointers=yes"
3030

3131
FROM rust:1.74-slim-bookworm AS builder

examples/Cargo.lock

Lines changed: 2 additions & 140 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

linera-base/Cargo.toml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ workspace = true
1818
metrics = ["prometheus"]
1919
reqwest = ["dep:reqwest"]
2020
revm = []
21-
opentelemetry = ["opentelemetry-otlp"]
2221
test = ["test-strategy", "proptest"]
2322
web = [
2423
"getrandom/js",
@@ -49,7 +48,6 @@ ed25519-dalek.workspace = true
4948
futures.workspace = true
5049
getrandom = { workspace = true, optional = true }
5150
hex.workspace = true
52-
is-terminal.workspace = true
5351
k256.workspace = true
5452
linera-kywasmtime = { workspace = true, optional = true }
5553
linera-witty = { workspace = true, features = ["macros"] }
@@ -67,7 +65,6 @@ thiserror.workspace = true
6765
tokio = { workspace = true, features = ["time"] }
6866
tokio-stream.workspace = true
6967
tracing.workspace = true
70-
tracing-subscriber = { workspace = true, features = ["json", "fmt", "ansi"] }
7168
trait-variant.workspace = true
7269
wasm-bindgen = { workspace = true, optional = true }
7370
wasm-bindgen-futures = { workspace = true, optional = true }
@@ -81,11 +78,6 @@ tracing-web = { optional = true, workspace = true }
8178

8279
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
8380
chrono.workspace = true
84-
opentelemetry.workspace = true
85-
opentelemetry-otlp = { workspace = true, optional = true }
86-
opentelemetry_sdk = { workspace = true, features = ["testing"] }
87-
tracing-chrome.workspace = true
88-
tracing-opentelemetry.workspace = true
8981
rand = { workspace = true, features = ["getrandom", "std", "std_rng"] }
9082
tokio = { workspace = true, features = [
9183
"process",

linera-base/src/lib.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ pub mod vm;
3838
#[cfg(not(chain))]
3939
pub use task::Blocking;
4040
pub mod time;
41-
#[cfg_attr(web, path = "tracing_web.rs")]
42-
pub mod tracing;
43-
#[cfg(not(target_arch = "wasm32"))]
44-
pub mod tracing_opentelemetry;
4541
#[cfg(test)]
4642
mod unit_tests;
4743

linera-base/src/tracing_web.rs

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)