Merge branch 'dougqh/guardrails-telemetry' of https://github.com/DataDog/dd-trace-java into dougqh/guardrails-telemetry

Author: dougqh

.gitlab-ci.yml

@@ -206,6 +206,9 @@ deploy_artifacts_to_github:
     - gh release upload --clobber --repo DataDog/dd-trace-java $CI_COMMIT_TAG workspace/dd-java-agent/build/libs/dd-java-agent-${VERSION}.jar
     - gh release upload --clobber --repo DataDog/dd-trace-java $CI_COMMIT_TAG workspace/dd-trace-api/build/libs/dd-trace-api-${VERSION}.jar
     - gh release upload --clobber --repo DataDog/dd-trace-java $CI_COMMIT_TAG workspace/dd-trace-ot/build/libs/dd-trace-ot-${VERSION}.jar
+  retry:
+    max: 2
+    when: always
 
 package-oci:
   needs: [ build ]

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

@@ -11,7 +11,7 @@ com.datadoghq.okhttp3:okhttp:3.12.15=jmhRuntimeClasspath,testCompileClasspath,te
 com.datadoghq.okio:okio:1.17.6=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.datadoghq:java-dogstatsd-client:4.4.0=jmhRuntimeClasspath,testRuntimeClasspath
-com.datadoghq:sketches-java:0.8.2=jmhRuntimeClasspath,testRuntimeClasspath
+com.datadoghq:sketches-java:0.8.3=jmhRuntimeClasspath,testRuntimeClasspath
 com.github.javaparser:javaparser-core:3.25.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.jnr:jffi:1.3.13=jmhRuntimeClasspath,testRuntimeClasspath
 com.github.jnr:jnr-a64asm:1.0.0=jmhRuntimeClasspath,testRuntimeClasspath
@@ -45,8 +45,8 @@ jaxen:jaxen:1.2.0=spotbugs
 jline:jline:2.14.6=jmhRuntimeClasspath,testRuntimeClasspath
 junit:junit-dep:4.11=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 junit:junit:4.13.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.14.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.14.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.14.16=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.14.16=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.java.dev.jna:jna-platform:5.8.0=jmhRuntimeClasspath,testRuntimeClasspath
 net.java.dev.jna:jna:5.8.0=jmhRuntimeClasspath,testRuntimeClasspath
 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
 org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
 org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
 org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
-org.apiguardian:apiguardian-api:1.1.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.codehaus.groovy:groovy-all:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.groovy:groovy-ant:2.5.14=codenarc
 org.codehaus.groovy:groovy-ant:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath

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

@@ -53,6 +53,7 @@
 import java.util.EnumSet;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.regex.PatternSyntaxException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -1345,6 +1346,14 @@ private static boolean isDataJobsSupported(String javaCommand, String dataJobsCo
       return true;
     }
 
-    return javaCommand.matches(dataJobsCommandPattern);
+    try {
+      return javaCommand.matches(dataJobsCommandPattern);
+    } catch (PatternSyntaxException e) {
+      log.warn(
+          "Invalid data jobs command pattern {}. The value must be a valid regex",
+          dataJobsCommandPattern);
+    }
+
+    return true;
   }
 }

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

@@ -87,7 +87,7 @@ public Builder type(String type) {
       this.type = type;
       // Those DBs use the full text of the query including the comments as a cache key,
       // so we disable full propagation support for them to avoid destroying the cache.
-      if (type.equals("oracle") || type.equals("sqlserver")) this.fullPropagationSupport = false;
+      if (type.equals("oracle")) this.fullPropagationSupport = false;
       return this;
     }
 

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

@@ -11,7 +11,7 @@ com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,main_java11CompileClasspat
 com.datadoghq.okio:okio:1.17.6=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testRuntimeClasspath
-com.datadoghq:sketches-java:0.8.2=runtimeClasspath,testRuntimeClasspath
+com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath
 com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath
 com.github.jnr:jffi:1.3.13=runtimeClasspath,testRuntimeClasspath
 com.github.jnr:jnr-a64asm:1.0.0=runtimeClasspath,testRuntimeClasspath
@@ -45,8 +45,8 @@ jaxen:jaxen:1.2.0=spotbugs
 jline:jline:2.14.6=testRuntimeClasspath
 junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath
 junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.14.13=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.14.13=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.14.16=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.14.16=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.java.dev.jna:jna-platform:5.8.0=runtimeClasspath,testRuntimeClasspath
 net.java.dev.jna:jna:5.8.0=runtimeClasspath,testRuntimeClasspath
 net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
@@ -65,7 +65,7 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
 org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
 org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
 org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testRuntimeClasspath
+org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath
 org.codehaus.groovy:groovy-ant:2.5.14=codenarc
 org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath