Merge branch 'master' into alexeyk/protocol-v1-1

Author: AlexeyKuznetsov-DD

.gitlab-ci.yml

@@ -7,13 +7,26 @@ include:
   - project: 'DataDog/apm-reliability/apm-sdks-benchmarks'
     file: '.gitlab/ci-java-spring-petclinic-parallel.yml'
     ref: 'main'
+  - project: 'DataDog/apm-reliability/apm-sdks-benchmarks'
+    file: '.gitlab/ci-java-load-parallel.yml'
+    ref: 'main'
+  - project: 'DataDog/apm-reliability/apm-sdks-benchmarks'
+    file: '.gitlab/ci-java-startup-parallel.yml'
+    ref: 'main'
+  - project: 'DataDog/apm-reliability/apm-sdks-benchmarks'
+    file: '.gitlab/ci-java-dacapo-parallel.yml'
+    ref: 'main'
+  - local: ".gitlab/java-benchmark-configs.yml"
 
 stages:
   - build
   - publish
   # These benchmarks are intended to replace the legacy benchmarks in the future
   - java-spring-petclinic-parallel
   - java-spring-petclinic-parallel-slo
+  - java-startup-parallel
+  - java-load-parallel
+  - java-dacapo-parallel
   - shared-pipeline
   - benchmarks
   - macrobenchmarks

.gitlab/java-benchmark-configs.yml

@@ -0,0 +1,21 @@
+# Ensure the tracer artifact publish finishes before the benchmark jobs start.
+linux-java-spring-petclinic-parallel:
+  needs: ["publish-artifacts-to-s3"]
+
+linux-java-insecure-bank-load-parallel:
+  needs: ["publish-artifacts-to-s3"]
+
+linux-java-spring-petclinic-load-parallel:
+  needs: ["publish-artifacts-to-s3"]
+
+linux-java-insecure-bank-startup-parallel:
+  needs: ["publish-artifacts-to-s3"]
+
+linux-java-spring-petclinic-startup-parallel:
+  needs: ["publish-artifacts-to-s3"]
+
+linux-java-dacapo-parallel-1:
+  needs: ["publish-artifacts-to-s3"]
+
+linux-java-dacapo-parallel-2:
+  needs: ["publish-artifacts-to-s3"]

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 # NOTE: Ranges for some versions are needed to allow instrumentation tests to specify the desired version.
 
 # Build
-develocity = "4.2.2"
+develocity = "4.4.1"
 forbiddenapis = "3.10"
 spotbugs_annotations = "4.9.8"
 

metadata/supported-configurations.json

@@ -909,7 +909,7 @@
       {
         "version": "A",
         "type": "boolean",
-        "default": "true",
+        "default": "false",
         "aliases": []
       }
     ],
@@ -1107,7 +1107,7 @@
     ],
     "DD_DATA_STREAMS_TRANSACTION_EXTRACTORS": [
       {
-        "version": "A",
+        "version": "B",
         "type": "string",
         "default": null,
         "aliases": []
@@ -2227,7 +2227,7 @@
     ],
     "DD_TRACE_LOG_LEVEL": [
       {
-        "version": "A",
+        "version": "D",
         "type": "string",
         "default": null,
         "aliases": ["DD_LOG_LEVEL"]
@@ -2371,23 +2371,23 @@
     ],
     "DD_OTLP_TRACES_ENDPOINT": [
       {
-        "version": "A",
+        "version": "B",
         "type": "string",
         "default": null,
         "aliases": []
       }
     ],
     "DD_OTLP_TRACES_HEADERS": [
       {
-        "version": "A",
+        "version": "B",
         "type": "map",
         "default": null,
         "aliases": []
       }
     ],
     "DD_OTLP_TRACES_PROTOCOL": [
       {
-        "version": "A",
+        "version": "B",
         "type": "string",
         "default": "HTTP_PROTOBUF",
         "aliases": []
@@ -11123,7 +11123,7 @@
     ],
     "DD_TRACE_WEBSOCKET_ENABLED": [
       {
-        "version": "B",
+        "version": "C",
         "type": "boolean",
         "default": "true",
         "aliases": ["DD_TRACE_INTEGRATION_WEBSOCKET_ENABLED", "DD_INTEGRATION_WEBSOCKET_ENABLED"]

repository.datadog.yaml

@@ -2,9 +2,14 @@
 schema-version: v1
 kind: mergequeue # https://datadoghq.atlassian.net/wiki/x/XgUQug
 enable: true
+# Each PR in the MQ is processed in parallel
+# Conflicts between PRs in the MQ will not be detected
+workflow_type: noqueue
 merge_method: squash
-skip_labels: true
+# Ensure head commit Gitlab pipelines complete and are successful before merging the PR
 gitlab_check_enable: true
+# Do not add merge queue status labels on the PR - they may cause race condition errors with existing label checks
+skip_labels: true
 branches:
   master:
     allow_skip_checks: true

settings.gradle.kts

@@ -20,7 +20,7 @@ pluginManagement {
 }
 
 plugins {
-  id("com.gradle.develocity") version "4.4.0"
+  id("com.gradle.develocity") version "4.4.1"
   id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }