Skip to content

Commit a9ffb10

Browse files
dougqhdougqh
authored
Merge branch 'master' into dougqh/guardrails-telemetry
2 parents 319b87b + 8b3304e commit a9ffb10

File tree

558 files changed

+9916
-3311
lines changed

Some content is hidden

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

558 files changed

+9916
-3311
lines changed

‎.gitlab-ci.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,9 @@ deploy_artifacts_to_github:
206206
- gh release upload --clobber --repo DataDog/dd-trace-java $CI_COMMIT_TAG workspace/dd-java-agent/build/libs/dd-java-agent-${VERSION}.jar
207207
- gh release upload --clobber --repo DataDog/dd-trace-java $CI_COMMIT_TAG workspace/dd-trace-api/build/libs/dd-trace-api-${VERSION}.jar
208208
- gh release upload --clobber --repo DataDog/dd-trace-java $CI_COMMIT_TAG workspace/dd-trace-ot/build/libs/dd-trace-ot-${VERSION}.jar
209+
retry:
210+
max: 2
211+
when: always
209212

210213
package-oci:
211214
needs: [ build ]

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ com.datadoghq.okhttp3:okhttp:3.12.15=jmhRuntimeClasspath,testCompileClasspath,te
1111
com.datadoghq.okio:okio:1.17.6=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
1212
com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1313
com.datadoghq:java-dogstatsd-client:4.4.0=jmhRuntimeClasspath,testRuntimeClasspath
14-
com.datadoghq:sketches-java:0.8.2=jmhRuntimeClasspath,testRuntimeClasspath
14+
com.datadoghq:sketches-java:0.8.3=jmhRuntimeClasspath,testRuntimeClasspath
1515
com.github.javaparser:javaparser-core:3.25.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
1616
com.github.jnr:jffi:1.3.13=jmhRuntimeClasspath,testRuntimeClasspath
1717
com.github.jnr:jnr-a64asm:1.0.0=jmhRuntimeClasspath,testRuntimeClasspath
@@ -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.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
49-
net.bytebuddy:byte-buddy:1.14.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
48+
net.bytebuddy:byte-buddy-agent:1.14.16=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
49+
net.bytebuddy:byte-buddy:1.14.16=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
@@ -67,7 +67,7 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
6767
org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
6868
org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
6969
org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
70-
org.apiguardian:apiguardian-api:1.1.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
70+
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
7171
org.codehaus.groovy:groovy-all:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
7272
org.codehaus.groovy:groovy-ant:2.5.14=codenarc
7373
org.codehaus.groovy:groovy-ant:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
import java.util.EnumSet;
5454
import java.util.concurrent.TimeUnit;
5555
import java.util.concurrent.atomic.AtomicBoolean;
56+
import java.util.regex.PatternSyntaxException;
5657
import org.slf4j.Logger;
5758
import org.slf4j.LoggerFactory;
5859

@@ -1345,6 +1346,14 @@ private static boolean isDataJobsSupported(String javaCommand, String dataJobsCo
13451346
return true;
13461347
}
13471348

1348-
return javaCommand.matches(dataJobsCommandPattern);
1349+
try {
1350+
return javaCommand.matches(dataJobsCommandPattern);
1351+
} catch (PatternSyntaxException e) {
1352+
log.warn(
1353+
"Invalid data jobs command pattern {}. The value must be a valid regex",
1354+
dataJobsCommandPattern);
1355+
}
1356+
1357+
return true;
13491358
}
13501359
}

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public Builder type(String type) {
8787
this.type = type;
8888
// Those DBs use the full text of the query including the comments as a cache key,
8989
// so we disable full propagation support for them to avoid destroying the cache.
90-
if (type.equals("oracle") || type.equals("sqlserver")) this.fullPropagationSupport = false;
90+
if (type.equals("oracle")) this.fullPropagationSupport = false;
9191
return this;
9292
}
9393

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/span_origin/EntrySpanOriginInfo.java‎

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

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/span_origin/ExitSpanOriginInfo.java‎

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

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/span_origin/FindFirstStackTraceElement.java‎

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

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/span_origin/LineInfo.java‎

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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,main_java11CompileClasspat
1111
com.datadoghq.okio:okio:1.17.6=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1212
com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1313
com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testRuntimeClasspath
14-
com.datadoghq:sketches-java:0.8.2=runtimeClasspath,testRuntimeClasspath
14+
com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath
1515
com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath
1616
com.github.jnr:jffi:1.3.13=runtimeClasspath,testRuntimeClasspath
1717
com.github.jnr:jnr-a64asm:1.0.0=runtimeClasspath,testRuntimeClasspath
@@ -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.13=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
49-
net.bytebuddy:byte-buddy:1.14.13=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
48+
net.bytebuddy:byte-buddy-agent:1.14.16=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
49+
net.bytebuddy:byte-buddy:1.14.16=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
@@ -65,7 +65,7 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
6565
org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
6666
org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
6767
org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
68-
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testRuntimeClasspath
68+
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
6969
org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath
7070
org.codehaus.groovy:groovy-ant:2.5.14=codenarc
7171
org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath

0 commit comments

Comments
 (0)