Merge branch 'master' into nicholas.hulston/lambda-eventbridge-tracing-fix

Author: nhulston

.circleci/config.continue.yml.j2

@@ -880,11 +880,27 @@ jobs:
 
       - run:
           name: Run APM Integrations tests
+          environment:
+            - AWS_ACCESS_KEY_ID: $SYSTEM_TESTS_IDM_AWS_ACCESS_KEY_ID
+            - AWS_SECRET_ACCESS_KEY: $SYSTEM_TESTS_IDM_AWS_SECRET_ACCESS_KEY
+            - AWS_REGION: us-east-1
+            - AWS_DEFAULT_REGION: us-east-1  # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION`
           # Stop the job after 5m to avoid excessive overhead. Will need adjustment as more tests are added.
           no_output_timeout: 5m
           command: |
             cd system-tests
             DD_SITE=datadoghq.com DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY DD_APPLICATION_KEY=$SYSTEM_TESTS_E2E_DD_APP_KEY ./run.sh INTEGRATIONS
+        
+      - run:
+          name: Run IDM Crossed Tracing Libraries propagation tests for messaging
+          environment:
+            - AWS_ACCESS_KEY_ID: $SYSTEM_TESTS_IDM_AWS_ACCESS_KEY_ID
+            - AWS_SECRET_ACCESS_KEY: $SYSTEM_TESTS_IDM_AWS_SECRET_ACCESS_KEY
+            - AWS_REGION: us-east-1
+            - AWS_DEFAULT_REGION: us-east-1  # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION`
+          command: |
+            cd system-tests
+            DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh CROSSED_TRACING_LIBRARIES
 
       - store_test_results:
           path: system-tests/logs_integrations

.github/workflows/README.md

@@ -82,6 +82,15 @@ _Action:_ Clean up old lib-injection OCI images from GitHub Container Registry.
 
 _Recovery:_ Manually trigger the action again.
 
+### prune-old-pull-requests [🔗](prune-old-pull-requests.yaml)
+
+_Trigger:_ Every month or manually.
+
+_Action:_ Mark as stale and comment on pull requests with no update during the last quarter.
+Close them if no following update within a week.
+
+_Recovery:_ Manually trigger the action again.
+
 ## Code Quality and Security
 
 ### analyze-changes [🔗](analyze-changes-with-github-codeql.yaml)

.github/workflows/increment-milestone-on-tag.yaml

@@ -55,7 +55,7 @@ jobs:
             const nextMilestoneTitle = versionNumbers.join('.')
             core.info(`Creating next version milestone: ${nextMilestoneTitle}`)
             // Create the next milestone
