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

Author: AlexeyKuznetsov-DD

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
   id("dd-trace-java.config-inversion-linter")
   id("dd-trace-java.ci-jobs")
 
-  id("com.diffplug.spotless") version "8.2.1"
+  id("com.diffplug.spotless") version "8.4.0"
   id("me.champeau.gradle.japicmp") version "0.4.3"
   id("com.github.spotbugs") version "6.4.8"
   id("de.thetaphi.forbiddenapis") version "3.10"
@@ -39,6 +39,7 @@ with(extensions["spotlessPredeclare"] as SpotlessExtension) {
     removeUnusedImports()
 
     googleJavaFormat("1.34.1")
+    tableTestFormatter("1.1.1")
   }
   groovyGradle {
     greclipse()

buildSrc/build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
   `java-gradle-plugin`
   `kotlin-dsl`
   `jvm-test-suite`
-  id("com.diffplug.spotless") version "8.2.1"
+  id("com.diffplug.spotless") version "8.4.0"
 }
 
 // The buildSrc still needs to target Java 8 as build time instrumentation and muzzle plugin

buildSrc/call-site-instrumentation-plugin/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
   java
-  id("com.diffplug.spotless") version "8.2.1"
+  id("com.diffplug.spotless") version "8.4.0"
   id("com.gradleup.shadow") version "8.3.9"
 }
 

components/json/src/test/java/datadog/json/JsonMapperTest.java

@@ -94,12 +94,12 @@ void testMappingToMapFromNonObjectJson(String json) {
   }
 
   @TableTest({
-    "Scenario      | Input                | Expected                          ",
-    "null input    |                      | '[]'                              ",
-    "empty list    | []                   | '[]'                              ",
-    "single value  | [value1]             | '[\"value1\"]'                    ",
-    "two values    | [value1, value2]     | '[\"value1\",\"value2\"]'         ",
-    "quoted values | [va\"lu\"e1, value2] | '[\"va\\\"lu\\\"e1\",\"value2\"]' "
+    "Scenario      | Input                | Expected                         ",
+    "null input    |                      | '[]'                             ",
+    "empty list    | []                   | '[]'                             ",
+    "single value  | [value1]             | '[\"value1\"]'                   ",
+    "two values    | [value1, value2]     | '[\"value1\",\"value2\"]'        ",
+    "quoted values | [va\"lu\"e1, value2] | '[\"va\\\"lu\\\"e1\",\"value2\"]'"
   })
   @ParameterizedTest(name = "test mapping iterable to JSON array: {0}")
   void testMappingIterableToJsonArray(List<String> input, String expected) throws IOException {
@@ -137,14 +137,14 @@ void testMappingToListFromEmptyJsonObject(String json) throws IOException {
   }
 
   @TableTest({
-    "Scenario      | input  | expected   ",
-    " null value   |        | ''         ",
-    " empty string | ''     | ''         ",
-    " \\b          | '\b'   | '\"\\b\"'  ",
-    " \\t          | '\t'   | '\"\\t\"'  ",
-    " \\f          | '\f'   | '\"\\f\"'  ",
-    " a            | 'a'    | '\"a\"'    ",
-    " /            | '/'    | '\"\\/\"'  ",
+    "Scenario     | input | expected ",
+    "null value   |       | ''       ",
+    "empty string | ''    | ''       ",
+    "\\b          | '\b'  | '\"\\b\"'",
+    "\\t          | '\t'  | '\"\\t\"'",
+    "\\f          | '\f'  | '\"\\f\"'",
+    "a            | 'a'   | '\"a\"'  ",
+    "/            | '/'   | '\"\\/\"'"
   })
   @ParameterizedTest(name = "test mapping to JSON string: {0}")
   @MethodSource("testMappingToJsonStringArguments")

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java

@@ -193,7 +193,7 @@ public String getInstance() {
   }
 
   public String getDb() {
-    return db;
+    return db != null ? db : instance;
   }
 
   public String getHost() {

dd-java-agent/agent-debugger/build.gradle

@@ -32,20 +32,21 @@ excludedClassesCoverage += [
 
 dependencies {
   // main dependencies
-  implementation project(':utils:container-utils')
-  implementation libs.slf4j
-  implementation libs.bundles.asm
-  implementation project(':internal-api')
-  implementation project(':communication')
-  implementation project(':products:metrics:metrics-lib')
-  compileOnly project(':dd-java-agent:agent-tooling')
   compileOnly project(':dd-java-agent:agent-builder')
+  compileOnly project(':dd-java-agent:agent-tooling')
   compileOnly project(':dd-trace-core')
-  implementation project(':dd-java-agent:agent-debugger:debugger-el')
+  implementation project(':communication')
   implementation project(':dd-java-agent:agent-debugger:debugger-bootstrap')
-  implementation libs.okhttp
+  implementation project(':dd-java-agent:agent-debugger:debugger-el')
+  implementation project(':internal-api')
+  implementation project(':products:metrics:metrics-lib')
+  implementation project(':utils:container-utils')
+  implementation project(':utils:logging-utils')
+  implementation libs.bundles.asm
   implementation libs.dogstatsd
   implementation libs.moshi
+  implementation libs.okhttp
+  implementation libs.slf4j
 
   testImplementation libs.asm.util
   testImplementation libs.bundles.junit5

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java

@@ -14,12 +14,12 @@
 import com.datadog.debugger.util.ExceptionHelper;
 import com.datadog.debugger.util.SpringHelper;
 import datadog.environment.JavaVirtualMachine;
+import datadog.logging.RatelimitedLogger;
 import datadog.trace.api.Config;
 import datadog.trace.bootstrap.debugger.DebuggerContext;
 import datadog.trace.bootstrap.debugger.ProbeId;
 import datadog.trace.bootstrap.debugger.ProbeImplementation;
 import datadog.trace.bootstrap.debugger.ProbeRateLimiter;
-import datadog.trace.relocate.api.RatelimitedLogger;
 import datadog.trace.util.TagsHelper;
 import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/ProbeStatusSink.java

@@ -10,9 +10,9 @@
 import com.datadog.debugger.util.ExceptionHelper;
 import com.datadog.debugger.util.MoshiHelper;
 import com.squareup.moshi.JsonAdapter;
+import datadog.logging.RatelimitedLogger;
 import datadog.trace.api.Config;
 import datadog.trace.bootstrap.debugger.ProbeId;
-import datadog.trace.relocate.api.RatelimitedLogger;
 import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/uploader/BatchUploader.java

@@ -5,8 +5,8 @@
 import com.datadog.debugger.util.DebuggerMetrics;
 import datadog.common.container.ContainerInfo;
 import datadog.communication.http.OkHttpUtils;
+import datadog.logging.RatelimitedLogger;
 import datadog.trace.api.Config;
-import datadog.trace.relocate.api.RatelimitedLogger;
 import datadog.trace.util.AgentThreadFactory;
 import java.io.IOException;
 import java.time.Duration;

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ExceptionHelper.java

@@ -1,6 +1,6 @@
 package com.datadog.debugger.util;
 
-import datadog.trace.relocate.api.RatelimitedLogger;
+import datadog.logging.RatelimitedLogger;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.io.Writer;