Skip to content

Commit a40b323

Browse files
authored
Merge branch 'main' into kakkoyun/use_stacktrace_package
2 parents 8ba9e8b + 61f9647 commit a40b323

File tree

309 files changed

+16595
-3451
lines changed

Some content is hidden

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

309 files changed

+16595
-3451
lines changed

.github/actions/add-codeowners/codeowners.sh

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
11
#!/bin/bash
22

3+
RESULT_PATH="${1:-.}"
4+
if [ ! -d "$RESULT_PATH" ]; then
5+
echo "Error: Result path does not exist"
6+
exit 1
7+
fi
8+
9+
cd "$RESULT_PATH" || exit 1
10+
311
for file in gotestsum-report*.xml; do
4-
temp_file="tempfile.xml"
12+
# Skip if the glob didn't match any files
13+
[ -f "$file" ] || break
14+
15+
temp_file="${file}_tmp.xml"
516

617
# force write a new line at the end of the gotestsum-report.xml, or else
718
# the loop will skip the last line.
819
# fixes issue with a missing </testsuites>
9-
echo -e "\n" >> $file
20+
echo -e "\n" >> "$file"
1021

11-
while read p; do
22+
while IFS= read -r p || [ -n "$p" ]; do
1223
# we might try to report gotestsum-report.xml multiple times, so don't
1324
# calculate codeowners more times than we need
1425
if [[ "$p" =~ \<testcase && ! "$p" =~ "file=" ]]; then
@@ -22,7 +33,7 @@ for file in gotestsum-report*.xml; do
2233
else
2334
echo "$p" >> "$temp_file"
2435
fi
25-
done < $file
36+
done < "$file"
2637

27-
mv "$temp_file" $file
38+
mv "$temp_file" "$file"
2839
done

.github/actions/dd-ci-upload/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ runs:
4444
4545
- name: Add CodeOwners to JUnit files
4646
shell: bash
47-
run: ./.github/actions/add-codeowners/codeowners.sh
47+
run: ./.github/actions/add-codeowners/codeowners.sh "${{ inputs.path }}"
4848

4949
- name: Upload the JUnit files
5050
shell: bash

.github/workflows/apps/go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ go 1.24.0
44

55
require (
66
github.com/DataDog/dd-trace-go/v2 v2.4.0-dev
7-
golang.org/x/mod v0.28.0
7+
golang.org/x/mod v0.29.0
88
)
99

