Merge branch 'master' into andrea.marziali/new-mule-propagate-grizzly

Author: amarziali

.gitlab/one-pipeline.locked.yml

@@ -1,4 +1,4 @@
 # DO NOT EDIT THIS FILE MANUALLY
 # This file is auto-generated by automation.
 include:
-  - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/f2050f53c1f5aed62a24e6b406c746e7d593230ce02b5d56d2a2296db763ebf4/one-pipeline.yml
+  - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/da9922e97994c97cdeca1c9a515fff18a9581a70d0cc1c921bd623c648d1caf8/one-pipeline.yml

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

@@ -26,21 +26,12 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.BitSet;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.BiFunction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public abstract class HttpClientDecorator<REQUEST, RESPONSE> extends UriBasedClientDecorator {
-  public static final LinkedHashMap<String, String> CLIENT_PATHWAY_EDGE_TAGS;
-
-  static {
-    CLIENT_PATHWAY_EDGE_TAGS = new LinkedHashMap<>(2);
-    // TODO: Refactor TagsProcessor to move it into a package that we can link the constants for.
-    CLIENT_PATHWAY_EDGE_TAGS.put("direction", "out");
-    CLIENT_PATHWAY_EDGE_TAGS.put("type", "http");
-  }
 
   private static final Logger log = LoggerFactory.getLogger(HttpClientDecorator.class);
 

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

@@ -2,7 +2,7 @@
 
 import static datadog.context.Context.root;
 import static datadog.trace.api.cache.RadixTreeCache.UNSET_STATUS;
-import static datadog.trace.api.datastreams.DataStreamsContext.fromTags;
+import static datadog.trace.api.datastreams.DataStreamsContext.forHttpServer;
 import static datadog.trace.api.gateway.Events.EVENTS;
 import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.traceConfig;
@@ -38,14 +38,14 @@
 import datadog.trace.bootstrap.instrumentation.decorator.http.ClientIpAddressResolver;
 import java.net.InetAddress;
 import java.util.BitSet;
-import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -62,15 +62,6 @@ public abstract class HttpServerDecorator<REQUEST, CONNECTION, RESPONSE, REQUEST
   public static final String DD_RESPONSE_ATTRIBUTE = "datadog.response";
   public static final String DD_IGNORE_COMMIT_ATTRIBUTE = "datadog.commit.ignore";
 
-  public static final LinkedHashMap<String, String> SERVER_PATHWAY_EDGE_TAGS;
-
-  static {
-    SERVER_PATHWAY_EDGE_TAGS = new LinkedHashMap<>(2);
-    // TODO: Refactor TagsProcessor to move it into a package that we can link the constants for.
-    SERVER_PATHWAY_EDGE_TAGS.put("direction", "in");
-    SERVER_PATHWAY_EDGE_TAGS.put("type", "http");
-  }
-
   private static final UTF8BytesString DEFAULT_RESOURCE_NAME = UTF8BytesString.create("/");
   protected static final UTF8BytesString NOT_FOUND_RESOURCE_NAME = UTF8BytesString.create("404");
   protected static final boolean SHOULD_SET_404_RESOURCE_NAME =
@@ -165,7 +156,7 @@ public AgentSpan startSpan(
     }
     AgentPropagation.ContextVisitor<REQUEST_CARRIER> getter = getter();
     if (null != carrier && null != getter) {
-      tracer().getDataStreamsMonitoring().setCheckpoint(span, fromTags(SERVER_PATHWAY_EDGE_TAGS));
+      tracer().getDataStreamsMonitoring().setCheckpoint(span, forHttpServer());
     }
     return span;
   }
@@ -191,7 +182,7 @@ public AgentSpan onRequest(
       final AgentSpan span,
       final CONNECTION connection,
       final REQUEST request,
-      final AgentSpanContext.Extracted context) {
+      @Nullable final AgentSpanContext.Extracted context) {
     Config config = Config.get();
     boolean clientIpResolverEnabled =
         config.isClientIpEnabled()

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

@@ -1,13 +1,18 @@
 package datadog.trace.bootstrap.instrumentation.decorator;
 
+import static datadog.context.propagation.Propagators.defaultPropagator;
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.traceConfig;
+
+import datadog.context.Context;
+import datadog.context.propagation.CarrierSetter;
 import datadog.trace.api.Config;
+import datadog.trace.api.datastreams.DataStreamsContext;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.Tags;
 import java.net.URI;
 import javax.annotation.Nonnull;
 
 public abstract class UriBasedClientDecorator extends ClientDecorator {
-
   public void onURI(@Nonnull final AgentSpan span, @Nonnull final URI uri) {
     String host = uri.getHost();
     int port = uri.getPort();
@@ -21,4 +26,13 @@ public void onURI(@Nonnull final AgentSpan span, @Nonnull final URI uri) {
       }
     }
   }
+
+  public <C> void injectContext(Context context, final C request, CarrierSetter<C> setter) {
+    // Add additional default DSM context for HTTP clients if missing but DSM is enabled
+    if (DataStreamsContext.fromContext(context) == null && traceConfig().isDataStreamsEnabled()) {
+      context = context.with(DataStreamsContext.forHttpClient());
+    }
+    // Inject context into carrier
+    defaultPropagator().inject(context, request, setter);
+  }
 }

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityRepoServices.java

