Merge branch 'master' into dougqh/span-links-allocation

Author: dougqh

.github/CODEOWNERS

@@ -188,5 +188,6 @@
 # @DataDog/rum
 /internal-api/src/main/java/datadog/trace/api/rum/   @DataDog/rum
 /internal-api/src/test/groovy/datadog/trace/api/rum/ @DataDog/rum
+/dd-smoke-tests/rum/                                 @DataDog/rum
 /telemetry/src/main/java/datadog/telemetry/rum/      @DataDog/rum
 /telemetry/src/test/groovy/datadog/telemetry/rum/    @DataDog/rum

.github/dependabot.yml

@@ -1,37 +1,36 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
-
 version: 2
 updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    labels:
-      - "comp: tooling"
-      - "tag: dependencies"
-      - "tag: no release notes"
-    commit-message:
-      prefix: "chore(ci): "
-    groups:
-      gh-actions-packages:
-        patterns:
-          - "*"
-
-  - package-ecosystem: "gradle"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    allow:
-      - dependency-name: "gradle"
-    ignore:
-      - dependency-name: "gradle"
-        update-types: ["version-update:semver-major"]
-    labels:
-      - "comp: tooling"
-      - "tag: dependencies"
-      - "tag: no release notes"
-    commit-message:
-      prefix: "chore(build): "
+- package-ecosystem: github-actions
+  directory: /
+  schedule:
+    interval: weekly
+  labels:
+  - 'comp: tooling'
+  - 'tag: dependencies'
+  - 'tag: no release notes'
+  commit-message:
+    prefix: 'chore(ci): '
+  groups:
+    gh-actions-packages:
+      patterns:
+      - '*'
+  cooldown:
+    default-days: 14
+- package-ecosystem: gradle
+  directory: /
+  schedule:
+    interval: weekly
+  allow:
+  - dependency-name: gradle
+  ignore:
+  - dependency-name: gradle
+    update-types:
+    - version-update:semver-major
+  labels:
+  - 'comp: tooling'
+  - 'tag: dependencies'
+  - 'tag: no release notes'
+  commit-message:
+    prefix: 'chore(build): '
+  cooldown:
+    default-days: 14

.github/workflows/create-release-branch.yaml

@@ -119,7 +119,7 @@ jobs:
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git commit -m "chore: Pin system-tests for release branch" .github/workflows/run-system-tests.yaml
+          git commit -m "chore: Pin system-tests for release branch" .github/workflows/run-system-tests.yaml .gitlab-ci.yml
           echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
       
       - name: Push changes

.github/workflows/run-system-tests.yaml

@@ -62,7 +62,7 @@ jobs:
     needs:
     - build
     # If you change the following comment, update the pattern in the update_system_test_reference.sh script to match.
-    uses: DataDog/system-tests/.github/workflows/system-tests.yml@main # system tests are pinned for releases only
+    uses: DataDog/system-tests/.github/workflows/system-tests.yml@main # system tests are pinned on release branches only
     secrets:
       TEST_OPTIMIZATION_API_KEY: ${{ secrets.DATADOG_API_KEY_PROD }}
     permissions:
@@ -72,7 +72,7 @@ jobs:
     with:
       library: java
        # If you change the following comment, update the pattern in the update_system_test_reference.sh script to match.
-      ref: main # system tests are pinned for releases only
+      ref: main # system tests are pinned on release branches only
       binaries_artifact: binaries
       desired_execution_time: 900  # 15 minutes
       scenarios_groups: tracer-release

.gitlab-ci.yml

@@ -809,7 +809,12 @@ aggregate_test_counts:
   rules:
     - if: '$POPULATE_CACHE'
       when: never
-    - when: always
+    - if: '$CI_COMMIT_BRANCH == "master"'
+      when: on_success
+    - if: '$CI_COMMIT_BRANCH =~ /^mq-working-branch-/'
+      when: on_success
+    - if: '$CI_COMMIT_BRANCH =~ /^gh-readonly-queue/'
+      when: on_success
   script:
     - *set_datadog_api_keys
     - .gitlab/aggregate_test_counts.sh
@@ -1066,6 +1071,7 @@ publishing-gate:
 
 configure_system_tests:
   variables:
+    SYSTEM_TESTS_REF: main # system tests are pinned on release branches only
     SYSTEM_TESTS_SCENARIOS_GROUPS: "simple_onboarding,simple_onboarding_profiling,simple_onboarding_appsec,docker-ssi,lib-injection"
 
 create_key:

.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/f14ac28614630d12bcfe6cba4fd8d72dce142c62ff0b053ba7c323622104ebd7/one-pipeline.yml
+  - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/9cf7d7609ff62e4723c9cbc061ca2a25345ce5d6055b9acad9a13dbf736261f0/one-pipeline.yml

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

@@ -4,8 +4,8 @@
 import static datadog.trace.util.AgentThreadFactory.AGENT_THREAD_GROUP;
 
 import datadog.common.container.ContainerInfo;
-import datadog.common.socket.SocketUtils;
 import datadog.communication.http.OkHttpUtils;
+import datadog.communication.http.SocketUtils;
 import datadog.metrics.api.Monitoring;
 import datadog.remoteconfig.ConfigurationPoller;
 import datadog.remoteconfig.DefaultConfigurationPoller;

communication/src/main/java/datadog/communication/http/OkHttpUtils.java

@@ -1,6 +1,6 @@
 package datadog.communication.http;
 
