Skip to content

Commit 9eff4f3

Browse files
authored
Merge branch 'master' into ayan.khan/stable-session-id-headers
2 parents 3406b39 + f22a608 commit 9eff4f3

43 files changed

Lines changed: 174 additions & 160 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.

.claude/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
2+
"env": {
3+
"OTEL_RESOURCE_ATTRIBUTES": "repo.owner=DataDog,repo.name=dd-trace-dotnet"
4+
},
25
"extraKnownMarketplaces": {
36
"datadog-claude-plugins": {
47
"source": {

.github/actions/create-system-test-docker-base-images/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,18 @@ runs:
3737
cp ./tracer/build/_build/docker/system-tests.dockerfile ${{inputs.artifacts_path}}
3838
3939
- name: Set up QEMU
40-
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
40+
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
4141

4242
- name: Set up Docker Buildx
4343
id: buildx
44-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f #v3.12.0
44+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd #v4.0.0
4545

4646
- name: Login to Docker
4747
shell: bash
4848
run: docker login -u publisher -p ${{ inputs.github_token }} ghcr.io
4949

5050
- name: Docker Build linux-x64 and linux-arm64 images
51-
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
51+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
5252
with:
5353
push: true
5454
tags: ghcr.io/datadog/dd-trace-dotnet/dd-trace-dotnet:${{ inputs.image_tag || 'latest_snapshot' }}

.github/actions/publish-debug-symbols/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ runs:
3232
steps:
3333
# datadog-ci needs the version 20 (https://github.com/DataDog/profiling-backend/blob/prod/debug-symbol-upload/Dockerfile#L6)
3434
- name: Install Node
35-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
35+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
3636
with:
3737
node-version: 20
3838

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ updates:
2929
update-types: ["version-update:semver-patch"]
3030

3131
# Mocked projects for integration dependency notifications
32+
cooldown:
33+
default-days: 2
3234
- package-ecosystem: "nuget"
3335
directory: "/tracer/dependabot/integrations"
3436
registries: "*"
@@ -41,6 +43,8 @@ updates:
4143

4244
# Azure functions explicit testing - we can't include these with our "normal" process checks
4345
# Because they aren't compatible with the dotnet msbuild approach we're using
46+
cooldown:
47+
default-days: 2
4448
- package-ecosystem: "nuget"
4549
directory: "/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated"
4650
registries: "*"
@@ -54,6 +58,8 @@ updates:
5458
update-types: ["version-update:semver-patch"]
5559

5660
# Src libraries
61+
cooldown:
62+
default-days: 2
5763
- package-ecosystem: "nuget"
5864
directory: "/tracer/src"
5965
# This is a hacky way to get Dependabot to care primarily about
@@ -93,6 +99,8 @@ updates:
9399
# Lock Microsoft.Build.Framework for widest compatibility when instrumenting builds
94100
- dependency-name: "Microsoft.Build.Framework"
95101

102+
cooldown:
103+
default-days: 2
96104
- package-ecosystem: "github-actions"
97105
directories:
98106
- "/"
@@ -104,3 +112,5 @@ updates:
104112
gh-actions-packages:
105113
patterns:
106114
- "*"
115+
cooldown:
116+
default-days: 2

.github/workflows/_create_draft_release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
echo "Using sha $commitsha"
7171
echo "sha=${commitsha}" >> $GITHUB_OUTPUT
7272
73-
- uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
73+
- uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
7474
with:
7575
global-json-file: global.json
7676

@@ -112,7 +112,7 @@ jobs:
112112
113113
- name: Get GitHub Token via dd-octo-sts
114114
id: generate-token
115-
uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
115+
uses: DataDog/dd-octo-sts-action@96a25462dbcb10ebf0bfd6e2ccc917d2ab235b9a # v1.0.4
116116
with:
117117
scope: DataDog/dd-trace-dotnet
118118
policy: self.github.create-draft-release
@@ -152,7 +152,7 @@ jobs:
152152
GITHUB_TOKEN: "${{ steps.generate-token.outputs.token }}"
153153

154154
- name: Create Release
155-
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
155+
uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe # v2.6.1
156156
with:
157157
token: "${{ steps.generate-token.outputs.token }}"
158158
draft: true

.github/workflows/auto-trigger-aas-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- name: Get GitHub Token via dd-octo-sts
1515
id: octo-sts
16-
uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
16+
uses: DataDog/dd-octo-sts-action@96a25462dbcb10ebf0bfd6e2ccc917d2ab235b9a # v1.0.4
1717
with:
1818
scope: DataDog/datadog-aas-extension
1919
policy: dd-trace-dotnet.github.trigger-aas-release

.github/workflows/auto_add_vnext_milestone_to_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Checkout
2121
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2222

23-
- uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
23+
- uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
2424
with:
2525
global-json-file: global.json
2626

.github/workflows/auto_check_snapshots.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
with:
1818
fetch-depth: 0
1919

20-
- uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
20+
- uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
2121
with:
2222
global-json-file: global.json
2323

.github/workflows/auto_create_version_bump_pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
run: git config --system core.longpaths true
2626

2727
- name: Get dd-octo-sts token
28-
uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
28+
uses: DataDog/dd-octo-sts-action@96a25462dbcb10ebf0bfd6e2ccc917d2ab235b9a # v1.0.4
2929
id: octo-sts
3030
with:
3131
scope: DataDog/dd-trace-dotnet
@@ -52,7 +52,7 @@ jobs:
5252
git config user.name "${{ github.actor }}"
5353
git config user.email "${{ github.actor }}@users.noreply.github.com"
5454
55-
- uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
55+
- uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
5656
with:
5757
global-json-file: global.json
5858

.github/workflows/auto_delete_hotfix_branch_post_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
fetch-depth: 0
3131

32-
- uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
32+
- uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
3333
with:
3434
global-json-file: global.json
3535

0 commit comments

Comments
 (0)