Merge branch 'master' into alexeyk/refactored-env-vars-to-be-testable

Author: AlexeyKuznetsov-DD

buildSrc/build.gradle.kts

@@ -76,7 +76,6 @@ testing {
     val integTest by registering(JvmTestSuite::class) {
       dependencies {
         implementation(gradleTestKit())
-        implementation("org.assertj:assertj-core:3.25.3")
       }
       // Makes the gradle plugin publish its declared plugins to this source set
       gradlePlugin.testSourceSet(sources)

buildSrc/src/integTest/kotlin/datadog/gradle/plugin/version/TracerVersionIntegrationTest.kt

@@ -1,10 +1,8 @@
 package datadog.gradle.plugin.version
 
-import org.assertj.core.api.Assertions.assertThat
 import org.gradle.testkit.runner.GradleRunner
-import org.junit.jupiter.api.Disabled
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.io.CleanupMode
 import org.junit.jupiter.api.io.TempDir
 import java.io.File
 import java.io.IOException
@@ -289,7 +287,7 @@ class TracerVersionIntegrationTest {
       // .withDebug(true)
       .build()
 
-    assertThat(buildResult.output).isEqualToIgnoringNewLines(expectedVersion)
+    assertEquals(expectedVersion, buildResult.output.lines().first())
   }
 
   private fun exec(workingDirectory: File, vararg args: String) {

communication/build.gradle.kts

@@ -23,7 +23,6 @@ dependencies {
 
   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")

communication/gradle.lockfile

@@ -32,15 +32,8 @@ com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClass
 com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs
 com.github.spotbugs:spotbugs:4.7.3=spotbugs
 com.github.stefanbirkner:system-rules:1.19.0=testCompileClasspath,testRuntimeClasspath
-com.google.auto.value:auto-value-annotations:1.8.1=testCompileClasspath,testRuntimeClasspath
 com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.9.1=spotbugs
-com.google.errorprone:error_prone_annotations:2.7.1=testCompileClasspath,testRuntimeClasspath
-com.google.guava:failureaccess:1.0.1=testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:30.1.1-android=testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:1.3=testCompileClasspath,testRuntimeClasspath
-com.google.truth:truth:1.1.3=testCompileClasspath,testRuntimeClasspath
 com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.squareup.okhttp3:mockwebserver:3.12.12=testCompileClasspath,testRuntimeClasspath
 com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath
@@ -75,8 +68,6 @@ org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
 org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
 org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-compat-qual:2.5.5=testCompileClasspath,testRuntimeClasspath
-org.checkerframework:checker-qual:3.13.0=testCompileClasspath,testRuntimeClasspath
 org.codehaus.groovy:groovy-all:3.0.24=testCompileClasspath,testRuntimeClasspath
 org.codehaus.groovy:groovy-ant:3.0.23=codenarc
 org.codehaus.groovy:groovy-ant:3.0.24=testCompileClasspath,testRuntimeClasspath
@@ -144,8 +135,7 @@ org.ow2.asm:asm-tree:9.8=jacocoAnt
 org.ow2.asm:asm-util:7.1=compileClasspath,testCompileClasspath
 org.ow2.asm:asm-util:9.2=runtimeClasspath,testRuntimeClasspath
 org.ow2.asm:asm-util:9.4=spotbugs
-org.ow2.asm:asm:7.1=compileClasspath
-org.ow2.asm:asm:9.1=testCompileClasspath
+org.ow2.asm:asm:7.1=compileClasspath,testCompileClasspath
 org.ow2.asm:asm:9.2=runtimeClasspath,testRuntimeClasspath
 org.ow2.asm:asm:9.4=spotbugs
 org.ow2.asm:asm:9.8=jacocoAnt

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

@@ -271,13 +271,11 @@ private boolean processInfoResponse(State newState, String response) {
         newState.debuggerLogEndpoint = DEBUGGER_ENDPOINT_V1;
       }
       // both debugger v2 and diagnostics endpoints are forwarding events to the DEBUGGER intake
-      // because older agents support diagnostics, we fall back to it before falling back to v1
+      // because older agents support diagnostics from DD agent 7.49
       if (containsEndpoint(endpoints, DEBUGGER_ENDPOINT_V2)) {
         newState.debuggerSnapshotEndpoint = DEBUGGER_ENDPOINT_V2;
       } else if (containsEndpoint(endpoints, DEBUGGER_DIAGNOSTICS_ENDPOINT)) {
         newState.debuggerSnapshotEndpoint = DEBUGGER_DIAGNOSTICS_ENDPOINT;
-      } else if (containsEndpoint(endpoints, DEBUGGER_ENDPOINT_V1)) {
-        newState.debuggerSnapshotEndpoint = DEBUGGER_ENDPOINT_V1;
       }
       if (containsEndpoint(endpoints, DEBUGGER_DIAGNOSTICS_ENDPOINT)) {
         newState.debuggerDiagnosticsEndpoint = DEBUGGER_DIAGNOSTICS_ENDPOINT;

communication/src/test/groovy/datadog/communication/ddagent/DDAgentFeaturesDiscoveryTest.groovy

@@ -440,8 +440,8 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     1 * client.newCall(_) >> { Request request -> infoResponse(request, INFO_WITH_TELEMETRY_PROXY_RESPONSE) }
     features.supportsTelemetryProxy()
     features.supportsDebugger()
-    features.getDebuggerSnapshotEndpoint() == "debugger/v1/input"
-    !features.supportsDebuggerDiagnostics()
+    features.getDebuggerSnapshotEndpoint() == "debugger/v1/diagnostics"
+    features.supportsDebuggerDiagnostics()
     0 * _
   }
 

communication/src/test/groovy/datadog/communication/http/SafeRequestBuilderTest.groovy

@@ -1,31 +1,34 @@
 package datadog.communication.http
 
-import com.google.common.truth.Truth
 import okhttp3.Request
-import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 
+import static org.junit.jupiter.api.Assertions.assertFalse
+import static org.junit.jupiter.api.Assertions.assertThrows
+import static org.junit.jupiter.api.Assertions.assertTrue
+
 class SafeRequestBuilderTest {
   Request.Builder testBuilder = new Request.Builder()
 
   @Test
   void "test adding bad header"() {
     def name = 'bad'
     def password = 'very-secret-password'
-    IllegalArgumentException ex = Assertions.assertThrows(IllegalArgumentException, {
+    IllegalArgumentException ex = assertThrows(IllegalArgumentException, {
       testBuilder.url("http:localhost").addHeader(name, "$password\n")
     })
-    Truth.assertThat(ex).hasMessageThat().contains(name)
-    Truth.assertThat(ex).hasMessageThat().doesNotContain(password)
+    assertTrue(ex.getMessage().contains(name))
+    assertFalse(ex.getMessage().contains(password))
   }
+
   @Test
   void "test adding bad header2"(){
     def name = '\u0019'
     def password = 'very-secret-password'
-    IllegalArgumentException ex = Assertions.assertThrows(IllegalArgumentException, {
+    IllegalArgumentException ex = assertThrows(IllegalArgumentException, {
       testBuilder.url("http:localhost").addHeader(name, "\u0080$password")
     })
-    Truth.assertThat(ex).hasMessageThat().contains(name)
-    Truth.assertThat(ex).hasMessageThat().doesNotContain(password)
+    assertTrue(ex.getMessage().contains(name))
+    assertFalse(ex.getMessage().contains(password))
   }
 }

communication/src/test/resources/agent-features/agent-info-with-telemetry-proxy.json

@@ -15,6 +15,7 @@
     "/evp_proxy/v1/",
     "/evp_proxy/v2/",
     "/debugger/v1/input",
+    "/debugger/v1/diagnostics",
     "/v0.7/config"
   ],
   "feature_flags": [

dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/gradle.lockfile

@@ -12,10 +12,10 @@ com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClas
 com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.datadoghq:java-dogstatsd-client:4.4.3=runtimeClasspath,testRuntimeClasspath
 com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath
-com.fasterxml.jackson.core:jackson-annotations:2.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.fasterxml.jackson.core:jackson-core:2.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.fasterxml.jackson.core:jackson-databind:2.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.fasterxml.jackson:jackson-bom:2.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson.core:jackson-annotations:2.20=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson.core:jackson-core:2.20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson.core:jackson-databind:2.20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson:jackson-bom:2.20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.javaparser:javaparser-core:3.25.6=codenarc,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.jnr:jffi:1.3.13=runtimeClasspath,testRuntimeClasspath
 com.github.jnr:jnr-a64asm:1.0.0=runtimeClasspath,testRuntimeClasspath

dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/gradle.lockfile

@@ -12,10 +12,10 @@ com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClas
 com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.datadoghq:java-dogstatsd-client:4.4.3=runtimeClasspath,testRuntimeClasspath
 com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath
-com.fasterxml.jackson.core:jackson-annotations:2.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.fasterxml.jackson.core:jackson-core:2.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.fasterxml.jackson.core:jackson-databind:2.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.fasterxml.jackson:jackson-bom:2.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson.core:jackson-annotations:2.20=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson.core:jackson-core:2.20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson.core:jackson-databind:2.20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson:jackson-bom:2.20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.javaparser:javaparser-core:3.25.6=codenarc,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.jnr:jffi:1.3.13=runtimeClasspath,testRuntimeClasspath
 com.github.jnr:jnr-a64asm:1.0.0=runtimeClasspath,testRuntimeClasspath