Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add cargo deny #604

Merged
merged 4 commits into from
Jul 30, 2021
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
8 changes: 8 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,14 @@ jobs:
cargo test --verbose --manifest-path=opentelemetry/Cargo.toml --features trace,metrics,serialize,rt-tokio,serde,testing &&
cargo test --manifest-path=opentelemetry-jaeger/Cargo.toml --features rt-tokio &&
cargo test --manifest-path=opentelemetry-zipkin/Cargo.toml
cargo-deny:
runs-on: ubuntu-latest
continue-on-error: true # Prevent sudden announcement of a new advisory from failing ci
steps:
- uses: actions/checkout@v2
- uses: EmbarkStudios/cargo-deny-action@v1
with:
command: check advisories
coverage:
continue-on-error: true
runs-on: ubuntu-latest
Expand Down
20 changes: 20 additions & 0 deletions deny.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[licenses]
unlicensed = "deny"
allow = [
"MIT",
"Apache-2.0",
"ISC",
"BSD-3-Clause",
"OpenSSL"
]

[licenses.private]
ignore = true

[[licenses.clarify]]
name = "ring"
version = "*"
expression = "MIT AND ISC AND OpenSSL"
license-files = [
{ path = "LICENSE", hash = 0xbd0eed23 }
]
1 change: 1 addition & 0 deletions examples/actix-http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "actix-http-example"
version = "0.1.0"
edition = "2018"
publish = false

[dependencies]
opentelemetry = { path = "../../opentelemetry", features = ["rt-tokio"] }
Expand Down
1 change: 1 addition & 0 deletions examples/actix-udp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "actix-udp-example"
version = "0.1.0"
edition = "2018"
publish = false

[dependencies]
opentelemetry = { path = "../../opentelemetry" }
Expand Down
1 change: 1 addition & 0 deletions examples/async/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "async"
version = "0.1.0"
edition = "2018"
publish = false

[dependencies]
futures = "0.3"
Expand Down
1 change: 1 addition & 0 deletions examples/aws-xray/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "aws-xray"
version = "0.1.0"
edition = "2018"
publish = false

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
1 change: 1 addition & 0 deletions examples/basic-otlp-http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name = "basic-otlp-http"
version = "0.1.0"
authors = ["rdan <[email protected]>"]
edition = "2018"
publish = false

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
1 change: 1 addition & 0 deletions examples/basic-otlp-with-selector/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "basic-otlp-with-selector"
version = "0.1.0"
edition = "2018"
publish = false

[dependencies]
futures = "0.3"
Expand Down
1 change: 1 addition & 0 deletions examples/basic-otlp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "basic-otlp"
version = "0.1.0"
edition = "2018"
publish = false

[dependencies]
futures = "0.3"
Expand Down
1 change: 1 addition & 0 deletions examples/basic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "basic"
version = "0.1.0"
edition = "2018"
publish = false

[dependencies]
futures = "0.3"
Expand Down
1 change: 1 addition & 0 deletions examples/datadog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "datadog"
version = "0.1.0"
edition = "2018"
publish = false

[dependencies]
opentelemetry = { path = "../../opentelemetry" }
Expand Down
1 change: 1 addition & 0 deletions examples/external-otlp-grpcio-async-std/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "external-otlp-grpcio-async-std"
version = "0.1.0"
edition = "2018"
publish = false

[dependencies]
async-std = { version = "1.9.0", features = ["attributes"] }
Expand Down
1 change: 1 addition & 0 deletions examples/external-otlp-tonic-tokio/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "external-otlp-tonic-tokio"
version = "0.1.0"
edition = "2018"
publish = false

[dependencies]
futures = "0.3"
Expand Down
7 changes: 4 additions & 3 deletions examples/grpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "grpc"
version = "0.1.0"
edition = "2018"
publish = false

[[bin]] # Bin to run the gRPC server
name = "grpc-server"
Expand All @@ -15,11 +16,11 @@ doc = false

[dependencies]
http = "0.2"
tonic = "0.4"
prost = "0.7"
tonic = "0.5"
prost = "0.8"
tokio = { version = "1.0", features = ["full"] }
opentelemetry = { path = "../../opentelemetry" }
opentelemetry-jaeger = { path = "../../opentelemetry-jaeger" }

[build-dependencies]
tonic-build = "0.4"
tonic-build = "0.5"
1 change: 1 addition & 0 deletions examples/http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "http"
version = "0.1.0"
edition = "2018"
publish = false

[[bin]] # Bin to run the http server
name = "http-server"
Expand Down
1 change: 1 addition & 0 deletions examples/hyper-prometheus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "hyper-prometheus"
version = "0.1.0"
edition = "2018"
publish = false

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
1 change: 1 addition & 0 deletions examples/multiple-span-processors/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "multiple-span-processors"
version = "0.1.0"
edition = "2018"
publish = false

[dependencies]
opentelemetry = { path = "../../opentelemetry", features = ["rt-tokio"] }
Expand Down
7 changes: 4 additions & 3 deletions examples/tracing-grpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "tracing-grpc"
version = "0.1.0"
edition = "2018"
publish = false

[[bin]] # Bin to run the gRPC server
name = "grpc-server"
Expand All @@ -13,8 +14,8 @@ path = "src/client.rs"

[dependencies]
http = "0.2"
tonic = "0.4"
prost = "0.7"
tonic = "0.5"
prost = "0.8"
tokio = { version = "1.0", features = ["full"] }
opentelemetry = { version = "0.14", features = ["rt-tokio"] }
opentelemetry-jaeger = "0.13"
Expand All @@ -24,4 +25,4 @@ tracing-opentelemetry = "0.13"
tracing-futures = "0.2"

[build-dependencies]
tonic-build = "0.4"
tonic-build = "0.5"
1 change: 1 addition & 0 deletions examples/zipkin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "zipkin"
version = "0.1.0"
edition = "2018"
publish = false

[dependencies]
opentelemetry = { path = "../../opentelemetry" }
Expand Down
8 changes: 4 additions & 4 deletions opentelemetry-stackdriver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[build-dependencies]
tonic-build = "0.4.0"
tonic-build = "0.5.0"
which = "4.0.2"

[dependencies]
Expand All @@ -24,10 +24,10 @@ hyper = "0.14.2"
hyper-rustls = { version = "0.22.1", optional = true }
log = "0.4"
opentelemetry = { version = "0.15", path = "../opentelemetry" }
prost = "0.7"
prost-types = "0.7"
prost = "0.8"
prost-types = "0.8"
rustls = "0.19"
tonic = { version = "0.4", features = ["tls", "transport"] }
tonic = { version = "0.5", features = ["tls", "transport"] }
tokio = { version = "1.1", optional = true }
yup-oauth2 = { version = "5.0.1", optional = true }
webpki-roots = "0.21"
Expand Down