Skip to content

Commit c117ce0

Browse files
jandro996jandro996
authored
Merge branch 'master' into alejandro.gonzalez/WaPo-headers
2 parents 761eade + 19cd36d commit c117ce0

File tree

506 files changed

+22496
-3178
lines changed

Some content is hidden

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

506 files changed

+22496
-3178
lines changed

‎.circleci/config.continue.yml.j2‎

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ instrumentation_modules: &instrumentation_modules "dd-java-agent/instrumentation
3636
debugger_modules: &debugger_modules "dd-java-agent/agent-debugger|dd-java-agent/agent-bootstrap|dd-java-agent/agent-builder|internal-api|communication|dd-trace-core"
3737
profiling_modules: &profiling_modules "dd-java-agent/agent-profiling"
3838

39-
default_system_tests_commit: &default_system_tests_commit 08276e905c5c81055412ea4c318856d879cf15e5
39+
default_system_tests_commit: &default_system_tests_commit 380d8deb4dd86369e30827ae3d908400c91d2d3e
4040

4141
parameters:
4242
nightly:
@@ -850,8 +850,6 @@ jobs:
850850
(
851851
echo "
852852
DEFAULT
853-
APM_TRACING_E2E
854-
APM_TRACING_E2E_SINGLE_SPAN
855853
TRACING_CONFIG_NONDEFAULT
856854
TRACING_CONFIG_NONDEFAULT_2
857855
TRACING_CONFIG_NONDEFAULT_3
@@ -875,14 +873,8 @@ jobs:
875873
"
876874
fi
877875
) | circleci tests split > scenarios.list
876+
export DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY
878877
for scenario in $(<scenarios.list); do
879-
if [[ $scenario =~ .*_E2E.* ]]; then
880-
export DD_SITE=datadoghq.com
881-
export DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY
882-
export DD_APPLICATION_KEY=$SYSTEM_TESTS_E2E_DD_APP_KEY
883-
else
884-
export DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY
885-
fi
886878
echo "Running scenario $scenario"
887879
./run.sh $scenario
888880
done
@@ -922,27 +914,11 @@ jobs:
922914
923915
- run:
924916
name: Run APM Integrations tests
925-
environment:
926-
- AWS_ACCESS_KEY_ID: $SYSTEM_TESTS_IDM_AWS_ACCESS_KEY_ID
927-
- AWS_SECRET_ACCESS_KEY: $SYSTEM_TESTS_IDM_AWS_SECRET_ACCESS_KEY
928-
- AWS_REGION: us-east-1
929-
- AWS_DEFAULT_REGION: us-east-1 # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION`
930917
# Stop the job after 5m to avoid excessive overhead. Will need adjustment as more tests are added.
931918
no_output_timeout: 5m
932919
command: |
933920
cd system-tests
934-
DD_SITE=datadoghq.com DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY DD_APPLICATION_KEY=$SYSTEM_TESTS_E2E_DD_APP_KEY ./run.sh INTEGRATIONS
935-
936-
- run:
937-
name: Run IDM Crossed Tracing Libraries propagation tests for messaging
938-
environment:
939-
- AWS_ACCESS_KEY_ID: $SYSTEM_TESTS_IDM_AWS_ACCESS_KEY_ID
940-
- AWS_SECRET_ACCESS_KEY: $SYSTEM_TESTS_IDM_AWS_SECRET_ACCESS_KEY
941-
- AWS_REGION: us-east-1
942-
- AWS_DEFAULT_REGION: us-east-1 # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION`
943-
command: |
944-
cd system-tests
945-
DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh CROSSED_TRACING_LIBRARIES
921+
DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh INTEGRATIONS
946922
947923
- store_test_results:
948924
path: system-tests/logs_integrations
@@ -975,7 +951,7 @@ jobs:
975951
no_output_timeout: 5m
976952
command: |
977953
cd system-tests
978-
export DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY
954+
export DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY
979955
./run.sh DEBUGGER_SCENARIOS
980956
981957
- run:

‎.github/workflows/README.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,14 @@ _Action:_ Create a PR updating the Grade dependencies and their locking files.
129129

130130
_Recovery:_ Manually trigger the action again.
131131

