Skip to content

Commit

Permalink
Upgrade trillium-opentelemetry (#1503)
Browse files Browse the repository at this point in the history
* Patch in upgrade of trillium-opentelemetry

* Check for duplicate crate versions
  • Loading branch information
divergentdave authored Jan 15, 2025
1 parent f22da58 commit c40e0c7
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 24 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,7 @@ jobs:
run: cargo check -p divviup-cli --no-default-features --features ring,common
- name: check cli +default +admin
run: cargo check -p divviup-cli --features admin
- name: cargo deny
uses: EmbarkStudios/cargo-deny-action@v2.0.4
with:
command: check bans
33 changes: 9 additions & 24 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -126,3 +126,7 @@ path = "src/bin.rs"

[profile.release]
lto = "fat"

[patch.crates-io]
# TODO(#1485): upgrade to the next release of trillium-opentelemetry once it is available
trillium-opentelemetry = { git = "https://github.com/divviup/trillium-opentelemetry.git", rev = "da2f578c4684e50a03ba177ceefd183e43a5367f" }
25 changes: 25 additions & 0 deletions deny.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
[graph]
targets = [{ triple = "x86_64-unknown-linux-gnu" }, { triple = "x86_64-unknown-linux-musl" }]
all-features = true

[advisories]
version = 2

[bans]
multiple-versions = "allow"
deny = [{ name = "tracing", deny-multiple-versions = true }, { name = "opentelemetry", deny-multiple-versions = true }]

[sources]
unknown-registry = "deny"
unknown-git = "deny"
required-git-spec = "rev"
allow-org = { github = ["divviup"] }

[licenses]
version = 2
allow = ["MPL-2.0", "MIT", "Apache-2.0", "BSL-1.0", "BSD-2-Clause", "BSD-3-Clause", "Unicode-DFS-2016", "Unicode-3.0", "ISC", "OpenSSL", "Unlicense", "CC0-1.0"]

[[licenses.clarify]]
name = "ring"
expression = "MIT AND ISC AND OpenSSL"
license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }]

0 comments on commit c40e0c7

Please sign in to comment.