Skip to content

Commit cf3b9cb

Browse files
dougqhdougqh
authored
Merge branch 'master' into dougqh/collection-benchmarks
2 parents 53901eb + c6896b7 commit cf3b9cb

581 files changed

Lines changed: 2170 additions & 5031 deletions

File tree

Some content is hidden

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

‎dd-java-agent/agent-bootstrap/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ dependencies {
2929
// ^ Generally a bad idea for libraries, but we're shadowing.
3030

3131
testImplementation project(':dd-java-agent:testing')
32+
testImplementation group: 'com.google.guava', name: 'guava-testlib', version: '20.0'
3233
}
3334

3435
// Must use Java 11 to build JFR enabled code - there is no JFR in OpenJDK 8 (revisit once JFR in Java 8 is available)

‎dd-java-agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
7676
org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
7777
org.jacoco:org.jacoco.core:0.8.14=jacocoAnt
7878
org.jacoco:org.jacoco.report:0.8.14=jacocoAnt
79-
org.jctools:jctools-core:3.3.0=jmhRuntimeClasspath,testRuntimeClasspath
79+
org.jctools:jctools-core-jdk11:4.0.6=jmhRuntimeClasspath,testRuntimeClasspath
80+
org.jctools:jctools-core:4.0.6=jmhRuntimeClasspath,testRuntimeClasspath
8081
org.junit.jupiter:junit-jupiter-api:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
8182
org.junit.jupiter:junit-jupiter-engine:5.14.1=jmhRuntimeClasspath,testRuntimeClasspath
8283
org.junit.jupiter:junit-jupiter-params:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ClassHierarchyIterable.java renamed to dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/ClassHierarchyIterable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.trace.agent.tooling;
1+
package datadog.trace.bootstrap;
22

33
import java.util.ArrayDeque;
44
import java.util.HashSet;

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/log/LogContextScopeListener.java renamed to dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/log/LogContextScopeListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.trace.agent.tooling.log;
1+
package datadog.trace.bootstrap.instrumentation.log;
22

33
import datadog.trace.api.CorrelationIdentifier;
44
import datadog.trace.api.WithGlobalTracer;

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/log/UnionMap.java renamed to dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/log/UnionMap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.trace.agent.tooling.log;
1+
package datadog.trace.bootstrap.instrumentation.log;
22

33
import java.io.Serializable;
44
import java.util.AbstractMap;

dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/log/UnionMapTest.groovy renamed to dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/log/UnionMapTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.trace.agent.tooling.log
1+
package datadog.trace.bootstrap.instrumentation.log
22

33

44
import com.google.common.collect.testing.MapTestSuiteBuilder

‎dd-java-agent/agent-builder/gradle.lockfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
7474
org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
7575
org.jacoco:org.jacoco.core:0.8.14=jacocoAnt
7676
org.jacoco:org.jacoco.report:0.8.14=jacocoAnt
77-
org.jctools:jctools-core:3.3.0=runtimeClasspath,testRuntimeClasspath
77+
org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testRuntimeClasspath
78+
org.jctools:jctools-core:4.0.6=runtimeClasspath,testRuntimeClasspath
7879
org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath
7980
org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath
8081
org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath

‎dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/gradle.lockfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
8383
org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
8484
org.jacoco:org.jacoco.core:0.8.14=jacocoAnt,runtimeClasspath,testRuntimeClasspath
8585
org.jacoco:org.jacoco.report:0.8.14=jacocoAnt,runtimeClasspath,testRuntimeClasspath
86-
org.jctools:jctools-core:3.3.0=runtimeClasspath,testRuntimeClasspath
86+
org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testRuntimeClasspath
87+
org.jctools:jctools-core:4.0.6=runtimeClasspath,testRuntimeClasspath
8788
org.junit.jupiter:junit-jupiter-api:5.14.1=runtimeClasspath,testCompileClasspath,testRuntimeClasspath
8889
org.junit.jupiter:junit-jupiter-engine:5.14.1=runtimeClasspath,testRuntimeClasspath
8990
org.junit.jupiter:junit-jupiter-params:5.14.1=runtimeClasspath,testCompileClasspath,testRuntimeClasspath

‎dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/gradle.lockfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
8383
org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
8484
org.jacoco:org.jacoco.core:0.8.14=jacocoAnt,runtimeClasspath,testRuntimeClasspath
8585
org.jacoco:org.jacoco.report:0.8.14=jacocoAnt,runtimeClasspath,testRuntimeClasspath
86-
org.jctools:jctools-core:3.3.0=runtimeClasspath,testRuntimeClasspath
86+
org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testRuntimeClasspath
87+
org.jctools:jctools-core:4.0.6=runtimeClasspath,testRuntimeClasspath
8788
org.junit.jupiter:junit-jupiter-api:5.14.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
8889
org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath
8990
org.junit.jupiter:junit-jupiter-params:5.14.1=compileClasspath,testCompileClasspath,testRuntimeClasspath

‎dd-java-agent/agent-ci-visibility/gradle.lockfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
9393
org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
9494
org.jacoco:org.jacoco.core:0.8.14=compileClasspath,implementationDependenciesMetadata,jacocoAnt,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
9595
org.jacoco:org.jacoco.report:0.8.14=compileClasspath,implementationDependenciesMetadata,jacocoAnt,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
96-
org.jctools:jctools-core:3.3.0=testRuntimeClasspath
96+
org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath
97+
org.jctools:jctools-core:4.0.6=testRuntimeClasspath
9798
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
9899
org.jetbrains.kotlin:kotlin-build-common:2.0.21=kotlinBuildToolsApiClasspath
99100
org.jetbrains.kotlin:kotlin-build-tools-api:2.0.21=kotlinBuildToolsApiClasspath

0 commit comments

Comments
 (0)