-            await github.issues.createMilestone({
+            await github.rest.issues.createMilestone({
               owner: context.repo.owner,
               repo: context.repo.repo,
               title: nextMilestoneTitle

.github/workflows/prune-old-pull-requests.yaml

@@ -0,0 +1,23 @@
+name: Prune old pull requests
+on:
+  schedule:
+    - cron: '0 3 1 * *'
+  workflow_dispatch:
+
+jobs:
+  prune-old-pull-requests:
+    name: Prune old pull requests
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+    - name: Prune old pull requests
+      uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
+      with:
+        days-before-stale: -1 # Disable general stale bot
+        days-before-pr-stale: 90 # Only enable stale bot for PRs with no activity for 90 days
+        stale-pr-message: 'This pull request has been marked as stale because it has not had activity over the past quarter. It will be closed in 7 days if no further activity occurs. Feel free to reopen the PR if you are still working on it.'
+        close-pr-message: 'This pull request has been closed because it has not had activity over the past quarter. Feel free to reopen the PR if you are still working on it.'
+        stale-pr-label: 'tag: stale'
+        operations-per-run: 500

.gitlab-ci.yml

@@ -17,13 +17,6 @@ stages:
   - ci-visibility-tests
   - generate-signing-key
 
-workflow:
-  rules:
-    - if: $POPULATE_CACHE == "true"
-      variables:
-        SKIP_SHARED_PIPELINE: "true"
-    - when: always
-
 variables:
   REGISTRY: 486234852809.dkr.ecr.us-east-1.amazonaws.com
   BUILD_JOB_NAME: "build"

BUILDING.md

@@ -25,6 +25,7 @@ $ ./setup.sh
 ✅ The git command line is installed.
 ✅ pre-commit hook is installed in repository.
 ✅ git config submodule.recurse is set to true.
+✅ All git submodules are initialized.
 ℹ️ Checking Docker environment:
 ✅ The docker command line is installed.
 ✅ The Docker server is running.
@@ -190,4 +191,14 @@ To build the entire project with tests (this can take a very long time) run:
 ./gradlew clean build
 ```
 
-After building the project, you can find the jar build artifact into the `dd-java-agent/build/libs` folder.
+>[!NOTE]
+> Running the complete test suite on a local development environment can be challenging.
+> It might take a very long time, and you might encounter few flaky tests along the way.
+> It is recommended to only run the tests related to your changes locally, and leave the whole test suite to the continuous integration platform.
+
+To build the JVM agent artifact only run:
+```bash
+./gradlew :dd-java-agent:shadowJar
+```
+
+After building the project, you can find the built JVM agent artifact into the `dd-java-agent/build/libs` folder.

CONTRIBUTING.md

@@ -4,13 +4,8 @@
 
 Pull requests for bug fixes are welcome, but before submitting new features or changes to current
 functionality, please [open an issue](https://github.com/DataDog/dd-trace-java/issues/new)
-and discuss your ideas or propose the changes you wish to make first. After a resolution is reached a PR can be
-submitted for
-review.
-
-When opening a pull request, please open it as
-a [draft](https://github.blog/2019-02-14-introducing-draft-pull-requests/) to not auto assign reviewers before you feel
-the pull request is in a reviewable state.
+and discuss your ideas or propose the changes you wish to make first. After a resolution is reached a [PR can be
+submitted](#pull-request-guidelines) for review.
 
 ## Adding instrumentations
 
@@ -91,6 +86,10 @@ command line should be Java 8.
 
 ## Pull Request Guidelines
 
+### Draft first
+
+When opening a pull request, please open it as a [draft](https://github.blog/2019-02-14-introducing-draft-pull-requests/) to not auto assign reviewers before you feel the pull request is in a reviewable state.
+
 ### Title Format
 
 Pull request titles should briefly describe the proposed changes in a way that makes sense for the users.
@@ -133,3 +132,17 @@ Labels are not only used to categorize but also alter the continuous integration
 >[!NOTE]
 > For reference, the [full list of all labels available](https://github.com/DataDog/dd-trace-java/labels).
 > If you feel one is missing, let [the maintainer team](https://github.com/orgs/DataDog/teams/apm-java) know!
+
+## Pull Request Reviews
+
+### Review Expectations
+
+After making you pull request ready for review by converting it from draft, you can expect getting an initial review comment within two working days, and a full review within a week of work.
+If you don't receive any update, feel free to send a nice reminder to the assigned reviewers using pull request comments or our internal Slack channel.
+
+### Stale Pull Requests
+
+A pull request is considered "stale" if it has had no activity (comments, updates) for the last quarter.
+Stale PRs will be commented and labelled as such (using the `tag: stale` label), then closed if they still receive no update for a week after.
+
+Closed PRs can be reopened at any time, but may be closed again if they ever meet the same stale conditions.

communication/src/main/java/datadog/communication/BackendApiFactory.java

@@ -34,8 +34,13 @@ public BackendApiFactory(Config config, SharedCommunicationObjects sharedCommuni
             "Agentless mode is enabled and api key is not set. Please set application key");
       }
       String traceId = config.getIdGenerationStrategy().generateTraceId().toString();
-      long timeoutMillis = config.getCiVisibilityBackendApiTimeoutMillis();
-      return new IntakeApi(agentlessUrl, apiKey, traceId, timeoutMillis, retryPolicyFactory, true);
+      return new IntakeApi(
+          agentlessUrl,
+          apiKey,
+          traceId,
+          retryPolicyFactory,
+          sharedCommunicationObjects.okHttpClient,
+          true);
     }
 
     DDAgentFeaturesDiscovery featuresDiscovery =

communication/src/main/java/datadog/communication/IntakeApi.java

@@ -37,16 +37,15 @@ public IntakeApi(
       HttpUrl hostUrl,
       String apiKey,
       String traceId,
-      long timeoutMillis,
       HttpRetryPolicy.Factory retryPolicyFactory,
+      OkHttpClient httpClient,
       boolean responseCompression) {
     this.hostUrl = hostUrl;
     this.apiKey = apiKey;
     this.traceId = traceId;
     this.retryPolicyFactory = retryPolicyFactory;
     this.responseCompression = responseCompression;
-
-    httpClient = OkHttpUtils.buildHttpClient(hostUrl, timeoutMillis);
+    this.httpClient = httpClient;
   }
 
   @Override

communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java

@@ -36,11 +36,21 @@ public void createRemaining(Config config) {
       }
     }
     if (okHttpClient == null) {
-      String unixDomainSocket = SocketUtils.discoverApmSocket(config);
-      String namedPipe = config.getAgentNamedPipe();
+      String unixDomainSocket;
+      String namedPipe;
+      HttpUrl url;
+      if (!config.isCiVisibilityAgentlessEnabled()) {
+        unixDomainSocket = SocketUtils.discoverApmSocket(config);
+        namedPipe = config.getAgentNamedPipe();
+        url = agentUrl;
+      } else {
+        unixDomainSocket = null;
+        namedPipe = null;
+        url = null;
+      }
       okHttpClient =
           OkHttpUtils.buildHttpClient(
-              agentUrl, unixDomainSocket, namedPipe, getHttpClientTimeout(config));
+              url, unixDomainSocket, namedPipe, getHttpClientTimeout(config));
     }
   }
 

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/iast/NamedContext.java

@@ -19,6 +19,8 @@ public abstract class NamedContext {
 
   public abstract void taintName(@Nullable String name);
 
+  public abstract void setCurrentName(@Nullable final String name);
+
   @Nonnull
   public static <E> NamedContext getOrCreate(
       @Nonnull final ContextStore<E, NamedContext> store, @Nonnull final E target) {
@@ -47,6 +49,9 @@ public void taintValue(@Nullable final String value) {}
 
     @Override
     public void taintName(@Nullable final String name) {}
+
+    @Override
+    public void setCurrentName(@Nullable final String name) {}
   }
 
   private static class NamedContextImpl extends NamedContext {
@@ -78,6 +83,11 @@ public void taintName(@Nullable final String name) {
       }
     }
 
+    @Override
+    public void setCurrentName(@Nullable final String name) {
+      currentName = name;
+    }
+
     private IastContext iastCtx() {
       if (!fetched) {
         fetched = true;

dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/ExcludeFilterTest.groovy

@@ -9,7 +9,7 @@ import static datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFil
 
 class ExcludeFilterTest extends DDSpecification {
 
-  def "test empty ExcludeFilter"() {
+  def "test empty ExcludeFilter #type.name()"() {
     setup:
     def one = new One()
     def oneName = One.getName()
@@ -22,7 +22,7 @@ class ExcludeFilterTest extends DDSpecification {
     type << ExcludeFilter.ExcludeType.values()
   }
 
-  def "test ExcludeFilter"() {
+  def "test ExcludeFilter #type.name()"() {
     setup:
     def another = new Another()
     def anotherName = Another.getName()

dd-java-agent/agent-builder/src/test/groovy/datadog/trace/agent/test/DefaultInstrumenterForkedTest.groovy

@@ -20,7 +20,7 @@ class DefaultInstrumenterForkedTest extends DDSpecification {
     target.enabled
   }
 
-  def "default enabled override"() {
+  def "default enabled override #enabled"() {
     expect:
     target.enabled == enabled
 

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

@@ -31,7 +31,6 @@
 import datadog.trace.civisibility.source.SourcePathResolver;
 import datadog.trace.civisibility.source.index.RepoIndexProvider;
 import datadog.trace.civisibility.source.index.RepoIndexSourcePathResolver;
-import datadog.trace.civisibility.utils.ProcessHierarchyUtils;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Map;
@@ -76,11 +75,12 @@ public class CiVisibilityRepoServices {
     codeowners = buildCodeowners(repoRoot);
     sourcePathResolver = buildSourcePathResolver(repoRoot, repoIndexProvider);
 
-    if (ProcessHierarchyUtils.isChild()) {
+    if (services.processHierarchy.isChild()) {
       executionSettingsFactory = buildExecutionSettingsFetcher(services.signalClientFactory);
     } else {
       executionSettingsFactory =
           buildExecutionSettingsFactory(
+              services.processHierarchy,
               services.config,
               services.metricCollector,
               services.backendApi,
@@ -122,6 +122,7 @@ private static ExecutionSettingsFactory buildExecutionSettingsFetcher(
   }
 
   private static ExecutionSettingsFactory buildExecutionSettingsFactory(
+      ProcessHierarchy processHierarchy,
       Config config,
       CiVisibilityMetricCollector metricCollector,
       BackendApi backendApi,
@@ -138,7 +139,7 @@ private static ExecutionSettingsFactory buildExecutionSettingsFactory(
 
     ExecutionSettingsFactoryImpl factory =
         new ExecutionSettingsFactoryImpl(config, configurationApi, gitDataUploader, repoRoot);
-    if (ProcessHierarchyUtils.isHeadless()) {
+    if (processHierarchy.isHeadless()) {
       return factory;
     } else {
       return new MultiModuleExecutionSettingsFactory(config, factory);