Merge branch 'master' into andrea.marziali/css2

Author: amarziali

.gitlab-ci.yml

@@ -200,11 +200,11 @@ pre-release-checks:
       allow_failure: false
   script:
     - |
-      SONATYPE_USERNAME=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.central_username --with-decryption --query "Parameter.Value" --out text)
-      SONATYPE_PASSWORD=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.central_password --with-decryption --query "Parameter.Value" --out text)
+      MAVEN_CENTRAL_USERNAME=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.central_username --with-decryption --query "Parameter.Value" --out text)
+      MAVEN_CENTRAL_PASSWORD=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.central_password --with-decryption --query "Parameter.Value" --out text)
       # See https://central.sonatype.org/publish/publish-portal-api/
       # 15e0cbbb-deff-421e-9e02-296a24d0cada is deployment, any deployment id listed in central  work, the idea is to check whether the token can authenticate
-      curl --request POST --include --fail https://central.sonatype.com/api/v1/publisher/status?id=15e0cbbb-deff-421e-9e02-296a24d0cada --header "Authorization: Bearer $(printf "$SONATYPE_USERNAME:$SONATYPE_PASSWORD" | base64)"
+      curl --request POST --include --fail https://central.sonatype.com/api/v1/publisher/status?id=15e0cbbb-deff-421e-9e02-296a24d0cada --header "Authorization: Bearer $(printf "$MAVEN_CENTRAL_USERNAME:$MAVEN_CENTRAL_PASSWORD" | base64)"
       if [ $? -ne 0 ]; then
         echo "Failed to authenticate against central. Check credentials, see https://datadoghq.atlassian.net/wiki/x/Oog5OgE"
         exit 1
@@ -768,8 +768,8 @@ deploy_to_di_backend:manual:
     UPSTREAM_COMMIT_AUTHOR: $CI_COMMIT_AUTHOR
     UPSTREAM_COMMIT_SHORT_SHA: $CI_COMMIT_SHORT_SHA
 
-# If the deploy_to_sonatype job is re-run, re-trigger the deploy_artifacts_to_github job as well so that the artifacts match.
-deploy_to_sonatype:
+# If the deploy_to_maven_central job is re-run, re-trigger the deploy_artifacts_to_github job as well so that the artifacts match.
+deploy_to_maven_central:
   extends: .gradle_build
   stage: publish
   needs: [ build ]
@@ -786,8 +786,8 @@ deploy_to_sonatype:
     - when: manual
       allow_failure: true
   script:
-    - export SONATYPE_USERNAME=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.central_username --with-decryption --query "Parameter.Value" --out text)
-    - export SONATYPE_PASSWORD=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.central_password --with-decryption --query "Parameter.Value" --out text)
+    - export MAVEN_CENTRAL_USERNAME=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.central_username --with-decryption --query "Parameter.Value" --out text)
+    - export MAVEN_CENTRAL_PASSWORD=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.central_password --with-decryption --query "Parameter.Value" --out text)
     - export GPG_PRIVATE_KEY=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.signing.gpg_private_key --with-decryption --query "Parameter.Value" --out text)
     - export GPG_PASSWORD=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.signing.gpg_passphrase --with-decryption --query "Parameter.Value" --out text)
     - ./gradlew -PbuildInfo.build.number=$CI_JOB_ID publishToSonatype closeSonatypeStagingRepository -PskipTests $GRADLE_ARGS
@@ -805,11 +805,11 @@ deploy_artifacts_to_github:
       when: never
     - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+$/'
       when: on_success
-  # Requires the deploy_to_sonatype job to have run first (the UP-TO-DATE gradle check across jobs is broken)
+  # Requires the deploy_to_maven_central job to have run first (the UP-TO-DATE gradle check across jobs is broken)
   # This will deploy the artifacts built from the publishToSonatype task to the GitHub release
   needs:
-    - job: deploy_to_sonatype
-      # The deploy_to_sonatype job is not run for release candidate versions
+    - job: deploy_to_maven_central
+      # The deploy_to_maven_central job is not run for release candidate versions
       optional: true
   script:
     - aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.gh_release_token --with-decryption --query "Parameter.Value" --out text > github-token.txt

build.gradle

@@ -110,8 +110,8 @@ nexusPublishing {
       sonatype {
         nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
         snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
-        username = System.getenv("SONATYPE_USERNAME")
-        password = System.getenv("SONATYPE_PASSWORD")
+        username = System.getenv("MAVEN_CENTRAL_USERNAME")
+        password = System.getenv("MAVEN_CENTRAL_PASSWORD")
       }
     }
   }

dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy

@@ -365,6 +365,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
       "-Duser.dir=${projectHome.toAbsolutePath()}".toString(),
       "-Dmaven.mainClass=org.apache.maven.cli.MavenCli".toString(),
       "-Dmaven.multiModuleProjectDirectory=${projectHome.toAbsolutePath()}".toString(),
