Merge branch 'master' into sarahchen6/use-octo-sts

Author: sarahchen6

.github/chainguard/self.gitlab.release.sts.yaml

@@ -0,0 +1,11 @@
+issuer: https://gitlab.ddbuild.io
+
+subject_pattern: "project_path:DataDog/apm-reliability/dd-trace-java:ref_type:tag:ref:v.*"
+
+claim_pattern:
+  project_path: "DataDog/apm-reliability/dd-trace-java"
+  ref_type: "tag"
+  ref: "v.*"
+
+permissions:
+  contents: "write"

.github/workflows/analyze-changes.yaml

@@ -47,7 +47,7 @@ jobs:
 
       - name: Build dd-trace-java for creating the CodeQL database
         run: |
-          GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx2G -Xms2G'" \
+          GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx3G -Xms2G'" \
           JAVA_HOME=$JAVA_HOME_8_X64 \
           JAVA_8_HOME=$JAVA_HOME_8_X64 \
           JAVA_11_HOME=$JAVA_HOME_11_X64 \
@@ -93,7 +93,7 @@ jobs:
 
       - name: Build and publish artifacts locally
         run: |
-          GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx2G -Xms2G'" \
+          GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx3G -Xms2G'" \
           JAVA_HOME=$JAVA_HOME_8_X64 \
           JAVA_8_HOME=$JAVA_HOME_8_X64 \
           JAVA_11_HOME=$JAVA_HOME_11_X64 \

.github/workflows/update-gradle-dependencies.yaml

@@ -28,7 +28,7 @@ jobs:
           git push -u origin $BRANCH_NAME --force
       - name: Update Gradle dependencies
         run: |
-          GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx2G -Xms2G'" \
+          GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx3G -Xms2G'" \
           JAVA_HOME=$JAVA_HOME_8_X64 \
           JAVA_8_HOME=$JAVA_HOME_8_X64 \
           JAVA_11_HOME=$JAVA_HOME_11_X64 \

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

communication/build.gradle

@@ -0,0 +1,84 @@
+plugins {
+  `java-library`
+}
+
+description = "communication"
+
+apply(from = rootDir.resolve("gradle/java.gradle"))
+
+dependencies {
+  implementation(libs.slf4j)
+
+  api(project(":remote-config:remote-config-api"))
+  implementation(project(":remote-config:remote-config-core"))
+  implementation(project(":internal-api"))
+  implementation(project(":utils:container-utils"))
+  implementation(project(":utils:socket-utils"))
+  implementation(project(":utils:version-utils"))
+
+  api(libs.okio)
+  api(libs.okhttp)
+  api(libs.moshi)
+  implementation(libs.dogstatsd)
+
+  testImplementation(project(":utils:test-utils"))
+  testImplementation(libs.bundles.junit5)
+  testImplementation(libs.truth)
+  testImplementation(libs.bytebuddy)
+  testImplementation("org.msgpack:msgpack-core:0.8.20")
+  testImplementation("org.msgpack:jackson-dataformat-msgpack:0.8.20")
+  testImplementation(
+    group = "com.squareup.okhttp3",
+    name = "mockwebserver",
+    version = libs.versions.okhttp.legacy.get() // actually a version range
+  )
+}
+
+val minimumBranchCoverage by extra(0.5)
+val minimumInstructionCoverage by extra(0.8)
+val excludedClassesCoverage by extra(
+  listOf(
+    "datadog.communication.ddagent.ExternalAgentLauncher",
+    "datadog.communication.ddagent.ExternalAgentLauncher.NamedPipeHealthCheck",
+    "datadog.communication.ddagent.SharedCommunicationObjects.FixedConfigUrlSupplier",
+    "datadog.communication.ddagent.SharedCommunicationObjects.RetryConfigUrlSupplier",
+    "datadog.communication.http.OkHttpUtils",
+    "datadog.communication.http.OkHttpUtils.1",
+    "datadog.communication.http.OkHttpUtils.ByteBufferRequestBody",
+    "datadog.communication.http.OkHttpUtils.CustomListener",
+    "datadog.communication.http.OkHttpUtils.GZipByteBufferRequestBody",
+    "datadog.communication.http.OkHttpUtils.GZipRequestBodyDecorator",
+    "datadog.communication.http.OkHttpUtils.JsonRequestBody",
+    "datadog.communication.monitor.DDAgentStatsDConnection",
+    "datadog.communication.monitor.DDAgentStatsDConnection.*",
+    "datadog.communication.monitor.LoggingStatsDClient",
+    "datadog.communication.BackendApiFactory",
+    "datadog.communication.BackendApiFactory.Intake",
+    "datadog.communication.EvpProxyApi",
+    "datadog.communication.IntakeApi",
+    "datadog.communication.util.IOUtils",
+    "datadog.communication.util.IOUtils.1",
+  )
+)
+val excludedClassesBranchCoverage by extra(
+  listOf(
+    "datadog.communication.ddagent.TracerVersion",
+    "datadog.communication.BackendApiFactory",
+    "datadog.communication.EvpProxyApi",
+    "datadog.communication.IntakeApi",
+  )
+)
+val excludedClassesInstructionCoverage by extra(
+  listOf(
+    // can't reach the error condition now
+    "datadog.communication.fleet.FleetServiceImpl",
+    "datadog.communication.ddagent.SharedCommunicationObjects",
+    "datadog.communication.ddagent.TracerVersion",
+    "datadog.communication.BackendApiFactory",
+    "datadog.communication.BackendApiFactory.Intake",
+    "datadog.communication.EvpProxyApi",
+    "datadog.communication.IntakeApi",
+    "datadog.communication.util.IOUtils",
+    "datadog.communication.util.IOUtils.1",
+  )
+)

