Skip to content

Commit 71c47c5

Browse files
authored
Merge branch 'main' into levi/fix-windows-declspec-vars
2 parents d98886b + ed316b6 commit 71c47c5

Some content is hidden

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

49 files changed

+2286
-462
lines changed

.config/nextest.toml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# Enable experimental setup scripts feature for pre-building bin_test binaries
2+
experimental = ["setup-scripts"]
3+
4+
# Define the prebuild setup script that builds all bin_tests artifacts upfront
5+
[script.prebuild-bin-tests]
6+
command = 'cargo run -p bin_tests --bin prebuild'
7+
18
[store]
29
dir = "target/nextest"
310

@@ -18,13 +25,23 @@ fail-fast = true
1825
filter = 'test(::single_threaded_tests::)'
1926
test-group = 'single-threaded'
2027

28+
# Run prebuild script before bin_tests to build all artifacts upfront
29+
[[profile.default.scripts]]
30+
filter = 'package(bin_tests)'
31+
setup = 'prebuild-bin-tests'
32+
2133
[profile.ci]
2234
# Print out output for failing tests as soon as they fail, and also at the end
2335
# of the run (for easy scrollability).
2436
failure-output = "immediate-final"
2537
# Do not cancel the test run on the first failure.
2638
fail-fast = false
2739

40+
# Run prebuild script before bin_tests to build all artifacts upfront
41+
[[profile.ci.scripts]]
42+
filter = 'package(bin_tests)'
43+
setup = 'prebuild-bin-tests'
44+
2845
[profile.ci.junit]
2946
# Output a JUnit report into the given file inside 'store.dir/<profile-name>'.
3047
path = "junit.xml"

.github/CODEOWNERS

Lines changed: 76 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -2,78 +2,81 @@
22
# Rules are evaluated in order. Later matches override earlier ones.
33
# More specific patterns at the bottom override general patterns above.
44

