Dt on by default

functional_test/src/test/java/com/newrelic/agent/async/AsyncTest.java

@@ -103,7 +103,7 @@ public void verifyCpu(long minCpu) {
         Assert.assertTrue("The cpu should be greater than 0", val > 0);
         Assert.assertTrue("The cpu should be greater than the expeted min value " + minCpu, val > minCpu);
 
-        long cpuTime = 0l;
+        long cpuTime = 0L;
         Collection<Tracer> tracers = new HashSet<>();
         tracers.add(data.getRootTracer());
         tracers.addAll(data.getTracers());
@@ -241,8 +241,7 @@ private void verifyGivenTransactionSegmentBreadthFirst(TransactionSegment segmen
         Assert.assertEquals("ROOT", segment.getMetricName());
         Assert.assertNotNull(segment.getTraceParameters().get("async_context"));
 
-        Queue<TransactionSegment> segments = new LinkedList<>();
-        segments.addAll(segment.getChildren());
+        Queue<TransactionSegment> segments = new LinkedList<>(segment.getChildren());
         int index = 0;
         while (!segments.isEmpty()) {
             TransactionSegment seg = segments.poll();
@@ -266,8 +265,7 @@ public void verifyTransactionSegmentNodesWithExecContext(Map<String, String> met
         TransactionTrace trace = TransactionTrace.getTransactionTrace(data);
         TransactionSegment root = trace.getRootSegment();
 
-        Queue<TransactionSegment> segments = new LinkedList<>();
-        segments.addAll(root.getChildren());
+        Queue<TransactionSegment> segments = new LinkedList<>(root.getChildren());
         int index = 0;
         while (!segments.isEmpty()) {
             TransactionSegment seg = segments.poll();
@@ -289,8 +287,7 @@ public void verifyTransactionSegmentsChildren(String parent, String... children)
         TransactionTrace trace = TransactionTrace.getTransactionTrace(data);
         TransactionSegment root = trace.getRootSegment();
 
-        Queue<TransactionSegment> segments = new LinkedList<>();
-        segments.addAll(root.getChildren());
+        Queue<TransactionSegment> segments = new LinkedList<>(root.getChildren());
         int index = 0;
         while (!segments.isEmpty()) {
             TransactionSegment seg = segments.poll();
@@ -374,7 +371,7 @@ private void waitForTransaction() {
         while ((System.currentTimeMillis() - start) < 5000 && (data == null || stats == null)) {
             try {
                 Thread.sleep(50);
-            } catch (InterruptedException e) {
+            } catch (InterruptedException ignored) {
             }
         }
     }
@@ -385,7 +382,7 @@ private void waitForTransactionTimesSet(int timesSet) {
         while ((System.currentTimeMillis() - start) < 5000 && (data == null || stats == null || this.timesSet != timesSet)) {
             try {
                 Thread.sleep(50);
-            } catch (InterruptedException e) {
+            } catch (InterruptedException ignored) {
             }
         }
     }

functional_test/src/test/java/com/newrelic/agent/instrumentation/APISupportabilityTest.java

@@ -9,6 +9,7 @@
 
 import com.newrelic.agent.TransactionData;
 import com.newrelic.agent.TransactionStatsListener;
+import com.newrelic.agent.async.ExternalAsyncTest;
 import com.newrelic.agent.bridge.AgentBridge;
 import com.newrelic.agent.bridge.TracedActivity;
 import com.newrelic.agent.service.ServiceFactory;
@@ -25,6 +26,8 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import test.newrelic.EnvironmentHolderSettingsGenerator;
+import test.newrelic.test.agent.EnvironmentHolder;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -35,6 +38,8 @@ public class APISupportabilityTest implements TransactionStatsListener {
 
     private TransactionData data;
     private TransactionStats stats;
+    private static final String CONFIG_FILE = "configs/cross_app_tracing_test.yml";
+    private static final ClassLoader CLASS_LOADER = APISupportabilityTest.class.getClassLoader();
 
     @Before
     public void before() throws Exception {
@@ -48,6 +53,13 @@ public void after() {
         ServiceFactory.getTransactionService().removeTransactionStatsListener(this);
     }
 
+    public EnvironmentHolder setupEnvironmentHolder(String environment) throws Exception {
+        EnvironmentHolderSettingsGenerator envHolderSettings = new EnvironmentHolderSettingsGenerator(CONFIG_FILE, environment, CLASS_LOADER);
+        EnvironmentHolder environmentHolder = new EnvironmentHolder(envHolderSettings);
+        environmentHolder.setupEnvironment();
+        return environmentHolder;
+    }
+
     public static class TokenApiDispatcherTestClass {
         @Trace(dispatcher = true)
         public void getTokenLinkAndExpire() {
@@ -858,15 +870,22 @@ public void testNewRelicIgnoreNonDispatcherSupportabilityTracking() throws Excep
 
     @Test
     public void testProcessRequestMetadataDispatcherSupportabilityTracking() throws Exception {
-        String className = APISupportabilityTest.ProcessRequestMetadataDispatcherTestClass.class.getName();
-        InstrumentTestUtils.createTransformerAndRetransformClass(className, "getProcessRequestMetadata", "()V;");
+        // override default agent config to disabled distributed tracing and use CAT instead
+        EnvironmentHolder holder = setupEnvironmentHolder("cat_enabled_dt_disabled_test");
 
-        final String processRequestMetadataMetric = "Supportability/API/ProcessRequestMetadata/API";
-        new ProcessRequestMetadataDispatcherTestClass().getProcessRequestMetadata();
+        try {
+            String className = APISupportabilityTest.ProcessRequestMetadataDispatcherTestClass.class.getName();
+            InstrumentTestUtils.createTransformerAndRetransformClass(className, "getProcessRequestMetadata", "()V;");
 
-        Map<String, Integer> metricData = InstrumentTestUtils.getAndClearMetricData();
-        Assert.assertNotNull(metricData.get(processRequestMetadataMetric));
-        Assert.assertEquals(Integer.valueOf(1), metricData.get(processRequestMetadataMetric));
+            final String processRequestMetadataMetric = "Supportability/API/ProcessRequestMetadata/API";
+            new ProcessRequestMetadataDispatcherTestClass().getProcessRequestMetadata();
+
+            Map<String, Integer> metricData = InstrumentTestUtils.getAndClearMetricData();
+            Assert.assertNotNull(metricData.get(processRequestMetadataMetric));
+            Assert.assertEquals(Integer.valueOf(1), metricData.get(processRequestMetadataMetric));
+        } finally {
+            holder.close();
+        }
     }
 
     @Test
@@ -885,15 +904,22 @@ public void testProcessRequestMetadataNonDispatcherSupportabilityTracking() thro
 
     @Test
     public void testBridgeProcessRequestMetadataDispatcherSupportabilityTracking() throws Exception {
-        String className = APISupportabilityTest.ProcessRequestMetadataDispatcherBridgeTestClass.class.getName();
-        InstrumentTestUtils.createTransformerAndRetransformClass(className, "getProcessRequestMetadata", "()V;");
+        // override default agent config to disabled distributed tracing and use CAT instead
+        EnvironmentHolder holder = setupEnvironmentHolder("cat_enabled_dt_disabled_test");
 
-        final String processRequestMetadataMetric = "Supportability/API/ProcessRequestMetadata/API";
-        new ProcessRequestMetadataDispatcherBridgeTestClass().getProcessRequestMetadata();
+        try {
+            String className = APISupportabilityTest.ProcessRequestMetadataDispatcherBridgeTestClass.class.getName();
+            InstrumentTestUtils.createTransformerAndRetransformClass(className, "getProcessRequestMetadata", "()V;");
 
-        Map<String, Integer> metricData = InstrumentTestUtils.getAndClearMetricData();
-        Assert.assertNotNull(metricData.get(processRequestMetadataMetric));
-        Assert.assertEquals(Integer.valueOf(1), metricData.get(processRequestMetadataMetric));
+            final String processRequestMetadataMetric = "Supportability/API/ProcessRequestMetadata/API";
+            new ProcessRequestMetadataDispatcherBridgeTestClass().getProcessRequestMetadata();
+
+            Map<String, Integer> metricData = InstrumentTestUtils.getAndClearMetricData();
+            Assert.assertNotNull(metricData.get(processRequestMetadataMetric));
+            Assert.assertEquals(Integer.valueOf(1), metricData.get(processRequestMetadataMetric));
+        } finally {
+            holder.close();
+        }
     }
 
     @Test
@@ -912,15 +938,22 @@ public void testBridgeProcessRequestMetadataNonDispatcherSupportabilityTracking(
 
     @Test
     public void testProcessResponseMetadataDispatcherSupportabilityTracking1() throws Exception {
-        String className = APISupportabilityTest.ProcessResponseMetadataDispatcherTestClass1.class.getName();
-        InstrumentTestUtils.createTransformerAndRetransformClass(className, "getProcessResponseMetadata", "()V;");
+        // override default agent config to disabled distributed tracing and use CAT instead
+        EnvironmentHolder holder = setupEnvironmentHolder("cat_enabled_dt_disabled_test");
 
-        final String processResponseMetadataMetric = "Supportability/API/ProcessResponseMetadata/API";
-        new ProcessResponseMetadataDispatcherTestClass1().getProcessResponseMetadata();
+        try {
+            String className = APISupportabilityTest.ProcessResponseMetadataDispatcherTestClass1.class.getName();
+            InstrumentTestUtils.createTransformerAndRetransformClass(className, "getProcessResponseMetadata", "()V;");
 
-        Map<String, Integer> metricData = InstrumentTestUtils.getAndClearMetricData();
-        Assert.assertNotNull(metricData.get(processResponseMetadataMetric));
-        Assert.assertEquals(Integer.valueOf(1), metricData.get(processResponseMetadataMetric));
+            final String processResponseMetadataMetric = "Supportability/API/ProcessResponseMetadata/API";
+            new ProcessResponseMetadataDispatcherTestClass1().getProcessResponseMetadata();
+
+            Map<String, Integer> metricData = InstrumentTestUtils.getAndClearMetricData();
+            Assert.assertNotNull(metricData.get(processResponseMetadataMetric));
+            Assert.assertEquals(Integer.valueOf(1), metricData.get(processResponseMetadataMetric));
+        } finally {
+            holder.close();
+        }
     }
 
     @Test
@@ -939,15 +972,22 @@ public void testProcessResponseMetadataNonDispatcherSupportabilityTracking1() th
 
     @Test
     public void testBridgeProcessResponseMetadataDispatcherSupportabilityTracking1() throws Exception {
-        String className = APISupportabilityTest.ProcessResponseMetadataDispatcherBridgeTestClass1.class.getName();
-        InstrumentTestUtils.createTransformerAndRetransformClass(className, "getProcessResponseMetadata", "()V;");
+        // override default agent config to disabled distributed tracing and use CAT instead
+        EnvironmentHolder holder = setupEnvironmentHolder("cat_enabled_dt_disabled_test");
 
-        final String processResponseMetadataMetric = "Supportability/API/ProcessResponseMetadata/API";
-        new ProcessResponseMetadataDispatcherBridgeTestClass1().getProcessResponseMetadata();
+        try {
+            String className = APISupportabilityTest.ProcessResponseMetadataDispatcherBridgeTestClass1.class.getName();
+            InstrumentTestUtils.createTransformerAndRetransformClass(className, "getProcessResponseMetadata", "()V;");
 
-        Map<String, Integer> metricData = InstrumentTestUtils.getAndClearMetricData();
-        Assert.assertNotNull(metricData.get(processResponseMetadataMetric));
-        Assert.assertEquals(Integer.valueOf(1), metricData.get(processResponseMetadataMetric));
+            final String processResponseMetadataMetric = "Supportability/API/ProcessResponseMetadata/API";
+            new ProcessResponseMetadataDispatcherBridgeTestClass1().getProcessResponseMetadata();
+
+            Map<String, Integer> metricData = InstrumentTestUtils.getAndClearMetricData();
+            Assert.assertNotNull(metricData.get(processResponseMetadataMetric));
+            Assert.assertEquals(Integer.valueOf(1), metricData.get(processResponseMetadataMetric));
+        } finally {
+            holder.close();
+        }
     }
 
     @Test
@@ -966,15 +1006,22 @@ public void testBridgeProcessResponseMetadataNonDispatcherSupportabilityTracking
 
     @Test
     public void testProcessResponseMetadataDispatcherSupportabilityTracking2() throws Exception {
-        String className = APISupportabilityTest.ProcessResponseMetadataDispatcherTestClass2.class.getName();
-        InstrumentTestUtils.createTransformerAndRetransformClass(className, "getProcessResponseMetadata", "()V;");
+        // override default agent config to disabled distributed tracing and use CAT instead
+        EnvironmentHolder holder = setupEnvironmentHolder("cat_enabled_dt_disabled_test");
 
-        final String processResponseMetadataMetric = "Supportability/API/ProcessResponseMetadata/API";
-        new ProcessResponseMetadataDispatcherTestClass2().getProcessResponseMetadata();
+        try {
+            String className = APISupportabilityTest.ProcessResponseMetadataDispatcherTestClass2.class.getName();
+            InstrumentTestUtils.createTransformerAndRetransformClass(className, "getProcessResponseMetadata", "()V;");
 
-        Map<String, Integer> metricData = InstrumentTestUtils.getAndClearMetricData();
-        Assert.assertNotNull(metricData.get(processResponseMetadataMetric));
-        Assert.assertEquals(Integer.valueOf(1), metricData.get(processResponseMetadataMetric));
+            final String processResponseMetadataMetric = "Supportability/API/ProcessResponseMetadata/API";
+            new ProcessResponseMetadataDispatcherTestClass2().getProcessResponseMetadata();
+
+            Map<String, Integer> metricData = InstrumentTestUtils.getAndClearMetricData();
+            Assert.assertNotNull(metricData.get(processResponseMetadataMetric));
+            Assert.assertEquals(Integer.valueOf(1), metricData.get(processResponseMetadataMetric));
+        } finally {
+            holder.close();
+        }
     }
 
     @Test
@@ -993,15 +1040,22 @@ public void testProcessResponseMetadataNonDispatcherSupportabilityTracking2() th
 
     @Test
     public void testBridgeProcessResponseMetadataDispatcherSupportabilityTracking2() throws Exception {
-        String className = APISupportabilityTest.ProcessResponseMetadataDispatcherBridgeTestClass2.class.getName();
-        InstrumentTestUtils.createTransformerAndRetransformClass(className, "getProcessResponseMetadata", "()V;");
+        // override default agent config to disabled distributed tracing and use CAT instead
+        EnvironmentHolder holder = setupEnvironmentHolder("cat_enabled_dt_disabled_test");
 
-        final String processResponseMetadataMetric = "Supportability/API/ProcessResponseMetadata/API";
-        new ProcessResponseMetadataDispatcherBridgeTestClass2().getProcessResponseMetadata();
+        try {
+            String className = APISupportabilityTest.ProcessResponseMetadataDispatcherBridgeTestClass2.class.getName();
+            InstrumentTestUtils.createTransformerAndRetransformClass(className, "getProcessResponseMetadata", "()V;");
 
-        Map<String, Integer> metricData = InstrumentTestUtils.getAndClearMetricData();
-        Assert.assertNotNull(metricData.get(processResponseMetadataMetric));
-        Assert.assertEquals(Integer.valueOf(1), metricData.get(processResponseMetadataMetric));
+            final String processResponseMetadataMetric = "Supportability/API/ProcessResponseMetadata/API";
+            new ProcessResponseMetadataDispatcherBridgeTestClass2().getProcessResponseMetadata();
+
+            Map<String, Integer> metricData = InstrumentTestUtils.getAndClearMetricData();
+            Assert.assertNotNull(metricData.get(processResponseMetadataMetric));
+            Assert.assertEquals(Integer.valueOf(1), metricData.get(processResponseMetadataMetric));
+        } finally {
+            holder.close();
+        }
     }
 
     @Test

functional_test/src/test/java/test/newrelic/test/agent/api/ApiTest.java

@@ -22,6 +22,7 @@
 import com.newrelic.agent.environment.AgentIdentity;
 import com.newrelic.agent.errors.ErrorService;
 import com.newrelic.agent.errors.TracedError;
+import com.newrelic.agent.instrumentation.APISupportabilityTest;
 import com.newrelic.agent.metric.MetricName;
 import com.newrelic.agent.service.ServiceFactory;
 import com.newrelic.agent.stats.ResponseTimeStats;
@@ -66,6 +67,8 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import test.newrelic.EnvironmentHolderSettingsGenerator;
+import test.newrelic.test.agent.EnvironmentHolder;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -89,6 +92,8 @@
 
 public class ApiTest implements TransactionListener {
     ApiTestHelper apiTestHelper = new ApiTestHelper();
+    private static final String CONFIG_FILE = "configs/cross_app_tracing_test.yml";
+    private static final ClassLoader CLASS_LOADER = ApiTest.class.getClassLoader();
 
     @Before
     public void before() {
@@ -110,6 +115,13 @@ public void after() {
         ServiceFactory.getTransactionService().addTransactionListener(this);
     }
 
+    public EnvironmentHolder setupEnvironmentHolder(String environment) throws Exception {
+        EnvironmentHolderSettingsGenerator envHolderSettings = new EnvironmentHolderSettingsGenerator(CONFIG_FILE, environment, CLASS_LOADER);
+        EnvironmentHolder environmentHolder = new EnvironmentHolder(envHolderSettings);
+        environmentHolder.setupEnvironment();
+        return environmentHolder;
+    }
+
     @Override
     public void dispatcherTransactionFinished(TransactionData transactionData, TransactionStats transactionStats) {
         apiTestHelper.tranStats = transactionStats;
@@ -1869,7 +1881,9 @@ private void runTestExternalAPI() {
     /* External/CAT - FIT to Public API */
 
     @Test
-    public void testExternalCatAPI() {
+    public void testExternalCatAPI() throws Exception {
+        // override default agent config to disabled distributed tracing and use CAT instead
+        EnvironmentHolder holder = setupEnvironmentHolder("cat_enabled_dt_disabled_test");
         TestServer server = new TestServer(8088);
 
         try {
@@ -1881,6 +1895,7 @@ public void testExternalCatAPI() {
         } finally {
             Transaction.clearTransaction();
             server.closeAllConnections();
+            holder.close();
         }
     }
 
@@ -2030,8 +2045,11 @@ public String toObfuscatedQueryString(BsonDocument query) {
     /* Messaging - FIT to Public API */
 
     @Test
-    public void testMessagingAPI() {
+    public void testMessagingAPI() throws Exception {
+        // override default agent config to disabled distributed tracing and use CAT instead
+        EnvironmentHolder holder = setupEnvironmentHolder("cat_enabled_dt_disabled_test");
         MessagingTestServer server = new MessagingTestServer(8088);
+
         try {
             server.start();
             runTestMessagingAPI();
@@ -2043,6 +2061,7 @@ public void testMessagingAPI() {
         } finally {
             Transaction.clearTransaction();
             server.closeAllConnections();
+            holder.close();
         }
     }
 

functional_test/src/test/resources/configs/cross_app_tracing_test.yml

@@ -0,0 +1,21 @@
+cat_enabled_dt_enabled_test:
+
+  cross_application_tracer:
+    enabled: true
+    cross_process_id: '12345#xyz'
+    encoding_key: asdf
+    trusted_account_ids: '12345'
+
+  distributed_tracing:
+    enabled: true
+
+cat_enabled_dt_disabled_test:
+
+  cross_application_tracer:
+    enabled: true
+    cross_process_id: '12345#xyz'
+    encoding_key: asdf
+    trusted_account_ids: '12345'
+
+  distributed_tracing:
+    enabled: false