communication/build.gradle.kts

@@ -24,7 +24,7 @@
  */
 class CommandLine {
   private static final String SUN_JAVA_COMMAND_PROPERTY = "sun.java.command";
-  final List<String> fullCommand = findFullCommand();
+  private final List<String> fullCommand = findFullCommand();
   final String name = getCommandName();
   final List<String> arguments = getCommandArguments();
 
@@ -35,14 +35,14 @@ private List<String> findFullCommand() {
   }
 
   private String getCommandName() {
-    return fullCommand.isEmpty() ? null : fullCommand.get(0);
+    return this.fullCommand.isEmpty() ? null : this.fullCommand.get(0);
   }
 
   private List<String> getCommandArguments() {
-    if (fullCommand.isEmpty()) {
-      return fullCommand;
+    if (this.fullCommand.isEmpty()) {
+      return this.fullCommand;
     } else {
-      return fullCommand.subList(1, fullCommand.size());
+      return this.fullCommand.subList(1, this.fullCommand.size());
     }
   }
 }

components/environment/src/main/java/datadog/environment/CommandLine.java

@@ -16,7 +16,8 @@ private EnvironmentVariables() {}
    * Gets an environment variable value.
    *
    * @param name The environment variable name.
-   * @return The environment variable value, {@code null} if missing or can't be retrieved.
+   * @return The environment variable value, {@code null} if missing, can't be retrieved, or the
+   *     environment variable name is {@code null}.
    */
   public static @Nullable String get(String name) {
     return getOrDefault(name, null);
@@ -28,9 +29,13 @@ private EnvironmentVariables() {}
    * @param name The environment variable name.
    * @param defaultValue The default value to return if the environment variable is missing or can't
    *     be retrieved.
-   * @return The environment variable value, {@code defaultValue} if missing or can't be retrieved.
+   * @return The environment variable value, {@code defaultValue} if missing, can't be retrieved or
+   *     the environment variable name is {@code null}.
    */
   public static String getOrDefault(@Nonnull String name, String defaultValue) {
+    if (name == null) {
+      return defaultValue;
+    }
     try {
       String value = System.getenv(name);
       return value == null ? defaultValue : value;

components/environment/src/main/java/datadog/environment/EnvironmentVariables.java

@@ -1,5 +1,7 @@
 package datadog.environment;
 
+import javax.annotation.Nonnull;
+
 /**
  * Safely queries system properties against security manager.
  *
@@ -13,7 +15,8 @@ private SystemProperties() {}
    * Gets a system property value.
    *
    * @param property The system property name.
-   * @return The system property value, {@code null} if missing or can't be retrieved.
+   * @return The system property value, {@code null} if missing, can't be retrieved, or the system
+   *     property name is {@code null}.
    */
   public static String get(String property) {
     return getOrDefault(property, null);
@@ -25,9 +28,13 @@ public static String get(String property) {
    * @param property The system property name.
    * @param defaultValue The default value to return if the system property is missing or can't be
    *     retrieved.
-   * @return The system property value, {@code defaultValue} if missing or can't be retrieved.
+   * @return The system property value, {@code defaultValue} if missing, can't be retrieved, or the
+   *     system property name is {@code null}.
    */
-  public static String getOrDefault(String property, String defaultValue) {
+  public static String getOrDefault(@Nonnull String property, String defaultValue) {
+    if (property == null) {
+      return defaultValue;
+    }
     try {
       return System.getProperty(property, defaultValue);
     } catch (SecurityException ignored) {

components/environment/src/main/java/datadog/environment/SystemProperties.java

@@ -1,27 +1,39 @@
 package datadog.environment;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.junit.jupiter.api.Test;
 
 class EnvironmentVariablesTest {
   private static final String EXISTING_ENV_VAR = "JAVA_8_HOME";
   private static final String MISSING_ENV_VAR = "UNDEFINED_ENV_VAR";
+  private static final String DEFAULT_VALUE = "DEFAULT";
 
   @Test
   void testGet() {
+    // Existing environment variable
     assertNotNull(EnvironmentVariables.get(EXISTING_ENV_VAR));
+    // Missing environment variable
     assertNull(EnvironmentVariables.get(MISSING_ENV_VAR));
-    assertThrows(NullPointerException.class, () -> EnvironmentVariables.get(null));
+    // Null values
+    assertDoesNotThrow(() -> EnvironmentVariables.get(null));
+    assertNull(EnvironmentVariables.get(null));
   }
 
   @Test
   void testGetOrDefault() {
+    // Existing environment variable
     assertNotNull(EnvironmentVariables.getOrDefault(EXISTING_ENV_VAR, null));
-
-    assertEquals("", EnvironmentVariables.getOrDefault(MISSING_ENV_VAR, ""));
+    // Missing environment variable
+    assertEquals(DEFAULT_VALUE, EnvironmentVariables.getOrDefault(MISSING_ENV_VAR, DEFAULT_VALUE));
+    assertNull(EnvironmentVariables.getOrDefault(MISSING_ENV_VAR, null));
+    // Null values
+    assertDoesNotThrow(() -> EnvironmentVariables.getOrDefault(null, DEFAULT_VALUE));
+    assertEquals(DEFAULT_VALUE, EnvironmentVariables.getOrDefault(null, DEFAULT_VALUE));
+    assertDoesNotThrow(() -> EnvironmentVariables.getOrDefault(MISSING_ENV_VAR, null));
     assertNull(EnvironmentVariables.getOrDefault(MISSING_ENV_VAR, null));
-
-    assertThrows(NullPointerException.class, () -> EnvironmentVariables.getOrDefault(null, ""));
   }
 }