Skip to content

Commit 5c7422c

Browse files
na-jina-ji
committed
Merge remote-tracking branch 'origin/master' into yoann.bentz/mongodb-dbm-support
2 parents 20eeee0 + 4596de2 commit 5c7422c

File tree

1,054 files changed

+10303
-5265
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,054 files changed

+10303
-5265
lines changed

‎.github/chainguard/self.update-system-tests.create-pr.sts.yaml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎.github/workflows/README.md‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@ _Action:_ Check the pull request did not introduce unexpected label.
3636

3737
_Recovery:_ Update the pull request or add a comment to trigger the action again.
3838

39+
### create-release-branch [🔗](create-release-branch.yaml)
40+
41+
_Trigger:_ When a git tag matching the pattern "vM.N.0" is pushed (e.g. for a minor release).
42+
43+
_Action:_ Create a release branch that corresponds to the pushed tag (e.g. "release/vM.N.x").
44+
45+
_Recovery:_ Manually create the branch from the "vM.N.0" git tag.
46+
3947
### draft-release-notes-on-tag [🔗](draft-release-notes-on-tag.yaml)
4048

4149
_Trigger:_ When creating a tag, or manually (providing a tag)
@@ -61,6 +69,15 @@ _Recovery:_ Manually [close the related milestone and create a new one](https://
6169

6270
_Notes:_ This action will not apply to release candidate versions using `-RC` tags.
6371

72+
### prune-old-pull-requests [🔗](prune-old-pull-requests.yaml)
73+
74+
_Trigger:_ Every month or manually.
75+
76+
_Action:_ Mark as stale and comment on pull requests with no update during the last quarter.
77+
Close them if no following update within a week.
78+
79+
_Recovery:_ Manually trigger the action again.
80+
6481
### update-docker-build-image [🔗](update-docker-build-image.yaml)
6582

6683
_Trigger:_ Quarterly released, loosely [a day after the new image tag is created](https://github.com/DataDog/dd-trace-java-docker-build/blob/master/.github/workflows/docker-tag.yml).
@@ -93,16 +110,6 @@ _Action:_
93110

94111
_Recovery:_ Check at the milestone for the related issues and update them manually.
95112

96-
97-
### prune-old-pull-requests [🔗](prune-old-pull-requests.yaml)
98-
99-
_Trigger:_ Every month or manually.
100-
101-
_Action:_ Mark as stale and comment on pull requests with no update during the last quarter.
102-
Close them if no following update within a week.
103-
104-
_Recovery:_ Manually trigger the action again.
105-
106113
## Code Quality and Security
107114

108115
### analyze-changes [🔗](analyze-changes.yaml)
@@ -122,14 +129,6 @@ _Trigger:_ When creating a PR commits to `master` or a `release/*` branch with a
122129

123130
_Action:_ Notify the PR author through comments that about the Git Submodule update.
124131

125-
### update-gradle-dependencies [🔗](update-gradle-dependencies.yaml)
126-
127-
_Trigger:_ Every week or manually.
128-
129-
_Action:_ Create a PR updating the Grade dependencies and their locking files.
130-
131-
_Recovery:_ Manually trigger the action again.
132-
133132
### run-system-tests [🔗](run-system-tests.yaml)
134133

135134
_Trigger:_ When pushing commits to `master` or manually.
@@ -138,6 +137,14 @@ _Action:_ Build the Java Client Library and runs [the system tests](https://gith
138137

139138
_Recovery:_ Manually trigger the action on the desired branch.
140139

140+
### update-gradle-dependencies [🔗](update-gradle-dependencies.yaml)
141+
142+
_Trigger:_ Every week or manually.
143+
144+
_Action:_ Create a PR updating the Grade dependencies and their locking files.
145+
146+
_Recovery:_ Manually trigger the action again.
147+
141148
### update-jmxfetch-submodule [🔗](update-jmxfetch-submodule.yaml)
142149

143150
_Trigger:_ Monthly or manually

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

Lines changed: 21 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
name: Create Release Branch and Pin System-Tests
1+
name: Create Release Branch
22

33
on:
44
push:
55
tags:
6-
- 'v[0-9]+.[0-9]+.0' # Trigger on minor release tags (e.g. v1.54.0)
6+
- 'v[0-9]+.[0-9]+.0' # Trigger on minor release tags (e.g. v1.54.0)
77
workflow_dispatch:
88
inputs:
99
tag:
@@ -15,19 +15,8 @@ jobs:
1515
create-release-branch:
1616
runs-on: ubuntu-latest
1717
permissions:
18-
# contents: write # Allow pushing the empty release branch
19-
contents: read
20-
id-token: write # Required for OIDC token federation
18+
contents: write # Allow pushing the release branch
2119
steps:
22-
- uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
23-
id: octo-sts
24-
with:
25-
scope: DataDog/dd-trace-java
26-
policy: self.update-system-tests.create-pr
27-
28-
- name: Checkout dd-trace-java at tag
29-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
30-
3120
- name: Determine tag
3221
id: determine-tag
3322
run: |
@@ -48,61 +37,25 @@ jobs:
4837
TAG=${{ steps.determine-tag.outputs.tag }}
4938
echo "branch=release/${TAG%.0}.x" >> "$GITHUB_OUTPUT"
5039
51-
# - name: Check if branch already exists
52-
# id: check-branch
53-
# run: |
54-
# BRANCH=${{ steps.define-branch.outputs.branch }}
55-
# if git ls-remote --heads origin "$BRANCH" | grep -q "$BRANCH"; then
56-
# echo "creating_new_branch=false" >> "$GITHUB_OUTPUT"
57-
# echo "Branch $BRANCH already exists - skipping following steps"
58-
# else
59-
# echo "creating_new_branch=true" >> "$GITHUB_OUTPUT"
60-
# echo "Branch $BRANCH does not exist - proceeding with following steps"
61-
# fi
62-
63-
# - name: Create and push empty release branch
64-
# if: steps.check-branch.outputs.creating_new_branch == 'true'
65-
# run: |
66-
# git checkout -b "${{ steps.define-branch.outputs.branch }}"
67-
# git push -u origin "${{ steps.define-branch.outputs.branch }}"
68-
69-
- name: Update system-tests references to latest commit SHA on main
70-
# if: steps.check-branch.outputs.creating_new_branch == 'true'
71-
run: BRANCH=main ./tooling/update_system_test_reference.sh
72-
73-
- name: Define temp branch name
74-
# if: steps.check-branch.outputs.creating_new_branch == 'true'
75-
id: define-temp-branch
76-
run: echo "temp-branch=ci/pin-system-tests-$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
40+
- name: Checkout dd-trace-java at tag
41+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
42+
with:
43+
ref: ${{ steps.determine-tag.outputs.tag }}
7744

78-
- name: Commit changes
79-
# if: steps.check-branch.outputs.creating_new_branch == 'true'
80-
id: create-commit
45+
- name: Check if branch already exists
46+
id: check-branch
8147
run: |
82-
git config user.name "github-actions[bot]"
83-
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
84-
git commit -m "chore: Pin system-tests for release branch" .github/workflows/run-system-tests.yaml
85-
echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
86-
87-
- name: Push changes to temp branch
88-
# if: steps.check-branch.outputs.creating_new_branch == 'true'
89-
uses: DataDog/commit-headless@5a0f3876e0fbdd3a86b3e008acf4ec562db59eee # action/v2.0.1
90-
with:
91-
token: "${{ steps.octo-sts.outputs.token }}"
92-
branch: "${{ steps.define-temp-branch.outputs.temp-branch }}"
93-
head-sha: "${{ github.sha }}"
94-
create-branch: true
95-
command: push
96-
commits: "${{ steps.create-commit.outputs.commit }}"
48+
BRANCH=${{ steps.define-branch.outputs.branch }}
49+
if git ls-remote --heads origin "$BRANCH" | grep -q "$BRANCH"; then
50+
echo "creating_new_branch=false" >> "$GITHUB_OUTPUT"
51+
echo "Branch $BRANCH already exists - skipping creation"
52+
else
53+
echo "creating_new_branch=true" >> "$GITHUB_OUTPUT"
54+
echo "Branch $BRANCH does not exist - creating it now"
55+
fi
9756
98-
- name: Create pull request from temp branch to release branch
99-
# if: steps.check-branch.outputs.creating_new_branch == 'true'
100-
env:
101-
GH_TOKEN: ${{ steps.octo-sts.outputs.token }}
57+
- name: Create and push release branch
58+
if: steps.check-branch.outputs.creating_new_branch == 'true'
10259
run: |
103-
gh pr create --title "Pin system-tests for ${{ steps.define-branch.outputs.branch }}" \
104-
--base "${{ steps.define-branch.outputs.branch }}" \
105-
--head "${{ steps.define-temp-branch.outputs.temp-branch }}" \
106-
--label "tag: dependencies" \
107-
--label "tag: no release notes" \
108-
--body "This PR pins the system-tests reference for the release branch."
60+
git checkout -b "${{ steps.define-branch.outputs.branch }}"
61+
git push -u origin "${{ steps.define-branch.outputs.branch }}"

‎.gitlab-ci.yml‎

Lines changed: 19 additions & 11 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.10-" # 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.11-" # 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:
@@ -132,12 +132,12 @@ default:
132132
image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}base
133133
stage: build
134134
variables:
135-
MAVEN_OPTS: "-Xms64M -Xmx512M"
135+
MAVEN_OPTS: "-Xms256M -Xmx1024M"
136136
GRADLE_WORKERS: 2
137-
GRADLE_MEM: 2560M
137+
GRADLE_MEM: 3G
138138
KUBERNETES_CPU_REQUEST: 8
139-
KUBERNETES_MEMORY_REQUEST: 8Gi
140-
KUBERNETES_MEMORY_LIMIT: 8Gi
139+
KUBERNETES_MEMORY_REQUEST: 10Gi
140+
KUBERNETES_MEMORY_LIMIT: 10Gi
141141
CACHE_TYPE: "lib" #default
142142
FF_USE_FASTZIP: "true"
143143
CACHE_COMPRESSION_LEVEL: "slowest"
@@ -289,8 +289,7 @@ build_tests:
289289
CACHE_TYPE: "latestdep"
290290
- GRADLE_TARGET: ":smokeTest"
291291
CACHE_TYPE: "smoke"
292-
MAVEN_OPTS: "-Xms64M -Xmx512M -Dorg.slf4j.simpleLogger.defaultLogLevel=debug" # FIXME: Build :smokeTest build fails unless mvn debug logging is on
293-
292+
MAVEN_OPTS: "-Xms256M -Xmx1024M"
294293
script:
295294
- *gitlab_base_ref_params
296295
- ./gradlew --version
@@ -361,6 +360,14 @@ spotless:
361360
- ./gradlew --version
362361
- ./gradlew spotlessCheck $GRADLE_ARGS
363362

363+
config-inversion-linter:
364+
extends: .gradle_build
365+
stage: tests
366+
needs: []
367+
script:
368+
- ./gradlew --version
369+
- ./gradlew logEnvVarUsages checkEnvironmentVariablesUsage checkConfigStrings
370+
364371
test_published_artifacts:
365372
extends: .gradle_build
366373
image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}7 # Needs Java7 for some tests
@@ -975,13 +982,14 @@ create_key:
975982
paths:
976983
- pubkeys
977984

978-
validate_supported_configurations_local_file:
979-
extends: .validate_supported_configurations_local_file
985+
validate_supported_configurations_v2_local_file:
986+
extends: .validate_supported_configurations_v2_local_file
980987
variables:
981988
LOCAL_JSON_PATH: "metadata/supported-configurations.json"
989+
BACKFILLED: "false"
982990

983-
update_central_configurations_version_range:
984-
extends: .update_central_configurations_version_range
991+
update_central_configurations_version_range_v2:
992+
extends: .update_central_configurations_version_range_v2
985993
variables:
986994
LOCAL_REPO_NAME: "dd-trace-java"
987995
LOCAL_JSON_PATH: "metadata/supported-configurations.json"

‎.gitlab/benchmarks.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,15 @@ check-big-regressions:
7171
needs:
7272
- job: benchmarks-startup
7373
artifacts: true
74-
- job: benchmarks-load
74+
- job: benchmarks-dacapo
7575
artifacts: true
7676
when: on_success
7777
tags: ["arch:amd64"]
7878
rules:
7979
- if: '$POPULATE_CACHE'
8080
when: never
81+
- if: '$CI_COMMIT_BRANCH =~ /backport-pr-/'
82+
when: never
8183
- if: '$CI_COMMIT_BRANCH !~ /^(master|release\/)/'
8284
when: on_success
8385
- when: never
@@ -86,7 +88,7 @@ check-big-regressions:
8688
script:
8789
- !reference [ .benchmarks, script ]
8890
- |
89-
for benchmarkType in startup load; do
91+
for benchmarkType in startup dacapo; do
9092
find "$ARTIFACTS_DIR/$benchmarkType" -name "benchmark-baseline.json" -o -name "benchmark-candidate.json" | while read file; do
9193
relpath="${file#$ARTIFACTS_DIR/$benchmarkType/}"
9294
prefix="${relpath%/benchmark-*}" # Remove the trailing /benchmark-(baseline|candidate).json

‎.gitlab/one-pipeline.locked.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# DO NOT EDIT THIS FILE MANUALLY
22
# This file is auto-generated by automation.
33
include:
4-
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/53cec1ca53804e5abff804aefdd5cffbcaa5cb546c7e6fcf4c35df6796e06bf1/one-pipeline.yml
4+
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/ef1b27c2b0cdbbfb25d185344cdb7aa6bb4feb905cb2a77fa1a5a5340b570004/one-pipeline.yml

0 commit comments

Comments
 (0)