Skip to content

Commit b7806c6

Browse files
mtoffl01mtoffl01
committed
Merge branch 'mtoff/stable_cfg_2' of github.com:DataDog/dd-trace-java into mtoff/stable_cfg_2
2 parents 4bcef0c + dd40811 commit b7806c6

File tree

559 files changed

+3484
-1798
lines changed

Some content is hidden

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

559 files changed

+3484
-1798
lines changed

‎.circleci/config.continue.yml.j2

+18-1
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 1ef00a34ad1f83ae999887e510ef1ea1c27b151b
39+
default_system_tests_commit: &default_system_tests_commit 1de04c42cbd9783432258004e46eb5982bbc9fe5
4040

4141
parameters:
4242
nightly:
@@ -1333,6 +1333,7 @@ build_test_jobs: &build_test_jobs
13331333
matrix:
13341334
<<: *test_matrix
13351335
1336+
{% if ssi_smoke %}
13361337
- tests:
13371338
requires:
13381339
- ok_to_test
@@ -1346,6 +1347,7 @@ build_test_jobs: &build_test_jobs
13461347
maxWorkers: 3
13471348
matrix:
13481349
<<: *test_matrix
1350+
{% endif %}
13491351
13501352
- tests:
13511353
requires:
@@ -1389,6 +1391,7 @@ build_test_jobs: &build_test_jobs
13891391
maxWorkers: 3
13901392
testJvm: "8"
13911393
1394+
{% if ssi_smoke %}
13921395
- tests:
13931396
requires:
13941397
- ok_to_test
@@ -1401,13 +1404,16 @@ build_test_jobs: &build_test_jobs
14011404
parallelism: 4
14021405
maxWorkers: 3
14031406
testJvm: "8"
1407+
{% endif %}
14041408
14051409
- fan_in:
14061410
requires:
14071411
- z_test_<< matrix.testJvm >>_base
14081412
- z_test_<< matrix.testJvm >>_inst
14091413
- z_test_<< matrix.testJvm >>_smoke
1414+
{% if ssi_smoke %}
14101415
- z_test_<< matrix.testJvm >>_ssi_smoke
1416+
{% endif %}
14111417
name: test_<< matrix.testJvm >>
14121418
stage: tracing
14131419
matrix:
@@ -1418,7 +1424,9 @@ build_test_jobs: &build_test_jobs
14181424
- z_test_8_base
14191425
- z_test_8_inst
14201426
- z_test_8_smoke
1427+
{% if ssi_smoke %}
14211428
- z_test_8_ssi_smoke
1429+
{% endif %}
14221430
name: test_8
14231431
stage: tracing
14241432
testJvm: "8"
@@ -1512,6 +1520,14 @@ build_test_jobs: &build_test_jobs
15121520
stage: required
15131521
15141522
workflows:
1523+
{% if skip_circleci %}
1524+
build_test:
1525+
jobs:
1526+
# Just a "required" job to make GitHub PR checks happy, and run nothing else.
1527+
- fan_in:
1528+
name: required
1529+
stage: required
1530+
{% else %}
15151531
{% if is_regular %}
15161532
build_test:
15171533
jobs:
@@ -1552,3 +1568,4 @@ workflows:
15521568
gradleTarget: :profilingTest
15531569
cacheType: profiling
15541570
{% endif %}
1571+
{% endif %}

‎.circleci/no_circleci_changes.sh

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env bash
2+
set -eu
3+
git diff --name-only "$1" | grep --invert-match --quiet -E '^(.gitlab-ci.yml|.gitlab)'

‎.circleci/render_config.py

+13-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import os
44
import os.path
5+
import subprocess
56
import time
67

78
import jinja2
@@ -14,9 +15,10 @@
1415
GENERATED_CONFIG_PATH = os.path.join(SCRIPT_DIR, OUT_FILENAME)
1516

