From aaf84e2d142afd08456dbc4b3edeeb58a090cb7c Mon Sep 17 00:00:00 2001
From: Michal Nowacki <mnowacki@newrelic.com>
Date: Wed, 26 Jul 2023 10:57:36 -0400
Subject: [PATCH] tests(agent): add Drupal integration tests (#696)

---
 tests/include/.gitignore                      |   5 +
 tests/include/drupal.php                      |  69 ++++++++++++
 tests/integration/external/drupal6/skipif.inc |  15 +++
 .../external/drupal6/test_basic.php           |  51 +++++++++
 .../test_cat_and_synthetics_disabled.php      |  76 +++++++++++++
 .../external/drupal6/test_cat_disabled.php    |  55 ++++++++++
 .../test_cross_process_empty_headers.php      |  59 ++++++++++
 .../test_cross_process_existing_header.php    |  59 ++++++++++
 .../drupal6/test_cross_process_no_headers.php |  59 ++++++++++
 .../drupal6/test_dt_empty_headers.php         |  63 +++++++++++
 .../drupal6/test_dt_existing_headers.php      |  65 +++++++++++
 .../test_dt_newrelic_header_disabled.php      |  61 +++++++++++
 .../external/drupal6/test_dt_no_headers.php   |  62 +++++++++++
 .../external/drupal6/test_multiple_calls.php  |  56 ++++++++++
 .../external/drupal6/test_span_externals.php  | 103 ++++++++++++++++++
 .../drupal6/test_span_externals_clm_off.php   |  96 ++++++++++++++++
 .../external/drupal6/test_spans_post.php      | 103 ++++++++++++++++++
 .../drupal6/test_spans_post_clm_off.php       |  96 ++++++++++++++++
 .../external/drupal6/test_synthetics.php      |  81 ++++++++++++++
 .../drupal6/test_synthetics_disabled.php      |  78 +++++++++++++
 .../test_synthetics_with_cat_disabled.php     |  78 +++++++++++++
 .../drupal6/test_synthetics_with_dt.php       |  84 ++++++++++++++
 tests/integration/external/drupal7/skipif.inc |  15 +++
 .../test_bad_params_integer_headers.php       |  50 +++++++++
 .../test_bad_params_integer_options.php       |  45 ++++++++
 .../drupal7/test_bad_params_null_headers.php  |  50 +++++++++
 .../drupal7/test_bad_params_null_options.php  |  49 +++++++++
 .../external/drupal7/test_bad_url.php         |  50 +++++++++
 .../external/drupal7/test_basic.php           |  50 +++++++++
 .../test_cat_and_synthetics_disabled.php      |  76 +++++++++++++
 .../external/drupal7/test_cat_disabled.php    |  59 ++++++++++
 .../test_cross_process_empty_headers.php      |  59 ++++++++++
 .../test_cross_process_empty_options.php      |  59 ++++++++++
 .../test_cross_process_existing_header.php    |  63 +++++++++++
 .../drupal7/test_cross_process_no_options.php |  59 ++++++++++
 .../drupal7/test_dt_empty_headers.php         |  63 +++++++++++
 .../drupal7/test_dt_existing_headers.php      |  64 +++++++++++
 .../test_dt_newrelic_header_disabled.php      |  61 +++++++++++
 .../external/drupal7/test_dt_no_headers.php   |  62 +++++++++++
 .../external/drupal7/test_multiple_calls.php  |  53 +++++++++
 .../external/drupal7/test_spans_post.php      | 103 ++++++++++++++++++
 .../external/drupal7/test_spans_post_clm.php  | 103 ++++++++++++++++++
 .../drupal7/test_spans_post_clm_off.php       |  96 ++++++++++++++++
 ...est_spans_sets_external_span_correctly.php | 103 ++++++++++++++++++
 ...s_sets_external_span_correctly_clm_off.php |  96 ++++++++++++++++
 .../external/drupal7/test_synthetics.php      |  79 ++++++++++++++
 .../drupal7/test_synthetics_disabled.php      |  82 ++++++++++++++
 .../test_synthetics_with_cat_disabled.php     |  77 +++++++++++++
 .../drupal7/test_synthetics_with_dt.php       |  80 ++++++++++++++
 49 files changed, 3280 insertions(+)
 create mode 100644 tests/include/drupal.php
 create mode 100644 tests/integration/external/drupal6/skipif.inc
 create mode 100644 tests/integration/external/drupal6/test_basic.php
 create mode 100644 tests/integration/external/drupal6/test_cat_and_synthetics_disabled.php
 create mode 100644 tests/integration/external/drupal6/test_cat_disabled.php
 create mode 100644 tests/integration/external/drupal6/test_cross_process_empty_headers.php
 create mode 100644 tests/integration/external/drupal6/test_cross_process_existing_header.php
 create mode 100644 tests/integration/external/drupal6/test_cross_process_no_headers.php
 create mode 100644 tests/integration/external/drupal6/test_dt_empty_headers.php
 create mode 100644 tests/integration/external/drupal6/test_dt_existing_headers.php
 create mode 100644 tests/integration/external/drupal6/test_dt_newrelic_header_disabled.php
 create mode 100644 tests/integration/external/drupal6/test_dt_no_headers.php
 create mode 100644 tests/integration/external/drupal6/test_multiple_calls.php
 create mode 100644 tests/integration/external/drupal6/test_span_externals.php
 create mode 100644 tests/integration/external/drupal6/test_span_externals_clm_off.php
 create mode 100644 tests/integration/external/drupal6/test_spans_post.php
 create mode 100644 tests/integration/external/drupal6/test_spans_post_clm_off.php
 create mode 100644 tests/integration/external/drupal6/test_synthetics.php
 create mode 100644 tests/integration/external/drupal6/test_synthetics_disabled.php
 create mode 100644 tests/integration/external/drupal6/test_synthetics_with_cat_disabled.php
 create mode 100644 tests/integration/external/drupal6/test_synthetics_with_dt.php
 create mode 100644 tests/integration/external/drupal7/skipif.inc
 create mode 100644 tests/integration/external/drupal7/test_bad_params_integer_headers.php
 create mode 100644 tests/integration/external/drupal7/test_bad_params_integer_options.php
 create mode 100644 tests/integration/external/drupal7/test_bad_params_null_headers.php
 create mode 100644 tests/integration/external/drupal7/test_bad_params_null_options.php
 create mode 100644 tests/integration/external/drupal7/test_bad_url.php
 create mode 100644 tests/integration/external/drupal7/test_basic.php
 create mode 100644 tests/integration/external/drupal7/test_cat_and_synthetics_disabled.php
 create mode 100644 tests/integration/external/drupal7/test_cat_disabled.php
 create mode 100644 tests/integration/external/drupal7/test_cross_process_empty_headers.php
 create mode 100644 tests/integration/external/drupal7/test_cross_process_empty_options.php
 create mode 100644 tests/integration/external/drupal7/test_cross_process_existing_header.php
 create mode 100644 tests/integration/external/drupal7/test_cross_process_no_options.php
 create mode 100644 tests/integration/external/drupal7/test_dt_empty_headers.php
 create mode 100644 tests/integration/external/drupal7/test_dt_existing_headers.php
 create mode 100644 tests/integration/external/drupal7/test_dt_newrelic_header_disabled.php
 create mode 100644 tests/integration/external/drupal7/test_dt_no_headers.php
 create mode 100644 tests/integration/external/drupal7/test_multiple_calls.php
 create mode 100644 tests/integration/external/drupal7/test_spans_post.php
 create mode 100644 tests/integration/external/drupal7/test_spans_post_clm.php
 create mode 100644 tests/integration/external/drupal7/test_spans_post_clm_off.php
 create mode 100644 tests/integration/external/drupal7/test_spans_sets_external_span_correctly.php
 create mode 100644 tests/integration/external/drupal7/test_spans_sets_external_span_correctly_clm_off.php
 create mode 100644 tests/integration/external/drupal7/test_synthetics.php
 create mode 100644 tests/integration/external/drupal7/test_synthetics_disabled.php
 create mode 100644 tests/integration/external/drupal7/test_synthetics_with_cat_disabled.php
 create mode 100644 tests/integration/external/drupal7/test_synthetics_with_dt.php

diff --git a/tests/include/.gitignore b/tests/include/.gitignore
index 7d9ced9c2..eb56f03c9 100644
--- a/tests/include/.gitignore
+++ b/tests/include/.gitignore
@@ -3,3 +3,8 @@ guzzle/
 # byproduct of logging/monolog tests
 monolog2/
 monolog3/
+# byproduct of running drupal tests
+drupal_6_bootstrap.inc
+drupal_6_common.inc
+drupal_7_bootstrap.inc
+drupal_7_common.inc
diff --git a/tests/include/drupal.php b/tests/include/drupal.php
new file mode 100644
index 000000000..97a0dcfa8
--- /dev/null
+++ b/tests/include/drupal.php
@@ -0,0 +1,69 @@
+<?php
+/*
+ * Copyright 2023 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* 
+ * Dupal core modules (bootstrap.inc, common.inc) are not embedded
+ * in the repository. They are downloaded when Drupal tests are run
+ * and `download_drupal`  is called in the SKIPIF section. 
+ * 
+ * The purpose of this solution is to avoid embedding Drupal code, while still
+ * being able to run tests in the PR builder. If downloading Drupal core modules
+ * fails, the test will abort with a warning.
+ *
+ */
+
+/*
+ * `download_drupal` is called during the SKIPIF sections of integration tests.
+ * It downloads the bootstrap.inc and common.inc files from drupal project in
+ * desired version.
+ */
+function download_drupal($version) {
+    $pwd = realpath(dirname(__FILE__));
+    $files = ['bootstrap.inc', 'common.inc'];
+    $checksums = [
+        '6' => [
+            'bootstrap.inc' => '14e7070e475e020775255db84f3d3a73999418aa8b6ac51299eb34078690413b5e7aef4003c89f2538d3966b460e2dbf', 
+            'common.inc' => 'b84b1e7c61cf8d28ded9c6c8b20abc52bc2962bf15ab9f08a2daa90b1c09694501a85a912a8d0e9ede842655be4c446d'],
+        '7' => [
+            'bootstrap.inc' => '673244b6d19dd2de6b5048f3412d62f1baf24593245175034d59f0dac305c936b0e67a1a91ba57614d17154cd82e0db5', 
+            'common.inc' => 'f0b758b53f6819bc133b22987c180f947f5055d1225bf14ab2768e84a64c83283e507fcf82e6c3499e3eaf51e65340d0']
+    ];
+    $file_prefix = 'drupal_' . $version . '_';
+    $drupal_source = 'https://raw.githubusercontent.com/drupal/drupal/';
+
+    if (6 == $version) {
+        // fd9d1859fce12f359a587e038212d30c2bd738e6 is snapshot in time of 6.x after 6.37 but before 6.38
+        $drupal_commit_sha = 'fd9d1859fce12f359a587e038212d30c2bd738e6';
+    } elseif (7 == $version) {
+        // 728503753272f746bb988ffb30d5327f8f2df4b2 is 7.92
+        $drupal_commit_sha = '728503753272f746bb988ffb30d5327f8f2df4b2';
+    } else {
+        /* Unsupported version */
+        return false;
+    }
+
+    foreach ($files as $f) {
+        $src_file_path = $drupal_source . $drupal_commit_sha . '/includes/' . $f;
+        $dest_file_path = $pwd . '/' . $file_prefix . $f;
+        if (!file_exists($dest_file_path)) {
+            copy($src_file_path, $dest_file_path);
+        }
+    }
+
+    foreach ($files as $f) {
+        $file_path = $pwd . '/' . $file_prefix . $f;
+        if (!file_exists($file_path)) {
+            return false;
+        }
+        $got_checksum = hash_file('sha384', $file_path);
+        $want_checksum = $checksums[$version][$f];
+        if ($got_checksum != $want_checksum) {
+            return false;
+        }
+    }
+
+    return true;
+}
diff --git a/tests/integration/external/drupal6/skipif.inc b/tests/integration/external/drupal6/skipif.inc
new file mode 100644
index 000000000..56940a205
--- /dev/null
+++ b/tests/integration/external/drupal6/skipif.inc
@@ -0,0 +1,15 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+if (version_compare(PHP_VERSION, "7.4", ">")) {
+  die("skip: PHP > 7.4.0 not supported\n");
+}
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal.php');
+
+if (!download_drupal(6)) {
+    die("warn: drupal6 installation required\n");
+}
diff --git a/tests/integration/external/drupal6/test_basic.php b/tests/integration/external/drupal6/test_basic.php
new file mode 100644
index 000000000..e0b9c45d6
--- /dev/null
+++ b/tests/integration/external/drupal6/test_basic.php
@@ -0,0 +1,51 @@
+<?php
+
+/*DESCRIPTION
+Test that a simple request through drupal_http_request gets instrumented.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled=0
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+Hello world!
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                 [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                           [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                      [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},           [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},              [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},  [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all",
+      "scope":"OtherTransaction/php__FILE__"},          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"}, [1,    0,    0,    0,    0,    0]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . $EXTERNAL_HOST; 
+$rv = drupal_http_request($url);
+echo $rv->data;
+
diff --git a/tests/integration/external/drupal6/test_cat_and_synthetics_disabled.php b/tests/integration/external/drupal6/test_cat_and_synthetics_disabled.php
new file mode 100644
index 000000000..b3ce9faa8
--- /dev/null
+++ b/tests/integration/external/drupal6/test_cat_and_synthetics_disabled.php
@@ -0,0 +1,76 @@
+<?php
+
+/*DESCRIPTION
+1. The agent SHALL NOT add X-NewRelic-ID and X-NewRelic-Transaction headers
+   to external calls when cross application tracing is disabled.
+2. The agent SHALL NOT add X-NewRelic-Synthetics headers to external calls when
+   the Synthetics feature is disabled.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.cross_application_tracer.enabled = false
+newrelic.synthetics.enabled = false
+newrelic.distributed_tracing_enabled=0
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*
+ * The synthetics header contains the following JSON.
+ *   [
+ *     1,
+ *     432507,
+ *     "rrrrrrr-rrrr-1234-rrrr-rrrrrrrrrrrr",
+ *     "jjjjjjj-jjjj-1234-jjjj-jjjjjjjjjjjj",
+ *     "mmmmmmm-mmmm-1234-mmmm-mmmmmmmmmmmm"
+ *   ]
+ */
+
+/*HEADERS
+X-NewRelic-Synthetics=PwcbVVVRDQMHSEMQRUNFFBZDG0EQFBFPAVALVhVKRkBBSEsTQxNBEBZERRMUERofEg4LCF1bXQxJW1xZCEtSUANWFQhSUl4fWQ9TC1sLWQgOXF0LRE8aXl0JDA9aXBoLCVxbHlNUUFYdD1UPVRVZX14IVAxcDF4PCVsVPA==
+*/
+
+/*EXPECT
+X-NewRelic-ID=missing X-NewRelic-Transaction=missing tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? start time",
+  "?? stop time",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Apdex"},                                  ["??", "??", "??", "??", "??",    0]],
+    [{"name":"Apdex/Uri__FILE__"},                      ["??", "??", "??", "??", "??",    0]],
+    [{"name":"External/all"},                           [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allWeb"},                        [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                 [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all",
+      "scope":"WebTransaction/Uri__FILE__"},            [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"HttpDispatcher"},                         [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"}, [   1,    0,    0,    0,    0,    0]],
+    [{"name":"WebTransaction"},                         [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransaction/Uri__FILE__"},             [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransactionTotalTime"},                [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransactionTotalTime/Uri__FILE__"},    [   1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url);
+echo $rv->data;
diff --git a/tests/integration/external/drupal6/test_cat_disabled.php b/tests/integration/external/drupal6/test_cat_disabled.php
new file mode 100644
index 000000000..de021cd01
--- /dev/null
+++ b/tests/integration/external/drupal6/test_cat_disabled.php
@@ -0,0 +1,55 @@
+<?php
+
+/*DESCRIPTION
+The agent SHALL NOT add X-NewRelic-ID and X-NewRelic-Transaction headers
+to external calls when cross application tracing is disabled.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.cross_application_tracer.enabled = false
+newrelic.distributed_tracing_enabled=0
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+X-NewRelic-ID=missing X-NewRelic-Transaction=missing tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? start time",
+  "?? stop time",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                           [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                      [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                 [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all",
+      "scope":"OtherTransaction/php__FILE__"},          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"}, [1,    0,    0,    0,    0,    0]],
+    [{"name":"OtherTransaction/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},           [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},              [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},  [1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url);
+echo $rv->data;
diff --git a/tests/integration/external/drupal6/test_cross_process_empty_headers.php b/tests/integration/external/drupal6/test_cross_process_empty_headers.php
new file mode 100644
index 000000000..d686ee49d
--- /dev/null
+++ b/tests/integration/external/drupal6/test_cross_process_empty_headers.php
@@ -0,0 +1,59 @@
+<?php
+
+/*DESCRIPTION
+Test that cross app tracing works with drupal_http_request when called with an
+empty header array.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled=0
+newrelic.cross_application_tracer.enabled = true
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+X-NewRelic-App-Data=??
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                        [1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"},
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/all"},                     [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},                [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing",
+      "scope":"OtherTransaction/php__FILE__"},            [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},   [1,    0,    0,    0,    0,    0]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url, array());
+echo $rv->data;
diff --git a/tests/integration/external/drupal6/test_cross_process_existing_header.php b/tests/integration/external/drupal6/test_cross_process_existing_header.php
new file mode 100644
index 000000000..7bc4b6e64
--- /dev/null
+++ b/tests/integration/external/drupal6/test_cross_process_existing_header.php
@@ -0,0 +1,59 @@
+<?php
+
+/*DESCRIPTION
+Test that cross app tracing works with drupal_http_request when called with a
+single header.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled=0
+newrelic.cross_application_tracer.enabled = true
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+X-NewRelic-App-Data=??
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                        [1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"},
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/all"},                     [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},                [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing",
+      "scope":"OtherTransaction/php__FILE__"},            [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},   [1,    0,    0,    0,    0,    0]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url, array("kiteboarding" => "windsurfing"));
+echo $rv->data;
diff --git a/tests/integration/external/drupal6/test_cross_process_no_headers.php b/tests/integration/external/drupal6/test_cross_process_no_headers.php
new file mode 100644
index 000000000..9cec8a27d
--- /dev/null
+++ b/tests/integration/external/drupal6/test_cross_process_no_headers.php
@@ -0,0 +1,59 @@
+<?php
+
+/*DESCRIPTION
+Test that cross app tracing works with drupal_http_request when called with no
+headers.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled=0
+newrelic.cross_application_tracer.enabled = true
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+X-NewRelic-App-Data=??
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                        [1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"},
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/all"},                     [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},                [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing",
+      "scope":"OtherTransaction/php__FILE__"},            [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},   [1,    0,    0,    0,    0,    0]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url);
+echo $rv->data;
diff --git a/tests/integration/external/drupal6/test_dt_empty_headers.php b/tests/integration/external/drupal6/test_dt_empty_headers.php
new file mode 100644
index 000000000..1a5309a73
--- /dev/null
+++ b/tests/integration/external/drupal6/test_dt_empty_headers.php
@@ -0,0 +1,63 @@
+<?php
+
+/*DESCRIPTION
+Test that DT works with drupal_http_request when called with an empty header
+array.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled = true
+newrelic.cross_application_tracer.enabled = false
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+traceparent=found tracestate=found newrelic=found X-NewRelic-ID=missing X-NewRelic-Transaction=missing tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all", 
+      "scope":"OtherTransaction/php__FILE__"},            [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                        [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/all"},                     [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},                [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},   [1,    0,    0,    0,    0,    0]],
+    [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, 
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, 
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/TraceContext/Create/Success"},    
+							  [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, 
+                                                          [1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url, array());
+echo $rv->data;
diff --git a/tests/integration/external/drupal6/test_dt_existing_headers.php b/tests/integration/external/drupal6/test_dt_existing_headers.php
new file mode 100644
index 000000000..d7f12d461
--- /dev/null
+++ b/tests/integration/external/drupal6/test_dt_existing_headers.php
@@ -0,0 +1,65 @@
+<?php
+
+/*DESCRIPTION
+Test that DT works with drupal_http_request when called with a single header.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled = true
+newrelic.cross_application_tracer.enabled = false
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+traceparent=found tracestate=found newrelic=found X-NewRelic-ID=missing X-NewRelic-Transaction=missing tracing endpoint reached
+traceparent=found tracestate=found newrelic=found X-NewRelic-ID=missing X-NewRelic-Transaction=missing Customer-Header=found tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                   [2, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all", 
+      "scope":"OtherTransaction/php__FILE__"},            [2, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                             [2, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                        [2, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/all"},                     [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},                [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},   [1,    0,    0,    0,    0,    0]],
+    [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, 
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, 
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/TraceContext/Create/Success"},
+                                                          [2, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, 
+                                                          [2, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url, array("kiteboarding" => "windsurfing"));
+echo $rv->data;
+$rv = drupal_http_request($url, array(CUSTOMER_HEADER => "windsurfing"));
+echo $rv->data;
diff --git a/tests/integration/external/drupal6/test_dt_newrelic_header_disabled.php b/tests/integration/external/drupal6/test_dt_newrelic_header_disabled.php
new file mode 100644
index 000000000..4781c96fa
--- /dev/null
+++ b/tests/integration/external/drupal6/test_dt_newrelic_header_disabled.php
@@ -0,0 +1,61 @@
+<?php
+
+/*DESCRIPTION
+Test that DT works with drupal_http_request when called with no headers.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled = true
+newrelic.cross_application_tracer.enabled = false
+newrelic.distributed_tracing_exclude_newrelic_header = true
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+traceparent=found tracestate=found X-NewRelic-ID=missing X-NewRelic-Transaction=missing tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all", 
+      "scope":"OtherTransaction/php__FILE__"},            [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                        [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/all"},                     [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},                [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},   [1,    0,    0,    0,    0,    0]],
+    [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, 
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, 
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/TraceContext/Create/Success"},    
+							  [1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url);
+echo $rv->data;
diff --git a/tests/integration/external/drupal6/test_dt_no_headers.php b/tests/integration/external/drupal6/test_dt_no_headers.php
new file mode 100644
index 000000000..b41e8d662
--- /dev/null
+++ b/tests/integration/external/drupal6/test_dt_no_headers.php
@@ -0,0 +1,62 @@
+<?php
+
+/*DESCRIPTION
+Test that DT works with drupal_http_request when called with no headers.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled = true
+newrelic.cross_application_tracer.enabled = false
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+traceparent=found tracestate=found newrelic=found X-NewRelic-ID=missing X-NewRelic-Transaction=missing tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all", 
+      "scope":"OtherTransaction/php__FILE__"},            [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                        [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/all"},                     [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},                [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},   [1,    0,    0,    0,    0,    0]],
+    [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, 
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, 
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/TraceContext/Create/Success"},    
+							  [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, 
+                                                          [1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url);
+echo $rv->data;
diff --git a/tests/integration/external/drupal6/test_multiple_calls.php b/tests/integration/external/drupal6/test_multiple_calls.php
new file mode 100644
index 000000000..581c83ea0
--- /dev/null
+++ b/tests/integration/external/drupal6/test_multiple_calls.php
@@ -0,0 +1,56 @@
+<?php
+
+/*DESCRIPTION
+Test that multiple calls to drupal_http_request() doesn't result in a segfault.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled=0
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+Hello world!
+Hello world!
+Hello world!
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                 [3,"??","??","??","??","??"]],
+    [{"name":"External/all"},                           [3,"??","??","??","??","??"]],
+    [{"name":"External/allOther"},                      [3,"??","??","??","??","??"]],
+    [{"name":"OtherTransaction/all"},                   [1,"??","??","??","??","??"]],
+    [{"name":"OtherTransaction/php__FILE__"},           [1,"??","??","??","??","??"]],
+    [{"name":"OtherTransactionTotalTime"},              [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},  [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all","scope":"OtherTransaction/php__FILE__"},
+                                                        [3,"??","??","??","??","??"]],
+    [{"name":"Supportability/framework/Drupal/forced"}, [1,0,0,0,0,0]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . $EXTERNAL_HOST; 
+$rv = drupal_http_request($url);
+echo $rv->data."\n";
+$rv = drupal_http_request($url, array());
+echo $rv->data."\n";
+$rv = drupal_http_request($url, array('X-Foo' => 'bar'), 'GET', NULL, 2, 2);
+echo $rv->data."\n";
diff --git a/tests/integration/external/drupal6/test_span_externals.php b/tests/integration/external/drupal6/test_span_externals.php
new file mode 100644
index 000000000..09b2a9871
--- /dev/null
+++ b/tests/integration/external/drupal6/test_span_externals.php
@@ -0,0 +1,103 @@
+<?php
+
+/*DESCRIPTION
+Span events are generated and external span event fields are set correctly.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled = true
+newrelic.transaction_tracer.threshold = 0
+newrelic.transaction_tracer.detail = 0
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+
+if (version_compare(PHP_VERSION, "7.0", "<")) {
+  die("skip: CLM for PHP 5 not supported\n");
+}
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 3
+  },
+  [
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "OtherTransaction\/php__FILE__",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "sampled": true,
+        "nr.entryPoint": true,
+        "timestamp": "??",
+        "transaction.name": "OtherTransaction\/php__FILE__"
+      },
+      {},
+      {}
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "??",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "sampled": true,
+        "parentId": "??",
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "??",
+        "code.function": "drupal_http_request"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "External\/127.0.0.1\/all",
+        "guid": "??",
+        "type": "Span",
+        "category": "http",
+        "priority": "??",
+        "sampled": true,
+        "timestamp": "??",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "Drupal"
+      },
+      {},
+      {
+        "http.url": "??",
+        "http.method": "GET",
+        "http.statusCode": 200
+      }
+    ]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url);
diff --git a/tests/integration/external/drupal6/test_span_externals_clm_off.php b/tests/integration/external/drupal6/test_span_externals_clm_off.php
new file mode 100644
index 000000000..c1985c469
--- /dev/null
+++ b/tests/integration/external/drupal6/test_span_externals_clm_off.php
@@ -0,0 +1,96 @@
+<?php
+
+/*DESCRIPTION
+Span events are generated and external span event fields are set correctly.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled = true
+newrelic.transaction_tracer.threshold = 0
+newrelic.transaction_tracer.detail = 0
+newrelic.code_level_metrics.enabled=false
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 3
+  },
+  [
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "OtherTransaction\/php__FILE__",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "sampled": true,
+        "nr.entryPoint": true,
+        "timestamp": "??",
+        "transaction.name": "OtherTransaction\/php__FILE__"
+      },
+      {},
+      {}
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "??",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "sampled": true,
+        "parentId": "??",
+        "timestamp": "??"
+      },
+      {},
+      {}
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "External\/127.0.0.1\/all",
+        "guid": "??",
+        "type": "Span",
+        "category": "http",
+        "priority": "??",
+        "sampled": true,
+        "timestamp": "??",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "Drupal"
+      },
+      {},
+      {
+        "http.url": "??",
+        "http.method": "GET",
+        "http.statusCode": 200
+      }
+    ]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url);
diff --git a/tests/integration/external/drupal6/test_spans_post.php b/tests/integration/external/drupal6/test_spans_post.php
new file mode 100644
index 000000000..5cd4bc722
--- /dev/null
+++ b/tests/integration/external/drupal6/test_spans_post.php
@@ -0,0 +1,103 @@
+<?php
+
+/*DESCRIPTION
+Span events are generated and external span event fields are set correctly.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled = true
+newrelic.transaction_tracer.threshold = 0
+newrelic.transaction_tracer.detail = 0
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+
+if (version_compare(PHP_VERSION, "7.0", "<")) {
+  die("skip: CLM for PHP 5 not supported\n");
+}
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 3
+  },
+  [
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "OtherTransaction\/php__FILE__",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "sampled": true,
+        "nr.entryPoint": true,
+        "timestamp": "??",
+        "transaction.name": "OtherTransaction\/php__FILE__"
+      },
+      {},
+      {}
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/drupal_http_request",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+       },
+       {},
+       {
+        "code.lineno": "??",
+        "code.filepath": "??",
+        "code.function": "drupal_http_request"
+       }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "External\/127.0.0.1\/all",
+        "guid": "??",
+        "type": "Span",
+        "category": "http",
+        "priority": "??",
+        "sampled": true,
+        "timestamp": "??",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "Drupal"
+      },
+      {},
+      {
+        "http.url": "??",
+        "http.method": "POST",
+        "http.statusCode": 200
+      }
+    ]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv =drupal_http_request($url, NULL, "POST");
diff --git a/tests/integration/external/drupal6/test_spans_post_clm_off.php b/tests/integration/external/drupal6/test_spans_post_clm_off.php
new file mode 100644
index 000000000..0592f83ef
--- /dev/null
+++ b/tests/integration/external/drupal6/test_spans_post_clm_off.php
@@ -0,0 +1,96 @@
+<?php
+
+/*DESCRIPTION
+Span events are generated and external span event fields are set correctly.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled = true
+newrelic.transaction_tracer.threshold = 0
+newrelic.transaction_tracer.detail = 0
+newrelic.code_level_metrics.enabled=false
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 3
+  },
+  [
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "OtherTransaction\/php__FILE__",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "sampled": true,
+        "nr.entryPoint": true,
+        "timestamp": "??",
+        "transaction.name": "OtherTransaction\/php__FILE__"
+      },
+      {},
+      {}
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/drupal_http_request",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+       },
+       {},
+       {}
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "External\/127.0.0.1\/all",
+        "guid": "??",
+        "type": "Span",
+        "category": "http",
+        "priority": "??",
+        "sampled": true,
+        "timestamp": "??",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "Drupal"
+      },
+      {},
+      {
+        "http.url": "??",
+        "http.method": "POST",
+        "http.statusCode": 200
+      }
+    ]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv =drupal_http_request($url, NULL, "POST");
diff --git a/tests/integration/external/drupal6/test_synthetics.php b/tests/integration/external/drupal6/test_synthetics.php
new file mode 100644
index 000000000..26d35faa4
--- /dev/null
+++ b/tests/integration/external/drupal6/test_synthetics.php
@@ -0,0 +1,81 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+The agent SHALL add X-NewRelic-Synthetics headers to external calls when
+the current request is a synthetics request.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled=0
+newrelic.cross_application_tracer.enabled = true
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*
+ * The synthetics header contains the following JSON.
+ *   [
+ *     1,
+ *     432507,
+ *     "rrrrrrr-rrrr-1234-rrrr-rrrrrrrrrrrr",
+ *     "jjjjjjj-jjjj-1234-jjjj-jjjjjjjjjjjj",
+ *     "mmmmmmm-mmmm-1234-mmmm-mmmmmmmmmmmm"
+ *   ]
+ */
+
+/*HEADERS
+X-NewRelic-Synthetics=PwcbVVVRDQMHSEMQRUNFFBZDG0EQFBFPAVALVhVKRkBBSEsTQxNBEBZERRMUERofEg4LCF1bXQxJW1xZCEtSUANWFQhSUl4fWQ9TC1sLWQgOXF0LRE8aXl0JDA9aXBoLCVxbHlNUUFYdD1UPVRVZX14IVAxcDF4PCVsVPA==
+*/
+
+/*EXPECT
+X-NewRelic-Synthetics=found tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+X-NewRelic-App-Data=??
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? start time",
+  "?? stop time",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Apdex"},                                    ["??", "??", "??", "??", "??",    0]],
+    [{"name":"Apdex/Uri__FILE__"},                        ["??", "??", "??", "??", "??",    0]],
+    [{"name":"External/all"},                             [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allWeb"},                          [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                   [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"},
+                                                          [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing",
+      "scope":"WebTransaction/Uri__FILE__"},              [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"HttpDispatcher"},                           [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},   [   1,    0,    0,    0,    0,    0]],
+    [{"name":"WebTransaction"},                           [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransaction/Uri__FILE__"},               [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransactionTotalTime"},                  [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransactionTotalTime/Uri__FILE__"},      [   1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url);
+echo $rv->data;
diff --git a/tests/integration/external/drupal6/test_synthetics_disabled.php b/tests/integration/external/drupal6/test_synthetics_disabled.php
new file mode 100644
index 000000000..d69230a2e
--- /dev/null
+++ b/tests/integration/external/drupal6/test_synthetics_disabled.php
@@ -0,0 +1,78 @@
+<?php
+
+/*DESCRIPTION
+The agent SHALL NOT add X-NewRelic-Synthetics headers to external calls
+when the Synthetics feature is disabled.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.synthetics.enabled = false
+newrelic.distributed_tracing_enabled=0
+newrelic.cross_application_tracer.enabled = true
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*
+ * The synthetics header contains the following JSON.
+ *   [
+ *     1,
+ *     432507,
+ *     "rrrrrrr-rrrr-1234-rrrr-rrrrrrrrrrrr",
+ *     "jjjjjjj-jjjj-1234-jjjj-jjjjjjjjjjjj",
+ *     "mmmmmmm-mmmm-1234-mmmm-mmmmmmmmmmmm"
+ *   ]
+ */
+
+/*HEADERS
+X-NewRelic-Synthetics=PwcbVVVRDQMHSEMQRUNFFBZDG0EQFBFPAVALVhVKRkBBSEsTQxNBEBZERRMUERofEg4LCF1bXQxJW1xZCEtSUANWFQhSUl4fWQ9TC1sLWQgOXF0LRE8aXl0JDA9aXBoLCVxbHlNUUFYdD1UPVRVZX14IVAxcDF4PCVsVPA==
+*/
+
+/*EXPECT
+tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+X-NewRelic-App-Data=??
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? start time",
+  "?? stop time",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Apdex"},                                    ["??", "??", "??", "??", "??",    0]],
+    [{"name":"Apdex/Uri__FILE__"},                        ["??", "??", "??", "??", "??",    0]],
+    [{"name":"External/all"},                             [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allWeb"},                          [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                   [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"},
+                                                          [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing",
+      "scope":"WebTransaction/Uri__FILE__"},              [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"HttpDispatcher"},                           [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},   [   1,    0,    0,    0,    0,    0]],
+    [{"name":"WebTransaction"},                           [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransaction/Uri__FILE__"},               [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransactionTotalTime"},                  [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransactionTotalTime/Uri__FILE__"},      [   1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url);
+echo $rv->data;
diff --git a/tests/integration/external/drupal6/test_synthetics_with_cat_disabled.php b/tests/integration/external/drupal6/test_synthetics_with_cat_disabled.php
new file mode 100644
index 000000000..5d5b6843f
--- /dev/null
+++ b/tests/integration/external/drupal6/test_synthetics_with_cat_disabled.php
@@ -0,0 +1,78 @@
+<?php
+
+/*DESCRIPTION
+1. The agent SHALL NOT add X-NewRelic-ID and X-NewRelic-Transaction headers
+   to external calls when cross application tracing is disabled.
+2. The agent SHALL add X-NewRelic-Synthetics headers to external calls when
+   the current request is a synthetics request regardless of whether
+   cross application tracing is enabled.
+*/
+
+/*XFAIL PHP-1022 */
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.cross_application_tracer.enabled = false
+newrelic.distributed_tracing_enabled=0
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*
+ * The synthetics header contains the following JSON.
+ *   [
+ *     1,
+ *     432507,
+ *     "rrrrrrr-rrrr-1234-rrrr-rrrrrrrrrrrr",
+ *     "jjjjjjj-jjjj-1234-jjjj-jjjjjjjjjjjj",
+ *     "mmmmmmm-mmmm-1234-mmmm-mmmmmmmmmmmm"
+ *   ]
+ */
+
+/*HEADERS
+X-NewRelic-Synthetics=PwcbVVVRDQMHSEMQRUNFFBZDG0EQFBFPAVALVhVKRkBBSEsTQxNBEBZERRMUERofEg4LCF1bXQxJW1xZCEtSUANWFQhSUl4fWQ9TC1sLWQgOXF0LRE8aXl0JDA9aXBoLCVxbHlNUUFYdD1UPVRVZX14IVAxcDF4PCVsVPA==
+*/
+
+/*EXPECT
+X-NewRelic-ID=missing X-NewRelic-Transaction=missing X-NewRelic-Synthetics=found tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? start time",
+  "?? stop time",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Apdex"},                                  ["??", "??", "??", "??", "??",    0]],
+    [{"name":"Apdex/Uri__FILE__"},                      ["??", "??", "??", "??", "??",    0]],
+    [{"name":"External/all"},                           [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allWeb"},                        [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                 [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all",
+      "scope":"WebTransaction/Uri__FILE__"},            [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"HttpDispatcher"},                         [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"}, [   1,    0,    0,    0,    0,    0]],
+    [{"name":"WebTransaction"},                         [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransaction/Uri__FILE__"},             [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransactionTotalTime"},                [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransactionTotalTime/Uri__FILE__"},    [   1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url);
+echo $rv->data;
diff --git a/tests/integration/external/drupal6/test_synthetics_with_dt.php b/tests/integration/external/drupal6/test_synthetics_with_dt.php
new file mode 100644
index 000000000..6af782360
--- /dev/null
+++ b/tests/integration/external/drupal6/test_synthetics_with_dt.php
@@ -0,0 +1,84 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+The agent SHALL add X-NewRelic-Synthetics headers to external calls when
+the current request is a synthetics request and DT is used.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled = true
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*
+ * The synthetics header contains the following JSON.
+ *   [
+ *     1,
+ *     432507,
+ *     "rrrrrrr-rrrr-1234-rrrr-rrrrrrrrrrrr",
+ *     "jjjjjjj-jjjj-1234-jjjj-jjjjjjjjjjjj",
+ *     "mmmmmmm-mmmm-1234-mmmm-mmmmmmmmmmmm"
+ *   ]
+ */
+
+/*HEADERS
+X-NewRelic-Synthetics=PwcbVVVRDQMHSEMQRUNFFBZDG0EQFBFPAVALVhVKRkBBSEsTQxNBEBZERRMUERofEg4LCF1bXQxJW1xZCEtSUANWFQhSUl4fWQ9TC1sLWQgOXF0LRE8aXl0JDA9aXBoLCVxbHlNUUFYdD1UPVRVZX14IVAxcDF4PCVsVPA==
+*/
+
+/*EXPECT
+traceparent=found tracestate=found newrelic=found X-NewRelic-ID=missing X-NewRelic-Transaction=missing X-NewRelic-Synthetics=found tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? start time",
+  "?? stop time",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Apdex"},                                    ["??", "??", "??", "??", "??",    0]],
+    [{"name":"Apdex/Uri__FILE__"},                        ["??", "??", "??", "??", "??",    0]],
+    [{"name":"External/all"},                             [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allWeb"},                          [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                   [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all", 
+      "scope":"WebTransaction/Uri__FILE__"},              [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"HttpDispatcher"},                           [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},   [   1,    0,    0,    0,    0,    0]],
+    [{"name":"WebTransaction"},                           [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransaction/Uri__FILE__"},               [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransactionTotalTime"},                  [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransactionTotalTime/Uri__FILE__"},      [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, 
+                                                          [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allWeb"}, 
+                                                          [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/TraceContext/Create/Success"},    
+							  [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, 
+                                                          [   1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url);
+echo $rv->data;
diff --git a/tests/integration/external/drupal7/skipif.inc b/tests/integration/external/drupal7/skipif.inc
new file mode 100644
index 000000000..41d425401
--- /dev/null
+++ b/tests/integration/external/drupal7/skipif.inc
@@ -0,0 +1,15 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+if (version_compare(PHP_VERSION, "8.2", ">=")) {
+  die("skip: PHP >= 8.2 not supported\n");
+}
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal.php');
+
+if (!download_drupal(7)) {
+    die("warn: drupal7 installation required\n");
+}
diff --git a/tests/integration/external/drupal7/test_bad_params_integer_headers.php b/tests/integration/external/drupal7/test_bad_params_integer_headers.php
new file mode 100644
index 000000000..b717584c4
--- /dev/null
+++ b/tests/integration/external/drupal7/test_bad_params_integer_headers.php
@@ -0,0 +1,50 @@
+<?php
+
+/*DESCRIPTION
+Test that adding cross process headers doesn't blow up if the second parameter
+is bogus.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled=0
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Errors/OtherTransaction/php__FILE__"},    [1,    0,    0,    0,    0,    0]],
+    [{"name":"Errors/all"},                             [1,    0,    0,    0,    0,    0]],
+    [{"name":"Errors/allOther"},                        [1,    0,    0,    0,    0,    0]],
+    [{"name":"OtherTransaction/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},           [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},              [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},  [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"}, [1,    0,    0,    0,    0,    0]],
+    [{"name":"External/127.0.0.1/all"},                 [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                           [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                      [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all",
+      "scope":"OtherTransaction/php__FILE__"},          [1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . $EXTERNAL_HOST;
+
+drupal_http_request($url, array("headers" => 22));
diff --git a/tests/integration/external/drupal7/test_bad_params_integer_options.php b/tests/integration/external/drupal7/test_bad_params_integer_options.php
new file mode 100644
index 000000000..63cd65175
--- /dev/null
+++ b/tests/integration/external/drupal7/test_bad_params_integer_options.php
@@ -0,0 +1,45 @@
+<?php
+
+/*DESCRIPTION
+Test that adding cross process headers doesn't blow up if the second parameter
+is bogus.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled=0
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Errors/OtherTransaction/php__FILE__"},    [1,    0,    0,    0,    0,    0]],
+    [{"name":"Errors/all"},                             [1,    0,    0,    0,    0,    0]],
+    [{"name":"Errors/allOther"},                        [1,    0,    0,    0,    0,    0]],
+    [{"name":"OtherTransaction/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},           [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},              [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},  [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"}, [1,    0,    0,    0,    0,    0]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . $EXTERNAL_HOST;
+
+drupal_http_request($url, 22);
diff --git a/tests/integration/external/drupal7/test_bad_params_null_headers.php b/tests/integration/external/drupal7/test_bad_params_null_headers.php
new file mode 100644
index 000000000..6ace16115
--- /dev/null
+++ b/tests/integration/external/drupal7/test_bad_params_null_headers.php
@@ -0,0 +1,50 @@
+<?php
+
+/*DESCRIPTION
+Test that adding cross process headers doesn't blow up if the second parameter
+is bogus.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled=0
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Errors/OtherTransaction/php__FILE__"},    [1,    0,    0,    0,    0,    0]],
+    [{"name":"Errors/all"},                             [1,    0,    0,    0,    0,    0]],
+    [{"name":"Errors/allOther"},                        [1,    0,    0,    0,    0,    0]],
+    [{"name":"OtherTransaction/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},           [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},              [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},  [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"}, [1,    0,    0,    0,    0,    0]],
+    [{"name":"External/127.0.0.1/all"},                 [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                           [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                      [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all",
+      "scope":"OtherTransaction/php__FILE__"},          [1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . $EXTERNAL_HOST;
+
+drupal_http_request($url, array("headers" => NULL));
diff --git a/tests/integration/external/drupal7/test_bad_params_null_options.php b/tests/integration/external/drupal7/test_bad_params_null_options.php
new file mode 100644
index 000000000..8d582967e
--- /dev/null
+++ b/tests/integration/external/drupal7/test_bad_params_null_options.php
@@ -0,0 +1,49 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that adding cross process headers doesn't blow up if the second parameter
+is bogus.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled=0
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Errors/OtherTransaction/php__FILE__"},    [1,    0,    0,    0,    0,    0]],
+    [{"name":"Errors/all"},                             [1,    0,    0,    0,    0,    0]],
+    [{"name":"Errors/allOther"},                        [1,    0,    0,    0,    0,    0]],
+    [{"name":"OtherTransaction/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},           [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},              [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},  [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"}, [1,    0,    0,    0,    0,    0]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . $EXTERNAL_HOST;
+
+drupal_http_request($url, NULL);
diff --git a/tests/integration/external/drupal7/test_bad_url.php b/tests/integration/external/drupal7/test_bad_url.php
new file mode 100644
index 000000000..7b5301200
--- /dev/null
+++ b/tests/integration/external/drupal7/test_bad_url.php
@@ -0,0 +1,50 @@
+<?php
+
+/*DESCRIPTION
+Test that our instrumentation of drupal_http_request doesn't blow up if the
+first parameter is bogus.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled=0
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+ok - url is number
+ok - url is false
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},           [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},              [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},  [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"}, [1,    0,    0,    0,    0,    0]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php');
+
+$url = "http://" . $EXTERNAL_HOST; 
+$rv = drupal_http_request(22);
+tap_equal('missing schema', $rv->error, "url is number");
+$rv = drupal_http_request(false);
+tap_equal('missing schema', $rv->error, "url is false");
diff --git a/tests/integration/external/drupal7/test_basic.php b/tests/integration/external/drupal7/test_basic.php
new file mode 100644
index 000000000..2f9ff08e4
--- /dev/null
+++ b/tests/integration/external/drupal7/test_basic.php
@@ -0,0 +1,50 @@
+<?php
+
+/*DESCRIPTION
+Test that a simple request through drupal_http_request gets instrumented.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled=0
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+Hello world!
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                 [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                           [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                      [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},           [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},              [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},  [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all",
+      "scope":"OtherTransaction/php__FILE__"},          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"}, [1,    0,    0,    0,    0,    0]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . $EXTERNAL_HOST; 
+$rv = drupal_http_request($url);
+echo $rv->data;
diff --git a/tests/integration/external/drupal7/test_cat_and_synthetics_disabled.php b/tests/integration/external/drupal7/test_cat_and_synthetics_disabled.php
new file mode 100644
index 000000000..32b5e9510
--- /dev/null
+++ b/tests/integration/external/drupal7/test_cat_and_synthetics_disabled.php
@@ -0,0 +1,76 @@
+<?php
+
+/*DESCRIPTION
+1. The agent SHALL NOT add X-NewRelic-ID and X-NewRelic-Transaction headers
+   to external calls when cross application tracing is disabled.
+2. The agent SHALL NOT add X-NewRelic-Synthetics headers to external calls when
+   the Synthetics feature is disabled.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.cross_application_tracer.enabled = false
+newrelic.synthetics.enabled = false
+newrelic.distributed_tracing_enabled=0
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*
+ * The synthetics header contains the following JSON.
+ *   [
+ *     1,
+ *     432507,
+ *     "rrrrrrr-rrrr-1234-rrrr-rrrrrrrrrrrr",
+ *     "jjjjjjj-jjjj-1234-jjjj-jjjjjjjjjjjj",
+ *     "mmmmmmm-mmmm-1234-mmmm-mmmmmmmmmmmm"
+ *   ]
+ */
+
+/*HEADERS
+X-NewRelic-Synthetics=PwcbVVVRDQMHSEMQRUNFFBZDG0EQFBFPAVALVhVKRkBBSEsTQxNBEBZERRMUERofEg4LCF1bXQxJW1xZCEtSUANWFQhSUl4fWQ9TC1sLWQgOXF0LRE8aXl0JDA9aXBoLCVxbHlNUUFYdD1UPVRVZX14IVAxcDF4PCVsVPA==
+*/
+
+/*EXPECT
+X-NewRelic-ID=missing X-NewRelic-Transaction=missing tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? start time",
+  "?? stop time",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Apdex"},                                  ["??", "??", "??", "??", "??",    0]],
+    [{"name":"Apdex/Uri__FILE__"},                      ["??", "??", "??", "??", "??",    0]],
+    [{"name":"External/all"},                           [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allWeb"},                        [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                 [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all",
+      "scope":"WebTransaction/Uri__FILE__"},            [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"HttpDispatcher"},                         [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"}, [   1,    0,    0,    0,    0,    0]],
+    [{"name":"WebTransaction"},                         [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransaction/Uri__FILE__"},             [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransactionTotalTime"},                [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransactionTotalTime/Uri__FILE__"},    [   1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url);
+echo $rv->data;
diff --git a/tests/integration/external/drupal7/test_cat_disabled.php b/tests/integration/external/drupal7/test_cat_disabled.php
new file mode 100644
index 000000000..3dae42b91
--- /dev/null
+++ b/tests/integration/external/drupal7/test_cat_disabled.php
@@ -0,0 +1,59 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+The agent SHALL NOT add X-NewRelic-ID and X-NewRelic-Transaction headers
+to external calls when cross application tracing is disabled.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.cross_application_tracer.enabled = false
+newrelic.distributed_tracing_enabled=0
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+X-NewRelic-ID=missing X-NewRelic-Transaction=missing tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? start time",
+  "?? stop time",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                           [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                      [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                 [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all",
+      "scope":"OtherTransaction/php__FILE__"},          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"}, [1,    0,    0,    0,    0,    0]],
+    [{"name":"OtherTransaction/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},           [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},              [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},  [1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url);
+echo $rv->data;
diff --git a/tests/integration/external/drupal7/test_cross_process_empty_headers.php b/tests/integration/external/drupal7/test_cross_process_empty_headers.php
new file mode 100644
index 000000000..bbbb3e5ee
--- /dev/null
+++ b/tests/integration/external/drupal7/test_cross_process_empty_headers.php
@@ -0,0 +1,59 @@
+<?php
+
+/*DESCRIPTION
+Test that cross app tracing works with drupal_http_request when called with an
+empty headers array.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled=0
+newrelic.cross_application_tracer.enabled = true
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+X-NewRelic-App-Data=??
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                        [1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"},
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/all"},                     [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},                [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing",
+      "scope":"OtherTransaction/php__FILE__"},            [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},   [1,    0,    0,    0,    0,    0]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url, array('headers' => array()));
+echo $rv->data;
diff --git a/tests/integration/external/drupal7/test_cross_process_empty_options.php b/tests/integration/external/drupal7/test_cross_process_empty_options.php
new file mode 100644
index 000000000..cdb2f7a9d
--- /dev/null
+++ b/tests/integration/external/drupal7/test_cross_process_empty_options.php
@@ -0,0 +1,59 @@
+<?php
+
+/*DESCRIPTION
+Test that cross app tracing works with drupal_http_request when called with an
+empty options array.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled=0
+newrelic.cross_application_tracer.enabled = true
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+X-NewRelic-App-Data=??
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                        [1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"},
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/all"},                     [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},                [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing",
+      "scope":"OtherTransaction/php__FILE__"},            [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},   [1,    0,    0,    0,    0,    0]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url, array());
+echo $rv->data;
diff --git a/tests/integration/external/drupal7/test_cross_process_existing_header.php b/tests/integration/external/drupal7/test_cross_process_existing_header.php
new file mode 100644
index 000000000..b0741979d
--- /dev/null
+++ b/tests/integration/external/drupal7/test_cross_process_existing_header.php
@@ -0,0 +1,63 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that cross app tracing works with drupal_http_request when called with
+options containing a header.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled=0
+newrelic.cross_application_tracer.enabled = true
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+X-NewRelic-App-Data=??
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                        [1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"},
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/all"},                     [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},                [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing",
+      "scope":"OtherTransaction/php__FILE__"},            [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},   [1,    0,    0,    0,    0,    0]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url, array('headers' => array('kiteboarding' => 'windsurfing')));
+echo $rv->data;
diff --git a/tests/integration/external/drupal7/test_cross_process_no_options.php b/tests/integration/external/drupal7/test_cross_process_no_options.php
new file mode 100644
index 000000000..9d658c44a
--- /dev/null
+++ b/tests/integration/external/drupal7/test_cross_process_no_options.php
@@ -0,0 +1,59 @@
+<?php
+
+/*DESCRIPTION
+Test that cross app tracing works with drupal_http_request when called with a
+single parameter.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled=0
+newrelic.cross_application_tracer.enabled = true
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+X-NewRelic-App-Data=??
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                        [1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"},
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/all"},                     [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},                [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing",
+      "scope":"OtherTransaction/php__FILE__"},            [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},   [1,    0,    0,    0,    0,    0]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url);
+echo $rv->data;
diff --git a/tests/integration/external/drupal7/test_dt_empty_headers.php b/tests/integration/external/drupal7/test_dt_empty_headers.php
new file mode 100644
index 000000000..1bb2b0dd4
--- /dev/null
+++ b/tests/integration/external/drupal7/test_dt_empty_headers.php
@@ -0,0 +1,63 @@
+<?php
+
+/*DESCRIPTION
+Test that DT works with drupal_http_request when called with an empty header
+array.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled = true
+newrelic.cross_application_tracer.enabled = false
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+traceparent=found tracestate=found newrelic=found X-NewRelic-ID=missing X-NewRelic-Transaction=missing tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all", 
+      "scope":"OtherTransaction/php__FILE__"},            [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                        [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/all"},                     [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},                [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},   [1,    0,    0,    0,    0,    0]],
+    [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, 
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, 
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/TraceContext/Create/Success"},    
+							  [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, 
+                                                          [1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url, array('headers' => array()));
+echo $rv->data;
diff --git a/tests/integration/external/drupal7/test_dt_existing_headers.php b/tests/integration/external/drupal7/test_dt_existing_headers.php
new file mode 100644
index 000000000..538a66c7a
--- /dev/null
+++ b/tests/integration/external/drupal7/test_dt_existing_headers.php
@@ -0,0 +1,64 @@
+<?php
+
+/*DESCRIPTION
+Test that DT works with drupal_http_request when called with a single header.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled = true
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+traceparent=found tracestate=found newrelic=found X-NewRelic-ID=missing X-NewRelic-Transaction=missing tracing endpoint reached
+traceparent=found tracestate=found newrelic=found X-NewRelic-ID=missing X-NewRelic-Transaction=missing Customer-Header=found tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                   [2, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all", 
+      "scope":"OtherTransaction/php__FILE__"},            [2, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                             [2, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                        [2, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/all"},                     [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},                [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},   [1,    0,    0,    0,    0,    0]],
+    [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, 
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, 
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/TraceContext/Create/Success"},
+							  [2, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, 
+                                                          [2, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url, array('headers' => array("kiteboarding" => "windsurfing")));
+echo $rv->data;
+$rv = drupal_http_request($url, array('headers' => array(CUSTOMER_HEADER => "windsurfing")));
+echo $rv->data;
diff --git a/tests/integration/external/drupal7/test_dt_newrelic_header_disabled.php b/tests/integration/external/drupal7/test_dt_newrelic_header_disabled.php
new file mode 100644
index 000000000..d3ee2219f
--- /dev/null
+++ b/tests/integration/external/drupal7/test_dt_newrelic_header_disabled.php
@@ -0,0 +1,61 @@
+<?php
+
+/*DESCRIPTION
+Test that DT works with drupal_http_request when called with no headers.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled = true
+newrelic.cross_application_tracer.enabled = false
+newrelic.distributed_tracing_exclude_newrelic_header = true
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+traceparent=found tracestate=found X-NewRelic-ID=missing X-NewRelic-Transaction=missing tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all", 
+      "scope":"OtherTransaction/php__FILE__"},            [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                        [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/all"},                     [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},                [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},   [1,    0,    0,    0,    0,    0]],
+    [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, 
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, 
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/TraceContext/Create/Success"},    
+							  [1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url);
+echo $rv->data;
diff --git a/tests/integration/external/drupal7/test_dt_no_headers.php b/tests/integration/external/drupal7/test_dt_no_headers.php
new file mode 100644
index 000000000..9f60bf427
--- /dev/null
+++ b/tests/integration/external/drupal7/test_dt_no_headers.php
@@ -0,0 +1,62 @@
+<?php
+
+/*DESCRIPTION
+Test that DT works with drupal_http_request when called with no headers.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled = true
+newrelic.cross_application_tracer.enabled = false
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+traceparent=found tracestate=found newrelic=found X-NewRelic-ID=missing X-NewRelic-Transaction=missing tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                   [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all", 
+      "scope":"OtherTransaction/php__FILE__"},            [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/all"},                             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allOther"},                        [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/all"},                     [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransaction/php__FILE__"},             [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime"},                [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},   [1,    0,    0,    0,    0,    0]],
+    [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, 
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, 
+                                                          [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/TraceContext/Create/Success"},    
+							  [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, 
+                                                          [1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url);
+echo $rv->data;
diff --git a/tests/integration/external/drupal7/test_multiple_calls.php b/tests/integration/external/drupal7/test_multiple_calls.php
new file mode 100644
index 000000000..9279a8801
--- /dev/null
+++ b/tests/integration/external/drupal7/test_multiple_calls.php
@@ -0,0 +1,53 @@
+<?php
+
+/*DESCRIPTION
+Test that multiple calls to drupal_http_request() doesn't result in a segfault.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled=0
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT
+Hello world!
+Hello world!
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? timeframe start",
+  "?? timeframe stop",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                 [2,"??","??","??","??","??"]],
+    [{"name":"External/all"},                           [2,"??","??","??","??","??"]],
+    [{"name":"External/allOther"},                      [2,"??","??","??","??","??"]],
+    [{"name":"OtherTransaction/all"},                   [1,"??","??","??","??","??"]],
+    [{"name":"OtherTransaction/php__FILE__"},           [1,"??","??","??","??","??"]],
+    [{"name":"OtherTransactionTotalTime"},              [1, "??", "??", "??", "??", "??"]],
+    [{"name":"OtherTransactionTotalTime/php__FILE__"},  [1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all","scope":"OtherTransaction/php__FILE__"},
+                                                        [2,"??","??","??","??","??"]],
+    [{"name":"Supportability/framework/Drupal/forced"}, [1,0,0,0,0,0]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . $EXTERNAL_HOST; 
+$rv = drupal_http_request($url);
+echo $rv->data."\n";
+$rv = drupal_http_request($url, array());
+echo $rv->data."\n";
diff --git a/tests/integration/external/drupal7/test_spans_post.php b/tests/integration/external/drupal7/test_spans_post.php
new file mode 100644
index 000000000..7c84f5f6b
--- /dev/null
+++ b/tests/integration/external/drupal7/test_spans_post.php
@@ -0,0 +1,103 @@
+<?php
+
+/*DESCRIPTION
+This tests when a drupal http call is made that the category is set to 'http'
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled = true
+newrelic.transaction_tracer.threshold = 0
+newrelic.transaction_tracer.detail = 0
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+
+if (version_compare(PHP_VERSION, "7.0", "<")) {
+  die("skip: CLM for PHP 5 not supported\n");
+}
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 3
+  },
+  [
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "OtherTransaction\/php__FILE__",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "sampled": true,
+        "nr.entryPoint": true,
+        "timestamp": "??",
+        "transaction.name": "OtherTransaction\/php__FILE__"
+      },
+      {},
+      {}
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/drupal_http_request",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "??",
+        "code.function": "drupal_http_request"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "External\/127.0.0.1\/all",
+        "guid": "??",
+        "type": "Span",
+        "category": "http",
+        "priority": "??",
+        "sampled": true,
+        "timestamp": "??",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "Drupal"
+      },
+      {},
+      {
+        "http.url": "??",
+        "http.method": "POST",
+        "http.statusCode": 200
+      }
+    ]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url, array('method' => 'POST'));
diff --git a/tests/integration/external/drupal7/test_spans_post_clm.php b/tests/integration/external/drupal7/test_spans_post_clm.php
new file mode 100644
index 000000000..bb56c9ee7
--- /dev/null
+++ b/tests/integration/external/drupal7/test_spans_post_clm.php
@@ -0,0 +1,103 @@
+<?php
+
+/*DESCRIPTION
+This tests when a drupal http call is made that the category is set to 'http'
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled = true
+newrelic.transaction_tracer.threshold = 0
+newrelic.transaction_tracer.detail = 0
+newrelic.code_level_metrics.enabled = 1
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+if (version_compare(PHP_VERSION, "7.0", "<")) {
+    die("skip: PHP >= 7.0 needed for CLM\n");
+}
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 3
+  },
+  [
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "OtherTransaction\/php__FILE__",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "sampled": true,
+        "nr.entryPoint": true,
+        "timestamp": "??",
+        "transaction.name": "OtherTransaction\/php__FILE__"
+      },
+      {},
+      {}
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/drupal_http_request",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": 797,
+        "code.filepath": "/.*\/drupal_7_common.inc/",
+        "code.function": "drupal_http_request"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "External\/127.0.0.1\/all",
+        "guid": "??",
+        "type": "Span",
+        "category": "http",
+        "priority": "??",
+        "sampled": true,
+        "timestamp": "??",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "Drupal"
+      },
+      {},
+      {
+        "http.url": "??",
+        "http.method": "POST",
+        "http.statusCode": 200
+      }
+    ]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url, array('method' => 'POST'));
diff --git a/tests/integration/external/drupal7/test_spans_post_clm_off.php b/tests/integration/external/drupal7/test_spans_post_clm_off.php
new file mode 100644
index 000000000..9ab4accb1
--- /dev/null
+++ b/tests/integration/external/drupal7/test_spans_post_clm_off.php
@@ -0,0 +1,96 @@
+<?php
+
+/*DESCRIPTION
+This tests when a drupal http call is made that the category is set to 'http'
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled = true
+newrelic.transaction_tracer.threshold = 0
+newrelic.transaction_tracer.detail = 0
+newrelic.code_level_metrics.enabled=false
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 3
+  },
+  [
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "OtherTransaction\/php__FILE__",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "sampled": true,
+        "nr.entryPoint": true,
+        "timestamp": "??",
+        "transaction.name": "OtherTransaction\/php__FILE__"
+      },
+      {},
+      {}
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/drupal_http_request",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {}
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "External\/127.0.0.1\/all",
+        "guid": "??",
+        "type": "Span",
+        "category": "http",
+        "priority": "??",
+        "sampled": true,
+        "timestamp": "??",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "Drupal"
+      },
+      {},
+      {
+        "http.url": "??",
+        "http.method": "POST",
+        "http.statusCode": 200
+      }
+    ]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url, array('method' => 'POST'));
diff --git a/tests/integration/external/drupal7/test_spans_sets_external_span_correctly.php b/tests/integration/external/drupal7/test_spans_sets_external_span_correctly.php
new file mode 100644
index 000000000..4c319f229
--- /dev/null
+++ b/tests/integration/external/drupal7/test_spans_sets_external_span_correctly.php
@@ -0,0 +1,103 @@
+<?php
+
+/*DESCRIPTION
+This tests when a drupal http call is made that the category is set to 'http'
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled = true
+newrelic.transaction_tracer.threshold = 0
+newrelic.transaction_tracer.detail = 0
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+
+if (version_compare(PHP_VERSION, "7.0", "<")) {
+  die("skip: CLM for PHP 5 not supported\n");
+}
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 3
+  },
+  [
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "OtherTransaction\/php__FILE__",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "sampled": true,
+        "nr.entryPoint": true,
+        "timestamp": "??",
+        "transaction.name": "OtherTransaction\/php__FILE__"
+      },
+      {},
+      {}
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "??",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "sampled": true,
+        "parentId": "??",
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "??",
+        "code.function": "drupal_http_request"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "External\/127.0.0.1\/all",
+        "guid": "??",
+        "type": "Span",
+        "category": "http",
+        "priority": "??",
+        "sampled": true,
+        "timestamp": "??",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "Drupal"
+      },
+      {},
+      {
+        "http.url": "??",
+        "http.method": "GET",
+        "http.statusCode": 200
+      }
+    ]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url, array('headers' => array("kiteboarding" => "windsurfing")));
diff --git a/tests/integration/external/drupal7/test_spans_sets_external_span_correctly_clm_off.php b/tests/integration/external/drupal7/test_spans_sets_external_span_correctly_clm_off.php
new file mode 100644
index 000000000..70dca905a
--- /dev/null
+++ b/tests/integration/external/drupal7/test_spans_sets_external_span_correctly_clm_off.php
@@ -0,0 +1,96 @@
+<?php
+
+/*DESCRIPTION
+This tests when a drupal http call is made that the category is set to 'http'
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled = true
+newrelic.transaction_tracer.threshold = 0
+newrelic.transaction_tracer.detail = 0
+newrelic.code_level_metrics.enabled=false
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 3
+  },
+  [
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "OtherTransaction\/php__FILE__",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "sampled": true,
+        "nr.entryPoint": true,
+        "timestamp": "??",
+        "transaction.name": "OtherTransaction\/php__FILE__"
+      },
+      {},
+      {}
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "??",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "sampled": true,
+        "parentId": "??",
+        "timestamp": "??"
+      },
+      {},
+      {}
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "External\/127.0.0.1\/all",
+        "guid": "??",
+        "type": "Span",
+        "category": "http",
+        "priority": "??",
+        "sampled": true,
+        "timestamp": "??",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "Drupal"
+      },
+      {},
+      {
+        "http.url": "??",
+        "http.method": "GET",
+        "http.statusCode": 200
+      }
+    ]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url, array('headers' => array("kiteboarding" => "windsurfing")));
diff --git a/tests/integration/external/drupal7/test_synthetics.php b/tests/integration/external/drupal7/test_synthetics.php
new file mode 100644
index 000000000..a0312e00d
--- /dev/null
+++ b/tests/integration/external/drupal7/test_synthetics.php
@@ -0,0 +1,79 @@
+<?php
+
+/*DESCRIPTION
+The agent should add X-NewRelic-Synthetics headers to external calls when
+the current request is a synthetics request.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled=0
+newrelic.cross_application_tracer.enabled = true
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*
+ * The synthetics header contains the following JSON.
+ *   [
+ *     1,
+ *     432507,
+ *     "rrrrrrr-rrrr-1234-rrrr-rrrrrrrrrrrr",
+ *     "jjjjjjj-jjjj-1234-jjjj-jjjjjjjjjjjj",
+ *     "mmmmmmm-mmmm-1234-mmmm-mmmmmmmmmmmm"
+ *   ]
+ */
+
+/*HEADERS
+X-NewRelic-Synthetics=PwcbVVVRDQMHSEMQRUNFFBZDG0EQFBFPAVALVhVKRkBBSEsTQxNBEBZERRMUERofEg4LCF1bXQxJW1xZCEtSUANWFQhSUl4fWQ9TC1sLWQgOXF0LRE8aXl0JDA9aXBoLCVxbHlNUUFYdD1UPVRVZX14IVAxcDF4PCVsVPA==
+*/
+
+/*EXPECT
+X-NewRelic-Synthetics=found tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+X-NewRelic-App-Data=??
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? start time",
+  "?? stop time",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Apdex"},                                    ["??", "??", "??", "??", "??",    0]],
+    [{"name":"Apdex/Uri__FILE__"},                        ["??", "??", "??", "??", "??",    0]],
+    [{"name":"External/all"},                             [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allWeb"},                          [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                   [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"},
+                                                          [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing",
+      "scope":"WebTransaction/Uri__FILE__"},              [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"HttpDispatcher"},                           [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},   [   1,    0,    0,    0,    0,    0]],
+    [{"name":"WebTransaction"},                           [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransaction/Uri__FILE__"},               [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransactionTotalTime"},                  [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransactionTotalTime/Uri__FILE__"},      [   1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url);
+echo $rv->data;
diff --git a/tests/integration/external/drupal7/test_synthetics_disabled.php b/tests/integration/external/drupal7/test_synthetics_disabled.php
new file mode 100644
index 000000000..bdc4ff73a
--- /dev/null
+++ b/tests/integration/external/drupal7/test_synthetics_disabled.php
@@ -0,0 +1,82 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+The agent SHALL NOT add X-NewRelic-Synthetics headers to external calls
+when the Synthetics feature is disabled.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.synthetics.enabled = false
+newrelic.distributed_tracing_enabled=0
+newrelic.cross_application_tracer.enabled = true
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*
+ * The synthetics header contains the following JSON.
+ *   [
+ *     1,
+ *     432507,
+ *     "rrrrrrr-rrrr-1234-rrrr-rrrrrrrrrrrr",
+ *     "jjjjjjj-jjjj-1234-jjjj-jjjjjjjjjjjj",
+ *     "mmmmmmm-mmmm-1234-mmmm-mmmmmmmmmmmm"
+ *   ]
+ */
+
+/*HEADERS
+X-NewRelic-Synthetics=PwcbVVVRDQMHSEMQRUNFFBZDG0EQFBFPAVALVhVKRkBBSEsTQxNBEBZERRMUERofEg4LCF1bXQxJW1xZCEtSUANWFQhSUl4fWQ9TC1sLWQgOXF0LRE8aXl0JDA9aXBoLCVxbHlNUUFYdD1UPVRVZX14IVAxcDF4PCVsVPA==
+*/
+
+/*EXPECT
+tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+X-NewRelic-App-Data=??
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? start time",
+  "?? stop time",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Apdex"},                                    ["??", "??", "??", "??", "??",    0]],
+    [{"name":"Apdex/Uri__FILE__"},                        ["??", "??", "??", "??", "??",    0]],
+    [{"name":"External/all"},                             [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allWeb"},                          [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                   [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"},
+                                                          [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing",
+      "scope":"WebTransaction/Uri__FILE__"},              [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"HttpDispatcher"},                           [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},   [   1,    0,    0,    0,    0,    0]],
+    [{"name":"WebTransaction"},                           [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransaction/Uri__FILE__"},               [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransactionTotalTime"},                  [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransactionTotalTime/Uri__FILE__"},      [   1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url);
+echo $rv->data;
diff --git a/tests/integration/external/drupal7/test_synthetics_with_cat_disabled.php b/tests/integration/external/drupal7/test_synthetics_with_cat_disabled.php
new file mode 100644
index 000000000..8a27df9cb
--- /dev/null
+++ b/tests/integration/external/drupal7/test_synthetics_with_cat_disabled.php
@@ -0,0 +1,77 @@
+<?php
+
+/*DESCRIPTION
+1. The agent SHALL NOT add X-NewRelic-ID and X-NewRelic-Transaction headers
+   to external calls when cross application tracing is disabled.
+2. The agent SHALL add X-NewRelic-Synthetics headers to external calls when
+   the current request is a synthetics request regardless of whether
+   cross application tracing is enabled.
+*/
+
+/*XFAIL PHP-1022 */
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.cross_application_tracer.enabled = false
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*
+ * The synthetics header contains the following JSON.
+ *   [
+ *     1,
+ *     432507,
+ *     "rrrrrrr-rrrr-1234-rrrr-rrrrrrrrrrrr",
+ *     "jjjjjjj-jjjj-1234-jjjj-jjjjjjjjjjjj",
+ *     "mmmmmmm-mmmm-1234-mmmm-mmmmmmmmmmmm"
+ *   ]
+ */
+
+/*HEADERS
+X-NewRelic-Synthetics=PwcbVVVRDQMHSEMQRUNFFBZDG0EQFBFPAVALVhVKRkBBSEsTQxNBEBZERRMUERofEg4LCF1bXQxJW1xZCEtSUANWFQhSUl4fWQ9TC1sLWQgOXF0LRE8aXl0JDA9aXBoLCVxbHlNUUFYdD1UPVRVZX14IVAxcDF4PCVsVPA==
+*/
+
+/*EXPECT
+X-NewRelic-ID=missing X-NewRelic-Transaction=missing X-NewRelic-Synthetics=found tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? start time",
+  "?? stop time",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Apdex"},                                  ["??", "??", "??", "??", "??",    0]],
+    [{"name":"Apdex/Uri__FILE__"},                      ["??", "??", "??", "??", "??",    0]],
+    [{"name":"External/all"},                           [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allWeb"},                        [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                 [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all",
+      "scope":"WebTransaction/Uri__FILE__"},            [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"HttpDispatcher"},                         [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"}, [   1,    0,    0,    0,    0,    0]],
+    [{"name":"WebTransaction"},                         [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransaction/Uri__FILE__"},             [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransactionTotalTime"},                [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransactionTotalTime/Uri__FILE__"},    [   1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url);
+echo $rv->data;
diff --git a/tests/integration/external/drupal7/test_synthetics_with_dt.php b/tests/integration/external/drupal7/test_synthetics_with_dt.php
new file mode 100644
index 000000000..af960b29d
--- /dev/null
+++ b/tests/integration/external/drupal7/test_synthetics_with_dt.php
@@ -0,0 +1,80 @@
+<?php
+
+/*DESCRIPTION
+The agent SHALL add X-NewRelic-Synthetics headers to external calls when
+the current request is a synthetics request and DT is used.
+*/
+
+// force the framework to avoid requiring the drupal detection file
+/*INI
+newrelic.framework = drupal
+newrelic.distributed_tracing_enabled = true
+*/
+
+/*SKIPIF
+<?php
+require("skipif.inc");
+*/
+
+/*
+ * The synthetics header contains the following JSON.
+ *   [
+ *     1,
+ *     432507,
+ *     "rrrrrrr-rrrr-1234-rrrr-rrrrrrrrrrrr",
+ *     "jjjjjjj-jjjj-1234-jjjj-jjjjjjjjjjjj",
+ *     "mmmmmmm-mmmm-1234-mmmm-mmmmmmmmmmmm"
+ *   ]
+ */
+
+/*HEADERS
+X-NewRelic-Synthetics=PwcbVVVRDQMHSEMQRUNFFBZDG0EQFBFPAVALVhVKRkBBSEsTQxNBEBZERRMUERofEg4LCF1bXQxJW1xZCEtSUANWFQhSUl4fWQ9TC1sLWQgOXF0LRE8aXl0JDA9aXBoLCVxbHlNUUFYdD1UPVRVZX14IVAxcDF4PCVsVPA==
+*/
+
+/*EXPECT
+traceparent=found tracestate=found newrelic=found X-NewRelic-ID=missing X-NewRelic-Transaction=missing X-NewRelic-Synthetics=found tracing endpoint reached
+*/
+
+/*EXPECT_RESPONSE_HEADERS
+*/
+
+/*EXPECT_METRICS
+[
+  "?? agent run id",
+  "?? start time",
+  "?? stop time",
+  [
+    [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},    [1, "??", "??", "??", "??", "??"]],
+    [{"name": "Supportability/Logging/Metrics/PHP/enabled"},       [1, "??", "??", "??", "??", "??"]],
+    [{"name":"Apdex"},                                    ["??", "??", "??", "??", "??",    0]],
+    [{"name":"Apdex/Uri__FILE__"},                        ["??", "??", "??", "??", "??",    0]],
+    [{"name":"External/all"},                             [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/allWeb"},                          [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all"},                   [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"External/127.0.0.1/all", 
+      "scope":"WebTransaction/Uri__FILE__"},              [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"HttpDispatcher"},                           [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/framework/Drupal/forced"},   [   1,    0,    0,    0,    0,    0]],
+    [{"name":"WebTransaction"},                           [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransaction/Uri__FILE__"},               [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransactionTotalTime"},                  [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"WebTransactionTotalTime/Uri__FILE__"},      [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, 
+                                                          [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allWeb"}, 
+                                                          [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/TraceContext/Create/Success"},    
+							  [   1, "??", "??", "??", "??", "??"]],
+    [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, 
+                                                          [   1, "??", "??", "??", "??", "??"]]
+  ]
+]
+*/
+
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc');
+require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php');
+
+$url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php');
+$rv = drupal_http_request($url);
+echo $rv->data;