Merge branch 'master' into mhlidd/DD_VERSION

Author: mhlidd

.circleci/config.continue.yml.j2

@@ -782,6 +782,7 @@ jobs:
           name: Gather muzzle tasks
           command: >-
             SKIP_BUILDSCAN="true"
+            GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx2G -Xms2G -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
             ./gradlew writeMuzzleTasksToFile
             << pipeline.parameters.gradle_flags >>
             --max-workers=3
@@ -880,11 +881,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
@@ -1201,6 +1218,20 @@ build_test_jobs: &build_test_jobs
       parallelism: 4
       maxWorkers: 4
       testJvm: "8"
+
+  - tests:
+      requires:
+        - ok_to_test
+      name: z_test_8_flaky_debugger
+      gradleTarget: ":debuggerTest"
+      gradleParameters: "-PrunFlakyTests"
+      continueOnFailure: true
+      triggeredBy: *debugger_modules
+      stage: debugger
+      cacheType: base
+      parallelism: 4
+      maxWorkers: 4
+      testJvm: "8"
 {% endif %}
 
   - tests:
@@ -1404,6 +1435,7 @@ build_test_jobs: &build_test_jobs
 {% for jdk in all_jdks %}
         - "test_{{ jdk }}"
 {% endfor %}
+        - muzzle
         - profiling
         - debugger
         - system-tests

.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"
@@ -210,13 +203,20 @@ deploy_artifacts_to_github:
     max: 2
     when: always
 
+requirements_json_test:
+  rules:
+    - when: on_success
+  variables:
+    REQUIREMENTS_BLOCK_JSON_PATH: "metadata/requirements-block.json"
+    REQUIREMENTS_ALLOW_JSON_PATH: "metadata/requirements-allow.json"
+
 package-oci:
   needs: [ build ]
 
 onboarding_tests_installer:
   parallel:
     matrix:
-      - ONBOARDING_FILTER_WEBLOG: [test-app-java, test-app-java-container, test-app-java-container-jdk15, test-app-java-alpine-libgcc]
+      - ONBOARDING_FILTER_WEBLOG: [test-app-java, test-app-java-container, test-app-java-container-jdk15, test-app-java-alpine]
         SCENARIO: [ SIMPLE_INSTALLER_AUTO_INJECTION, SIMPLE_AUTO_INJECTION_PROFILING ]
       - ONBOARDING_FILTER_WEBLOG: [test-app-java-buildpack]
         SCENARIO: [ SIMPLE_INSTALLER_AUTO_INJECTION ]

.gitlab/prepare-oci-package.sh

@@ -10,3 +10,4 @@ fi
 mkdir -p sources
 cp ../workspace/dd-java-agent/build/libs/*.jar sources/dd-java-agent.jar
 echo -n "$VERSION" > sources/version
+cp ../metadata/requirements.json sources/

BUILDING.md

@@ -10,7 +10,7 @@ This documentation is dedicated to developers to setup their environment, and bu
 
 ## Development environment quick check
 
-As a preliminary step, you can quickly check that your development environment is properly set up to build the project running `./setup.sh` from the project root:
+To check that your development environment is properly set up to build the project, you will eventually run `./setup.sh` from the project root and should have its output look something like this:
 
 ```bash
 $ ./setup.sh
@@ -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.

buildSrc/call-site-instrumentation-plugin/build.gradle.kts

@@ -34,8 +34,8 @@ dependencies {
   compileOnly("com.google.code.findbugs", "jsr305", "3.0.2")
 
   implementation("org.freemarker", "freemarker", "2.3.30")
-  implementation("org.ow2.asm", "asm", "9.0")
-  implementation("org.ow2.asm", "asm-tree", "9.0")
+  implementation("org.ow2.asm", "asm", "9.7")
+  implementation("org.ow2.asm", "asm-tree", "9.7")
   implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4")
 
   testImplementation("net.bytebuddy", "byte-buddy", "1.14.18")

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

@@ -3,11 +3,13 @@
 import datadog.communication.ddagent.DDAgentFeaturesDiscovery;
 import datadog.communication.ddagent.SharedCommunicationObjects;
 import datadog.communication.http.HttpRetryPolicy;
+import datadog.communication.http.OkHttpUtils;
 import datadog.trace.api.Config;
 import datadog.trace.util.throwable.FatalAgentMisconfigurationError;
 import java.util.function.Function;
 import javax.annotation.Nullable;
 import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,8 +36,10 @@ 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);
+      OkHttpClient httpClient =
+          OkHttpUtils.buildHttpClient(
+              agentlessUrl, config.getCiVisibilityBackendApiTimeoutMillis());
+      return new IntakeApi(agentlessUrl, apiKey, traceId, retryPolicyFactory, httpClient, true);
     }
 
     DDAgentFeaturesDiscovery featuresDiscovery =