1617
# JDKs that will run on every pipeline.
17-
ALWAYS_ON_JDKS = {"8", "11", "17", "21"}
18+
ALWAYS_ON_JDKS = {"8", "17", "21"}
1819
# And these will run only in master and release/ branches.
1920
MASTER_ONLY_JDKS = {
21+
"11",
2022
"ibm8",
2123
"oracle8",
2224
"semeru8",
@@ -74,6 +76,13 @@
7476
run_all = "all" in labels
7577
is_master_or_release = branch == "master" or branch.startswith("release/v")
7678

79+
skip_circleci = False
80+
if pr_base_ref:
81+
ret = subprocess.call([".circleci/no_circleci_changes.sh", f"{pr_base_ref}..HEAD"], shell=False)
82+
if ret == 1:
83+
# Only GitLab-related files have changed, just skip Circle CI jobs.
84+
skip_circleci = True
85+
7786
if is_master_or_release or run_all:
7887
all_jdks = ALWAYS_ON_JDKS | MASTER_ONLY_JDKS
7988
else:
@@ -99,10 +108,12 @@
99108
"all_jdks": all_jdks,
100109
"all_debugger_jdks": all_debugger_jdks,
101110
"nocov_jdks": nocov_jdks,
102-
"flaky": branch == "master" or "flaky" in labels or "all" in labels,
111+
"flaky": "flaky" in labels or "all" in labels,
103112
"docker_image_prefix": "" if is_nightly else f"{DOCKER_IMAGE_VERSION}-",
104113
"use_git_changes": use_git_changes,
105114
"pr_base_ref": pr_base_ref,
115+
"skip_circleci": skip_circleci,
116+
"ssi_smoke": is_regular and is_master_or_release
106117
}
107118

108119
print(f"Variables for this build: {vars}")

‎communication/gradle.lockfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ org.slf4j:slf4j-api:1.7.30=compileClasspath,runtimeClasspath,testCompileClasspat
157157
org.slf4j:slf4j-api:1.7.32=testRuntimeClasspath
158158
org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
159159
org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
160-
org.spockframework:spock-core:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath
161-
org.spockframework:spock-junit4:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath
160+
org.spockframework:spock-core:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
161+
org.spockframework:spock-junit4:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
162162
org.testng:testng:7.5=testRuntimeClasspath
163163
org.webjars:jquery:3.5.1=testRuntimeClasspath
164164
org.xmlresolver:xmlresolver:4.4.3=spotbugs

‎components/cli/gradle.lockfile

+118
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
# This is a Gradle generated file for dependency locking.
2+
# Manual edits can break the build and are not advised.
3+
# This file is expected to be part of source control.
4+
ch.qos.logback:logback-classic:1.2.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
5+
ch.qos.logback:logback-core:1.2.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
6+
com.beust:jcommander:1.78=jmhRuntimeClasspath,testRuntimeClasspath
7+
com.github.javaparser:javaparser-core:3.25.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
8+
com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
9+
com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs
10+
com.github.spotbugs:spotbugs:4.7.3=spotbugs
11+
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
12+
com.google.code.gson:gson:2.9.1=spotbugs
13+
com.thoughtworks.qdox:qdox:1.12.1=jmhRuntimeClasspath,testRuntimeClasspath
14+
commons-codec:commons-codec:1.15=spotbugs
15+
de.thetaphi:forbiddenapis:3.8=compileClasspath,jmhCompileClasspath
16+
info.picocli:picocli:4.6.3=jmhRuntimeClasspath,testRuntimeClasspath
17+
jaxen:jaxen:1.2.0=spotbugs
18+
jline:jline:2.14.6=jmhRuntimeClasspath,testRuntimeClasspath
19+
junit:junit:4.13.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
20+
net.jcip:jcip-annotations:1.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
21+
net.sf.jopt-simple:jopt-simple:5.0.4=jmh,jmhCompileClasspath,jmhRuntimeClasspath
22+
net.sf.saxon:Saxon-HE:11.4=spotbugs
23+
org.apache.ant:ant-antlr:1.10.12=jmhRuntimeClasspath,testRuntimeClasspath
24+
org.apache.ant:ant-antlr:1.9.15=codenarc
25+
org.apache.ant:ant-junit:1.10.12=jmhRuntimeClasspath,testRuntimeClasspath
26+
org.apache.ant:ant-junit:1.9.15=codenarc
27+
org.apache.ant:ant-launcher:1.10.12=jmhRuntimeClasspath,testRuntimeClasspath
28+
org.apache.ant:ant:1.10.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
29+
org.apache.bcel:bcel:6.5.0=spotbugs
30+
org.apache.commons:commons-lang3:3.12.0=pitest,spotbugs
31+
org.apache.commons:commons-math3:3.2=jmh,jmhCompileClasspath,jmhRuntimeClasspath
32+
org.apache.commons:commons-text:1.10.0=pitest,spotbugs
33+
org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs
34+
org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
35+
org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
36+
org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
37+
org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
38+
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
39+
org.codehaus.groovy:groovy-all:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
40+
org.codehaus.groovy:groovy-ant:2.5.14=codenarc
41+
org.codehaus.groovy:groovy-ant:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
42+
org.codehaus.groovy:groovy-astbuilder:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
43+
org.codehaus.groovy:groovy-cli-picocli:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
44+
org.codehaus.groovy:groovy-console:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
45+
org.codehaus.groovy:groovy-datetime:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
46+
org.codehaus.groovy:groovy-docgenerator:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
47+
org.codehaus.groovy:groovy-groovydoc:2.5.14=codenarc
48+
org.codehaus.groovy:groovy-groovydoc:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
49+
org.codehaus.groovy:groovy-groovysh:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
50+
org.codehaus.groovy:groovy-jmx:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
51+
org.codehaus.groovy:groovy-json:2.5.14=codenarc
52+
org.codehaus.groovy:groovy-json:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
53+
org.codehaus.groovy:groovy-jsr223:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
54+
org.codehaus.groovy:groovy-macro:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
55+
org.codehaus.groovy:groovy-nio:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
56+
org.codehaus.groovy:groovy-servlet:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
57+
org.codehaus.groovy:groovy-sql:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
58+
org.codehaus.groovy:groovy-swing:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
59+
org.codehaus.groovy:groovy-templates:2.5.14=codenarc
60+
org.codehaus.groovy:groovy-templates:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
61+
org.codehaus.groovy:groovy-test-junit5:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
62+
org.codehaus.groovy:groovy-test:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
63+
org.codehaus.groovy:groovy-testng:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
64+
org.codehaus.groovy:groovy-xml:2.5.14=codenarc
65+
org.codehaus.groovy:groovy-xml:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
66+
org.codehaus.groovy:groovy:2.5.14=codenarc
67+
org.codehaus.groovy:groovy:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
68+
org.codenarc:CodeNarc:2.2.0=codenarc
69+
org.dom4j:dom4j:2.1.3=spotbugs
70+
org.gmetrics:GMetrics:1.1=codenarc
71+
org.hamcrest:hamcrest-core:1.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
72+
org.hamcrest:hamcrest:2.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
73+
org.jacoco:org.jacoco.agent:0.8.5=jacocoAgent,jacocoAnt
74+
org.jacoco:org.jacoco.ant:0.8.5=jacocoAnt
75+
org.jacoco:org.jacoco.core:0.8.5=jacocoAnt
76+
org.jacoco:org.jacoco.report:0.8.5=jacocoAnt
77+
org.junit.jupiter:junit-jupiter-api:5.9.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
78+
org.junit.jupiter:junit-jupiter-engine:5.9.2=jmhRuntimeClasspath,testRuntimeClasspath
79+
org.junit.jupiter:junit-jupiter-params:5.9.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
80+
org.junit.jupiter:junit-jupiter:5.9.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
81+
org.junit.platform:junit-platform-commons:1.9.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
82+
org.junit.platform:junit-platform-engine:1.9.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
83+
org.junit.platform:junit-platform-launcher:1.9.2=jmhRuntimeClasspath,testRuntimeClasspath
84+
org.junit:junit-bom:5.9.1=spotbugs
85+
org.junit:junit-bom:5.9.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
86+
org.objenesis:objenesis:3.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
87+
org.openjdk.jmh:jmh-core:1.36=jmh,jmhCompileClasspath,jmhRuntimeClasspath
88+
org.openjdk.jmh:jmh-generator-asm:1.36=jmh,jmhCompileClasspath,jmhRuntimeClasspath
89+
org.openjdk.jmh:jmh-generator-bytecode:1.36=jmh,jmhCompileClasspath,jmhRuntimeClasspath
90+
org.openjdk.jmh:jmh-generator-reflection:1.36=jmh,jmhCompileClasspath,jmhRuntimeClasspath
91+
org.opentest4j:opentest4j:1.2.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
92+
org.ow2.asm:asm-analysis:7.2=jacocoAnt
93+
org.ow2.asm:asm-analysis:9.4=spotbugs
94+
org.ow2.asm:asm-commons:7.2=jacocoAnt
95+
org.ow2.asm:asm-commons:9.4=spotbugs
96+
org.ow2.asm:asm-tree:7.2=jacocoAnt
97+
org.ow2.asm:asm-tree:9.4=spotbugs
98+
org.ow2.asm:asm-util:9.4=spotbugs
99+
org.ow2.asm:asm:7.2=jacocoAnt
100+
org.ow2.asm:asm:9.0=jmh,jmhCompileClasspath,jmhRuntimeClasspath
101+
org.ow2.asm:asm:9.4=spotbugs
102+
org.pitest:pitest-command-line:1.9.11=pitest
103+
org.pitest:pitest-entry:1.9.11=pitest
104+
org.pitest:pitest:1.9.11=pitest
105+
org.slf4j:jcl-over-slf4j:1.7.30=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
106+
org.slf4j:jul-to-slf4j:1.7.30=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
107+
org.slf4j:log4j-over-slf4j:1.7.30=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
108+
org.slf4j:slf4j-api:1.7.30=testCompileClasspath
109+
org.slf4j:slf4j-api:1.7.32=jmhRuntimeClasspath,testRuntimeClasspath
110+
org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
111+
org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
112+
org.spockframework:spock-core:2.3-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
113+
org.spockframework:spock-junit4:2.3-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
114+
org.testng:testng:7.5=jmhRuntimeClasspath,testRuntimeClasspath
115+
org.webjars:jquery:3.5.1=jmhRuntimeClasspath,testRuntimeClasspath
116+
org.xmlresolver:xmlresolver:4.4.3=spotbugs
117+
xml-apis:xml-apis:1.4.01=spotbugs
118+
empty=annotationProcessor,jmhAnnotationProcessor,runtimeClasspath,spotbugsPlugins,testAnnotationProcessor