5-
.clang-format @Datadog/libdatadog
6-
.codecov.yml @Datadog/apm-common-components-core
7-
.cargo/* @Datadog/libdatadog-core
8-
.config/nextest.toml @Datadog/apm-common-components-core
9-
.config/commitlint.config.js @Datadog/apm-common-components-core
10-
.devcontainer @Datadog/apm-common-components-core
11-
.dockerignore @Datadog/libdatadog-core
12-
.github/ @Datadog/apm-common-components-core
13-
.gitignore @Datadog/libdatadog
14-
.gitlab-ci.yml @Datadog/apm-common-components-core
15-
.gitlab/benchmarks.yml @Datadog/apm-common-components-core
16-
.gitlab/fuzz.yml @Datadog/chaos-platform
17-
benchmark/ @Datadog/apm-common-components-core
18-
bin_tests/ @Datadog/libdatadog-profiling
19-
build-common/ @Datadog/apm-common-components-core
20-
builder @Datadog/apm-common-components-core
21-
Cargo.* @Datadog/libdatadog
22-
cmake/ @Datadog/apm-common-components-core
23-
CONTRIBUTING.md @Datadog/libdatadog-core
24-
Cross.toml @Datadog/apm-common-components-core
25-
datadog-ffe @Datadog/feature-flagging-and-experimentation-sdk
26-
datadog-ffe-ffi @Datadog/feature-flagging-and-experimentation-sdk
27-
datadog-ipc*/ @Datadog/libdatadog-php
28-
datadog-live-debugger*/ @Datadog/libdatadog-php @Datadog/libdatadog-apm
29-
datadog-profiling-replayer @Datadog/libdatadog-profiling
30-
datadog-remote-config @Datadog/libdatadog-php @Datadog/libdatadog-apm @Datadog/remote-config
31-
datadog-sidecar @Datadog/libdatadog-php @Datadog/libdatadog-apm
32-
datadog-sidecar-ffi @Datadog/libdatadog-php @Datadog/libdatadog-apm
33-
datadog-sidecar-macros @Datadog/libdatadog-php
34-
datadog-tracer-flare @Datadog/libdatadog-apm
35-
deny.toml @Datadog/libdatadog
36-
docker-bake.hcl @Datadog/apm-common-components-core
37-
docs @Datadog/libdatadog
38-
examples @Datadog/libdatadog
39-
libdd-alloc/ @Datadog/libdatadog-profiling
40-
libdd-common*/ @Datadog/libdatadog
41-
libdd-crashtracker*/ @Datadog/libdatadog-profiling
42-
libdd-data-pipeline*/ @Datadog/libdatadog-apm
43-
libdd-ddsketch*/ @Datadog/libdatadog-apm @Datadog/apm-common-components-core
44-
libdd-dogstatsd-client @Datadog/apm-common-components-core
45-
libdd-library-config*/ @Datadog/apm-sdk-capabilities
46-
libdd-log*/ @Datadog/apm-common-components-core
47-
libdd-profiling*/ @Datadog/libdatadog-profiling
48-
libdd-telemetry*/ @Datadog/apm-common-components-core
49-
libdd-tinybytes @Datadog/apm-common-components-core
50-
libdd-trace-normalization @Datadog/serverless @Datadog/libdatadog-apm
51-
libdd-trace-obfuscation @Datadog/serverless @Datadog/libdatadog-apm
52-
libdd-trace-protobuf @Datadog/serverless @Datadog/libdatadog-apm
53-
libdd-trace-stats @Datadog/apm-common-components-core
54-
libdd-trace-utils @Datadog/serverless @Datadog/libdatadog-apm
55-
LICENSE* @Datadog/libdatadog
56-
local-linux.Dockerfile @Datadog/libdatadog
57-
NOTICE @Datadog/libdatadog
58-
README.md @Datadog/libdatadog
59-
repository.datadog.yml @Datadog/apm-common-components-core
60-
ruby/ @Datadog/ruby-guild
61-
rustfmt.toml @Datadog/libdatadog-core
62-
scripts/check_cargo_metadata.sh @Datadog/libdatadog-core
63-
scripts/semver-level.sh @Datadog/libdatadog-core
64-
scripts/reformat_copyright.sh @Datadog/libdatadog-core
65-
scripts/update_license_3rdparty.sh @Datadog/libdatadog-core
66-
spawn_worker/ @Datadog/libdatadog-php @Datadog/libdatadog-apm
67-
symbolizer-ffi @Datadog/libdatadog-profiling
68-
tests/run-package-tests.ps1 @Datadog/apm-common-components-core
69-
tests/spawn_from_lib/ @Datadog/libdatadog-php @Datadog/libdatadog-apm
70-
tests/windows_package/ @Datadog/apm-common-components-core
71-
tools/ @Datadog/apm-common-components-core
72-
windows/ @Datadog/libdatadog-core
73-
fuzz/ @Datadog/chaos-platform
5+
.clang-format @DataDog/libdatadog
6+
.codecov.yml @DataDog/apm-common-components-core
7+
.cargo/* @DataDog/libdatadog-core
8+
.config/nextest.toml @DataDog/apm-common-components-core
9+
.config/commitlint.config.js @DataDog/apm-common-components-core
10+
.devcontainer @DataDog/apm-common-components-core
11+
.dockerignore @DataDog/libdatadog-core
12+
.github/ @DataDog/apm-common-components-core
13+
.gitignore @DataDog/libdatadog
14+
.gitlab-ci.yml @DataDog/apm-common-components-core
15+
.gitlab/benchmarks.yml @DataDog/apm-common-components-core
16+
.gitlab/fuzz.yml @DataDog/chaos-platform
17+
benchmark/ @DataDog/apm-common-components-core
18+
bin_tests/ @DataDog/libdatadog-profiling
19+
build-common/ @DataDog/apm-common-components-core
20+
builder @DataDog/apm-common-components-core
21+
Cargo.* @DataDog/libdatadog
22+
cliff.toml @DataDog/libdatadog-core
23+
cmake/ @DataDog/apm-common-components-core
24+
CONTRIBUTING.md @DataDog/libdatadog-core
25+
Cross.toml @DataDog/apm-common-components-core
26+
datadog-ffe @DataDog/feature-flagging-and-experimentation-sdk
27+
datadog-ffe-ffi @DataDog/feature-flagging-and-experimentation-sdk
28+
datadog-ipc*/ @DataDog/libdatadog-php
29+
datadog-live-debugger*/ @DataDog/libdatadog-php @DataDog/libdatadog-apm
30+
datadog-profiling-replayer @DataDog/libdatadog-profiling
31+
datadog-remote-config @DataDog/libdatadog-php @DataDog/libdatadog-apm @DataDog/remote-config
32+
datadog-sidecar @DataDog/libdatadog-php @DataDog/libdatadog-apm
33+
datadog-sidecar-ffi @DataDog/libdatadog-php @DataDog/libdatadog-apm
34+
datadog-sidecar-macros @DataDog/libdatadog-php
35+
datadog-tracer-flare @DataDog/libdatadog-apm
36+
deny.toml @DataDog/libdatadog
37+
docker-bake.hcl @DataDog/apm-common-components-core
38+
docs @DataDog/libdatadog
39+
examples @DataDog/libdatadog
40+
libdd-alloc/ @DataDog/libdatadog-profiling
41+
libdd-common*/ @DataDog/libdatadog
42+
libdd-crashtracker*/ @DataDog/libdatadog-profiling
43+
libdd-data-pipeline*/ @DataDog/libdatadog-apm
44+
libdd-ddsketch*/ @DataDog/libdatadog-apm @DataDog/apm-common-components-core
45+
libdd-dogstatsd-client @DataDog/apm-common-components-core
46+
libdd-library-config*/ @DataDog/apm-sdk-capabilities
47+
libdd-log*/ @DataDog/apm-common-components-core
48+
libdd-profiling*/ @DataDog/libdatadog-profiling
49+
libdd-telemetry*/ @DataDog/apm-common-components-core
50+
libdd-tinybytes @DataDog/apm-common-components-core
51+
libdd-trace-normalization @DataDog/serverless @DataDog/libdatadog-apm
52+
libdd-trace-obfuscation @DataDog/serverless @DataDog/libdatadog-apm
53+
libdd-trace-protobuf @DataDog/serverless @DataDog/libdatadog-apm
54+
libdd-trace-stats @DataDog/apm-common-components-core
55+
libdd-trace-utils @DataDog/serverless @DataDog/libdatadog-apm
56+
LICENSE* @DataDog/libdatadog
57+
local-linux.Dockerfile @DataDog/libdatadog
58+
NOTICE @DataDog/libdatadog
59+
README.md @DataDog/libdatadog
60+
repository.datadog.yml @DataDog/apm-common-components-core
61+
ruby/ @DataDog/ruby-guild
62+
rustfmt.toml @DataDog/libdatadog-core
63+
scripts/check_cargo_metadata.sh @DataDog/libdatadog-core
64+
scripts/commits-since-release.sh @DataDog/libdatadog-core
65+
scripts/publication-order.sh @DataDog/libdatadog-core
66+
scripts/reformat_copyright.sh @DataDog/libdatadog-core
67+
scripts/semver-level.sh @DataDog/libdatadog-core
68+
scripts/update_license_3rdparty.sh @DataDog/libdatadog-core
69+
spawn_worker/ @DataDog/libdatadog-php @DataDog/libdatadog-apm
70+
symbolizer-ffi @DataDog/libdatadog-profiling
71+
tests/run-package-tests.ps1 @DataDog/apm-common-components-core
72+
tests/spawn_from_lib/ @DataDog/libdatadog-php @DataDog/libdatadog-apm
73+
tests/windows_package/ @DataDog/apm-common-components-core
74+
tools/ @DataDog/apm-common-components-core
75+
windows/ @DataDog/libdatadog-core
76+
fuzz/ @DataDog/chaos-platform
7477

