Merge branch 'master' into joey/ddb-payload-tagging

Author: joeyzhao2018

.circleci/config.continue.yml.j2

@@ -36,7 +36,7 @@ instrumentation_modules: &instrumentation_modules "dd-java-agent/instrumentation
 debugger_modules: &debugger_modules "dd-java-agent/agent-debugger|dd-java-agent/agent-bootstrap|dd-java-agent/agent-builder|internal-api|communication|dd-trace-core"
 profiling_modules: &profiling_modules "dd-java-agent/agent-profiling"
 
-default_system_tests_commit: &default_system_tests_commit c208feb5b40cca543670870b9601509d6a69c65e
+default_system_tests_commit: &default_system_tests_commit 69a5e874384dd256e2e3f42fc1c95807a67efbe6
 
 parameters:
   nightly:
@@ -852,6 +852,9 @@ jobs:
             DEFAULT
             APM_TRACING_E2E
             APM_TRACING_E2E_SINGLE_SPAN
+            TRACING_CONFIG_NONDEFAULT
+            TRACING_CONFIG_NONDEFAULT_2
+            TRACING_CONFIG_NONDEFAULT_3
             "
             if ! [[ << parameters.weblog-variant >> =~ .*native ]]; then
               echo "

dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcCodeOriginTest.groovy

@@ -1,3 +1,4 @@
+import static datadog.trace.agent.test.asserts.TagsAssert.codeOriginTags
 import static datadog.trace.api.config.TraceInstrumentationConfig.GRPC_SERVER_ERROR_STATUSES
 
 import com.google.common.util.concurrent.MoreExecutors
@@ -150,6 +151,7 @@ abstract class GrpcTest extends VersionedNamingTestBase {
 
     then:
     response.message == "Hello $name"
+    codeOriginTags(TEST_WRITER)
     assertTraces(2) {
       trace(hasClientMessageSpans() ? 3 : 2) {
         basicSpan(it, "parent")
@@ -680,6 +682,12 @@ class GrpcDataStreamsEnabledV0Test extends GrpcDataStreamsEnabledForkedTest {
 
 class GrpcDataStreamsEnabledV1ForkedTest extends GrpcDataStreamsEnabledForkedTest {
 
+  @Override
+  protected void configurePreAgent() {
+    super.configurePreAgent()
+    codeOriginSetup()
+  }
+
   @Override
   int version() {
     return 1

dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy

@@ -32,6 +32,9 @@ import org.springframework.kafka.test.utils.KafkaTestUtils
 
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.Future
+
+import static datadog.trace.agent.test.asserts.TagsAssert.codeOriginTags
+
 import java.util.concurrent.LinkedBlockingQueue
 import java.util.concurrent.TimeUnit
 
@@ -227,8 +230,9 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
     int nTraces = isDataStreamsEnabled() ? 3 : 2
     int produceTraceIdx = nTraces - 1
     TEST_WRITER.waitForTraces(nTraces)
-    def traces = (Arrays.asList(TEST_WRITER.toArray()) as List<List<DDSpan>>)
-    Collections.sort(traces, new SortKafkaTraces())
+    def traces = new ArrayList<>(TEST_WRITER)
+    traces.sort(new SortKafkaTraces())
+    codeOriginTags(TEST_WRITER)
     assertTraces(nTraces, new SortKafkaTraces()) {
       if (hasQueueSpan()) {
         trace(2) {
@@ -1040,6 +1044,12 @@ class KafkaClientV0ForkedTest extends KafkaClientForkedTest {
 }
 
 class KafkaClientV1ForkedTest extends KafkaClientForkedTest {
+  @Override
+  void configurePreAgent() {
+    super.configurePreAgent()
+    codeOriginSetup()
+  }
+
   @Override
   int version() {
     1