+      "-Dmaven.artifact.threads=10",
     ]
     if (runWithAgent) {
       if (System.getenv("DD_CIVISIBILITY_SMOKETEST_DEBUG_PARENT") != null) {

dd-trace-core/src/main/java/datadog/trace/common/metrics/ConflatingMetricsAggregator.java

@@ -325,11 +325,6 @@ private void disable() {
     features.discover();
     if (!features.supportsMetrics()) {
       log.debug("Disabling metric reporting because an agent downgrade was detected");
-      AgentTaskScheduler.Scheduled<?> cancellation = this.cancellation;
-      if (null != cancellation) {
-        cancellation.cancel();
-      }
-      this.thread.interrupt();
       this.pending.clear();
       this.batchPool.clear();
       this.inbox.clear();

dd-trace-core/src/test/groovy/datadog/trace/common/metrics/MetricsReliabilityTest.groovy

@@ -0,0 +1,117 @@
+package datadog.trace.common.metrics
+
+import datadog.communication.ddagent.SharedCommunicationObjects
+import datadog.trace.api.Config
+import datadog.trace.core.test.DDCoreSpecification
+
+import java.util.concurrent.CountDownLatch
+
+import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
+
+class MetricsReliabilityTest extends DDCoreSpecification {
+
+  static class State {
+    boolean agentMetricsAvailable
+    boolean receivedStats
+    boolean receivedClientComputedHeader
+    CountDownLatch latch
+    def reset(agentMetricsAvailable) {
+      this.agentMetricsAvailable = agentMetricsAvailable
+      receivedStats = false
+      receivedClientComputedHeader = false
+      latch = new CountDownLatch(1)
+    }
+  }
+
+  static newAgent(State state) {
+    httpServer {
+      handlers {
+        get("/info") {
+          response.send('{"endpoints":[' + (state.agentMetricsAvailable ? '"/v0.6/stats", ' : '')
+            + '"/v0.4/traces"]}')
+          state.latch.countDown()
+        }
+        post("/v0.6/stats", {
+          state.receivedStats = true
+          response.status(state.agentMetricsAvailable ? 200 : 404).send()
+        })
+        put("/v0.4/traces", {
+          state.receivedClientComputedHeader = "true" == request.getHeader('Datadog-Client-Computed-Stats')
+          response.status(200).send()
+        })
+      }
+    }
+  }
+
+  def "metrics should reliably handle momentary downgrades"() {
+    setup:
+    def state = new State()
+    state.reset(true)
+    def agent = newAgent(state)
+    agent.start()
+    def props = new Properties()
+    props.put("trace.agent.url", agent.getAddress().toString())
+    props.put("trace.tracer.metrics.enabled", "true")
+    def config = Config.get(props)
+    def sharedComm = new SharedCommunicationObjects()
+    sharedComm.createRemaining(config)
+    def featuresDiscovery = sharedComm.featuresDiscovery(config)
+    def tracer = tracerBuilder().sharedCommunicationObjects(sharedComm).config(config).build()
+
+    when: "metrics enabled and discovery is performed"
+    featuresDiscovery.discover()
+
+    then: "should support metrics"
+    state.latch.await()
+    assert featuresDiscovery.supportsMetrics()
+
+    when: "a span is published"
+    tracer.startSpan("test", "test").finish()
+    tracer.flush()
+    tracer.flushMetrics()
+
+    then: "should have sent statistics and informed the agent that we calculate the stats"
+    assert state.receivedClientComputedHeader
+    assert state.receivedStats
+
+    when: "simulate an agent downgrade"
+    state.reset(false)
+    tracer.startSpan("test", "test").finish()
+    tracer.flush()
+    tracer.flushMetrics()
+
+    then: "a discovery should have done - we do not support anymore stats calculation"
+    state.latch.await()
+    assert !featuresDiscovery.supportsMetrics()
+
+    when: "a span is published"
+    tracer.startSpan("test", "test").finish()
+    tracer.flush()
+    tracer.flushMetrics()
+
+    then: "should have not sent statistics and informed the agent that we don't calculate the stats anymore"
+    assert !state.receivedClientComputedHeader
+    assert !state.receivedStats
+
+    when: "we detect that the agent can calculate the stats again"
+    state.reset(true)
+    featuresDiscovery.discover()
+
+    then: "we should understand it"
+    state.latch.await()
+    assert featuresDiscovery.supportsMetrics()
+
+    when: "a span is published"
+    tracer.startSpan("test", "test").finish()
+    tracer.flush()
+    tracer.flushMetrics()
+
+    then: "we should have sent the stats and informed the agent to not calculate the stats on the trace payload"
+    assert state.receivedClientComputedHeader
+    assert state.receivedStats
+
+    cleanup:
+    tracer.close()
+    agent.stop()
+  }
+}

gradle/publish.gradle

@@ -3,8 +3,8 @@ apply plugin: 'signing'
 
 /**
  * Proper publishing requires the following environment variables:
- * SONATYPE_USERNAME
- * SONATYPE_PASSWORD
+ * MAVEN_CENTRAL_USERNAME
+ * MAVEN_CENTRAL_PASSWORD
  * GPG_PRIVATE_KEY
  * GPG_PASSWORD
  */
@@ -81,8 +81,8 @@ gradle.taskGraph.whenReady { TaskExecutionGraph taskGraph ->
   if (taskGraph.hasTask(publish) || taskGraph.hasTask("publishToSonatype")) {
     assert project.findProperty("removeJarVersionNumbers") != true
     if (taskGraph.hasTask("publishToSonatype")) {
-      assert System.getenv("SONATYPE_USERNAME") != null
-      assert System.getenv("SONATYPE_PASSWORD") != null
+      assert System.getenv("MAVEN_CENTRAL_USERNAME") != null
+      assert System.getenv("MAVEN_CENTRAL_PASSWORD") != null
       if (isCI) {
         assert System.getenv("GPG_PRIVATE_KEY") != null
         assert System.getenv("GPG_PASSWORD") != null

gradle/repositories.gradle

@@ -10,7 +10,7 @@ repositories {
     }
   }
   mavenCentral()
-  // add sonatype repository for snapshot dependencies
+  // add maven central repository for snapshot dependencies
   maven {
     content {
       includeGroup "com.datadoghq"