Merge pull request #2777 from DataDog/aleksandr-gringauz/run-unit-tests-samples-and-benchmark

Run unit tests from samples folder and for tools:benchmark module

Author: aleksandr-gringauz

build.gradle.kts

@@ -95,6 +95,11 @@ registerSubModuleAggregationTask(
     ":features:"
 )
 registerSubModuleAggregationTask("unitTestDebugIntegrations", "testDebugUnitTest", ":integrations:")
+tasks.register("unitTestDebugSamples") {
+    dependsOn(
+        ":sample:benchmark:testDebugUnitTest"
+    )
+}
 
 tasks.register("assembleSampleRelease") {
     dependsOn(
@@ -111,7 +116,8 @@ tasks.register("unitTestTools") {
         ":tools:unit:testJvmReleaseUnitTest",
         ":tools:detekt:test",
         ":tools:lint:test",
-        ":tools:noopfactory:test"
+        ":tools:noopfactory:test",
+        ":tools:benchmark:test"
     )
 }
 

ci/pipelines/default-pipeline.yml

@@ -146,6 +146,7 @@ test:debug:
     - GRADLE_OPTS="-Xmx3072m" DD_TAGS="test.configuration.variant:debug" ./gradlew :dd-sdk-android-internal:testDebugUnitTest --no-daemon --build-cache --gradle-user-home cache/ -Dorg.gradle.jvmargs=-javaagent:$DD_TRACER_FOLDER/dd-java-agent.jar=$DD_COMMON_AGENT_CONFIG
     - GRADLE_OPTS="-Xmx3072m" DD_TAGS="test.configuration.variant:debug" ./gradlew :unitTestDebugFeatures --no-daemon --build-cache --gradle-user-home cache/ -Dorg.gradle.jvmargs=-javaagent:$DD_TRACER_FOLDER/dd-java-agent.jar=$DD_COMMON_AGENT_CONFIG
     - GRADLE_OPTS="-Xmx3072m" DD_TAGS="test.configuration.variant:debug" ./gradlew :unitTestDebugIntegrations --no-daemon --build-cache --gradle-user-home cache/ -Dorg.gradle.jvmargs=-javaagent:$DD_TRACER_FOLDER/dd-java-agent.jar=$DD_COMMON_AGENT_CONFIG
+    - GRADLE_OPTS="-Xmx3072m" DD_TAGS="test.configuration.variant:debug" ./gradlew :unitTestDebugSamples --no-daemon --build-cache --gradle-user-home cache/ -Dorg.gradle.jvmargs=-javaagent:$DD_TRACER_FOLDER/dd-java-agent.jar=$DD_COMMON_AGENT_CONFIG
   artifacts:
     when: always
     expire_in: 1 week

tools/benchmark/src/test/java/internal/DatadogHttpClientTest.kt

@@ -73,7 +73,8 @@ class DatadogHttpClientTest {
     @Forgery
     private lateinit var spanEvents: List<SpanEvent>
 
-    private val contentType = "application/json; charset=utf-8"
+    private val contentTypeJson = "application/json; charset=utf-8"
+    private val contentTypePlainText = "text/plain;charset=UTF-8"
 
     @BeforeEach
     fun `set up`() {
@@ -104,7 +105,7 @@ class DatadogHttpClientTest {
             verifyRequestBody(
                 firstValue.body,
                 fakeMetricJson,
-                contentType
+                contentTypeJson
             )
         }
     }
@@ -125,7 +126,7 @@ class DatadogHttpClientTest {
             verifyRequestBody(
                 firstValue.body,
                 fakeSpanJson,
-                contentType
+                contentTypePlainText
             )
         }
     }

tools/benchmark/src/test/java/internal/MemoryVitalReaderTest.kt

@@ -98,10 +98,10 @@ internal class MemoryVitalReaderTest {
 
         // When
         vmRssValuesKb.forEach { vmRss ->
-            // Set a Longer
-            Thread.sleep(memoryUpdateIntervalMs)
             fakeFile.writeText(generateStatusContent(vmRss))
+            Thread.sleep(memoryUpdateIntervalMs)
         }
+
         val result = testedReader.readVitalData()
 
         // Then