1010
require (
1111
github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.71.0 // indirect
1212
github.com/DataDog/datadog-agent/pkg/obfuscate v0.71.0 // indirect
1313
github.com/DataDog/datadog-agent/pkg/opentelemetry-mapping-go/otlp/attributes v0.71.0 // indirect
1414
github.com/DataDog/datadog-agent/pkg/proto v0.71.0 // indirect
15-
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.71.0 // indirect
15+
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.73.0-rc.1 // indirect
1616
github.com/DataDog/datadog-agent/pkg/trace v0.71.0 // indirect
1717
github.com/DataDog/datadog-agent/pkg/util/log v0.71.0 // indirect
1818
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.71.0 // indirect
1919
github.com/DataDog/datadog-agent/pkg/version v0.71.0 // indirect
2020
github.com/DataDog/datadog-go/v5 v5.7.1 // indirect
21-
github.com/DataDog/go-libddwaf/v4 v4.5.0 // indirect
21+
github.com/DataDog/go-libddwaf/v4 v4.7.0 // indirect
2222
github.com/DataDog/go-runtime-metrics-internal v0.0.4-0.20250806100345-ca5e7fdaf7b6 // indirect
2323
github.com/DataDog/go-sqllexer v0.1.8 // indirect
2424
github.com/DataDog/go-tuf v1.1.1-0.5.2 // indirect
@@ -74,9 +74,9 @@ require (
7474
go.uber.org/zap v1.27.0 // indirect
7575
go.yaml.in/yaml/v3 v3.0.4 // indirect
7676
golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect
77-
golang.org/x/net v0.44.0 // indirect
78-
golang.org/x/sys v0.36.0 // indirect
79-
golang.org/x/text v0.29.0 // indirect
77+
golang.org/x/net v0.46.0 // indirect
78+
golang.org/x/sys v0.37.0 // indirect
79+
golang.org/x/text v0.30.0 // indirect
8080
golang.org/x/time v0.13.0 // indirect
8181
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
8282
google.golang.org/genproto/googleapis/rpc v0.0.0-20250929231259-57b25ae835d4 // indirect

.github/workflows/apps/go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ github.com/DataDog/datadog-agent/pkg/opentelemetry-mapping-go/otlp/attributes v0
66
github.com/DataDog/datadog-agent/pkg/opentelemetry-mapping-go/otlp/attributes v0.71.0/go.mod h1:XeZj0IgsiL3vgeEGTucf61JvJRh1LxWMUbZA/XJsPD0=
77
github.com/DataDog/datadog-agent/pkg/proto v0.71.0 h1:YTwecwy8kF1zsL2HK6KVa7XLRZYZ0Ypb2anlG0zDLeE=
88
github.com/DataDog/datadog-agent/pkg/proto v0.71.0/go.mod h1:KSn4jt3CykV6CT1C8Rknn/Nj3E+VYHK/UDWolg/+kzw=
9-
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.71.0 h1:gansv7DxvKDgMEUVDzo2DXezbRYfPlL3abKwlTIFD/k=
10-
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.71.0/go.mod h1:cAUt6KWsedHR2k4agAvEfiK8tGxFJDIrCvrWMIGwe/o=
9+
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.73.0-rc.1 h1:fVqr9ApWmUMEExmgn8iFPfwm9ZrlEfFWgTKp1IcNH18=
10+
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.73.0-rc.1/go.mod h1:lwkSvCXABHXyqy6mG9WBU6MTK9/E0i0R8JVApUtT+XA=
1111
github.com/DataDog/datadog-agent/pkg/trace v0.71.0 h1:9UrKHDacMlAWfP2wpSxrZOQbtkwLY2AOAjYgGkgM96Y=
1212
github.com/DataDog/datadog-agent/pkg/trace v0.71.0/go.mod h1:wfVwOlKORIB4IB1vdncTuCTx/OrVU69TLBIiBpewe1Q=
1313
github.com/DataDog/datadog-agent/pkg/util/log v0.71.0 h1:VJ+nm5E0+UdLPkg2H7FKapx0syNcKzCFXA2vfcHz0Bc=
@@ -18,8 +18,8 @@ github.com/DataDog/datadog-agent/pkg/version v0.71.0 h1:jqkKmhFrhHSLpiC3twQFDCXU
1818
github.com/DataDog/datadog-agent/pkg/version v0.71.0/go.mod h1:FYj51C1ib86rpr5tlLEep9jitqvljIJ5Uz2rrimGTeY=
1919
github.com/DataDog/datadog-go/v5 v5.7.1 h1:dNhEwKaO3LJhGYKajl2DjobArfa5R9YF72z3Dy+PH3k=
2020
github.com/DataDog/datadog-go/v5 v5.7.1/go.mod h1:CA9Ih6tb3jtxk+ps1xvTnxmhjr7ldE8TiwrZyrm31ss=
21-
github.com/DataDog/go-libddwaf/v4 v4.5.0 h1:dXD9xL9T02Mqu9AH7imXpGThKAYqO3BmT2QoXbMFxow=
22-
github.com/DataDog/go-libddwaf/v4 v4.5.0/go.mod h1:/AZqP6zw3qGJK5mLrA0PkfK3UQDk1zCI2fUNCt4xftE=
21+
github.com/DataDog/go-libddwaf/v4 v4.7.0 h1:oF2YaaEtu7MYd5TrwceXUsJYdJ6b1kmLZsAj0up/0po=
22+
github.com/DataDog/go-libddwaf/v4 v4.7.0/go.mod h1:/AZqP6zw3qGJK5mLrA0PkfK3UQDk1zCI2fUNCt4xftE=
2323
github.com/DataDog/go-runtime-metrics-internal v0.0.4-0.20250806100345-ca5e7fdaf7b6 h1:rIMZ3Bqn2w8nWrAIXekOdm+sZVxUYHGX8cS7P9W06Kk=
2424
github.com/DataDog/go-runtime-metrics-internal v0.0.4-0.20250806100345-ca5e7fdaf7b6/go.mod h1:YFoTl1xsMzdSRFIu33oCSPS/3+HZAPGpO3oOM96wXCM=
2525
github.com/DataDog/go-sqllexer v0.1.8 h1:ku9DpghFHeyyviR28W/3R4cCJwzpsuC08YIoltnx5ds=
@@ -234,22 +234,22 @@ go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
234234
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
235235
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
236236
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
237-
golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
238-
golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
237+
golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
238+
golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
239239
golang.org/x/exp v0.0.0-20250911091902-df9299821621 h1:2id6c1/gto0kaHYyrixvknJ8tUK/Qs5IsmBtrc+FtgU=
240240
golang.org/x/exp v0.0.0-20250911091902-df9299821621/go.mod h1:TwQYMMnGpvZyc+JpB/UAuTNIsVJifOlSkrZkhcvpVUk=
241241
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
242242
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
243243
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
244-
golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U=
245-
golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI=
244+
golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
245+
golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
246246
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
247247
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
248248
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
249249
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
250250
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
251-
golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=
252-
golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
251+
golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
252+
golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
253253
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
254254
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
255255
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -266,13 +266,13 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
266266
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
267267
golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
268268
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
269-
golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
270-
golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
269+
golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
270+
golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
271271
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
272272
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
273273
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
274-
golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
275-
golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
274+
golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
275+
golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
276276
golang.org/x/time v0.13.0 h1:eUlYslOIt32DgYD6utsuUeHs4d7AsEYLuIAdg7FlYgI=
277277
golang.org/x/time v0.13.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
278278
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

.github/workflows/appsec.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
needs: go-mod-caching
109109
strategy:
110110
matrix:
111-
runs-on: [ macos-13, macos-15 ] # oldest and newest macos runners available - macos-15 is an ARM runner
111+
runs-on: [ macos-14, macos-latest ] # oldest and newest macos runners available
112112
go-version: [ "1.25", "1.24" ]
113113
fail-fast: true # saving some CI time - macos runners are too long to get
114114
steps:

.github/workflows/ecosystems-label-issue.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
permissions:
99
contents: read
1010
issues: write
11+
id-token: write
1112
jobs:
1213
label_issues:
1314
if: contains(github.event.issue.title, 'contrib')

.github/workflows/multios-unit-tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ jobs:
5151
path: .git
5252
key: gitdb-${{ github.repository_id }}-${{ github.sha }}
5353
- name: Checkout
54-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v2.7.0
54+
if: always()
55+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5556
with:
5657
ref: ${{ github.sha }}
5758
clean: false

.github/workflows/orchestrion.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,12 +291,12 @@ jobs:
291291
name: coverage-integration+${{ matrix.mode }}+go${{ steps.go.outputs.version }}+${{ runner.os }}+${{ runner.arch }}
292292
path: ${{ github.workspace }}/orchestrion/coverage/integration.out
293293

294-
# Checkout and prepare for uploading to Datadog CI
295294
- name: Checkout
296295
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
296+
if: always()
297297
with:
298-
repository: 'DataDog/dd-trace-go'
299-
ref: ${{ inputs.orchestrion-version != '' && 'main' || github.ref }}
298+
ref: ${{ inputs.orchestrion-version != '' && 'main' || github.sha }}
299+
clean: false
300300
- name: Upload the results to Datadog CI App
301301
if: always()
302302
continue-on-error: true

.github/workflows/smoke-tests.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,16 @@ jobs:
5858
run: |-
5959
mkdir -p $TEST_RESULTS
6060
go get -u -t $PACKAGES
61-
go get github.com/DataDog/datadog-agent/comp/core/tagger/[email protected]
61+
go get github.com/DataDog/datadog-agent/pkg/[email protected]
62+
go get github.com/DataDog/datadog-agent/pkg/remoteconfig/[email protected]
63+
go get github.com/DataDog/datadog-agent/pkg/[email protected]
6264
go get github.com/DataDog/datadog-agent/pkg/[email protected]
65+
go get github.com/DataDog/datadog-agent/comp/core/tagger/[email protected]
6366
go get github.com/DataDog/datadog-agent/pkg/opentelemetry-mapping-go/otlp/[email protected]
64-
go get github.com/DataDog/datadog-agent/pkg/[email protected]
65-
go get github.com/DataDog/datadog-agent/pkg/remoteconfig/[email protected]
66-
go get github.com/DataDog/datadog-agent/pkg/[email protected]
6767
go get github.com/DataDog/datadog-agent/pkg/util/[email protected]
6868
go get github.com/DataDog/datadog-agent/pkg/util/[email protected]
6969
go get github.com/DataDog/datadog-agent/pkg/[email protected]
70+
go get go.opentelemetry.io/collector/[email protected]
7071
go mod tidy
7172
for d in `find . -iname go.mod | xargs -n1 dirname`; do pushd $d; go mod tidy; popd; done;
7273

.github/workflows/static-checks.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,11 @@ jobs:
155155
filter_mode: nofilter
156156

157157
checklocks:
158+
# We have the infrastructure in place for this check,
159+
# but we still need to add the required annotations for
160+
# checklocks to actually identify issues. Skipping the
161+
# check until we do so.
162+
if: false
158163
runs-on: ubuntu-latest
159164
steps:
160165
- name: Checkout
@@ -170,5 +175,4 @@ jobs:
170175
- name: Run checklocks
171176
run: |-
172177
export PATH="${{ github.workspace }}/bin:${PATH}"
173-
# Errors are expected here, but we want to fail the CI if there are any errors for now
174-
./scripts/check_locks.sh || true
178+
./scripts/check_locks.sh

0 commit comments

Comments
 (0)