7578
# Specific overrides (must come after their general patterns above)
76-
bin_tests/tests/test_the_tests.rs @Datadog/libdatadog-core
77-
bin_tests/src/bin/test_the_tests.rs @Datadog/libdatadog-core
78-
tools/cc_utils/ @Datadog/libdatadog-php
79-
tools/sidecar_mockgen/ @Datadog/libdatadog-php
79+
bin_tests/tests/test_the_tests.rs @DataDog/libdatadog-core
80+
bin_tests/src/bin/test_the_tests.rs @DataDog/libdatadog-core
81+
tools/cc_utils/ @DataDog/libdatadog-php
82+
tools/sidecar_mockgen/ @DataDog/libdatadog-php

.github/chainguard/gitlab.github-access.write-contents.sts.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ claim_pattern:
99

1010
permissions:
1111
contents: write
12+
pull_requests: write
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
issuer: https://token.actions.githubusercontent.com
2+
3+
subject_pattern: "repo:DataDog/libdatadog.*"
4+
5+
claim_pattern:
6+
ref: "(main|release|julio/.*)" # TODO: remove testing branch and uncomment ref_protected
7+
# ref_protected: "true" # TODO: uncomment once tested.
8+
9+
permissions:
10+
members: read
11+
metadata: read
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
issuer: https://token.actions.githubusercontent.com
2+
3+
subject_pattern: "repo:DataDog/libdatadog.*"
4+
5+
claim_pattern:
6+
ref: "refs/heads/(main|release)"
7+
ref_protected: "true"
8+
# job_workflow_ref: DataDog/libdatadog/\.github/workflows/release-proposal-dispatch\.yml@.+
9+
10+
permissions:
11+
contents: write
12+
pull_requests: write

.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'
19+
checks_exclude: 'devflow/merge,dd-gitlab/default-pipeline'

.github/workflows/coverage.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ on:
88

99
jobs:
1010
coverage:
11-
runs-on: ubuntu-latest
11+
runs-on:
12+
labels: ubuntu-latest-16-cores
13+
group: APM Larger Runners
1214
env:
1315
CARGO_TERM_COLOR: always
1416
CARGO_INCREMENTAL: 0
@@ -20,7 +22,7 @@ jobs:
2022
android: true
2123
dotnet: true
2224
haskell: true
23-
large-packages: false
25+
large-packages: true
2426
docker-images: true
2527
swap-storage: true
2628
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2

.github/workflows/pr-metadata-docs-and-deps.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ jobs:
3131
# Check cargo metadata for crates that are not flagged as publish = false
3232
cargo-metadata:
3333
needs: changed-crates
34-
if: needs.changed-crates.outputs.crates_count > 0
34+
if: |
35+
needs.changed-crates.outputs.crates_count > 0 &&
36+
!contains(github.event.pull_request.labels.*.name, 'skip-metadata-check')
3537
runs-on: ubuntu-latest
3638
steps:
3739
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2

0 commit comments

Comments
 (0)