diff --git a/src/newrelic/integration/parse.go b/src/newrelic/integration/parse.go
index 43af09391..c7123daff 100644
--- a/src/newrelic/integration/parse.go
+++ b/src/newrelic/integration/parse.go
@@ -23,6 +23,7 @@ var (
 		"HEADERS":                 parseHeaders,
 		"SKIPIF":                  parseRawSkipIf,
 		"INI":                     parseSettings,
+		"PHPMODULES":              parsePHPModules,
 		"CONFIG":                  parseConfig,
 		"DESCRIPTION":             parseDescription,
 		"EXPECT_ANALYTICS_EVENTS": parseAnalyticEvents,
@@ -195,6 +196,35 @@ func parseSettings(t *Test, content []byte) error {
 	return nil
 }
 
+func parsePHPModules(t *Test, content []byte) error {
+	trimmed := bytes.TrimSpace(content)
+	settings := make(map[string]string)
+	scanner := bufio.NewScanner(bytes.NewReader(trimmed))
+	delim := []byte("=")
+
+	for scanner.Scan() {
+		parts := bytes.SplitN(scanner.Bytes(), delim, 2)
+		switch len(parts) {
+		case 2:
+			key, value := bytes.TrimSpace(parts[0]), bytes.TrimSpace(parts[1])
+			if len(key) > 0 {
+				settings[string(key)] = string(value)
+			} else {
+				return errBadSetting
+			}
+		case 1:
+			return errBadSetting
+		}
+	}
+
+	if err := scanner.Err(); err != nil {
+		return err
+	}
+	t.PhpModules = settings
+	return nil
+}
+
+
 func parseAnalyticEvents(test *Test, content []byte) error {
 	test.analyticEvents = content
 	return nil
diff --git a/src/newrelic/integration/test.go b/src/newrelic/integration/test.go
index 14d66bddc..3aaa98e0f 100644
--- a/src/newrelic/integration/test.go
+++ b/src/newrelic/integration/test.go
@@ -50,10 +50,11 @@ type Test struct {
 	// Raw parsed test information used to construct the Tx.
 	// The settings and env do not include global env and
 	// global settings.
-	rawSkipIf []byte
-	Env       map[string]string
-	Settings  map[string]string
-	headers   http.Header
+	rawSkipIf  []byte
+	Env        map[string]string
+	Settings   map[string]string
+	PhpModules map[string]string
+	headers    http.Header
 
 	// When non-empty describes why failed should be true after the test
 	// is run. This field may be set in the test definition to indicate
@@ -194,6 +195,8 @@ func (t *Test) MakeRun(ctx *Context) (Tx, error) {
 		}
 	}
 
+	settings = merge(settings, t.PhpModules)
+
 	if t.IsC() {
 		return CTx(ScriptFile(t.Path), env, settings, headers, ctx)
 	}
diff --git a/tests/integration/jit/function/skipif.inc b/tests/integration/jit/function/skipif.inc
new file mode 100644
index 000000000..c7f0ce357
--- /dev/null
+++ b/tests/integration/jit/function/skipif.inc
@@ -0,0 +1,16 @@
+<?php
+/*
+ * Copyright 2022 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* JIT only supported with OAPI with PHP 8+ */
+if (version_compare(PHP_VERSION, "8.0", "<")) {
+  die("skip: PHP < 8.0.0 not supported\n");
+}
+
+/* Test cannot run without opache */
+/* This should be changed to a 'warn' result when supported */
+if (!extension_loaded('Zend OPcache')) {
+  die("warn: Zend OPcache extension required\n");
+}
diff --git a/tests/integration/jit/function/test_computations.php b/tests/integration/jit/function/test_computations.php
new file mode 100644
index 000000000..9a842f78a
--- /dev/null
+++ b/tests/integration/jit/function/test_computations.php
@@ -0,0 +1,78 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Transaction event created and no errors despite creating spans
+for a HUGE number of calls.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ANALYTICS_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 50,
+    "events_seen": 1
+  },
+  [
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "timestamp": "??",
+        "type": "Transaction",
+        "name": "OtherTransaction\/php__FILE__",
+        "guid": "??",
+        "priority": "??",
+        "sampled": true,
+        "totalTime": "??",
+        "error": false
+      },
+      {},
+      {}
+    ]
+  ]
+]
+*/
+
+
+/*EXPECT
+Hello
+*/
+
+newrelic_add_custom_tracer('computation');
+
+function computation(float $a): int
+{
+
+    $b = intval($a) % (2 ** 32);
+    return $b;
+}
+
+for ($i = 0; $i < 500; ++$i) {
+    computation(2**64);
+}
+echo 'Hello';
diff --git a/tests/integration/jit/function/test_even_odd_count.php b/tests/integration/jit/function/test_even_odd_count.php
new file mode 100644
index 000000000..d71020694
--- /dev/null
+++ b/tests/integration/jit/function/test_even_odd_count.php
@@ -0,0 +1,84 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Transaction event generated with JIT enabled even when doing lots of loops.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS null */
+
+/*EXPECT_ANALYTICS_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 50,
+    "events_seen": 1
+  },
+  [
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "timestamp": "??",
+        "type": "Transaction",
+        "name": "OtherTransaction\/php__FILE__",
+        "guid": "??",
+        "priority": "??", 
+        "sampled": true,
+        "totalTime": "??",
+        "error": false
+      },
+      {},
+      {}
+    ]
+  ]
+]
+*/
+
+/*EXPECT
+5000
+*/
+
+
+function even(int $a): bool {
+    if ($a == 1)  {
+        return false;
+    } else if (($a % 2) == 0) {
+            return true;
+        }
+    return false;
+}
+
+$count = 0;
+for ($i = 1; $i <= 10000; $i++)
+{
+        if (even($i)) $count++;
+}
+echo "$count";
+
diff --git a/tests/integration/jit/function/test_recursion_no_segfault.php b/tests/integration/jit/function/test_recursion_no_segfault.php
new file mode 100644
index 000000000..0d0b85a5f
--- /dev/null
+++ b/tests/integration/jit/function/test_recursion_no_segfault.php
@@ -0,0 +1,55 @@
+<?php
+/*
+ * Copyright 2022 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+JIT enabled, should still instrument without crashing.
+Previous tests would invariably cause a segfault when
+recursively finding the 10th fibonacci number.
+ */
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+error_reporting = E_ALL
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.cross_application_tracer.enabled = false
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS
+null
+*/
+
+/*EXPECT
+89
+*/
+
+newrelic_add_custom_tracer('fibonacci'); 
+
+
+function fibonacci($n){
+    return(($n < 2) ? 1 : fibonacci($n - 2) + fibonacci($n - 1));
+}
+
+$n = 10; /* Get the nth Fibonacci number. */
+
+$fibonacci = fibonacci($n);
+echo $fibonacci;
+
diff --git a/tests/integration/jit/function/test_span_class_function.php b/tests/integration/jit/function/test_span_class_function.php
new file mode 100644
index 000000000..cd4b34d5b
--- /dev/null
+++ b/tests/integration/jit/function/test_span_class_function.php
@@ -0,0 +1,277 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+With JIT, span events should show properly.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 9
+  },
+  [
+    [
+      {
+        "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": "Custom\/main",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "Custom\/main",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "Custom\/main",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "Custom\/Classname::functionName",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.namespace": "Classname",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "Custom\/Classname::functionName",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.namespace": "Classname",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "Custom\/Classname::functionName",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.namespace": "Classname",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "Custom\/Classname::functionName",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.namespace": "Classname",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "Custom\/Classname::functionName",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.namespace": "Classname",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT
+HelloHelloHelloOK
+*/
+
+newrelic_add_custom_tracer('main');
+newrelic_add_custom_tracer('Classname::functionName');
+function main()
+{
+  echo 'Hello';
+}
+main();
+main();
+main();
+
+abstract class Classname{
+
+        protected function functionName() : void {
+        for($i = 0; $i < 500; ++$i){
+        /* Spin wheels. */
+        $x = 10 + 10;
+        }
+        }
+
+        final public function __destruct(){
+
+        }
+
+}
+
+class LittleClass extends Classname{
+        public function __construct(){
+                $this->functionName();
+        }
+}
+
+for($i = 0; $i < 5; ++$i){
+        new LittleClass;
+}
+echo "OK\n";
diff --git a/tests/integration/jit/function/test_span_events_are_created_from_segments.php b/tests/integration/jit/function/test_span_events_are_created_from_segments.php
new file mode 100644
index 000000000..b543794bd
--- /dev/null
+++ b/tests/integration/jit/function/test_span_events_are_created_from_segments.php
@@ -0,0 +1,118 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that span events are correctly created from any eligible segment.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*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\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Datastore\/statement\/FakeDB\/other\/other",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "datastore",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "FakeDB"
+      },
+      {},
+      {
+        "db.instance": "unknown",
+        "peer.hostname": "unknown",
+        "peer.address": "unknown:unknown"
+      }
+    ]
+  ]
+]
+*/
+
+function a() {
+  time_nanosleep(0, 100000000);
+}
+
+a();
+newrelic_record_datastore_segment(function () {
+  time_nanosleep(0, 100000000);
+}, array(
+  'product' => 'FakeDB',
+));
diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_caught_error.php b/tests/integration/jit/function/test_span_events_are_created_upon_caught_error.php
new file mode 100644
index 000000000..7eb35c819
--- /dev/null
+++ b/tests/integration/jit/function/test_span_events_are_created_upon_caught_error.php
@@ -0,0 +1,161 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that span events are correctly created from any eligible segment, even
+when an error is generated and handled.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+display_errors=1
+log_errors=0
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 4
+  },
+  [
+    [
+      {
+        "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": "Datastore\/statement\/FakeDB\/other\/other",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "datastore",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "FakeDB"
+      },
+      {},
+      {
+        "db.instance": "unknown",
+        "peer.hostname": "unknown",
+        "peer.address": "unknown:unknown"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "foo",
+        "error.class": "E_USER_ERROR",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/{closure}",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT_REGEX
+^\s*(PHP )?Fatal error:\s*foo in .*? on line [0-9]+\s*$
+*/
+
+set_error_handler(
+    function () {
+        time_nanosleep(0, 100000000);
+        return false;
+    }
+);
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    trigger_error('foo', E_USER_ERROR);
+}
+
+newrelic_record_datastore_segment(
+    function () {
+        time_nanosleep(0, 100000000);
+    }, array(
+        'product' => 'FakeDB',
+    )
+);
+a();
+
+echo 'this should never be printed';
diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_caught_exception.php b/tests/integration/jit/function/test_span_events_are_created_upon_caught_exception.php
new file mode 100644
index 000000000..13e09a87b
--- /dev/null
+++ b/tests/integration/jit/function/test_span_events_are_created_upon_caught_exception.php
@@ -0,0 +1,142 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that span events are correctly created from any eligible segment when a caught exception occurs.
+Putting in a try/catch block means an exception is NOT handled by the exception handler.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS
+null
+*/
+
+/*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": "Datastore\/statement\/FakeDB\/other\/other",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "datastore",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "FakeDB"
+      },
+      {},
+      {
+        "db.instance": "unknown",
+        "peer.hostname": "unknown",
+        "peer.address": "unknown:unknown"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+              "code.lineno": "??",
+              "code.filepath": "__FILE__",
+              "code.function": "a"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT
+*/
+
+set_exception_handler(
+    function () {
+        time_nanosleep(0, 100000000);
+        echo 'this should never be printed';
+        exit(0);
+    }
+);
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    throw new RuntimeException('oops');
+}
+
+newrelic_record_datastore_segment(
+    function () {
+        time_nanosleep(0, 100000000);
+    }, array(
+        'product' => 'FakeDB',
+    )
+);
+
+try {
+a();
+} catch (RuntimeException $e) {
+}
diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_exit.php b/tests/integration/jit/function/test_span_events_are_created_upon_exit.php
new file mode 100644
index 000000000..3274bf154
--- /dev/null
+++ b/tests/integration/jit/function/test_span_events_are_created_upon_exit.php
@@ -0,0 +1,123 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that span events are correctly created from any eligible segment, even
+when exit() is called.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*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": "Datastore\/statement\/FakeDB\/other\/other",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "datastore",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "FakeDB"
+      },
+      {},
+      {
+        "db.instance": "unknown",
+        "peer.hostname": "unknown",
+        "peer.address": "unknown:unknown"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    exit(0);
+}
+
+newrelic_record_datastore_segment(
+    function () {
+        time_nanosleep(0, 100000000);
+    }, array(
+    'product' => 'FakeDB',
+    )
+);
+a();
diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_error.php b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_error.php
new file mode 100644
index 000000000..c3f064b6d
--- /dev/null
+++ b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_error.php
@@ -0,0 +1,133 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that span events are correctly created from any eligible segment, even
+when an error is generated and left to the default error handler.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+display_errors=1
+log_errors=0
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*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": "Datastore\/statement\/FakeDB\/other\/other",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "datastore",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "FakeDB"
+      },
+      {},
+      {
+        "db.instance": "unknown",
+        "peer.hostname": "unknown",
+        "peer.address": "unknown:unknown"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "foo",
+        "error.class": "E_USER_ERROR",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT_REGEX
+^\s*(PHP )?Fatal error:\s*foo in .*? on line [0-9]+\s*$
+*/
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    trigger_error('foo', E_USER_ERROR);
+}
+
+newrelic_record_datastore_segment(
+    function () {
+        time_nanosleep(0, 100000000);
+    }, array(
+        'product' => 'FakeDB',
+    )
+);
+a();
+
+echo 'this should never be printed';
diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_exception.php b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_exception.php
new file mode 100644
index 000000000..3c0744dbf
--- /dev/null
+++ b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_exception.php
@@ -0,0 +1,136 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*DESCRIPTION
+Test that span events are correctly created from any eligible segment, even
+when an uncaught exception is thrown.
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+display_errors=1
+log_errors=0
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*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__"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",
+        "error.class": "RuntimeException"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Datastore\/statement\/FakeDB\/other\/other",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "datastore",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "FakeDB"
+      },
+      {},
+      {
+        "db.instance": "unknown",
+        "peer.hostname": "unknown",
+        "peer.address": "unknown:unknown"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT_REGEX
+^\s*(PHP )?Fatal error: Uncaught.*RuntimeException.*oops.*
+*/
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    throw new RuntimeException('oops');
+}
+
+newrelic_record_datastore_segment(
+    function () {
+        time_nanosleep(0, 100000000);
+    }, array(
+        'product' => 'FakeDB',
+    )
+);
+a();
+
+echo 'this should never be printed';
diff --git a/tests/integration/jit/function/test_span_events_error_collector_disabled.php b/tests/integration/jit/function/test_span_events_error_collector_disabled.php
new file mode 100644
index 000000000..08a872629
--- /dev/null
+++ b/tests/integration/jit/function/test_span_events_error_collector_disabled.php
@@ -0,0 +1,127 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that no span events error attributes are captured when error_collector is disabled
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+newrelic.error_collector.enabled = false
+display_errors=1
+log_errors=0
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*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": "Datastore\/statement\/FakeDB\/other\/other",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "datastore",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "FakeDB"
+      },
+      {},
+      {
+        "db.instance": "unknown",
+        "peer.hostname": "unknown",
+        "peer.address": "unknown:unknown"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    trigger_error('foo', E_USER_ERROR);
+}
+
+newrelic_record_datastore_segment(
+    function () {
+        time_nanosleep(0, 100000000);
+    }, array(
+        'product' => 'FakeDB',
+    )
+);
+a();
+
+echo 'this should never be printed';
diff --git a/tests/integration/jit/function/test_span_events_exception_caught_nested.php b/tests/integration/jit/function/test_span_events_exception_caught_nested.php
new file mode 100644
index 000000000..2433f1289
--- /dev/null
+++ b/tests/integration/jit/function/test_span_events_exception_caught_nested.php
@@ -0,0 +1,217 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that a caught exception that originated from a child span is 
+correctly handled.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS
+null
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 6
+  },
+  [
+    [
+      {
+        "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\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/b",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/c",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/fraction",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/fraction",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT
+Hello
+0.2
+Caught exception: Division by zero
+*/
+
+function c()
+{
+    time_nanosleep(0, 100000000);
+    echo fraction(5) . "\n";
+    echo fraction(0) . "\n";
+}
+
+function b()
+{
+    time_nanosleep(0, 100000000);
+    try {
+        c();
+    } catch (RuntimeException $e) {
+        echo("Caught exception: " . $e->getMessage() . "\n");
+    }
+}
+
+function fraction($x) {
+    time_nanosleep(0, 100000000);
+    if (!$x) {
+        throw new RuntimeException('Division by zero');
+    }
+    return 1/$x;
+}
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    echo "Hello\n";
+};
+
+a();
+b();
diff --git a/tests/integration/jit/function/test_span_events_exception_caught_nested_rethrown.php b/tests/integration/jit/function/test_span_events_exception_caught_nested_rethrown.php
new file mode 100644
index 000000000..036b6a55e
--- /dev/null
+++ b/tests/integration/jit/function/test_span_events_exception_caught_nested_rethrown.php
@@ -0,0 +1,196 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that a caught exception that originated from a child span that 
+is "rethrown" is correctly handled.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": "??",
+    "events_seen": 1
+  },
+  [
+    [
+      {
+        "type": "TransactionError",
+        "timestamp": "??",
+        "error.class": "RuntimeException",
+        "error.message": "Uncaught exception 'RuntimeException' with message 'Rethrown caught exception: Division by zero' in __FILE__:??",
+        "transactionName": "OtherTransaction\/php__FILE__",
+        "duration": "??",
+        "nr.transactionGuid": "??",
+        "guid": "??",
+        "sampled": true,
+        "priority": "??",
+        "traceId": "??",
+        "spanId": "??"
+      },
+      {},
+      {}
+    ]
+  ]
+]
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 4
+  },
+  [
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "OtherTransaction\/php__FILE__",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "sampled": true,
+        "nr.entryPoint": true,
+        "timestamp": "??",
+        "transaction.name": "OtherTransaction\/php__FILE__"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'Rethrown caught exception: Division by zero' in __FILE__:??",
+        "error.class": "RuntimeException"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/b",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'Rethrown caught exception: Division by zero' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/c",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/fraction",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+       "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT_REGEX
+^\s*(PHP )?Fatal error:.*Uncaught.*Exception.*Rethrown caught exception: Division by zero.*
+*/
+
+function c()
+{
+    time_nanosleep(0, 100000000);
+    echo fraction(0) . "\n";
+}
+
+function b()
+{
+    time_nanosleep(0, 100000000);
+    try {
+        c();
+    } catch (RuntimeException $e) {
+        throw new RuntimeException('Rethrown caught exception: '. $e->getMessage());
+    }
+}
+
+function fraction($x) {
+    time_nanosleep(0, 100000000);
+    if (!$x) {
+        throw new RuntimeException('Division by zero');
+    }
+    return 1/$x;
+}
+
+b();
diff --git a/tests/integration/jit/function/test_span_events_exception_caught_notice_error.php b/tests/integration/jit/function/test_span_events_exception_caught_notice_error.php
new file mode 100644
index 000000000..202479b19
--- /dev/null
+++ b/tests/integration/jit/function/test_span_events_exception_caught_notice_error.php
@@ -0,0 +1,169 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that a caught exception is correctly handled when a notice error is also
+called.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": "??",
+    "events_seen": 1
+  },
+  [
+    [
+      {
+        "type": "TransactionError",
+        "timestamp": "??",
+        "error.class": "Exception",
+        "error.message": "Noticed exception 'Exception' with message 'Notice me' in __FILE__:??",
+        "transactionName": "OtherTransaction\/php__FILE__",
+        "duration": "??",
+        "nr.transactionGuid": "??",
+        "guid": "??",
+        "sampled": true,
+        "priority": "??",
+        "traceId": "??",
+        "spanId": "??"
+      },
+      {},
+      {}
+    ]
+  ]
+]
+*/
+
+/*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\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/fraction",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Noticed exception 'Exception' with message 'Notice me' in __FILE__:??",
+        "error.class": "Exception",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT
+Hello
+Caught exception: Division by zero
+*/
+
+
+function fraction()
+{
+    time_nanosleep(0, 100000000);
+    try {
+        $x = 0;
+        if (!$x) {
+          throw new RuntimeException('Division by zero');
+    }
+        echo 1/$x . "\n";
+    
+    } catch (RuntimeException $e) {
+        echo("Caught exception: " . $e->getMessage() . "\n");
+    }
+    newrelic_notice_error(new Exception('Notice me'));
+}
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    echo "Hello\n";
+};
+
+a();
+fraction();
diff --git a/tests/integration/jit/function/test_span_events_exception_caught_notice_error_nested.php b/tests/integration/jit/function/test_span_events_exception_caught_notice_error_nested.php
new file mode 100644
index 000000000..f182090d3
--- /dev/null
+++ b/tests/integration/jit/function/test_span_events_exception_caught_notice_error_nested.php
@@ -0,0 +1,245 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that a caught exception that originated from a child span is correctly
+handled when a notice error is also called.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": "??",
+    "events_seen": 1
+  },
+  [
+    [
+      {
+        "type": "TransactionError",
+        "timestamp": "??",
+        "error.class": "Exception",
+        "error.message": "Noticed exception 'Exception' with message 'Notice me' in __FILE__:??",
+        "transactionName": "OtherTransaction\/php__FILE__",
+        "duration": "??",
+        "nr.transactionGuid": "??",
+        "guid": "??",
+        "sampled": true,
+        "priority": "??",
+        "traceId": "??",
+        "spanId": "??"
+      },
+      {},
+      {}
+    ]
+  ]
+]
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 6
+  },
+  [
+    [
+      {
+        "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\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/b",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Noticed exception 'Exception' with message 'Notice me' in __FILE__:??",
+        "error.class": "Exception",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/c",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/fraction",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"}
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/fraction",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT
+Hello
+0.2
+Caught exception: Division by zero
+*/
+
+function c()
+{
+    time_nanosleep(0, 100000000);
+    echo fraction(5) . "\n";
+    echo fraction(0) . "\n";
+}
+
+function b()
+{
+    time_nanosleep(0, 100000000);
+    try {
+        c();
+    } catch (RuntimeException $e) {
+        echo ("Caught exception: " . $e->getMessage() . "\n");
+    }
+    newrelic_notice_error(new Exception('Notice me'));
+}
+
+function fraction($x) {
+    time_nanosleep(0, 100000000);
+    if (!$x) {
+        throw new RuntimeException('Division by zero');
+    }
+    return 1/$x;
+}
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    echo "Hello\n";
+};
+
+a();
+b();
diff --git a/tests/integration/jit/function/test_span_events_exception_caught_same_span.php b/tests/integration/jit/function/test_span_events_exception_caught_same_span.php
new file mode 100644
index 000000000..943b908ba
--- /dev/null
+++ b/tests/integration/jit/function/test_span_events_exception_caught_same_span.php
@@ -0,0 +1,139 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that a caught exception is correctly handled in the same span.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS
+null
+*/
+
+/*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\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/fraction",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT
+Hello
+Caught exception: Division by zero
+*/
+
+
+function fraction()
+{
+    time_nanosleep(0, 100000000);
+    try {
+        $x = 0;
+        if (!$x) {
+          throw new RuntimeException('Division by zero');
+    }
+        echo 1/$x . "\n";
+    
+    } catch (RuntimeException $e) {
+        echo("Caught exception: " . $e->getMessage() . "\n");
+    }
+}
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    echo "Hello\n";
+};
+
+a();
+fraction();
diff --git a/tests/integration/jit/function/test_span_events_exception_uncaught_nested.php b/tests/integration/jit/function/test_span_events_exception_uncaught_nested.php
new file mode 100644
index 000000000..d3c317994
--- /dev/null
+++ b/tests/integration/jit/function/test_span_events_exception_uncaught_nested.php
@@ -0,0 +1,224 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/*DESCRIPTION
+Test that an uncaught exception that originated from a child span is correctly handled.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+display_errors=1
+log_errors=0
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": "??",
+    "events_seen": 1
+  },
+  [
+    [
+      {
+        "type": "TransactionError",
+        "timestamp": "??",
+        "error.class": "RuntimeException",
+        "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",
+        "transactionName": "OtherTransaction\/php__FILE__",
+        "duration": "??",
+        "databaseDuration": "??",
+        "databaseCallCount": "??",
+        "nr.transactionGuid": "??",
+        "guid": "??",
+        "sampled": true,
+        "priority": "??",
+        "traceId": "??",
+        "spanId": "??"
+      },
+      {},
+      {}
+    ]
+  ]
+]
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 5
+  },
+  [
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "OtherTransaction\/php__FILE__",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "sampled": true,
+        "nr.entryPoint": true,
+        "timestamp": "??",
+        "transaction.name": "OtherTransaction\/php__FILE__"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",
+        "error.class": "RuntimeException"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Datastore\/statement\/FakeDB\/other\/other",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "datastore",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "FakeDB"
+      },
+      {},
+      {
+        "db.instance": "unknown",
+        "peer.hostname": "unknown",
+        "peer.address": "unknown:unknown"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/b",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/c",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT_REGEX
+^\s*(PHP )?Fatal error: Uncaught.*RuntimeException.*oops.*
+*/
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    b();
+}
+
+function b()
+{
+    time_nanosleep(0, 100000000);
+    c();
+}
+
+function c()
+{
+    time_nanosleep(0, 100000000);
+    throw new RuntimeException('oops');
+}
+
+newrelic_record_datastore_segment(
+    function () {
+        time_nanosleep(0, 100000000);
+    }, array(
+        'product' => 'FakeDB',
+    )
+);
+a();
+
+echo 'this should never be printed';
diff --git a/tests/integration/jit/function/test_span_events_exist_when_no_segments.php b/tests/integration/jit/function/test_span_events_exist_when_no_segments.php
new file mode 100644
index 000000000..ce7cb296f
--- /dev/null
+++ b/tests/integration/jit/function/test_span_events_exist_when_no_segments.php
@@ -0,0 +1,65 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that a span event is created for transactions that create no segments.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 1
+  },
+  [
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "OtherTransaction\/php__FILE__",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "sampled": true,
+        "nr.entryPoint": true,
+        "timestamp": "??",
+        "transaction.name": "OtherTransaction\/php__FILE__"
+      },
+      {},
+      {}
+    ]
+  ]
+]
+*/
+
+phpinfo();
diff --git a/tests/integration/jit/function/test_span_events_hsm_error.php b/tests/integration/jit/function/test_span_events_hsm_error.php
new file mode 100644
index 000000000..d4814dbc0
--- /dev/null
+++ b/tests/integration/jit/function/test_span_events_hsm_error.php
@@ -0,0 +1,137 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that span events error attributes conform to high security mode.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+newrelic.high_security=true
+display_errors=1
+newrelic.high_security = true
+log_errors=0
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": "??",
+    "events_seen": 1
+  },
+  [
+    [
+      {
+        "type": "TransactionError",
+        "timestamp": "??",
+        "error.message": "Message removed by New Relic high_security setting",
+        "error.class": "RuntimeException",
+        "transactionName": "OtherTransaction\/php__FILE__",
+        "duration": "??",
+        "nr.transactionGuid": "??",
+        "guid": "??",
+        "sampled": true,
+        "priority": "??",
+        "traceId": "??",
+        "spanId": "??"
+      },
+      {},
+      {}
+    ]
+  ]
+]
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 2
+  },
+  [
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "OtherTransaction\/php__FILE__",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "sampled": true,
+        "nr.entryPoint": true,
+        "timestamp": "??",
+        "transaction.name": "OtherTransaction\/php__FILE__"
+      },
+      {},
+      {
+        "error.message": "Message removed by New Relic high_security setting",
+        "error.class": "RuntimeException"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Message removed by New Relic high_security setting",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT_REGEX
+^\s*(PHP )?Fatal error: Uncaught.*RuntimeException.*oops.*
+*/
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    throw new RuntimeException('oops');
+}
+
+a();
+
+echo 'this should never be printed';
diff --git a/tests/integration/jit/function/test_span_events_notice_error.php b/tests/integration/jit/function/test_span_events_notice_error.php
new file mode 100644
index 000000000..adfa8b40b
--- /dev/null
+++ b/tests/integration/jit/function/test_span_events_notice_error.php
@@ -0,0 +1,157 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that notice error is correctly handled.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": "??",
+    "events_seen": 1
+  },
+  [
+    [
+      {
+        "type": "TransactionError",
+        "timestamp": "??",
+        "error.class": "Exception",
+        "error.message": "Noticed exception 'Exception' with message 'Notice me' in __FILE__:??",
+        "transactionName": "OtherTransaction\/php__FILE__",
+        "duration": "??",
+        "nr.transactionGuid": "??",
+        "guid": "??",
+        "sampled": true,
+        "priority": "??",
+        "traceId": "??",
+        "spanId": "??"
+      },
+      {},
+      {}
+    ]
+  ]
+]
+*/
+
+/*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\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/b",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Noticed exception 'Exception' with message 'Notice me' in __FILE__:??",
+        "error.class": "Exception",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT
+Hello
+*/
+
+
+function b()
+{
+    time_nanosleep(0, 100000000);
+    newrelic_notice_error(new Exception('Notice me'));
+}
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    echo "Hello\n";
+};
+
+a();
+b();
diff --git a/tests/integration/jit/function/test_span_events_on_dt_off_cat_off.php b/tests/integration/jit/function/test_span_events_on_dt_off_cat_off.php
new file mode 100644
index 000000000..db998af12
--- /dev/null
+++ b/tests/integration/jit/function/test_span_events_on_dt_off_cat_off.php
@@ -0,0 +1,50 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Span events should not be sent when distributed tracing is
+disabled, regardless of span events being enabled.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled = 1
+newrelic.cross_application_tracer.enabled = false
+newrelic.distributed_tracing_enabled=0
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_SPAN_EVENTS
+null
+*/
+
+/*EXPECT
+Hello
+*/
+
+newrelic_add_custom_tracer('main');
+function main()
+{
+  echo 'Hello';
+}
+main();
+
diff --git a/tests/integration/jit/function/test_span_events_on_dt_off_cat_on.php b/tests/integration/jit/function/test_span_events_on_dt_off_cat_on.php
new file mode 100644
index 000000000..ac6758e3a
--- /dev/null
+++ b/tests/integration/jit/function/test_span_events_on_dt_off_cat_on.php
@@ -0,0 +1,50 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Span events should not be sent when distributed tracing is
+disabled, regardless of span events being enabled.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled = 1
+newrelic.cross_application_tracer.enabled = true
+newrelic.distributed_tracing_enabled=0
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=function
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_SPAN_EVENTS
+null
+*/
+
+/*EXPECT
+Hello
+*/
+
+newrelic_add_custom_tracer('main');
+function main()
+{
+  echo 'Hello';
+}
+main();
+
diff --git a/tests/integration/jit/function/test_span_events_root_parent.php b/tests/integration/jit/function/test_span_events_root_parent.php
new file mode 100644
index 000000000..1dc531ec9
--- /dev/null
+++ b/tests/integration/jit/function/test_span_events_root_parent.php
@@ -0,0 +1,140 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+JIT enabled, should still instrument.
+ */
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+error_reporting = E_ALL
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.cross_application_tracer.enabled = false
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 4
+  },
+  [
+    [
+      {
+        "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": "Custom\/main",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "Custom\/main",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "Custom\/main",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT
+HelloHelloHello
+*/
+
+newrelic_add_custom_tracer('main'); 
+
+function main()
+{
+  sleep(1);
+  echo 'Hello';
+}
+main();
+main();
+main();
diff --git a/tests/integration/jit/tracing/skipif.inc b/tests/integration/jit/tracing/skipif.inc
new file mode 100644
index 000000000..3a0d83424
--- /dev/null
+++ b/tests/integration/jit/tracing/skipif.inc
@@ -0,0 +1,17 @@
+<?php
+/*
+ * Copyright 2022 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+
+/* JIT only supported with OAPI with PHP 8+ */
+if (version_compare(PHP_VERSION, "8.0", "<")) {
+  die("skip: PHP < 8.0.0 not supported\n");
+}
+
+/* Test cannot run without opcache */
+/* This should be changed to a 'warn' result when supported */
+if (!extension_loaded('Zend OPcache')) {
+  die("warn: Zend OPcache extension required\n");
+}
diff --git a/tests/integration/jit/tracing/test_computations.php b/tests/integration/jit/tracing/test_computations.php
new file mode 100644
index 000000000..ff0422ce3
--- /dev/null
+++ b/tests/integration/jit/tracing/test_computations.php
@@ -0,0 +1,77 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Transaction event generated for heavy computation.  No errors or failures generated despite creating spans for a huge number of calls.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ANALYTICS_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 50,
+    "events_seen": 1
+  },
+  [
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "timestamp": "??",
+        "type": "Transaction",
+        "name": "OtherTransaction\/php__FILE__",
+        "guid": "??",
+        "priority": "??",
+        "sampled": true,
+        "totalTime": "??",
+        "error": false
+      },
+      {},
+      {}
+    ]
+  ]
+]
+*/
+
+/*EXPECT
+Hello
+*/
+
+newrelic_add_custom_tracer('computation');
+
+function computation(float $a): int
+{
+
+    $b = intval($a) % (2 ** 32);
+    return $b;
+}
+
+for ($i = 0; $i < 500; ++$i) {
+    computation(2**64);
+}
+echo 'Hello';
diff --git a/tests/integration/jit/tracing/test_even_odd_count.php b/tests/integration/jit/tracing/test_even_odd_count.php
new file mode 100644
index 000000000..1338b98f7
--- /dev/null
+++ b/tests/integration/jit/tracing/test_even_odd_count.php
@@ -0,0 +1,84 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Transaction event generated with JIT enabled even when doing lots of loops.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS null */
+
+/*EXPECT_ANALYTICS_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 50,
+    "events_seen": 1
+  },
+  [
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "timestamp": "??",
+        "type": "Transaction",
+        "name": "OtherTransaction\/php__FILE__",
+        "guid": "??",
+        "priority": "??", 
+        "sampled": true,
+        "totalTime": "??",
+        "error": false
+      },
+      {},
+      {}
+    ]
+  ]
+]
+*/
+
+/*EXPECT
+5000
+*/
+
+
+function even(int $a): bool {
+    if ($a == 1)  {
+        return false;
+    } else if (($a % 2) == 0) {
+            return true;
+        }
+    return false;
+}
+
+$count = 0;
+for ($i = 1; $i <= 10000; $i++)
+{
+        if (even($i)) $count++;
+}
+echo "$count";
+
diff --git a/tests/integration/jit/tracing/test_recursion_no_segfault.php b/tests/integration/jit/tracing/test_recursion_no_segfault.php
new file mode 100644
index 000000000..d3acca93b
--- /dev/null
+++ b/tests/integration/jit/tracing/test_recursion_no_segfault.php
@@ -0,0 +1,55 @@
+<?php
+/*
+ * Copyright 2022 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+JIT enabled, should still instrument without crashing.
+Previous tests would invariably cause a segfault when
+recursively finding the 10th fibonacci number.
+ */
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+error_reporting = E_ALL
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.cross_application_tracer.enabled = false
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS
+null
+*/
+
+/*EXPECT
+89
+*/
+
+newrelic_add_custom_tracer('fibonacci'); 
+
+
+function fibonacci($n){
+    return(($n < 2) ? 1 : fibonacci($n - 2) + fibonacci($n - 1));
+}
+
+$n = 10; /* Get the nth Fibonacci number. */
+
+$fibonacci = fibonacci($n);
+echo $fibonacci;
+
diff --git a/tests/integration/jit/tracing/test_span_class_function.php b/tests/integration/jit/tracing/test_span_class_function.php
new file mode 100644
index 000000000..f3ece5eb1
--- /dev/null
+++ b/tests/integration/jit/tracing/test_span_class_function.php
@@ -0,0 +1,276 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+With JIT, span events should show properly.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 9
+  },
+  [
+    [
+      {
+        "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": "Custom\/main",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "Custom\/main",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "Custom\/main",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "Custom\/Classname::functionName",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.namespace": "Classname",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "Custom\/Classname::functionName",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.namespace": "Classname",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "Custom\/Classname::functionName",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.namespace": "Classname",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "Custom\/Classname::functionName",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.namespace": "Classname",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "Custom\/Classname::functionName",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.namespace": "Classname",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT
+HelloHelloHelloOK
+*/
+
+newrelic_add_custom_tracer('main');
+newrelic_add_custom_tracer('Classname::functionName');
+function main()
+{
+  echo 'Hello';
+}
+main();
+main();
+main();
+
+abstract class Classname{
+
+        protected function functionName() : void {
+        for($i = 0; $i < 500; ++$i){
+        /* Spin wheels. */
+        $x = 10 + 10;
+        }
+        }
+
+        final public function __destruct(){
+
+        }
+
+}
+
+class LittleClass extends Classname{
+        public function __construct(){
+                $this->functionName();
+        }
+}
+
+for($i = 0; $i < 5; ++$i){
+        new LittleClass;
+}
+echo "OK\n";
diff --git a/tests/integration/jit/tracing/test_span_events_are_created_from_segments.php b/tests/integration/jit/tracing/test_span_events_are_created_from_segments.php
new file mode 100644
index 000000000..cc2a52753
--- /dev/null
+++ b/tests/integration/jit/tracing/test_span_events_are_created_from_segments.php
@@ -0,0 +1,118 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that span events are correctly created from any eligible segment.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*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\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Datastore\/statement\/FakeDB\/other\/other",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "datastore",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "FakeDB"
+      },
+      {},
+      {
+        "db.instance": "unknown",
+        "peer.hostname": "unknown",
+        "peer.address": "unknown:unknown"
+      }
+    ]
+  ]
+]
+*/
+
+function a() {
+  time_nanosleep(0, 100000000);
+}
+
+a();
+newrelic_record_datastore_segment(function () {
+  time_nanosleep(0, 100000000);
+}, array(
+  'product' => 'FakeDB',
+));
diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_caught_error.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_caught_error.php
new file mode 100644
index 000000000..c01951750
--- /dev/null
+++ b/tests/integration/jit/tracing/test_span_events_are_created_upon_caught_error.php
@@ -0,0 +1,161 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that span events are correctly created from any eligible segment, even
+when an error is generated and handled.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+display_errors=1
+log_errors=0
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 4
+  },
+  [
+    [
+      {
+        "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": "Datastore\/statement\/FakeDB\/other\/other",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "datastore",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "FakeDB"
+      },
+      {},
+      {
+        "db.instance": "unknown",
+        "peer.hostname": "unknown",
+        "peer.address": "unknown:unknown"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "foo",
+        "error.class": "E_USER_ERROR",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/{closure}",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT_REGEX
+^\s*(PHP )?Fatal error:\s*foo in .*? on line [0-9]+\s*$
+*/
+
+set_error_handler(
+    function () {
+        time_nanosleep(0, 100000000);
+        return false;
+    }
+);
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    trigger_error('foo', E_USER_ERROR);
+}
+
+newrelic_record_datastore_segment(
+    function () {
+        time_nanosleep(0, 100000000);
+    }, array(
+        'product' => 'FakeDB',
+    )
+);
+a();
+
+echo 'this should never be printed';
diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_caught_exception.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_caught_exception.php
new file mode 100644
index 000000000..0b4444679
--- /dev/null
+++ b/tests/integration/jit/tracing/test_span_events_are_created_upon_caught_exception.php
@@ -0,0 +1,142 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+ 
+/*DESCRIPTION
+Test that span events are correctly created from any eligible segment when a caught exception occurs.
+Putting in a try/catch block means an exception is NOT handled by the exception handler.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS
+null
+*/
+
+/*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": "Datastore\/statement\/FakeDB\/other\/other",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "datastore",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "FakeDB"
+      },
+      {},
+      {
+        "db.instance": "unknown",
+        "peer.hostname": "unknown",
+        "peer.address": "unknown:unknown"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+              "code.lineno": "??",
+              "code.filepath": "__FILE__",
+              "code.function": "a"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT
+*/
+
+set_exception_handler(
+    function () {
+        time_nanosleep(0, 100000000);
+        echo 'this should never be printed';
+        exit(0);
+    }
+);
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    throw new RuntimeException('oops');
+}
+
+newrelic_record_datastore_segment(
+    function () {
+        time_nanosleep(0, 100000000);
+    }, array(
+        'product' => 'FakeDB',
+    )
+);
+
+try {
+a();
+} catch (RuntimeException $e) {
+}
\ No newline at end of file
diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_exit.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_exit.php
new file mode 100644
index 000000000..176730a7f
--- /dev/null
+++ b/tests/integration/jit/tracing/test_span_events_are_created_upon_exit.php
@@ -0,0 +1,123 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that span events are correctly created from any eligible segment, even
+when exit() is called.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*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": "Datastore\/statement\/FakeDB\/other\/other",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "datastore",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "FakeDB"
+      },
+      {},
+      {
+        "db.instance": "unknown",
+        "peer.hostname": "unknown",
+        "peer.address": "unknown:unknown"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    exit(0);
+}
+
+newrelic_record_datastore_segment(
+    function () {
+        time_nanosleep(0, 100000000);
+    }, array(
+    'product' => 'FakeDB',
+    )
+);
+a();
diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_error.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_error.php
new file mode 100644
index 000000000..ee1a578ae
--- /dev/null
+++ b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_error.php
@@ -0,0 +1,133 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that span events are correctly created from any eligible segment, even
+when an error is generated and left to the default error handler.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+display_errors=1
+log_errors=0
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*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": "Datastore\/statement\/FakeDB\/other\/other",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "datastore",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "FakeDB"
+      },
+      {},
+      {
+        "db.instance": "unknown",
+        "peer.hostname": "unknown",
+        "peer.address": "unknown:unknown"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "foo",
+        "error.class": "E_USER_ERROR",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT_REGEX
+^\s*(PHP )?Fatal error:\s*foo in .*? on line [0-9]+\s*$
+*/
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    trigger_error('foo', E_USER_ERROR);
+}
+
+newrelic_record_datastore_segment(
+    function () {
+        time_nanosleep(0, 100000000);
+    }, array(
+        'product' => 'FakeDB',
+    )
+);
+a();
+
+echo 'this should never be printed';
diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_exception.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_exception.php
new file mode 100644
index 000000000..6141bdef4
--- /dev/null
+++ b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_exception.php
@@ -0,0 +1,136 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that span events are correctly created from any eligible segment, even
+when an uncaught exception is thrown.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+display_errors=1
+log_errors=0
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*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__"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",
+        "error.class": "RuntimeException"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Datastore\/statement\/FakeDB\/other\/other",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "datastore",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "FakeDB"
+      },
+      {},
+      {
+        "db.instance": "unknown",
+        "peer.hostname": "unknown",
+        "peer.address": "unknown:unknown"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT_REGEX
+^\s*(PHP )?Fatal error: Uncaught.*RuntimeException.*oops.*
+*/
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    throw new RuntimeException('oops');
+}
+
+newrelic_record_datastore_segment(
+    function () {
+        time_nanosleep(0, 100000000);
+    }, array(
+        'product' => 'FakeDB',
+    )
+);
+a();
+
+echo 'this should never be printed';
diff --git a/tests/integration/jit/tracing/test_span_events_error_collector_disabled.php b/tests/integration/jit/tracing/test_span_events_error_collector_disabled.php
new file mode 100644
index 000000000..5cb38dcc3
--- /dev/null
+++ b/tests/integration/jit/tracing/test_span_events_error_collector_disabled.php
@@ -0,0 +1,127 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that no span events error attributes are captured when error_collector is disabled
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+newrelic.error_collector.enabled = false
+display_errors=1
+log_errors=0
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*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": "Datastore\/statement\/FakeDB\/other\/other",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "datastore",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "FakeDB"
+      },
+      {},
+      {
+        "db.instance": "unknown",
+        "peer.hostname": "unknown",
+        "peer.address": "unknown:unknown"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    trigger_error('foo', E_USER_ERROR);
+}
+
+newrelic_record_datastore_segment(
+    function () {
+        time_nanosleep(0, 100000000);
+    }, array(
+        'product' => 'FakeDB',
+    )
+);
+a();
+
+echo 'this should never be printed';
diff --git a/tests/integration/jit/tracing/test_span_events_exception_caught_nested.php b/tests/integration/jit/tracing/test_span_events_exception_caught_nested.php
new file mode 100644
index 000000000..4ff854cf2
--- /dev/null
+++ b/tests/integration/jit/tracing/test_span_events_exception_caught_nested.php
@@ -0,0 +1,217 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that a caught exception that originated from a child span is 
+correctly handled.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS
+null
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 6
+  },
+  [
+    [
+      {
+        "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\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/b",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/c",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/fraction",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/fraction",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT
+Hello
+0.2
+Caught exception: Division by zero
+*/
+
+function c()
+{
+    time_nanosleep(0, 100000000);
+    echo fraction(5) . "\n";
+    echo fraction(0) . "\n";
+}
+
+function b()
+{
+    time_nanosleep(0, 100000000);
+    try {
+        c();
+    } catch (RuntimeException $e) {
+        echo("Caught exception: " . $e->getMessage() . "\n");
+    }
+}
+
+function fraction($x) {
+    time_nanosleep(0, 100000000);
+    if (!$x) {
+        throw new RuntimeException('Division by zero');
+    }
+    return 1/$x;
+}
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    echo "Hello\n";
+};
+
+a();
+b();
diff --git a/tests/integration/jit/tracing/test_span_events_exception_caught_nested_rethrown.php b/tests/integration/jit/tracing/test_span_events_exception_caught_nested_rethrown.php
new file mode 100644
index 000000000..1ec6df51b
--- /dev/null
+++ b/tests/integration/jit/tracing/test_span_events_exception_caught_nested_rethrown.php
@@ -0,0 +1,196 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that a caught exception that originated from a child span that 
+is "rethrown" is correctly handled.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": "??",
+    "events_seen": 1
+  },
+  [
+    [
+      {
+        "type": "TransactionError",
+        "timestamp": "??",
+        "error.class": "RuntimeException",
+        "error.message": "Uncaught exception 'RuntimeException' with message 'Rethrown caught exception: Division by zero' in __FILE__:??",
+        "transactionName": "OtherTransaction\/php__FILE__",
+        "duration": "??",
+        "nr.transactionGuid": "??",
+        "guid": "??",
+        "sampled": true,
+        "priority": "??",
+        "traceId": "??",
+        "spanId": "??"
+      },
+      {},
+      {}
+    ]
+  ]
+]
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 4
+  },
+  [
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "OtherTransaction\/php__FILE__",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "sampled": true,
+        "nr.entryPoint": true,
+        "timestamp": "??",
+        "transaction.name": "OtherTransaction\/php__FILE__"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'Rethrown caught exception: Division by zero' in __FILE__:??",
+        "error.class": "RuntimeException"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/b",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'Rethrown caught exception: Division by zero' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/c",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/fraction",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+       "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT_REGEX
+^\s*(PHP )?Fatal error:.*Uncaught.*Exception.*Rethrown caught exception: Division by zero.*
+*/
+
+function c()
+{
+    time_nanosleep(0, 100000000);
+    echo fraction(0) . "\n";
+}
+
+function b()
+{
+    time_nanosleep(0, 100000000);
+    try {
+        c();
+    } catch (RuntimeException $e) {
+        throw new RuntimeException('Rethrown caught exception: '. $e->getMessage());
+    }
+}
+
+function fraction($x) {
+    time_nanosleep(0, 100000000);
+    if (!$x) {
+        throw new RuntimeException('Division by zero');
+    }
+    return 1/$x;
+}
+
+b();
diff --git a/tests/integration/jit/tracing/test_span_events_exception_caught_notice_error.php b/tests/integration/jit/tracing/test_span_events_exception_caught_notice_error.php
new file mode 100644
index 000000000..5b42d5280
--- /dev/null
+++ b/tests/integration/jit/tracing/test_span_events_exception_caught_notice_error.php
@@ -0,0 +1,169 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that a caught exception is correctly handled when a notice error is also
+called.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": "??",
+    "events_seen": 1
+  },
+  [
+    [
+      {
+        "type": "TransactionError",
+        "timestamp": "??",
+        "error.class": "Exception",
+        "error.message": "Noticed exception 'Exception' with message 'Notice me' in __FILE__:??",
+        "transactionName": "OtherTransaction\/php__FILE__",
+        "duration": "??",
+        "nr.transactionGuid": "??",
+        "guid": "??",
+        "sampled": true,
+        "priority": "??",
+        "traceId": "??",
+        "spanId": "??"
+      },
+      {},
+      {}
+    ]
+  ]
+]
+*/
+
+/*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\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/fraction",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Noticed exception 'Exception' with message 'Notice me' in __FILE__:??",
+        "error.class": "Exception",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT
+Hello
+Caught exception: Division by zero
+*/
+
+
+function fraction()
+{
+    time_nanosleep(0, 100000000);
+    try {
+        $x = 0;
+        if (!$x) {
+          throw new RuntimeException('Division by zero');
+    }
+        echo 1/$x . "\n";
+    
+    } catch (RuntimeException $e) {
+        echo("Caught exception: " . $e->getMessage() . "\n");
+    }
+    newrelic_notice_error(new Exception('Notice me'));
+}
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    echo "Hello\n";
+};
+
+a();
+fraction();
diff --git a/tests/integration/jit/tracing/test_span_events_exception_caught_notice_error_nested.php b/tests/integration/jit/tracing/test_span_events_exception_caught_notice_error_nested.php
new file mode 100644
index 000000000..aaeb5a278
--- /dev/null
+++ b/tests/integration/jit/tracing/test_span_events_exception_caught_notice_error_nested.php
@@ -0,0 +1,246 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that a caught exception that originated from a child span is correctly
+handled when a notice error is also called.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": "??",
+    "events_seen": 1
+  },
+  [
+    [
+      {
+        "type": "TransactionError",
+        "timestamp": "??",
+        "error.class": "Exception",
+        "error.message": "Noticed exception 'Exception' with message 'Notice me' in __FILE__:??",
+        "transactionName": "OtherTransaction\/php__FILE__",
+        "duration": "??",
+        "nr.transactionGuid": "??",
+        "guid": "??",
+        "sampled": true,
+        "priority": "??",
+        "traceId": "??",
+        "spanId": "??"
+      },
+      {},
+      {}
+    ]
+  ]
+]
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 6
+  },
+  [
+    [
+      {
+        "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\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/b",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Noticed exception 'Exception' with message 'Notice me' in __FILE__:??",
+        "error.class": "Exception",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/c",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/fraction",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/fraction",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT
+Hello
+0.2
+Caught exception: Division by zero
+*/
+
+function c()
+{
+    time_nanosleep(0, 100000000);
+    echo fraction(5) . "\n";
+    echo fraction(0) . "\n";
+}
+
+function b()
+{
+    time_nanosleep(0, 100000000);
+    try {
+        c();
+    } catch (RuntimeException $e) {
+        echo ("Caught exception: " . $e->getMessage() . "\n");
+    }
+    newrelic_notice_error(new Exception('Notice me'));
+}
+
+function fraction($x) {
+    time_nanosleep(0, 100000000);
+    if (!$x) {
+        throw new RuntimeException('Division by zero');
+    }
+    return 1/$x;
+}
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    echo "Hello\n";
+};
+
+a();
+b();
diff --git a/tests/integration/jit/tracing/test_span_events_exception_caught_same_span.php b/tests/integration/jit/tracing/test_span_events_exception_caught_same_span.php
new file mode 100644
index 000000000..d92e22d16
--- /dev/null
+++ b/tests/integration/jit/tracing/test_span_events_exception_caught_same_span.php
@@ -0,0 +1,139 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that a caught exception is correctly handled in the same span.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS
+null
+*/
+
+/*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\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/fraction",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT
+Hello
+Caught exception: Division by zero
+*/
+
+
+function fraction()
+{
+    time_nanosleep(0, 100000000);
+    try {
+        $x = 0;
+        if (!$x) {
+          throw new RuntimeException('Division by zero');
+    }
+        echo 1/$x . "\n";
+    
+    } catch (RuntimeException $e) {
+        echo("Caught exception: " . $e->getMessage() . "\n");
+    }
+}
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    echo "Hello\n";
+};
+
+a();
+fraction();
diff --git a/tests/integration/jit/tracing/test_span_events_exception_uncaught_nested.php b/tests/integration/jit/tracing/test_span_events_exception_uncaught_nested.php
new file mode 100644
index 000000000..d352b174e
--- /dev/null
+++ b/tests/integration/jit/tracing/test_span_events_exception_uncaught_nested.php
@@ -0,0 +1,225 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that an uncaught exception that originated from a child span is correctly handled.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+display_errors=1
+log_errors=0
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": "??",
+    "events_seen": 1
+  },
+  [
+    [
+      {
+        "type": "TransactionError",
+        "timestamp": "??",
+        "error.class": "RuntimeException",
+        "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",
+        "transactionName": "OtherTransaction\/php__FILE__",
+        "duration": "??",
+        "databaseDuration": "??",
+        "databaseCallCount": "??",
+        "nr.transactionGuid": "??",
+        "guid": "??",
+        "sampled": true,
+        "priority": "??",
+        "traceId": "??",
+        "spanId": "??"
+      },
+      {},
+      {}
+    ]
+  ]
+]
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 5
+  },
+  [
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "OtherTransaction\/php__FILE__",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "sampled": true,
+        "nr.entryPoint": true,
+        "timestamp": "??",
+        "transaction.name": "OtherTransaction\/php__FILE__"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",
+        "error.class": "RuntimeException"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Datastore\/statement\/FakeDB\/other\/other",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "datastore",
+        "parentId": "??",
+        "span.kind": "client",
+        "component": "FakeDB"
+      },
+      {},
+      {
+        "db.instance": "unknown",
+        "peer.hostname": "unknown",
+        "peer.address": "unknown:unknown"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/b",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/c",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT_REGEX
+^\s*(PHP )?Fatal error: Uncaught.*RuntimeException.*oops.*
+*/
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    b();
+}
+
+function b()
+{
+    time_nanosleep(0, 100000000);
+    c();
+}
+
+function c()
+{
+    time_nanosleep(0, 100000000);
+    throw new RuntimeException('oops');
+}
+
+newrelic_record_datastore_segment(
+    function () {
+        time_nanosleep(0, 100000000);
+    }, array(
+        'product' => 'FakeDB',
+    )
+);
+a();
+
+echo 'this should never be printed';
diff --git a/tests/integration/jit/tracing/test_span_events_exist_when_no_segments.php b/tests/integration/jit/tracing/test_span_events_exist_when_no_segments.php
new file mode 100644
index 000000000..a3c7c6a11
--- /dev/null
+++ b/tests/integration/jit/tracing/test_span_events_exist_when_no_segments.php
@@ -0,0 +1,65 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that a span event is created for transactions that create no segments.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 1
+  },
+  [
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "OtherTransaction\/php__FILE__",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "sampled": true,
+        "nr.entryPoint": true,
+        "timestamp": "??",
+        "transaction.name": "OtherTransaction\/php__FILE__"
+      },
+      {},
+      {}
+    ]
+  ]
+]
+*/
+
+phpinfo();
diff --git a/tests/integration/jit/tracing/test_span_events_hsm_error.php b/tests/integration/jit/tracing/test_span_events_hsm_error.php
new file mode 100644
index 000000000..9f75d20cb
--- /dev/null
+++ b/tests/integration/jit/tracing/test_span_events_hsm_error.php
@@ -0,0 +1,137 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that span events error attributes conform to high security mode.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+newrelic.high_security=true
+display_errors=1
+newrelic.high_security = true
+log_errors=0
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": "??",
+    "events_seen": 1
+  },
+  [
+    [
+      {
+        "type": "TransactionError",
+        "timestamp": "??",
+        "error.message": "Message removed by New Relic high_security setting",
+        "error.class": "RuntimeException",
+        "transactionName": "OtherTransaction\/php__FILE__",
+        "duration": "??",
+        "nr.transactionGuid": "??",
+        "guid": "??",
+        "sampled": true,
+        "priority": "??",
+        "traceId": "??",
+        "spanId": "??"
+      },
+      {},
+      {}
+    ]
+  ]
+]
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 2
+  },
+  [
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "OtherTransaction\/php__FILE__",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "sampled": true,
+        "nr.entryPoint": true,
+        "timestamp": "??",
+        "transaction.name": "OtherTransaction\/php__FILE__"
+      },
+      {},
+      {
+        "error.message": "Message removed by New Relic high_security setting",
+        "error.class": "RuntimeException"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Message removed by New Relic high_security setting",
+        "error.class": "RuntimeException",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT_REGEX
+^\s*(PHP )?Fatal error: Uncaught.*RuntimeException.*oops.*
+*/
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    throw new RuntimeException('oops');
+}
+
+a();
+
+echo 'this should never be printed';
diff --git a/tests/integration/jit/tracing/test_span_events_notice_error.php b/tests/integration/jit/tracing/test_span_events_notice_error.php
new file mode 100644
index 000000000..a626285d5
--- /dev/null
+++ b/tests/integration/jit/tracing/test_span_events_notice_error.php
@@ -0,0 +1,157 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Test that notice error is correctly handled.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled=1
+newrelic.cross_application_tracer.enabled = false
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_ERROR_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": "??",
+    "events_seen": 1
+  },
+  [
+    [
+      {
+        "type": "TransactionError",
+        "timestamp": "??",
+        "error.class": "Exception",
+        "error.message": "Noticed exception 'Exception' with message 'Notice me' in __FILE__:??",
+        "transactionName": "OtherTransaction\/php__FILE__",
+        "duration": "??",
+        "nr.transactionGuid": "??",
+        "guid": "??",
+        "sampled": true,
+        "priority": "??",
+        "traceId": "??",
+        "spanId": "??"
+      },
+      {},
+      {}
+    ]
+  ]
+]
+*/
+
+/*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\/a",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "type": "Span",
+        "traceId": "??",
+        "transactionId": "??",
+        "sampled": true,
+        "priority": "??",
+        "name": "Custom\/b",
+        "guid": "??",
+        "timestamp": "??",
+        "duration": "??",
+        "category": "generic",
+        "parentId": "??"
+      },
+      {},
+      {
+        "error.message": "Noticed exception 'Exception' with message 'Notice me' in __FILE__:??",
+        "error.class": "Exception",
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT
+Hello
+*/
+
+
+function b()
+{
+    time_nanosleep(0, 100000000);
+    newrelic_notice_error(new Exception('Notice me'));
+}
+
+function a()
+{
+    time_nanosleep(0, 100000000);
+    echo "Hello\n";
+};
+
+a();
+b();
diff --git a/tests/integration/jit/tracing/test_span_events_on_dt_off_cat_off.php b/tests/integration/jit/tracing/test_span_events_on_dt_off_cat_off.php
new file mode 100644
index 000000000..e7b8e8b87
--- /dev/null
+++ b/tests/integration/jit/tracing/test_span_events_on_dt_off_cat_off.php
@@ -0,0 +1,50 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Span events should not be sent when distributed tracing is
+disabled, regardless of span events being enabled.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled = 1
+newrelic.cross_application_tracer.enabled = false
+newrelic.distributed_tracing_enabled=0
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_SPAN_EVENTS
+null
+*/
+
+/*EXPECT
+Hello
+*/
+
+newrelic_add_custom_tracer('main');
+function main()
+{
+  echo 'Hello';
+}
+main();
+
diff --git a/tests/integration/jit/tracing/test_span_events_on_dt_off_cat_on.php b/tests/integration/jit/tracing/test_span_events_on_dt_off_cat_on.php
new file mode 100644
index 000000000..8b42cd728
--- /dev/null
+++ b/tests/integration/jit/tracing/test_span_events_on_dt_off_cat_on.php
@@ -0,0 +1,50 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+Span events should not be sent when distributed tracing is
+disabled, regardless of span events being enabled.
+*/
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+newrelic.transaction_tracer.threshold = 0
+newrelic.span_events_enabled = 1
+newrelic.cross_application_tracer.enabled = true
+newrelic.distributed_tracing_enabled=0
+error_reporting = E_ALL
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_SPAN_EVENTS
+null
+*/
+
+/*EXPECT
+Hello
+*/
+
+newrelic_add_custom_tracer('main');
+function main()
+{
+  echo 'Hello';
+}
+main();
+
diff --git a/tests/integration/jit/tracing/test_span_events_root_parent.php b/tests/integration/jit/tracing/test_span_events_root_parent.php
new file mode 100644
index 000000000..1dc531ec9
--- /dev/null
+++ b/tests/integration/jit/tracing/test_span_events_root_parent.php
@@ -0,0 +1,140 @@
+<?php
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*DESCRIPTION
+JIT enabled, should still instrument.
+ */
+
+/*SKIPIF
+<?php
+
+require('skipif.inc');
+
+*/
+
+/*INI
+error_reporting = E_ALL
+newrelic.distributed_tracing_enabled=1
+newrelic.transaction_tracer.threshold = 0
+newrelic.cross_application_tracer.enabled = false
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=32M
+opcache.jit=tracing
+*/
+
+/*PHPMODULES
+zend_extension=opcache.so
+*/
+
+/*EXPECT_SPAN_EVENTS
+[
+  "?? agent run id",
+  {
+    "reservoir_size": 10000,
+    "events_seen": 4
+  },
+  [
+    [
+      {
+        "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": "Custom\/main",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "Custom\/main",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ],
+    [
+      {
+        "traceId": "??",
+        "duration": "??",
+        "transactionId": "??",
+        "name": "Custom\/main",
+        "guid": "??",
+        "type": "Span",
+        "category": "generic",
+        "priority": "??",
+        "parentId": "??",
+        "sampled": true,
+        "timestamp": "??"
+      },
+      {},
+      {
+        "code.lineno": "??",
+        "code.filepath": "__FILE__",
+        "code.function": "??"
+      }
+    ]
+  ]
+]
+*/
+
+/*EXPECT
+HelloHelloHello
+*/
+
+newrelic_add_custom_tracer('main'); 
+
+function main()
+{
+  sleep(1);
+  echo 'Hello';
+}
+main();
+main();
+main();