132+
### run-system-tests [🔗](run-system-tests.yaml)
133+
134+
_Trigger:_ When pushing commits to `master` or manually.
135+
136+
_Action:_ Build the Java Client Library and runs [the system tests](https://github.com/DataDog/system-tests) against.
137+
138+
_Recovery:_ Manually trigger the action on the desired branch.
139+
132140

133141
## Maintenance
134142

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
run: |
4444
echo "${{ steps.get-release-version.outputs.VERSION }}: ${{ steps.get-release-url.outputs.URL }}" >> index.yml
4545
- name: Commit and push changes
46-
uses: planetscale/ghcommit-action@b1cac81e65b25c96bc767d2b726b6a6e10d226d0 # v0.2.10
46+
uses: planetscale/ghcommit-action@5b20c92facae8dbf8a3836dc65b8503dda378573 # v0.2.13
4747
with:
4848
commit_message: "chore: Add version ${{ steps.get-release-version.outputs.VERSION }} to Cloud Foundry"
4949
repo: ${{ github.repository }}

‎.github/workflows/analyze-changes.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
${{ runner.os }}-gradle-
4141
4242
- name: Initialize CodeQL
43-
uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
43+
uses: github/codeql-action/init@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
4444
with:
4545
languages: 'java'
4646
build-mode: 'manual'
@@ -57,7 +57,7 @@ jobs:
5757
--build-cache --parallel --stacktrace --no-daemon --max-workers=4
5858
5959
- name: Perform CodeQL Analysis and upload results to GitHub Security tab
60-
uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
60+
uses: github/codeql-action/analyze@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
6161

6262
trivy:
6363
name: Analyze changes with Trivy
@@ -120,7 +120,7 @@ jobs:
120120
TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db
121121

122122
- name: Upload Trivy scan results to GitHub Security tab
123-
uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
123+
uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
124124
if: always()
125125
with:
126126
sarif_file: 'trivy-results.sarif'

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,12 @@ jobs:
125125
}
126126
function cleanUpTitle(title) {
127127
// Remove tags between brackets
128-
return title.replace(/\[[^\]]+\]/g, '')
128+
title = title.replace(/\[[^\]]+\]/g, '')
129+
// Remove cherry-pick prefix
130+
if (title.startsWith('🍒 ') && title.includes(' - ')) {
131+
title = title.substring(title.indexOf(' - ') + 3)
132+
}
133+
return title
129134
}
130135
function format(pullRequest) {
131136
var line = `${decorate(pullRequest)}${cleanUpTitle(pullRequest.title)} (#${pullRequest.number} - @${pullRequest.user.login}`

‎.github/workflows/system-tests.yaml‎ renamed to ‎.github/workflows/run-system-tests.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: system-tests
1+
name: Run system tests
22

33
on:
44
pull_request:
@@ -21,18 +21,18 @@ jobs:
2121
fetch-depth: 0
2222

2323
- name: Cache Gradle dependencies
24-
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
24+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
2525
with:
2626
path: |
2727
~/.gradle/caches
2828
~/.gradle/wrapper
2929
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
3030
restore-keys: |
3131
${{ runner.os }}-gradle-
32-
32+
3333
- name: Build dd-trace-java
3434
run: |
35-
GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx2G -Xms2G'" \
35+
GRADLE_OPTS="-Xms2g -Xmx4g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC" \
3636
JAVA_HOME=$JAVA_HOME_8_X64 \
3737
JAVA_8_HOME=$JAVA_HOME_8_X64 \
3838
JAVA_11_HOME=$JAVA_HOME_11_X64 \
@@ -60,5 +60,5 @@ jobs:
6060
binaries_artifact: binaries
6161
desired_execution_time: 900 # 15 minutes
6262
scenarios_groups: tracer-release
63-
excluded_scenarios: CROSSED_TRACING_LIBRARIES,INTEGRATIONS_AWS # require AWS credentials
63+
excluded_scenarios: CROSSED_TRACING_LIBRARIES,INTEGRATIONS_AWS,APM_TRACING_E2E_OTEL,APM_TRACING_E2E_SINGLE_SPAN,PROFILING # require AWS and datadog credentials
6464
skip_empty_scenarios: true

‎communication/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ jaxen:jaxen:1.2.0=spotbugs
5555
jline:jline:2.14.6=testRuntimeClasspath
5656
junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath
5757
junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
58-
net.bytebuddy:byte-buddy-agent:1.14.18=testCompileClasspath,testRuntimeClasspath
59-
net.bytebuddy:byte-buddy:1.14.18=testCompileClasspath,testRuntimeClasspath
58+
net.bytebuddy:byte-buddy-agent:1.15.11=testCompileClasspath,testRuntimeClasspath
59+
net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testRuntimeClasspath
6060
net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
6161
net.sf.saxon:Saxon-HE:11.4=spotbugs
6262
org.apache.ant:ant-antlr:1.10.12=testRuntimeClasspath

‎components/yaml/src/main/java/datadog/yaml/YamlParser.java‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
package datadog.yaml;
22

3-
import java.io.FileInputStream;
4-
import java.io.IOException;
53
import org.yaml.snakeyaml.Yaml;
64

75
public class YamlParser {
86
// Supports clazz == null for default yaml parsing
9-
public static <T> T parse(String filePath, Class<T> clazz) throws IOException {
7+
public static <T> T parse(String content, Class<T> clazz) {
108
Yaml yaml = new Yaml();
11-
try (FileInputStream fis = new FileInputStream(filePath)) {
12-
if (clazz == null) {
13-
return yaml.load(fis);
14-
} else {
15-
return yaml.loadAs(fis, clazz);
16-
}
9+
if (clazz == null) {
10+
return yaml.load(content);
11+
} else {
12+
return yaml.loadAs(content, clazz);
1713
}
1814
}
1915
}

‎dd-java-agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ jaxen:jaxen:1.2.0=spotbugs
4545
jline:jline:2.14.6=jmhRuntimeClasspath,testRuntimeClasspath
4646
junit:junit-dep:4.11=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
4747
junit:junit:4.13.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
48-
net.bytebuddy:byte-buddy-agent:1.14.18=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
49-
net.bytebuddy:byte-buddy:1.14.18=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
48+
net.bytebuddy:byte-buddy-agent:1.15.11=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
49+
net.bytebuddy:byte-buddy:1.15.11=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
5050
net.java.dev.jna:jna-platform:5.8.0=jmhRuntimeClasspath,testRuntimeClasspath
5151
net.java.dev.jna:jna:5.8.0=jmhRuntimeClasspath,testRuntimeClasspath
5252
net.jcip:jcip-annotations:1.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
@@ -134,16 +134,16 @@ org.ow2.asm:asm-analysis:9.2=jmhRuntimeClasspath,testRuntimeClasspath
134134
org.ow2.asm:asm-analysis:9.4=spotbugs
135135
org.ow2.asm:asm-commons:7.2=jacocoAnt
136136
org.ow2.asm:asm-commons:9.4=spotbugs
137-
org.ow2.asm:asm-commons:9.7.1=jmhRuntimeClasspath,testRuntimeClasspath
137+
org.ow2.asm:asm-commons:9.8=jmhRuntimeClasspath,testRuntimeClasspath
138138
org.ow2.asm:asm-tree:7.2=jacocoAnt
139139
org.ow2.asm:asm-tree:9.4=spotbugs
140-
org.ow2.asm:asm-tree:9.7.1=jmhRuntimeClasspath,testRuntimeClasspath
140+
org.ow2.asm:asm-tree:9.8=jmhRuntimeClasspath,testRuntimeClasspath
141141
org.ow2.asm:asm-util:9.2=jmhRuntimeClasspath,testRuntimeClasspath
142142
org.ow2.asm:asm-util:9.4=spotbugs
143143
org.ow2.asm:asm:7.2=jacocoAnt
144144
org.ow2.asm:asm:9.0=jmh,jmhCompileClasspath
145145
org.ow2.asm:asm:9.4=spotbugs
146-
org.ow2.asm:asm:9.7.1=jmhRuntimeClasspath,testRuntimeClasspath
146+
org.ow2.asm:asm:9.8=jmhRuntimeClasspath,testRuntimeClasspath
147147
org.pitest:pitest-command-line:1.9.11=pitest
148148
org.pitest:pitest-entry:1.9.11=pitest
149149
org.pitest:pitest:1.9.11=pitest

‎dd-java-agent/agent-builder/gradle.lockfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ jaxen:jaxen:1.2.0=spotbugs
4545
jline:jline:2.14.6=testRuntimeClasspath
4646
junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath
4747
junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
48-
net.bytebuddy:byte-buddy-agent:1.14.18=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
49-
net.bytebuddy:byte-buddy:1.14.18=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
48+
net.bytebuddy:byte-buddy-agent:1.15.11=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
49+
net.bytebuddy:byte-buddy:1.15.11=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5050
net.java.dev.jna:jna-platform:5.8.0=runtimeClasspath,testRuntimeClasspath
5151
net.java.dev.jna:jna:5.8.0=runtimeClasspath,testRuntimeClasspath
5252
net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
@@ -129,17 +129,17 @@ org.ow2.asm:asm-analysis:9.4=spotbugs
129129
org.ow2.asm:asm-commons:7.2=jacocoAnt
130130
org.ow2.asm:asm-commons:9.2=runtimeClasspath
131131
org.ow2.asm:asm-commons:9.4=spotbugs
132-
org.ow2.asm:asm-commons:9.7.1=testRuntimeClasspath
132+
org.ow2.asm:asm-commons:9.8=testRuntimeClasspath
133133
org.ow2.asm:asm-tree:7.2=jacocoAnt
134134
org.ow2.asm:asm-tree:9.2=runtimeClasspath
135135
org.ow2.asm:asm-tree:9.4=spotbugs
136-
org.ow2.asm:asm-tree:9.7.1=testRuntimeClasspath
136+
org.ow2.asm:asm-tree:9.8=testRuntimeClasspath
137137
org.ow2.asm:asm-util:9.2=runtimeClasspath,testRuntimeClasspath
138138
org.ow2.asm:asm-util:9.4=spotbugs
139139
org.ow2.asm:asm:7.2=jacocoAnt
140140
org.ow2.asm:asm:9.2=runtimeClasspath
141141
org.ow2.asm:asm:9.4=spotbugs
142-
org.ow2.asm:asm:9.7.1=testRuntimeClasspath
142+
org.ow2.asm:asm:9.8=testRuntimeClasspath
143143
org.pitest:pitest-command-line:1.9.11=pitest
144144
org.pitest:pitest-entry:1.9.11=pitest
145145
org.pitest:pitest:1.9.11=pitest

0 commit comments

Comments
 (0)