‎components/context/gradle.lockfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ org.slf4j:slf4j-api:1.7.30=testCompileClasspath
109109
org.slf4j:slf4j-api:1.7.32=jmhRuntimeClasspath,testRuntimeClasspath
110110
org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
111111
org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
112-
org.spockframework:spock-core:2.2-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
113-
org.spockframework:spock-junit4:2.2-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
112+
org.spockframework:spock-core:2.3-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
113+
org.spockframework:spock-junit4:2.3-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
114114
org.testng:testng:7.5=jmhRuntimeClasspath,testRuntimeClasspath
115115
org.webjars:jquery:3.5.1=jmhRuntimeClasspath,testRuntimeClasspath
116116
org.xmlresolver:xmlresolver:4.4.3=spotbugs

‎components/json/gradle.lockfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ org.slf4j:slf4j-api:1.7.30=testCompileClasspath
109109
org.slf4j:slf4j-api:1.7.32=jmhRuntimeClasspath,testRuntimeClasspath
110110
org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
111111
org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
112-
org.spockframework:spock-core:2.2-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
113-
org.spockframework:spock-junit4:2.2-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
112+
org.spockframework:spock-core:2.3-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
113+
org.spockframework:spock-junit4:2.3-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
114114
org.testng:testng:7.5=jmhRuntimeClasspath,testRuntimeClasspath
115115
org.webjars:jquery:3.5.1=jmhRuntimeClasspath,testRuntimeClasspath
116116
org.xmlresolver:xmlresolver:4.4.3=spotbugs

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ org.slf4j:slf4j-api:1.7.30=compileClasspath,jmhCompileClasspath,main_java11Compi
154154
org.slf4j:slf4j-api:1.7.32=jmhRuntimeClasspath,testRuntimeClasspath
155155
org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
156156
org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
157-
org.spockframework:spock-core:2.2-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
158-
org.spockframework:spock-junit4:2.2-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
157+
org.spockframework:spock-core:2.3-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
158+
org.spockframework:spock-junit4:2.3-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
159159
org.testng:testng:7.5=jmhRuntimeClasspath,testRuntimeClasspath
160160
org.webjars:jquery:3.5.1=jmhRuntimeClasspath,testRuntimeClasspath
161161
org.xmlresolver:xmlresolver:4.4.3=spotbugs

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/WebsocketDecorator.java

+1
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ private AgentSpan onFrameStart(
138138
if (useDedicatedTraces) {
139139
wsSpan = startSpan(WEBSOCKET.toString(), operationName, null);
140140
if (inheritSampling) {
141+
wsSpan.copyPropagationAndBaggage(handshakeSpan);
141142
wsSpan.setTag(DECISION_MAKER_INHERITED, 1);
142143
wsSpan.setTag(DECISION_MAKER_SERVICE, handshakeSpan.getServiceName());
143144
wsSpan.setTag(DECISION_MAKER_RESOURCE, handshakeSpan.getResourceName());

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ org.slf4j:slf4j-api:1.7.30=compileClasspath,main_java11CompileClasspath,runtimeC
150150
org.slf4j:slf4j-api:1.7.32=testRuntimeClasspath
151151
org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
152152
org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
153-
org.spockframework:spock-core:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath
154-
org.spockframework:spock-junit4:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath
153+
org.spockframework:spock-core:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
154+
org.spockframework:spock-junit4:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
155155
org.testng:testng:7.5=testRuntimeClasspath
156156
org.webjars:jquery:3.5.1=testRuntimeClasspath
157157
org.xmlresolver:xmlresolver:4.4.3=spotbugs

‎dd-java-agent/agent-ci-visibility/gradle.lockfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@ org.slf4j:slf4j-api:1.7.30=apiDependenciesMetadata,compileClasspath,implementati
224224
org.slf4j:slf4j-api:1.7.36=testFixturesRuntimeClasspath,testRuntimeClasspath
225225
org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
226226
org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
227-
org.spockframework:spock-core:2.2-groovy-3.0=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
228-
org.spockframework:spock-junit4:2.2-groovy-3.0=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
227+
org.spockframework:spock-core:2.3-groovy-3.0=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
228+
org.spockframework:spock-junit4:2.3-groovy-3.0=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
229229
org.testng:testng:7.5=testFixturesRuntimeClasspath,testRuntimeClasspath
230230
org.webjars:jquery:3.5.1=testFixturesRuntimeClasspath,testRuntimeClasspath
231231
org.xmlresolver:xmlresolver:4.4.3=spotbugs

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ org.slf4j:slf4j-api:1.7.30=compileClasspath,runtimeClasspath,testCompileClasspat
132132
org.slf4j:slf4j-api:1.7.32=testRuntimeClasspath
133133
org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
134134
org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
135-
org.spockframework:spock-core:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath
136-
org.spockframework:spock-junit4:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath
135+
org.spockframework:spock-core:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
136+
org.spockframework:spock-junit4:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
137137
org.testng:testng:7.5=testRuntimeClasspath
138138
org.webjars:jquery:3.5.1=testRuntimeClasspath
139139
org.xmlresolver:xmlresolver:4.4.3=spotbugs

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ org.slf4j:slf4j-api:1.7.30=compileClasspath,runtimeClasspath,testCompileClasspat
103103
org.slf4j:slf4j-api:1.7.32=testRuntimeClasspath
104104
org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
105105
org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
106-
org.spockframework:spock-core:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath
107-
org.spockframework:spock-junit4:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath
106+
org.spockframework:spock-core:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
107+
org.spockframework:spock-junit4:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
108108
org.testng:testng:7.5=testRuntimeClasspath
109109
org.webjars:jquery:3.5.1=testRuntimeClasspath
110110
org.xmlresolver:xmlresolver:4.4.3=spotbugs

0 commit comments

Comments
 (0)