-import static datadog.common.socket.SocketUtils.discoverApmSocket;
+import static datadog.communication.http.SocketUtils.discoverApmSocket;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
@@ -68,6 +68,7 @@ public static OkHttpClient buildHttpClient(
       final long timeoutMillis) {
     return buildHttpClient(
         unixDomainSocketPath,
+        Config.get().isJdkSocketEnabled(),
         namedPipe,
         null,
         isHttp,
@@ -77,7 +78,8 @@ public static OkHttpClient buildHttpClient(
         null,
         null,
         null,
-        timeoutMillis);
+        timeoutMillis,
+        Config.get().isAgentConfiguredUsingDefault());
   }
 
   public static OkHttpClient buildHttpClient(
@@ -93,6 +95,7 @@ public static OkHttpClient buildHttpClient(
       final long timeoutMillis) {
     return buildHttpClient(
         discoverApmSocket(config),
+        config.isJdkSocketEnabled(),
         config.getAgentNamedPipe(),
         dispatcher,
         isPlainHttp(url),
@@ -102,13 +105,15 @@ public static OkHttpClient buildHttpClient(
         proxyPort,
         proxyUsername,
         proxyPassword,
-        timeoutMillis);
+        timeoutMillis,
+        config.isAgentConfiguredUsingDefault());
   }
 
   public abstract static class CustomListener extends EventListener {}
 
   private static OkHttpClient buildHttpClient(
       final String unixDomainSocketPath,
+      final boolean useJdkUnixDomainSocket,
       final String namedPipe,
       final Dispatcher dispatcher,
       final boolean isHttp,
@@ -118,7 +123,8 @@ private static OkHttpClient buildHttpClient(
       final Integer proxyPort,
       final String proxyUsername,
       final String proxyPassword,
-      final long timeoutMillis) {
+      final long timeoutMillis,
+      final boolean agentConfiguredUsingDefault) {
     final OkHttpClient.Builder builder = new OkHttpClient.Builder();
 
     try {
@@ -144,7 +150,9 @@ private static OkHttpClient buildHttpClient(
             dispatcher != null ? dispatcher : new Dispatcher(RejectingExecutorService.INSTANCE));
 
     if (unixDomainSocketPath != null) {
-      builder.socketFactory(new UnixDomainSocketFactory(new File(unixDomainSocketPath)));
+      builder.socketFactory(
+          new UnixDomainSocketFactory(
+              new File(unixDomainSocketPath), useJdkUnixDomainSocket, agentConfiguredUsingDefault));
       log.debug("Using UnixDomainSocket as http transport");
     } else if (namedPipe != null) {
       builder.socketFactory(new NamedPipeSocketFactory(namedPipe));

…a/datadog/common/socket/SocketUtils.java …adog/communication/http/SocketUtils.javautils/socket-utils/src/main/java/datadog/common/socket/SocketUtils.java renamed to communication/src/main/java/datadog/communication/http/SocketUtils.java utils/socket-utils/src/main/java/datadog/common/socket/SocketUtils.java renamed to communication/src/main/java/datadog/communication/http/SocketUtils.java

@@ -1,4 +1,4 @@
-package datadog.common.socket;
+package datadog.communication.http;
 
 import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_AGENT_SOCKET_PATH;
 

dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploader.java

@@ -571,6 +571,18 @@ private RequestBody makeErrorTrackingRequestBody(@Nonnull CrashLog payload, bool
                       "os.version")); // this has been restructured under OsInfo so taking raw here
           writer.endObject();
         }
+        // experimental
+        if (payload.experimental != null && payload.experimental.ucontext != null) {
+          writer.name("experimental");
+          writer.beginObject();
+          writer.name("ucontext");
+          writer.beginObject();
+          for (Map.Entry<String, String> entry : payload.experimental.ucontext.entrySet()) {
+            writer.name(entry.getKey()).value(entry.getValue());
+          }
+          writer.endObject();
+          writer.endObject();
+        }
         writer.endObject();
       }
       return RequestBody.create(APPLICATION_JSON, buf.readByteString());
@@ -599,6 +611,16 @@ private String tagsForErrorTracking(String uuid, boolean isPing, boolean incompl
     tags.append(",")
         .append("language_version:")
         .append(normalizeTagValue(SystemProperties.getOrDefault("java.version", "unknown")));
+    tags.append(",")
+        .append("runtime_version:")
+        .append(
+            normalizeTagValue(SystemProperties.getOrDefault("java.runtime.version", "unknown")));
+    tags.append(",")
+        .append("runtime_vendor:")
+        .append(normalizeTagValue(SystemProperties.getOrDefault("java.vendor", "unknown")));
+    tags.append(",")
+        .append("runtime_name:")
+        .append(normalizeTagValue(SystemProperties.getOrDefault("java.runtime.name", "unknown")));
     tags.append(",").append("tracer_version:").append(normalizeTagValue(VersionInfo.VERSION));
     tags.append(",").append("uuid:").append(uuid);
     return (tags.toString());
@@ -611,6 +633,16 @@ private String tagsForPing(String uuid) {
     tags.append(",")
         .append("language_version:")
         .append(normalizeTagValue(SystemProperties.getOrDefault("java.version", "unknown")));
+    tags.append(",")
+        .append("runtime_version:")
+        .append(
+            normalizeTagValue(SystemProperties.getOrDefault("java.runtime.version", "unknown")));
+    tags.append(",")
+        .append("runtime_vendor:")
+        .append(normalizeTagValue(SystemProperties.getOrDefault("java.vendor", "unknown")));
+    tags.append(",")
+        .append("runtime_name:")
+        .append(normalizeTagValue(SystemProperties.getOrDefault("java.runtime.name", "unknown")));
     tags.append(",").append("tracer_version:").append(normalizeTagValue(VersionInfo.VERSION));
     tags.append(",").append("uuid:").append(uuid);
     return (tags.toString());