Skip to content

Commit 7506773

Browse files
Merge branch 'master' into sezen.leblay/apm-metrics-tag
2 parents f0b3d92 + c2aec92 commit 7506773

File tree

1,815 files changed

+18329
-11258
lines changed

Some content is hidden

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

1,815 files changed

+18329
-11258
lines changed

.github/CODEOWNERS

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
/internal-api/src/test/groovy/datadog/trace/api/sampling @DataDog/apm-sdk-api-java
2929

3030
# @DataDog/apm-serverless
31-
/dd-trace-core/src/main/java/datadog/trace/lambda/ @DataDog/apm-serverless
31+
/dd-trace-core/src/main/java/datadog/trace/lambda/ @DataDog/apm-serverless
3232
/dd-trace-core/src/test/groovy/datadog/trace/lambda/ @DataDog/apm-serverless
3333

3434
# @DataDog/apm-lang-platform-java
@@ -131,3 +131,9 @@ dd-trace-api/src/main/java/datadog/trace/api/llmobs/ @DataDog/ml-observability
131131
dd-java-agent/agent-llmobs/ @DataDog/ml-observability
132132
dd-trace-core/src/main/java/datadog/trace/llmobs/ @DataDog/ml-observability
133133
dd-trace-core/src/test/groovy/datadog/trace/llmobs/ @DataDog/ml-observability
134+
135+
# @DataDog/rum
136+
/internal-api/src/main/java/datadog/trace/api/rum/ @DataDog/rum
137+
/internal-api/src/test/groovy/datadog/trace/api/rum/ @DataDog/rum
138+
/telemetry/src/main/java/datadog/telemetry/rum/ @DataDog/rum
139+
/telemetry/src/test/groovy/datadog/telemetry/rum/ @DataDog/rum

.github/workflows/add-milestone-to-pull-requests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Add milestone to merged pull requests
18-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # 7.0.1
18+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # 8.0.0
1919
with:
2020
retries: 3
2121
retry-exempt-status-codes: 400,401

.github/workflows/analyze-changes.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
${{ runner.os }}-gradle-
3636
3737
- name: Initialize CodeQL
38-
uses: github/codeql-action/init@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.29.5
38+
uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
3939
with:
4040
languages: 'java'
4141
build-mode: 'manual'
@@ -52,7 +52,7 @@ jobs:
5252
--build-cache --parallel --stacktrace --no-daemon --max-workers=4
5353
5454
- name: Perform CodeQL Analysis and upload results to GitHub Security tab
55-
uses: github/codeql-action/analyze@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.29.5
55+
uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
5656

5757
trivy:
5858
name: Analyze changes with Trivy
@@ -102,7 +102,7 @@ jobs:
102102
ls -laR "./workspace/.trivy"
103103
104104
- name: Run Trivy security scanner
105-
uses: aquasecurity/trivy-action@f9424c10c36e288d5fa79bd3dfd1aeb2d6eae808 # v0.33.0
105+
uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8 # v0.33.1
106106
with:
107107
scan-type: rootfs
108108
scan-ref: './workspace/.trivy/'
@@ -115,7 +115,7 @@ jobs:
115115
TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db
116116

117117
- name: Upload Trivy scan results to GitHub Security tab
118-
uses: github/codeql-action/upload-sarif@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.29.5
118+
uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
119119
if: always()
120120
with:
121121
sarif_file: 'trivy-results.sarif'

.github/workflows/check-pull-requests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Check pull requests
20-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # 7.0.1
20+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # 8.0.0
2121
with:
2222
github-token: ${{secrets.GITHUB_TOKEN}}
2323
script: |

.github/workflows/comment-on-submodule-update.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Post comment on submodule update
20-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # 7.0.1
20+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # 8.0.0
2121
with:
2222
github-token: ${{secrets.GITHUB_TOKEN}}
2323
script: |

.github/workflows/draft-release-notes-on-tag.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- name: Get milestone title
1515
id: milestoneTitle
16-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # 7.0.1
16+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # 8.0.0
1717
with:
1818
result-encoding: string
1919
script: |

.github/workflows/increment-milestone-on-tag.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- name: Close current milestone
1313
id: close-milestone
14-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # 7.0.1
14+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # 8.0.0
1515
with:
1616
script: |
1717
// Get the milestone title ("X.Y.Z") from tag name ("vX.Y.Z")

.github/workflows/prune-old-pull-requests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
pull-requests: write
1414
steps:
1515
- name: Prune old pull requests
16-
uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
16+
uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
1717
with:
1818
days-before-stale: -1 # Disable general stale bot
1919
days-before-pr-stale: 90 # Only enable stale bot for PRs with no activity for 90 days

.github/workflows/update-issues-on-release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Get milestone for release
18-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # 7.0.1
18+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # 8.0.0
1919
with:
2020
github-token: ${{secrets.GITHUB_TOKEN}}
2121
script: |

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ variables:
2828
GRADLE_VERSION: "8.14.3" # must match gradle-wrapper.properties
2929
MAVEN_REPOSITORY_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
3030
GRADLE_PLUGIN_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
31-
BUILDER_IMAGE_VERSION_PREFIX: "v25.07-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")
31+
BUILDER_IMAGE_VERSION_PREFIX: "v25.09-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")
3232
REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
3333
DEFAULT_TEST_JVMS: /^(8|11|17|21|25)$/ # the latest "stable" version is LTS v25
3434
PROFILE_TESTS:
@@ -580,7 +580,7 @@ muzzle-dep-report:
580580
CI_USE_TEST_AGENT: "true"
581581
CI_AGENT_HOST: local-agent
582582
services:
583-
- name: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.31.1
583+
- name: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.33.1
584584
alias: local-agent
585585
variables:
586586
LOG_LEVEL: "DEBUG"

0 commit comments

Comments
 (0)