Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 14 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
with:
toolchain: stable
components: rustfmt, clippy
- uses: taiki-e/install-action@47be02f2de8a32619316956f6117e150bdc6763f # v2.62.44
- uses: taiki-e/install-action@6f9c7cc51aa54b13cbcbd12f8bbf69d8ba405b4b # v2.62.47
with:
tool: cargo-hack
- uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
# https://github.com/awslabs/cargo-check-external-types/releases
toolchain: nightly-2025-05-04
components: rustfmt
- uses: taiki-e/install-action@47be02f2de8a32619316956f6117e150bdc6763f # v2.62.44
- uses: taiki-e/install-action@6f9c7cc51aa54b13cbcbd12f8bbf69d8ba405b4b # v2.62.47
with:
tool: cargo-check-external-types@0.2.0
- name: external-type-check
Expand All @@ -117,7 +117,7 @@ jobs:
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9
with:
toolchain: stable
- uses: taiki-e/install-action@47be02f2de8a32619316956f6117e150bdc6763f # v2.62.44
- uses: taiki-e/install-action@6f9c7cc51aa54b13cbcbd12f8bbf69d8ba405b4b # v2.62.47
with:
tool: cargo-msrv
- uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:
uses: EmbarkStudios/cargo-deny-action@f2ba7abc2abebaf185c833c3961145a3c275caad # v2.0.13
with:
command: check bans

- name: Check sources
uses: EmbarkStudios/cargo-deny-action@f2ba7abc2abebaf185c833c3961145a3c275caad # v2.0.13
with:
Expand Down Expand Up @@ -199,7 +199,7 @@ jobs:
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Install cargo-llvm-cov
uses: taiki-e/install-action@47be02f2de8a32619316956f6117e150bdc6763f # v2.62.44
uses: taiki-e/install-action@6f9c7cc51aa54b13cbcbd12f8bbf69d8ba405b4b # v2.62.47
with:
tool: cargo-llvm-cov
- name: cargo generate-lockfile
Expand Down Expand Up @@ -232,7 +232,7 @@ jobs:
cargo build
fi
done
cargo-machete:
cargo-shear:
continue-on-error: true
runs-on: ubuntu-latest
steps:
Expand All @@ -246,9 +246,12 @@ jobs:
submodules: true
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9
with:
toolchain: stable
- uses: taiki-e/install-action@47be02f2de8a32619316956f6117e150bdc6763f # v2.62.44
toolchain: nightly
- uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: taiki-e/install-action@6f9c7cc51aa54b13cbcbd12f8bbf69d8ba405b4b # v2.62.47
with:
tool: cargo-machete
- name: cargo machete
run: cargo machete
tool: cargo-shear
- name: cargo shear
run: cargo shear --expand
9 changes: 7 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ log = "0.4.21"
once_cell = "1.13"
pin-project-lite = "0.2"
prost = "0.14"
prost-build = "0.14"
prost-types = "0.14"
rand = { version = "0.9", default-features = false }
reqwest = { version = "0.12", default-features = false }
serde = { version = "1.0", default-features = false }
Expand Down Expand Up @@ -100,3 +98,10 @@ tail_expr_drop_order = "allow"

[workspace.lints.clippy]
all = { level = "warn", priority = 1 }

[workspace.metadata.cargo-shear]
ignored = [
# workspace crates
"opentelemetry-appender-log",
"opentelemetry-jaeger-propagator",
]
6 changes: 0 additions & 6 deletions examples/tracing-grpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,3 @@ tonic-prost = { workspace = true }

[build-dependencies]
tonic-prost-build = { workspace = true }

[package.metadata.cargo-machete]
ignored = [
"prost", # needed for `tonic-prost-build`
"tonic-prost" # needed for `tonic-prost-build`
]
1 change: 0 additions & 1 deletion opentelemetry-otlp/tests/integration_test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ tracing = {workspace = true}
[target.'cfg(unix)'.dependencies]
opentelemetry-appender-tracing = { path = "../../../opentelemetry-appender-tracing", default-features = false}
opentelemetry-otlp = { path = "../../../opentelemetry-otlp", default-features = false }
opentelemetry-semantic-conventions = { path = "../../../opentelemetry-semantic-conventions" }

[features]
hyper-client = ["opentelemetry-otlp/hyper-client", "opentelemetry-otlp/http-proto", "opentelemetry-otlp/trace", "opentelemetry-otlp/logs", "opentelemetry-otlp/metrics", "internal-logs"]
Expand Down
5 changes: 0 additions & 5 deletions opentelemetry-prometheus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,3 @@ tokio = { version = "1", features = ["full"] }
default = ["internal-logs"]
prometheus-encoding = []
internal-logs = ["tracing"]

[package.metadata.cargo-machete]
ignored = [
"tracing" # needed for `internal-logs`
]
1 change: 0 additions & 1 deletion opentelemetry-proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ base64 = { workspace = true, optional = true }
[dev-dependencies]
opentelemetry = { workspace = true, features = ["testing"] }
tonic-prost-build = { workspace = true }
prost-build = { workspace = true }
tempfile = { workspace = true }
serde_json = { workspace = true }

Expand Down
1 change: 0 additions & 1 deletion opentelemetry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ opentelemetry_sdk = { path = "../opentelemetry-sdk", features = ["spec_unstable_
criterion = { workspace = true }
rand = { workspace = true, features = ["os_rng", "thread_rng"] }
tokio = { version = "1.0", features = ["full"] }
futures = "0.3"

[[bench]]
name = "metrics"
Expand Down