Merge branch 'master' into bdu/r-gate

Author: ddyurchenko

dd-smoke-tests/dynamic-config/src/test/groovy/datadog/smoketest/AppSecActivationSmokeTest.groovy

@@ -1,6 +1,7 @@
 package datadog.smoketest
 
 import datadog.smoketest.dynamicconfig.AppSecApplication
+import datadog.trace.test.util.Flaky
 
 class AppSecActivationSmokeTest extends AbstractSmokeTest {
 
@@ -22,6 +23,7 @@ class AppSecActivationSmokeTest extends AbstractSmokeTest {
     processBuilder.directory(new File(buildDirectory))
   }
 
+  @Flaky
   void 'test activation config change is sent via RC'() {
     when:
     setRemoteConfig('datadog/2/ASM_FEATURES/asm_features_activation/config', '{"asm":{"enabled":true}}')

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

@@ -41,8 +41,8 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
   private static final String JAVAC_PLUGIN_VERSION = Config.get().ciVisibilityCompilerPluginVersion
   private static final String JACOCO_PLUGIN_VERSION = Config.get().ciVisibilityJacocoPluginVersion
 
-  private static final int DEPENDENCIES_DOWNLOAD_TIMEOUT_SECS = 400
-  private static final int PROCESS_TIMEOUT_SECS = 120
+  private static final int DEPENDENCIES_DOWNLOAD_TIMEOUT_SECS = 120
+  private static final int PROCESS_TIMEOUT_SECS = 60
 
   private static final int DEPENDENCIES_DOWNLOAD_RETRIES = 5
 
@@ -293,9 +293,13 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
   private void retryUntilSuccessfulOrNoAttemptsLeft(List<String> mvnCommand, Map<String, String> additionalEnvVars = [:]) {
     def processBuilder = createProcessBuilder(mvnCommand, false, false, [], additionalEnvVars)
     for (int attempt = 0; attempt < DEPENDENCIES_DOWNLOAD_RETRIES; attempt++) {
-      def exitCode = runProcess(processBuilder.start(), DEPENDENCIES_DOWNLOAD_TIMEOUT_SECS)
-      if (exitCode == 0) {
-        return
+      try {
+        def exitCode = runProcess(processBuilder.start(), DEPENDENCIES_DOWNLOAD_TIMEOUT_SECS)
+        if (exitCode == 0) {
+          return
+        }
+      } catch (TimeoutException e) {
+        LOGGER.warn("Failed dependency resolution with exception: ", e)
       }
     }
     throw new AssertionError((Object) "Tried $DEPENDENCIES_DOWNLOAD_RETRIES times to execute $mvnCommand and failed")

dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java

@@ -62,6 +62,7 @@ public final class GeneralConfig {
   public static final String HEALTH_METRICS_STATSD_PORT = "trace.health.metrics.statsd.port";
   public static final String PERF_METRICS_ENABLED = "trace.perf.metrics.enabled";
 
+  public static final String TRACE_STATS_COMPUTATION_ENABLED = "trace.stats.computation.enabled";
   public static final String TRACER_METRICS_ENABLED = "trace.tracer.metrics.enabled";
   public static final String TRACER_METRICS_BUFFERING_ENABLED =
       "trace.tracer.metrics.buffering.enabled";

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

@@ -51,7 +51,7 @@ class MetricsReliabilityTest extends DDCoreSpecification {
     agent.start()
     def props = new Properties()
     props.put("trace.agent.url", agent.getAddress().toString())
-    props.put("trace.tracer.metrics.enabled", "true")
+    props.put("trace.stats.computation.enabled", "true")
     def config = Config.get(props)
     def sharedComm = new SharedCommunicationObjects()
     sharedComm.createRemaining(config)

internal-api/src/main/java/datadog/trace/api/Config.java

@@ -373,6 +373,7 @@
 import static datadog.trace.api.config.GeneralConfig.TRACER_METRICS_MAX_AGGREGATES;
 import static datadog.trace.api.config.GeneralConfig.TRACER_METRICS_MAX_PENDING;
 import static datadog.trace.api.config.GeneralConfig.TRACE_DEBUG;
+import static datadog.trace.api.config.GeneralConfig.TRACE_STATS_COMPUTATION_ENABLED;
 import static datadog.trace.api.config.GeneralConfig.TRACE_TAGS;
 import static datadog.trace.api.config.GeneralConfig.TRACE_TRIAGE;
 import static datadog.trace.api.config.GeneralConfig.TRIAGE_REPORT_DIR;
@@ -1785,7 +1786,9 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
             && configProvider.getBoolean(PERF_METRICS_ENABLED, DEFAULT_PERF_METRICS_ENABLED);
 
     // Enable tracer computed trace metrics by default for Azure Functions
-    tracerMetricsEnabled = configProvider.getBoolean(TRACER_METRICS_ENABLED, azureFunctions);
+    tracerMetricsEnabled =
+        configProvider.getBoolean(
+            TRACE_STATS_COMPUTATION_ENABLED, azureFunctions, TRACER_METRICS_ENABLED);
     tracerMetricsBufferingEnabled =
         configProvider.getBoolean(TRACER_METRICS_BUFFERING_ENABLED, false);
     tracerMetricsMaxAggregates = configProvider.getInteger(TRACER_METRICS_MAX_AGGREGATES, 2048);

repository.datadog.yaml

@@ -0,0 +1,4 @@
+---
+schema-version: v1
+kind: mergequeue
+enable: false

tooling/perform-release.sh

@@ -0,0 +1,92 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Ask for confirmation before continuing the release
+function confirmOrAbort() {
+    read -p "Do you want to continue? (y/N): " -n 1 -r
+    echo
+    if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+        echo "Aborting."
+        exit 1
+    fi
+}
+
+# Check if current branch is either 'master' or 'release/v*'
+CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+if [[ "$CURRENT_BRANCH" == "master" ]]; then
+    MINOR_RELEASE=true
+elif [[ "$CURRENT_BRANCH" =~ ^release/v[0-9]+\.[0-9]+\.x$ ]]; then
+    MINOR_RELEASE=false
+else
+    echo "❌ Please check out either 'master' branch or a 'release/v*' branch to perform a release first."
+    exit 1
+fi
+echo -n "✅ Current branch is '$CURRENT_BRANCH'. Performing a "
+if [ "$MINOR_RELEASE" = true ]; then
+    echo "minor release."
+else
+    echo "patch release."
+fi
+
+# Check upstream branch is set
+if ! git rev-parse --abbrev-ref --symbolic-full-name "@{u}" >/dev/null 2>&1; then
+    echo "❌ No upstream branch set. Please set the upstream branch for the current branch."
+    exit 1
+fi
+
+# Get the remote name
+REMOTE=$(git config --get "branch.$CURRENT_BRANCH.remote")
+if [ -z "$REMOTE" ]; then
+    echo "❌ Unable to determine the remote name. Please ensure you have a remote set."
+    exit 1
+fi
+
+# Check if working copy is clean
+if ! git diff-index --quiet HEAD; then
+    echo "❌ Working copy is not clean. Please commit or stash your changes before performing a release."
+    exit 1
+fi
+
+# Check if clone is up to date
+if ! git fetch "$REMOTE" --quiet ; then
+    echo "❌ Unable to fetch the latest changes from $REMOTE. Please check your network connection."
+    exit 1
+fi
+if ! git diff-index --quiet "$REMOTE/$CURRENT_BRANCH"; then
+    echo "❌ Working copy is not up to date with $REMOTE/$CURRENT_BRANCH. Please pull the latest changes before performing a release."
+    exit 1
+fi
+echo "✅ Working copy is clean and up-to-date."
+
+# Check the git log history
+LAST_RELEASE_TAG=$(git describe --tags --abbrev=0 --match='v[0-9]*.[0-9]*.[0-9]*')
+echo "ℹ️ Last release version: $LAST_RELEASE_TAG"
+SUSPICIOUS_COMMITS=$(git log --oneline --first-parent "$LAST_RELEASE_TAG"..HEAD | grep -E -v "Merge pull request #" | grep -E -v "\(#")
+if [ -n "$SUSPICIOUS_COMMITS" ]; then
+    echo "❌ The following commits are not merge commits and may not be suitable for a release:"
+    echo "$SUSPICIOUS_COMMITS"
+    echo "Please review these commits before proceeding with the release."
+    confirmOrAbort
+else
+    echo "✅ All commits since the last release are merge commits."
+fi
+
+# Get the next release version
+VERSION=$(echo "$LAST_RELEASE_TAG" | grep -E '^v[0-9]+\.[0-9]+\.0$' | sed 's/^v//')
+if [ -z "$VERSION" ]; then
+    echo "❌ Unable to determine the next release version from the last release tag: $LAST_RELEASE_TAG"
+    exit 1
+fi
+if [ "$MINOR_RELEASE" = true ]; then
+    NEXT_RELEASE_VERSION=$(echo "$VERSION" | awk -F. '{printf "v%d.%d.0", $1, $2 + 1}')
+else
+    NEXT_RELEASE_VERSION=$(echo "$VERSION" | awk -F. '{printf "v%d.%d.%d", $1, $2, $3 + 1}')
+fi
+echo "ℹ️ Next release version: $NEXT_RELEASE_VERSION"
+
+# Create and push the release tag
+echo "ℹ️ The release tag will be created and pushed. No abort is possible after this point."
+confirmOrAbort
+git tag -a -s -m "Release $NEXT_RELEASE_VERSION" "$NEXT_RELEASE_VERSION"
+git push "$REMOTE" "$NEXT_RELEASE_VERSION" --no-verify
+echo "✅ Release tag $NEXT_RELEASE_VERSION created and pushed to $REMOTE."