Merge branch 'master' into dd/pre-construct-tagmap-entries

Author: dougqh

.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

@@ -647,7 +647,7 @@ muzzle-dep-report:
     CI_USE_TEST_AGENT: "true"
     CI_AGENT_HOST: local-agent
   services:
-    - name: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.33.1
+    - name: registry.ddbuild.io/images/mirror/dd-apm-test-agent/ddapm-test-agent:v1.44.0
       alias: local-agent
       variables:
         LOG_LEVEL: "DEBUG"
@@ -1071,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:

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;
 

communication/src/main/java/datadog/communication/serialization/GrowableBuffer.java

@@ -17,11 +17,18 @@ public GrowableBuffer(int initialCapacity) {
     this.buffer = ByteBuffer.allocate(initialCapacity);
   }
 
+  /** Flips the buffer and returns a new slice which shares the buffered content. */
   public ByteBuffer slice() {
     buffer.flip();
     return buffer.slice();
   }
 
+  /** Flips the buffer and returns the buffered content. */
+  public ByteBuffer flip() {
+    buffer.flip();
+    return buffer;
+  }
+
   public int messageCount() {
     return messageCount;
   }

dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/common/export/OtlpCommonProto.java

@@ -3,10 +3,12 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import datadog.communication.serialization.GenerationalUtf8Cache;
+import datadog.communication.serialization.GrowableBuffer;
 import datadog.communication.serialization.SimpleUtf8Cache;
 import datadog.communication.serialization.StreamingBuffer;
 import datadog.trace.api.Config;
 import datadog.trace.bootstrap.otel.common.OtelInstrumentationScope;
+import java.nio.ByteBuffer;
 import java.util.List;
 
 /**
@@ -43,6 +45,14 @@ public static int sizeVarInt(long value) {
     return 1 + (63 - Long.numberOfLeadingZeros(value)) / 7;
   }
 
+  public static void writeVarInt(ByteBuffer buf, int value) {
+    for (int i = 1, len = sizeVarInt(value); i < len; i++) {
+      buf.put((byte) ((value & 0x7f) | 0x80));
+      value >>>= 7;
+    }
+    buf.put((byte) value);
+  }
+
   public static void writeVarInt(StreamingBuffer buf, int value) {
     for (int i = 1, len = sizeVarInt(value); i < len; i++) {
       buf.put((byte) ((value & 0x7f) | 0x80));
@@ -96,10 +106,32 @@ public static void writeString(StreamingBuffer buf, String value) {
     writeString(buf, value.getBytes(UTF_8));
   }
 
+  public static int sizeTag(int fieldNum) {
+    return sizeVarInt(fieldNum << 3);
+  }
+
+  public static void writeTag(ByteBuffer buf, int fieldNum, int wireType) {
+    writeVarInt(buf, fieldNum << 3 | wireType);
+  }
+
   public static void writeTag(StreamingBuffer buf, int fieldNum, int wireType) {
     writeVarInt(buf, fieldNum << 3 | wireType);
   }
 
+  public static byte[] recordMessage(GrowableBuffer buf, int fieldNum) {
+    try {
+      ByteBuffer data = buf.flip();
+      int dataSize = data.remaining();
+      ByteBuffer message = ByteBuffer.allocate(sizeTag(fieldNum) + sizeVarInt(dataSize) + dataSize);
+      writeTag(message, fieldNum, LEN_WIRE_TYPE);
+      writeVarInt(message, dataSize);
+      message.put(data);
+      return message.array();
+    } finally {
+      buf.reset();
+    }
+  }
+
   public static void writeInstrumentationScope(
       StreamingBuffer buf, OtelInstrumentationScope scope) {
     byte[] scopeNameUtf8 = scope.getName().getUtf8Bytes();

dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/common/export/OtlpResourceProto.java

@@ -0,0 +1,70 @@
+package datadog.trace.bootstrap.otel.common.export;
+
+import static datadog.trace.bootstrap.otel.common.export.OtlpAttributeVisitor.STRING;
+import static datadog.trace.bootstrap.otel.common.export.OtlpCommonProto.LEN_WIRE_TYPE;
+import static datadog.trace.bootstrap.otel.common.export.OtlpCommonProto.recordMessage;
+import static datadog.trace.bootstrap.otel.common.export.OtlpCommonProto.writeAttribute;
+import static datadog.trace.bootstrap.otel.common.export.OtlpCommonProto.writeTag;
+
+import datadog.communication.serialization.GrowableBuffer;
+import datadog.communication.serialization.StreamingBuffer;
+import datadog.trace.api.Config;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
+
+/** Provides a canned message for OpenTelemetry's "resource.proto" wire protocol. */
+public final class OtlpResourceProto {
+  private OtlpResourceProto() {}
+
+  private static final byte[] RESOURCE_MESSAGE = buildResourceMessage(Config.get());
+
+  private static final Set<String> IGNORED_GLOBAL_TAGS =
+      new HashSet<>(
+          Arrays.asList(
+              "service",
+              "env",
+              "version",
+              "service.name",
+              "deployment.environment.name",
+              "service.version"));
+
+  /** Writes the resource message in protobuf format to the given buffer. */
+  public static void writeResourceMessage(StreamingBuffer buf) {
+    buf.put(RESOURCE_MESSAGE);
+  }
+
+  static byte[] buildResourceMessage(Config config) {
+    GrowableBuffer buf = new GrowableBuffer(512);
+
+    String serviceName = config.getServiceName();
+    String env = config.getEnv();
+    String version = config.getVersion();
+
+    writeResourceAttribute(buf, "service.name", serviceName);
+    if (!env.isEmpty()) {
+      writeResourceAttribute(buf, "deployment.environment.name", env);
+    }
+    if (!version.isEmpty()) {
+      writeResourceAttribute(buf, "service.version", version);
+    }
+
+    config
+        .getGlobalTags()
+        .forEach(
+            (key, value) -> {
+              // ignore datadog tags and their otel equivalents that we map above
+              if (!IGNORED_GLOBAL_TAGS.contains(key.toLowerCase(Locale.ROOT))) {
+                writeResourceAttribute(buf, key, value);
+              }
+            });
+
+    return recordMessage(buf, 1);
+  }
+
+  private static void writeResourceAttribute(StreamingBuffer buf, String key, String value) {
+    writeTag(buf, 1, LEN_WIRE_TYPE);
+    writeAttribute(buf, STRING, key, value);
+  }
+}