Skip to content

Commit 31ebf5f

Browse files
Merge branch 'master' into alexeyk/groovy-4
# Conflicts: # build.gradle.kts # buildSrc/build.gradle.kts # dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/ddwaf/WAFModuleSpecification.groovy # gradle/codenarc.gradle # gradle/libs.versions.toml # utils/config-utils/build.gradle.kts
2 parents 4327f62 + 4165d42 commit 31ebf5f

File tree

1,373 files changed

+41136
-23086
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,373 files changed

+41136
-23086
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@
116116
**/DataStreams* @DataDog/data-streams-monitoring
117117

118118
# @DataDog/feature-flagging-and-experimentation-sdk
119-
/products/feature-flagging/ @DataDog/feature-flagging-and-experimentation-sdk
119+
/dd-smoke-tests/openfeature/ @DataDog/feature-flagging-and-experimentation-sdk
120+
/products/feature-flagging/ @DataDog/feature-flagging-and-experimentation-sdk
120121

121122
# @DataDog/profiling-java
122123
/dd-java-agent/agent-profiling/ @DataDog/profiling-java
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
issuer: https://token.actions.githubusercontent.com
2+
3+
subject_pattern: repo:DataDog/dd-trace-java:ref:refs/heads/.+
4+
5+
claim_pattern:
6+
event_name: (push|workflow_dispatch)
7+
ref: refs/heads/.+
8+
job_workflow_ref: DataDog/dd-trace-java/\.github/workflows/pin-system-tests\.yaml@.+
9+
10+
permissions:
11+
contents: write
12+
pull_requests: write
13+
workflows: write

.github/workflows/add-release-to-cloudfoundry.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout "cloudfoundry" branch
13-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
13+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
1414
with:
1515
ref: cloudfoundry
1616
- name: Get release version

.github/workflows/analyze-changes.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
19+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
2020
with:
2121
submodules: 'recursive'
2222
- name: Cache Gradle dependencies
@@ -30,7 +30,7 @@ jobs:
3030
${{ runner.os }}-gradle-
3131
3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
33+
uses: github/codeql-action/init@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
3434
with:
3535
languages: 'java'
3636
build-mode: 'manual'
@@ -49,7 +49,7 @@ jobs:
4949
--build-cache --parallel --stacktrace --no-daemon --max-workers=4
5050
5151
- name: Perform CodeQL Analysis and upload results to GitHub Security tab
52-
uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
52+
uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
5353

5454
trivy:
5555
name: Analyze changes with Trivy
@@ -61,7 +61,7 @@ jobs:
6161

6262
steps:
6363
- name: Checkout repository
64-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
64+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
6565
with:
6666
submodules: 'recursive'
6767

@@ -114,7 +114,7 @@ jobs:
114114
TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db
115115

116116
- name: Upload Trivy scan results to GitHub Security tab
117-
uses: github/codeql-action/upload-sarif@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
117+
uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
118118
if: always()
119119
with:
120120
sarif_file: 'trivy-results.sarif'

.github/workflows/check-pull-request-labels.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
repo: context.repo.repo
4646
})
4747
const commentMarker = '<!-- dd-trace-java-check-pr-labels-workflow -->'
48-
const blockingComment = comments.data.find(comment => comment.body.includes(commentMarker))
48+
let blockingComment = comments.data.find(comment => comment.body.includes(commentMarker))
4949
// Create or update blocking comment if there are invalid labels
5050
if (hasInvalidLabels) {
5151
const commentBody = '**PR Blocked - Invalid Label**\n\n' +

.github/workflows/create-release-branch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
echo "branch=release/${TAG%.0}.x" >> "$GITHUB_OUTPUT"
3939
4040
- name: Checkout dd-trace-java at tag
41-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
41+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
4242
with:
4343
ref: ${{ steps.determine-tag.outputs.tag }}
4444

.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@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
16+
uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
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/run-system-tests.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@ jobs:
2121
build:
2222
runs-on:
2323
group: APM Larger Runners
24+
environment:
25+
name: ci-build
2426
steps:
2527
- name: Checkout repository
26-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
28+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
2729
with:
2830
submodules: 'recursive'
2931
fetch-depth: 0

.github/workflows/update-docker-build-image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
policy: self.update-docker-build-image.create-pr
2626

2727
- name: Checkout the repository
28-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
28+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2929
- name: Define the Docker build image tag to use
3030
id: define-tag
3131
run: |

.github/workflows/update-gradle-dependencies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
policy: self.update-gradle-dependencies.create-pr
2020

2121
- name: Checkout repository
22-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
22+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
2323
with:
2424
submodules: "recursive"
2525
- name: Update Gradle dependencies

0 commit comments

Comments
 (0)