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
4 changes: 4 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,7 @@ libdd-trace-utils/src/otlp_encoder/ @DataDog/apm-sdk-capabil
datadog-sidecar/src/service/ffe_exposures_flusher.rs @DataDog/libdatadog-php @DataDog/libdatadog-apm @DataDog/feature-flagging-and-experimentation-sdk
datadog-sidecar/src/service/ffe_metrics_flusher.rs @DataDog/libdatadog-php @DataDog/libdatadog-apm @DataDog/feature-flagging-and-experimentation-sdk
.github/workflows/nix.yml @DataDog/nix-guild @DataDog/apm-common-components-core


# Vendored deps
vendor/tuf/ @DataDog/libdatadog-core
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ jobs:
run: sudo apt-get install -y licensecheck
- name: Check licenses
# Exclude symbolizer-ffi from the checks (mostly imported code)
run: '! find . \( -name "*.rs" -o -name "*.c" -o -name "*.sh" \) -not -path "./symbolizer-ffi/*" -not -path "./datadog-ipc/plugins/*" -not -path "./datadog-ipc/tarpc/*" -print0 | xargs -0 licensecheck -c ".*" | grep -v "Apache License 2.0"'
run: '! find . \( -name "*.rs" -o -name "*.c" -o -name "*.sh" \) -not -path "./symbolizer-ffi/*" -not -path "./datadog-ipc/plugins/*" -not -path "./datadog-ipc/tarpc/*" -not -path "./vendor/*" -print0 | xargs -0 licensecheck -c ".*" | grep -v "Apache License 2.0"'

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Keep vendored source in the license-header check

This new exclusion hides every file under vendor/ from the license-header job, and all 22 added Rust files under vendor/tuf lack the required Apache 2.0 header. The repository convention applies to all source files except symbolizer-ffi, so either add the required headers and keep these files covered by the check or narrow the exception without bypassing that invariant.

AGENTS.md reference: AGENTS.md:L90-L94

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, every vendored crate should be excluded, this is voluntary


license-3rdparty:
needs: setup
Expand Down
139 changes: 92 additions & 47 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ members = [
"libdd-log",
"libdd-log-ffi",
"libdd-sampling",
"vendor/tuf",
]

# https://doc.rust-lang.org/cargo/reference/resolver.html
Expand Down
1 change: 0 additions & 1 deletion LICENSE-3rdparty.csv
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,6 @@ tracing-log,https://github.com/tokio-rs/tracing,MIT,Tokio Contributors <team@tok
tracing-serde,https://github.com/tokio-rs/tracing,MIT,Tokio Contributors <team@tokio.rs>
tracing-subscriber,https://github.com/tokio-rs/tracing,MIT,"Eliza Weisman <eliza@buoyant.io>, David Barsky <me@davidbarsky.com>, Tokio Contributors <team@tokio.rs>"
try-lock,https://github.com/seanmonstar/try-lock,MIT,Sean McArthur <sean@seanmonstar.com>
tuf,https://github.com/theupdateframework/rust-tuf,MIT OR Apache-2.0,"heartsucker <heartsucker@autistici.org>, Erick Tryzelaar <etryzelaar@google.com>"
twox-hash,https://github.com/shepmaster/twox-hash,MIT,Jake Goulding <jake.goulding@gmail.com>
typeid,https://github.com/dtolnay/typeid,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
typenum,https://github.com/paholg/typenum,MIT OR Apache-2.0,"Paho Lurie-Gregg <paho@paholg.com>, Andre Bogus <bogusandre@gmail.com>"
Expand Down
2 changes: 1 addition & 1 deletion libdd-remote-config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ rand = { version = "0.8.5", optional = true }
thiserror = "2"
hashbrown = "0.15"
# branch = "opw-develop"
tuf = { git = "https://github.com/DataDog/rust-tuf/", rev = "eb129ccad320b11e8bf99d2f0ff2c415a0795ccb", default-features = false, optional = true }
tuf = { package = "libdd-tuf-rust", path = "../vendor/tuf", version = "0.3.0-beta10", default-features = false, optional = true }
chrono = { version = "0.4", default-features = false, features = [
"clock",
], optional = true }
Expand Down
7 changes: 7 additions & 0 deletions vendor/tuf/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Prevent Git from converting line endings in test fixture files.
# The ECDSA canonical-JSON fixture embeds PEM newlines that are part of
# the signed content; CRLF conversion on Windows would corrupt the bytes
# and cause signature-verification test failures.
tests/ecdsa/* binary
tests/ed25519/* binary
tests/rsa/* binary
Loading
Loading