Skip to content

Commit 463ecab

Browse files
AlexeyKuznetsov-DDAlexeyKuznetsov-DD
committed
Merge branch 'master' into alexeyk/protocol-v1-1
2 parents 509213b + 1f5d818 commit 463ecab

File tree

140 files changed

+1389
-488
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+1389
-488
lines changed

‎communication/gradle.lockfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,5 +103,7 @@ org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
103103
org.snakeyaml:snakeyaml-engine:2.9=runtimeClasspath,testRuntimeClasspath
104104
org.spockframework:spock-bom:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath
105105
org.spockframework:spock-core:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath
106+
org.tabletest:tabletest-junit:1.2.1=testCompileClasspath,testRuntimeClasspath
107+
org.tabletest:tabletest-parser:1.2.0=testCompileClasspath,testRuntimeClasspath
106108
org.xmlresolver:xmlresolver:5.3.3=spotbugs
107109
empty=annotationProcessor,spotbugsPlugins,testAnnotationProcessor

dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/Caching.java renamed to communication/src/main/java/datadog/communication/serialization/Caching.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.trace.common.writer.ddagent;
1+
package datadog.communication.serialization;
22

33
import java.util.Arrays;
44

dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/GenerationalUtf8Cache.java renamed to communication/src/main/java/datadog/communication/serialization/GenerationalUtf8Cache.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package datadog.trace.common.writer.ddagent;
1+
package datadog.communication.serialization;
22

3-
import datadog.communication.serialization.EncodingCache;
43
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
54
import java.nio.charset.StandardCharsets;
65

dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/SimpleUtf8Cache.java renamed to communication/src/main/java/datadog/communication/serialization/SimpleUtf8Cache.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package datadog.trace.common.writer.ddagent;
1+
package datadog.communication.serialization;
22

3-
import datadog.communication.serialization.EncodingCache;
43
import java.nio.charset.StandardCharsets;
54

65
/**

dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/CachingTest.java renamed to communication/src/test/java/datadog/communication/serialization/CachingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.trace.common.writer.ddagent;
1+
package datadog.communication.serialization;
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
44
import static org.junit.jupiter.api.Assertions.assertFalse;

dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/GenerationalUtf8CacheTest.java renamed to communication/src/test/java/datadog/communication/serialization/GenerationalUtf8CacheTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.trace.common.writer.ddagent;
1+
package datadog.communication.serialization;
22

33
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
44
import static org.junit.jupiter.api.Assertions.assertEquals;

dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/SimpleUtf8CacheTest.java renamed to communication/src/test/java/datadog/communication/serialization/SimpleUtf8CacheTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.trace.common.writer.ddagent;
1+
package datadog.communication.serialization;
22

33
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
44
import static org.junit.jupiter.api.Assertions.assertEquals;

‎components/context/gradle.lockfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,7 @@ org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j
6868
org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
6969
org.spockframework:spock-bom:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath
7070
org.spockframework:spock-core:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath
71+
org.tabletest:tabletest-junit:1.2.1=testCompileClasspath,testRuntimeClasspath
72+
org.tabletest:tabletest-parser:1.2.0=testCompileClasspath,testRuntimeClasspath
7173
org.xmlresolver:xmlresolver:5.3.3=spotbugs
7274
empty=annotationProcessor,runtimeClasspath,spotbugsPlugins,testAnnotationProcessor

‎components/environment/gradle.lockfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,7 @@ org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j
6868
org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
6969
org.spockframework:spock-bom:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath
7070
org.spockframework:spock-core:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath
71+
org.tabletest:tabletest-junit:1.2.1=testCompileClasspath,testRuntimeClasspath
72+
org.tabletest:tabletest-parser:1.2.0=testCompileClasspath,testRuntimeClasspath
7173
org.xmlresolver:xmlresolver:5.3.3=spotbugs
7274
empty=annotationProcessor,runtimeClasspath,shadow,spotbugsPlugins,testAnnotationProcessor

‎components/http/http-api/gradle.lockfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,7 @@ org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j
6969
org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
7070
org.spockframework:spock-bom:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath
7171
org.spockframework:spock-core:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath
72+
org.tabletest:tabletest-junit:1.2.1=testCompileClasspath,testRuntimeClasspath
73+
org.tabletest:tabletest-parser:1.2.0=testCompileClasspath,testRuntimeClasspath
7274
org.xmlresolver:xmlresolver:5.3.3=spotbugs
7375
empty=annotationProcessor,runtimeClasspath,spotbugsPlugins,testAnnotationProcessor,testFixturesAnnotationProcessor

0 commit comments

Comments
 (0)