@@ -129,7 +129,8 @@ private static PullRequestInfo buildUserPullRequestInfo(
         new PullRequestInfo(
             config.getGitPullRequestBaseBranch(),
             config.getGitPullRequestBaseBranchSha(),
-            config.getGitCommitHeadSha());
+            config.getGitCommitHeadSha(),
+            null);
 
     if (userInfo.isComplete()) {
       return userInfo;
@@ -140,7 +141,8 @@ private static PullRequestInfo buildUserPullRequestInfo(
         new PullRequestInfo(
             null,
             environment.get(Constants.DDCI_PULL_REQUEST_TARGET_SHA),
-            environment.get(Constants.DDCI_PULL_REQUEST_SOURCE_SHA));
+            environment.get(Constants.DDCI_PULL_REQUEST_SOURCE_SHA),
+            null);
 
     return PullRequestInfo.merge(userInfo, ddCiInfo);
   }

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AppVeyorInfo.java

@@ -24,17 +24,17 @@ class AppVeyorInfo implements CIProviderInfo {
   public static final String APPVEYOR_REPO_PROVIDER = "APPVEYOR_REPO_PROVIDER";
   public static final String APPVEYOR_REPO_COMMIT = "APPVEYOR_REPO_COMMIT";
   public static final String APPVEYOR_REPO_BRANCH = "APPVEYOR_REPO_BRANCH";
-  public static final String APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH =
-      "APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH";
-  public static final String APPVEYOR_PULL_REQUEST_HEAD_COMMIT =
-      "APPVEYOR_PULL_REQUEST_HEAD_COMMIT";
   public static final String APPVEYOR_REPO_TAG_NAME = "APPVEYOR_REPO_TAG_NAME";
   public static final String APPVEYOR_REPO_COMMIT_MESSAGE_SUBJECT = "APPVEYOR_REPO_COMMIT_MESSAGE";
   public static final String APPVEYOR_REPO_COMMIT_MESSAGE_BODY =
       "APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED";
   public static final String APPVEYOR_REPO_COMMIT_AUTHOR_NAME = "APPVEYOR_REPO_COMMIT_AUTHOR";
   public static final String APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL =
       "APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL";
+  public static final String APPVEYOR_PR_HEAD_REPO_BRANCH =
+      "APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH";
+  public static final String APPVEYOR_PR_HEAD_COMMIT = "APPVEYOR_PULL_REQUEST_HEAD_COMMIT";
+  public static final String APPVEYOR_PR_NUMBER = "APPVEYOR_PULL_REQUEST_NUMBER";
 
   private final CiEnvironment environment;
 
@@ -87,19 +87,20 @@ public CIInfo buildCIInfo() {
   @Override
   public PullRequestInfo buildPullRequestInfo() {
     // check if PR is detected
-    if (Strings.isNotBlank(environment.get(APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH))) {
+    if (Strings.isNotBlank(environment.get(APPVEYOR_PR_HEAD_REPO_BRANCH))) {
       return new PullRequestInfo(
           normalizeBranch(environment.get(APPVEYOR_REPO_BRANCH)),
           null,
-          environment.get(APPVEYOR_PULL_REQUEST_HEAD_COMMIT));
+          environment.get(APPVEYOR_PR_HEAD_COMMIT),
+          environment.get(APPVEYOR_PR_NUMBER));
     } else {
       return PullRequestInfo.EMPTY;
     }
   }
 
   private String buildGitBranch(final String repoProvider) {
     if ("github".equals(repoProvider)) {
-      String branch = environment.get(APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH);
+      String branch = environment.get(APPVEYOR_PR_HEAD_REPO_BRANCH);
       if (branch == null || branch.isEmpty()) {
         branch = environment.get(APPVEYOR_REPO_BRANCH);
       }

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AzurePipelinesInfo.java

@@ -40,6 +40,8 @@ class AzurePipelinesInfo implements CIProviderInfo {
   public static final String AZURE_BUILD_SOURCEVERSION_MESSAGE = "BUILD_SOURCEVERSIONMESSAGE";
   public static final String AZURE_BUILD_REQUESTED_FOR_ID = "BUILD_REQUESTEDFORID";
   public static final String AZURE_BUILD_REQUESTED_FOR_EMAIL = "BUILD_REQUESTEDFOREMAIL";
+  public static final String AZURE_PR_NUMBER = "SYSTEM_PULLREQUEST_PULLREQUESTNUMBER";
+  public static final String AZURE_PR_TARGET_BRANCH = "SYSTEM_PULLREQUEST_TARGETBRANCH";
 
   private final CiEnvironment environment;
 
@@ -85,7 +87,11 @@ public CIInfo buildCIInfo() {
   @Nonnull
   @Override
   public PullRequestInfo buildPullRequestInfo() {
-    return PullRequestInfo.EMPTY;
+    return new PullRequestInfo(
+        normalizeBranch(environment.get(AZURE_PR_TARGET_BRANCH)),
+        null,
+        null,
+        environment.get(AZURE_PR_NUMBER));
   }
 
   private String buildGitBranch() {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BitBucketInfo.java

@@ -27,6 +27,7 @@ class BitBucketInfo implements CIProviderInfo {
   public static final String BITBUCKET_GIT_BRANCH = "BITBUCKET_BRANCH";
   public static final String BITBUCKET_GIT_TAG = "BITBUCKET_TAG";
   public static final String BITBUCKET_PR_DESTINATION_BRANCH = "BITBUCKET_PR_DESTINATION_BRANCH";
+  public static final String BITBUCKET_PR_NUMBER = "BITBUCKET_PR_ID";
 
   private final CiEnvironment environment;
 
@@ -76,7 +77,10 @@ public CIInfo buildCIInfo() {
   @Override
   public PullRequestInfo buildPullRequestInfo() {
     return new PullRequestInfo(
-        normalizeBranch(environment.get(BITBUCKET_PR_DESTINATION_BRANCH)), null, null);
+        normalizeBranch(environment.get(BITBUCKET_PR_DESTINATION_BRANCH)),
+        null,
+        null,
+        environment.get(BITBUCKET_PR_NUMBER));
   }
 
   private String buildPipelineUrl(final String repo, final String number) {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BitriseInfo.java

@@ -33,6 +33,7 @@ class BitriseInfo implements CIProviderInfo {
   public static final String BITRISE_GIT_COMMITER_NAME = "GIT_CLONE_COMMIT_COMMITER_NAME";
   public static final String BITRISE_GIT_COMMITER_EMAIL = "GIT_CLONE_COMMIT_COMMITER_EMAIL";
   public static final String BITRISE_GIT_BRANCH_DEST = "BITRISEIO_GIT_BRANCH_DEST";
+  public static final String BITRISE_PR_NUMBER = "BITRISE_PULL_REQUEST";
 
   private final CiEnvironment environment;
 
@@ -73,7 +74,10 @@ public CIInfo buildCIInfo() {
   @Override
   public PullRequestInfo buildPullRequestInfo() {
     return new PullRequestInfo(
-        normalizeBranch(environment.get(BITRISE_GIT_BRANCH_DEST)), null, null);
+        normalizeBranch(environment.get(BITRISE_GIT_BRANCH_DEST)),
+        null,
+        null,
+        environment.get(BITRISE_PR_NUMBER));
   }
 
   private String buildGitCommit() {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuddyInfo.java

@@ -28,6 +28,7 @@ class BuddyInfo implements CIProviderInfo {
   public static final String BUDDY_GIT_COMMIT_AUTHOR = "BUDDY_EXECUTION_REVISION_COMMITTER_NAME";
   public static final String BUDDY_GIT_COMMIT_EMAIL = "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL";
   public static final String BUDDY_RUN_PR_BASE_BRANCH = "BUDDY_RUN_PR_BASE_BRANCH";
+  public static final String BUDDY_RUN_PR_NUMBER = "BUDDY_RUN_PR_NO";
 
   private final CiEnvironment environment;
 
@@ -64,7 +65,10 @@ public CIInfo buildCIInfo() {
   @Override
   public PullRequestInfo buildPullRequestInfo() {
     return new PullRequestInfo(
-        normalizeBranch(environment.get(BUDDY_RUN_PR_BASE_BRANCH)), null, null);
+        normalizeBranch(environment.get(BUDDY_RUN_PR_BASE_BRANCH)),
+        null,
+        null,
+        environment.get(BUDDY_RUN_PR_NUMBER));
   }
 
   private String getPipelineId(String pipelineNumber) {