Merge branch 'master' into bdu/simplify-task-partition

Author: bric3

.gitlab-ci.yml

@@ -539,8 +539,8 @@ muzzle-dep-report:
   needs: [ build_tests ]
   stage: tests
   variables:
-    KUBERNETES_MEMORY_REQUEST: 17Gi
-    KUBERNETES_MEMORY_LIMIT: 17Gi
+    KUBERNETES_MEMORY_REQUEST: 20Gi
+    KUBERNETES_MEMORY_LIMIT: 20Gi
     KUBERNETES_CPU_REQUEST: 10
     GRADLE_WORKERS: 4
     GRADLE_MEM: 3G
@@ -725,7 +725,7 @@ test_smoke:
     GRADLE_PARAMS: "-PskipFlakyTests"
     CACHE_TYPE: "smoke"
   parallel:
-    matrix: *test_matrix_6
+    matrix: *test_matrix_8
 
 test_ssi_smoke:
   extends: .test_job
@@ -736,7 +736,7 @@ test_ssi_smoke:
     DD_INJECT_FORCE: "true"
     DD_INJECTION_ENABLED: "tracer"
   parallel:
-    matrix: *test_matrix_6
+    matrix: *test_matrix_8
 
 test_smoke_graalvm:
   extends: .test_job

dd-java-agent/instrumentation/jersey/jersey-client-2.0/build.gradle

@@ -3,17 +3,18 @@ muzzle {
     group = "org.glassfish.jersey.core"
     module = "jersey-client"
     versions = "[2.0,3.0.0)"
+    // There is no such file `jakarta.annotation-api-1.3.4.redhat-00002.jar`
+    // in the Maven repository: https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/jakarta/annotation/jakarta.annotation-api/1.3.4.redhat-00002/
+    excludeDependency "jakarta.annotation:jakarta.annotation-api:1.3.4.redhat-00002"
   }
 }
 
 apply from: "$rootDir/gradle/java.gradle"
 
 dependencies {
   compileOnly group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '2.0'
-
   compileOnly project(':dd-java-agent:instrumentation:rs:jax-rs:jax-rs-client:jax-rs-client-2.0')
 
   testImplementation group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '2.0'
-
   testImplementation project(':dd-java-agent:instrumentation:rs:jax-rs:jax-rs-client:jax-rs-client-2.0')
 }

dd-java-agent/instrumentation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzDecorator.java

@@ -10,6 +10,8 @@
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator;
 import org.quartz.JobExecutionContext;
+import org.quartz.JobKey;
+import org.quartz.TriggerKey;
 
 public class QuartzDecorator extends BaseDecorator {
   public static final CharSequence SCHEDULED_CALL = UTF8BytesString.create("scheduled.call");
@@ -34,11 +36,21 @@ protected CharSequence component() {
 
   public AgentSpan onExecute(final AgentSpan span, JobExecutionContext context) {
     if (context != null) {
-      span.setTag(DDTags.RESOURCE_NAME, context.getJobInstance().getClass()).toString();
-      span.setTag(QUARTZ_TRIGGER_NAME, context.getTrigger().getKey().getName());
-      span.setTag(QUARTZ_TRIGGER_GROUP, context.getTrigger().getKey().getGroup());
-      span.setTag(QUARTZ_JOB_NAME, context.getTrigger().getJobKey().getName());
-      span.setTag(QUARTZ_JOB_GROUP, context.getTrigger().getJobKey().getGroup());
+      if (context.getJobInstance() != null) {
+        span.setTag(DDTags.RESOURCE_NAME, context.getJobInstance().getClass()).toString();
+      }
+      if (context.getTrigger() != null) {
+        final TriggerKey key = context.getTrigger().getKey();
+        if (key != null) {
+          span.setTag(QUARTZ_TRIGGER_NAME, key.getName());
+          span.setTag(QUARTZ_TRIGGER_GROUP, key.getGroup());
+        }
+        final JobKey jobKey = context.getJobDetail().getKey();
+        if (jobKey != null) {
+          span.setTag(QUARTZ_JOB_NAME, jobKey.getName());
+          span.setTag(QUARTZ_JOB_GROUP, jobKey.getGroup());
+        }
+      }
     }
     return span;
   }

internal-api/src/main/java/datadog/trace/api/normalize/HttpResourceNames.java

@@ -8,6 +8,7 @@
 import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import java.util.function.Function;
+import javax.annotation.Nonnull;
 
 public class HttpResourceNames {
   public static final UTF8BytesString DEFAULT_RESOURCE_NAME = UTF8BytesString.create("/");
@@ -71,6 +72,9 @@ private HttpResourceNames() {
 
   public static AgentSpan setForServer(
       AgentSpan span, CharSequence method, CharSequence path, boolean encoded) {
+    if (path == null) {
+      return span;
+    }
     Pair<CharSequence, Byte> result = computeForServer(method, path, encoded);
     if (result.hasLeft()) {
       span.setResourceName(result.getLeft(), result.getRight());
@@ -80,7 +84,7 @@ public static AgentSpan setForServer(
   }
 
   public static Pair<CharSequence, Byte> computeForServer(
-      CharSequence method, CharSequence path, boolean encoded) {
+      CharSequence method, @Nonnull CharSequence path, boolean encoded) {
     byte priority;
 
     String resourcePath =
@@ -96,7 +100,7 @@ public static Pair<CharSequence, Byte> computeForServer(
   }
 
   public static Pair<CharSequence, Byte> computeForClient(
-      CharSequence method, CharSequence path, boolean encoded) {
+      CharSequence method, @Nonnull CharSequence path, boolean encoded) {
     byte priority;
 
     String resourcePath =
@@ -112,6 +116,9 @@ public static Pair<CharSequence, Byte> computeForClient(
 
   public static AgentSpan setForClient(
       AgentSpan span, CharSequence method, CharSequence path, boolean encoded) {
+    if (path == null) {
+      return span;
+    }
     Pair<CharSequence, Byte> result = computeForClient(method, path, encoded);
     if (result.hasLeft()) {
       span.setResourceName(result.getLeft(), result.getRight());