Skip to content

Commit d2b9b9f

Browse files
committed
Merge branch 'main' into julio/opt-in-telemetry
2 parents 59d00d7 + 5b6dffc commit d2b9b9f

309 files changed

Lines changed: 19397 additions & 68242 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,14 @@ docker-bake.hcl @DataDog/apm-common-components-core
3939
docs @DataDog/libdatadog
4040
examples @DataDog/libdatadog
4141
libdd-alloc/ @DataDog/libdatadog-profiling
42+
libdd-capabilities*/ @DataDog/apm-common-components-core
4243
libdd-common*/ @DataDog/libdatadog
4344
libdd-crashtracker*/ @DataDog/libdatadog-profiling
4445
libdd-data-pipeline*/ @DataDog/libdatadog-apm
4546
libdd-ddsketch*/ @DataDog/libdatadog-apm @DataDog/apm-common-components-core
4647
libdd-dogstatsd-client @DataDog/apm-common-components-core
47-
libdd-library-config*/ @DataDog/apm-sdk-capabilities
48+
libdd-http-client @DataDog/apm-common-components-core
49+
libdd-library-config*/ @DataDog/apm-sdk-capabilities-rust
4850
libdd-libunwind*/ @DataDog/libdatadog-profiling
4951
libdd-log*/ @DataDog/apm-common-components-core
5052
libdd-profiling*/ @DataDog/libdatadog-profiling
@@ -56,6 +58,7 @@ libdd-trace-protobuf @DataDog/serverless @DataDog/libdatadog-apm
5658
libdd-trace-stats @DataDog/apm-common-components-core
5759
libdd-trace-utils @DataDog/serverless @DataDog/libdatadog-apm
5860
LICENSE* @DataDog/libdatadog
61+
license-tool.toml @DataDog/libdatadog
5962
local-linux.Dockerfile @DataDog/libdatadog
6063
NOTICE @DataDog/libdatadog
6164
README.md @DataDog/libdatadog
@@ -81,3 +84,6 @@ bin_tests/tests/test_the_tests.rs @DataDog/libdatadog-core
8184
bin_tests/src/bin/test_the_tests.rs @DataDog/libdatadog-core
8285
tools/cc_utils/ @DataDog/libdatadog-php
8386
tools/sidecar_mockgen/ @DataDog/libdatadog-php
87+
libdd-data-pipeline/src/otlp/ @DataDog/apm-sdk-capabilities
88+
libdd-data-pipeline/tests/test_trace_exporter_otlp_export.rs @DataDog/apm-sdk-capabilities
89+
libdd-trace-utils/src/otlp_encoder/ @DataDog/apm-sdk-capabilities

.github/actions/clippy-annotation-reporter/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "clippy-annotation-reporter"
3-
rust-version = "1.78.0"
3+
rust-version = "1.84.1"
44
edition = "2021"
55
version = "0.1.0"
66
description = "GitHub Action for reporting clippy annotation usage in PRs"

.github/actions/clippy-annotation-reporter/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ runs:
2525
steps:
2626
- name: Set up Rust
2727
shell: bash
28-
run: rustup install stable && rustup default stable
28+
run: rustup set profile minimal && rustup install stable && rustup default stable
2929

3030
- name: Fetch all branches
3131
shell: bash

.github/workflows/add_final_status.xsl

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

.github/workflows/all-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ jobs:
1616
delay: '3'
1717
retries: '45'
1818
polling_interval: '1'
19-
checks_exclude: 'devflow/merge,dd-gitlab/default-pipeline'
19+
checks_exclude: 'devflow/merge,dd-gitlab/default-pipeline,Rustfmt Auto / rustfmt'

.github/workflows/clippy-annotation-reporter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
with:
2929
fetch-depth: 0 # Full history
3030
- name: Install Rust
31-
run: rustup install stable
31+
run: rustup set profile minimal && rustup install stable
3232
- name: Run annotation reporter
3333
uses: ./.github/actions/clippy-annotation-reporter
3434
with:

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
submodules: recursive
3131
- name: Install Rust
32-
run: rustup install nightly-2026-02-08 && rustup default nightly-2026-02-08
32+
run: rustup set profile minimal && rustup install nightly-2026-02-08 && rustup default nightly-2026-02-08
3333
- name: Install cargo-llvm-cov
3434
uses: taiki-e/install-action@2c41309d51ede152b6f2ee6bf3b71e6dc9a8b7df # 2.49.27
3535
with:

.github/workflows/lint.yml

Lines changed: 9 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
with:
2828
submodules: recursive
2929
- name: Install nightly-2026-02-08 toolchain and rustfmt
30-
run: rustup install nightly-2026-02-08 && rustup default nightly-2026-02-08 && rustup component add rustfmt
30+
run: rustup set profile minimal && rustup install nightly-2026-02-08 && rustup default nightly-2026-02-08 && rustup component add rustfmt
3131
- name: Cache [rust]
3232
uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # 2.8.1
3333
with:
@@ -48,7 +48,7 @@ jobs:
4848
with:
4949
submodules: recursive
5050
- name: Install ${{ matrix.rust_version }} toolchain and clippy
51-
run: rustup install ${{ matrix.rust_version }} && rustup default ${{ matrix.rust_version }} && rustup component add clippy
51+
run: rustup set profile minimal && rustup install ${{ matrix.rust_version }} && rustup default ${{ matrix.rust_version }} && rustup component add clippy
5252
- name: Cache [rust]
5353
uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # 2.8.1
5454
with:
@@ -75,70 +75,22 @@ jobs:
7575
# Exclude symbolizer-ffi from the checks (mostly imported code)
7676
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"'
7777

78-
# todo: fix upstream warnings; from the readme:
79-
# The most common cause of missing licenses seems to be workspaces that
80-
# don't include forward their license files. Go to the repo for the
81-
# workspace and copy the relevant files from there.
82-
# A package license may receive a confidence warning stating that
83-
# cargo-bundle-licenses is "unsure" or "semi" confident. This means that
84-
# when the found license was compared to a template license it was found to
85-
# have diverged in more than a few words. You should verify that the licence
86-
# text is in fact correct in these cases.
8778
license-3rdparty:
8879
runs-on: ubuntu-latest
89-
name: "Valid LICENSE-3rdparty.yml"
80+
name: "Valid LICENSE-3rdparty.csv"
9081
steps:
9182
- name: Checkout sources
9283
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
93-
- run: stat LICENSE-3rdparty.yml
94-
- name: Cache
84+
- name: Cache dd-rust-license-tool
9585
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # 4.2.2
9686
with:
9787
path: |
98-
~/.cargo/registry/
99-
~/.cargo/git/db/
100-
~/.cargo/bin/
88+
~/.cargo/bin/dd-rust-license-tool
10189
~/.cargo/.crates.toml
102-
# cache key contains current version of cargo-bundle-licenses
103-
# when upstream version is updated we can bump the cache key version,
104-
# to cache the latest version of the tool
105-
key: "v1-4.0.0"
106-
# cargo-bundle-licenses v2.0 doesn't understand path differences due to
107-
# sparse vs git index, so force git.
108-
- run: mkdir -p .cargo && printf "[registries.crates-io]\nprotocol = \"git\"\n" > .cargo/config.toml
109-
- run: cargo install --version "4.0.0" cargo-bundle-licenses
110-
- name: "Generate new LICENSE-3rdparty.yml and check against the previous"
111-
env:
112-
CARGO_HOME: "/tmp/dd-cargo"
113-
run: |
114-
# Run cargo bundle-licenses without directly checking against a previous snapshot
115-
cargo bundle-licenses \
116-
--format yaml \
117-
--output /tmp/CI.yaml
118-
119-
# Normalize the paths in both files to ignore registry differences
120-
sed -E 's/(registry\/src\/)[^\/]+/\1normalized_path/g' /tmp/CI.yaml > /tmp/CI_normalized.yaml
121-
sed -E 's/(registry\/src\/)[^\/]+/\1normalized_path/g' LICENSE-3rdparty.yml > /tmp/LICENSE-3rdparty_normalized.yml
122-
123-
# Now perform the diff on the normalized files
124-
if ! diff /tmp/CI_normalized.yaml /tmp/LICENSE-3rdparty_normalized.yml; then
125-
echo "Differences detected (see above). You probably need to manually update the license files. To do so:"
126-
echo "cargo install cargo-bundle-licenses"
127-
echo "./scripts/update_license_3rdparty.sh"
128-
echo "...and push a commit with the result. Also, bonus points if someone automates this, wink wink nudge nudge."
129-
exit 1
130-
fi
131-
132-
echo "No differences found."
133-
134-
135-
- name: export the generated license file on failure
136-
if: failure()
137-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
138-
with:
139-
name: LICENSE-3rdparty.yml
140-
path: /tmp/CI.yaml
141-
overwrite: true
90+
~/.cargo/.crates2.json
91+
key: dd-rust-license-tool-1.0.6
92+
- run: cargo install dd-rust-license-tool --version "1.0.6" --locked
93+
- run: dd-rust-license-tool check
14294

14395
codeowners-validator:
14496
runs-on: ubuntu-latest

.github/workflows/pr-title-semver-check.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,9 @@ jobs:
9191

9292
- name: Install Rust ${{ env.RUST_VERSION }}
9393
run: |
94+
rustup set profile minimal
9495
rustup install ${{ env.RUST_VERSION }} && rustup default ${{ env.RUST_VERSION }}
95-
rustup toolchain install nightly-2026-02-08 --profile minimal
96+
rustup toolchain install nightly-2026-02-08
9697
# Link the dated nightly as 'nightly' for tools (like cargo-public-api) that expect it
9798
ln -sf ~/.rustup/toolchains/nightly-2026-02-08-x86_64-unknown-linux-gnu ~/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu
9899

0 commit comments

Comments
 (0)