diff --git a/agent/php_nrini.c b/agent/php_nrini.c index d586a2bf3..37da5a820 100644 --- a/agent/php_nrini.c +++ b/agent/php_nrini.c @@ -3046,7 +3046,7 @@ STD_PHP_INI_ENTRY_EX( * Code Level Metrics */ STD_PHP_INI_ENTRY_EX("newrelic.code_level_metrics.enabled", - "1", + "0", NR_PHP_REQUEST, nr_boolean_mh, code_level_metrics_enabled, diff --git a/agent/scripts/newrelic.ini.template b/agent/scripts/newrelic.ini.template index 945b2672e..4c199f00b 100644 --- a/agent/scripts/newrelic.ini.template +++ b/agent/scripts/newrelic.ini.template @@ -1334,7 +1334,7 @@ newrelic.daemon.logfile = "/var/log/newrelic/newrelic-daemon.log" ; Setting: newrelic.code_level_metrics.enabled ; Type : boolean ; Scope : per-directory -; Default: true +; Default: false ; Info : Toggles whether the agent provides function name, function ; filepath, function namespace, and function lineno as ; attributes on reported spans @@ -1348,7 +1348,7 @@ newrelic.daemon.logfile = "/var/log/newrelic/newrelic-daemon.log" ; entirely ; c) lower the value for newrelic.span_events.max_samples_stored ; -;newrelic.code_level_metrics.enabled = true +;newrelic.code_level_metrics.enabled = false ; Setting: newrelic.vulnerability_management.package_detection.enabled ; Type : boolean diff --git a/tests/integration/api/add_custom_parameter/test_add_custom_parameter_nested_caught_exception.php b/tests/integration/api/add_custom_parameter/test_add_custom_parameter_nested_caught_exception.php index f66452c15..217fc10b2 100644 --- a/tests/integration/api/add_custom_parameter/test_add_custom_parameter_nested_caught_exception.php +++ b/tests/integration/api/add_custom_parameter/test_add_custom_parameter_nested_caught_exception.php @@ -7,13 +7,6 @@ Tests newrelic_add_custom_parameter() on a nested path that includes a caught exception. */ -/*SKIPIF - -get($url); -echo $response->getBody(); - -$response = $client->post($url, [ - 'headers' => [ - 'zip' => ' zap']]); -echo $response->getBody(); diff --git a/tests/integration/external/guzzle6/test_spans_are_created_correctly.php5.php b/tests/integration/external/guzzle6/test_spans_are_created_correctly.php5.php deleted file mode 100644 index 82b9b9911..000000000 --- a/tests/integration/external/guzzle6/test_spans_are_created_correctly.php5.php +++ /dev/null @@ -1,81 +0,0 @@ -get($url); -echo $response->getBody(); diff --git a/tests/integration/ini/test_dt_enabled_default.php b/tests/integration/ini/test_dt_enabled_default.php index 53506b04d..1fc6a8895 100644 --- a/tests/integration/ini/test_dt_enabled_default.php +++ b/tests/integration/ini/test_dt_enabled_default.php @@ -10,13 +10,6 @@ configuration is given. */ -/*SKIPIF - 'mysql', - 'collection' => 'table', - 'operation' => 'select', - 'host' => 'host.name', - 'portPathOrId' => 2222, - 'databaseName' => 'db', - 'query' => 'SELECT * FROM table WHERE foo = 42', -)); diff --git a/tests/integration/jit/function/test_span_class_function.php b/tests/integration/jit/function/test_span_class_function.php index fe8e38d1c..7da8161b5 100644 --- a/tests/integration/jit/function/test_span_class_function.php +++ b/tests/integration/jit/function/test_span_class_function.php @@ -74,11 +74,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -95,11 +91,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -116,11 +108,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -137,12 +125,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.namespace": "Classname", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -159,12 +142,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.namespace": "Classname", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -181,12 +159,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.namespace": "Classname", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -203,12 +176,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.namespace": "Classname", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -225,12 +193,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.namespace": "Classname", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ] ] ] 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 index b543794bd..c4c7daff7 100644 --- 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 @@ -73,11 +73,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { 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 index 0c113528a..29c7d66fc 100644 --- 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 @@ -137,10 +137,7 @@ {}, { "error.message": "foo", - "error.class": "E_USER_ERROR", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "E_USER_ERROR" } ], [ @@ -158,11 +155,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ] ] ] diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_caught_error.php84.php b/tests/integration/jit/function/test_span_events_are_created_upon_caught_error.php84.php index f5ef9e41e..0b3a702f2 100644 --- a/tests/integration/jit/function/test_span_events_are_created_upon_caught_error.php84.php +++ b/tests/integration/jit/function/test_span_events_are_created_upon_caught_error.php84.php @@ -138,10 +138,7 @@ {}, { "error.message": "foo", - "error.class": "E_USER_WARNING", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "E_USER_WARNING" } ], [ @@ -159,11 +156,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ] ] ] 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 index 3274bf154..c5a278ab2 100644 --- 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 @@ -97,11 +97,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ] ] ] 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 index cc1fc14b3..c12ab112a 100644 --- 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 @@ -104,10 +104,7 @@ {}, { "error.message": "foo", - "error.class": "E_USER_WARNING", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "E_USER_WARNING" } ] ] diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_error.php84.php b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_error.php84.php index dfb8e1de2..f9feb38d5 100644 --- a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_error.php84.php +++ b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_error.php84.php @@ -105,10 +105,7 @@ {}, { "error.message": "foo", - "error.class": "E_USER_ERROR", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "E_USER_ERROR" } ] ] diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception.php b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception.php index 7624a2a4b..d22403b50 100644 --- a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception.php +++ b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception.php @@ -140,10 +140,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "a" + "error.class": "RuntimeException" } ], [ @@ -161,11 +158,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "{closure}" - } + {} ] ] ] diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception.php84.php b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception.php84.php index 28099b17c..d8ba88fde 100644 --- a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception.php84.php +++ b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception.php84.php @@ -141,10 +141,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "a" + "error.class": "RuntimeException" } ], [ @@ -162,11 +159,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "{closure:__FILE__:??}" - } + {} ] ] ] diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception_invalid_handler.php b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception_invalid_handler.php index fd00e971c..f62dcb4a0 100644 --- a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception_invalid_handler.php +++ b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception_invalid_handler.php @@ -151,10 +151,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "a" + "error.class": "RuntimeException" } ], [ @@ -172,11 +169,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "{closure}" - } + {} ] ] ] diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_unhandled_exception.php b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_unhandled_exception.php index f619cab45..074113479 100644 --- a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_unhandled_exception.php +++ b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_unhandled_exception.php @@ -138,10 +138,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ] ] 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 index 09a26cd9c..f57e27027 100644 --- a/tests/integration/jit/function/test_span_events_error_collector_disabled.php +++ b/tests/integration/jit/function/test_span_events_error_collector_disabled.php @@ -102,11 +102,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ] ] ] 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 index 2433f1289..5f5fb0175 100644 --- a/tests/integration/jit/function/test_span_events_exception_caught_nested.php +++ b/tests/integration/jit/function/test_span_events_exception_caught_nested.php @@ -78,11 +78,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -99,11 +95,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -122,10 +114,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ], [ @@ -143,11 +132,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -166,10 +151,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ] ] 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 index 036b6a55e..cbdbad0a0 100644 --- 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 @@ -109,10 +109,7 @@ {}, { "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": "??" + "error.class": "RuntimeException" } ], [ @@ -132,10 +129,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ], [ @@ -155,10 +149,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ] ] 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 index 202479b19..c80a51370 100644 --- 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 @@ -104,11 +104,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -127,10 +123,7 @@ {}, { "error.message": "Noticed exception 'Exception' with message 'Notice me' in __FILE__:??", - "error.class": "Exception", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "Exception" } ] ] 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 index f182090d3..49ad17caf 100644 --- 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 @@ -104,11 +104,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -127,10 +123,7 @@ {}, { "error.message": "Noticed exception 'Exception' with message 'Notice me' in __FILE__:??", - "error.class": "Exception", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "Exception" } ], [ @@ -150,10 +143,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ], [ @@ -171,10 +161,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??"} + {} ], [ { @@ -193,10 +180,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ] ] 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 index 943b908ba..18034a3e4 100644 --- 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 @@ -77,11 +77,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -98,11 +94,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ] ] ] 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 index d3c317994..e88794445 100644 --- a/tests/integration/jit/function/test_span_events_exception_uncaught_nested.php +++ b/tests/integration/jit/function/test_span_events_exception_uncaught_nested.php @@ -134,10 +134,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ], [ @@ -157,10 +154,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ], [ @@ -180,10 +174,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ] ] diff --git a/tests/integration/jit/function/test_span_events_hsm_error.php b/tests/integration/jit/function/test_span_events_hsm_error.php index d4814dbc0..f4be3eb32 100644 --- a/tests/integration/jit/function/test_span_events_hsm_error.php +++ b/tests/integration/jit/function/test_span_events_hsm_error.php @@ -112,10 +112,7 @@ {}, { "error.message": "Message removed by New Relic high_security setting", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ] ] diff --git a/tests/integration/jit/function/test_span_events_notice_error.php b/tests/integration/jit/function/test_span_events_notice_error.php index adfa8b40b..22a7b1bba 100644 --- a/tests/integration/jit/function/test_span_events_notice_error.php +++ b/tests/integration/jit/function/test_span_events_notice_error.php @@ -103,11 +103,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -126,10 +122,7 @@ {}, { "error.message": "Noticed exception 'Exception' with message 'Notice me' in __FILE__:??", - "error.class": "Exception", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "Exception" } ] ] diff --git a/tests/integration/jit/function/test_span_events_root_parent.php b/tests/integration/jit/function/test_span_events_root_parent.php index 1dc531ec9..15e165bbe 100644 --- a/tests/integration/jit/function/test_span_events_root_parent.php +++ b/tests/integration/jit/function/test_span_events_root_parent.php @@ -72,11 +72,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -93,11 +89,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -114,11 +106,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ] ] ] diff --git a/tests/integration/jit/tracing/test_span_class_function.php b/tests/integration/jit/tracing/test_span_class_function.php index 5a520f211..fbc7d6bff 100644 --- a/tests/integration/jit/tracing/test_span_class_function.php +++ b/tests/integration/jit/tracing/test_span_class_function.php @@ -73,11 +73,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -94,11 +90,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -115,11 +107,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -136,12 +124,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.namespace": "Classname", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -158,12 +141,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.namespace": "Classname", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -180,12 +158,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.namespace": "Classname", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -202,12 +175,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.namespace": "Classname", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -224,12 +192,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.namespace": "Classname", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ] ] ] 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 index cc2a52753..c2c6ad491 100644 --- 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 @@ -73,11 +73,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { 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 index 74e03bf46..3b8b71ba1 100644 --- 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 @@ -136,10 +136,7 @@ {}, { "error.message": "foo", - "error.class": "E_USER_ERROR", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "E_USER_ERROR" } ], [ @@ -157,11 +154,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ] ] ] diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_caught_error.php84.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_caught_error.php84.php index eeb18dc14..ef8dc18f8 100644 --- a/tests/integration/jit/tracing/test_span_events_are_created_upon_caught_error.php84.php +++ b/tests/integration/jit/tracing/test_span_events_are_created_upon_caught_error.php84.php @@ -137,10 +137,7 @@ {}, { "error.message": "foo", - "error.class": "E_USER_WARNING", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "E_USER_WARNING" } ], [ @@ -158,11 +155,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ] ] ] 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 index 176730a7f..a5fc5578c 100644 --- 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 @@ -97,11 +97,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ] ] ] 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 index 51f8b899a..54a5fab5e 100644 --- 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 @@ -104,10 +104,7 @@ {}, { "error.message": "foo", - "error.class": "E_USER_ERROR", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "E_USER_ERROR" } ] ] diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_error.php84.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_error.php84.php index 54660f8a3..0226a3e05 100644 --- a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_error.php84.php +++ b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_error.php84.php @@ -105,10 +105,7 @@ {}, { "error.message": "foo", - "error.class": "E_USER_WARNING", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "E_USER_WARNING" } ] ] diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception.php index 7444c28e7..c9574865e 100644 --- a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception.php +++ b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception.php @@ -137,10 +137,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "a" + "error.class": "RuntimeException" } ], [ @@ -158,11 +155,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "{closure}" - } + {} ] ] ] diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception.php84.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception.php84.php index 922a0c5a7..ad6affcbd 100644 --- a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception.php84.php +++ b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception.php84.php @@ -138,10 +138,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "a" + "error.class": "RuntimeException" } ], [ @@ -159,11 +156,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "{closure:__FILE__:??}" - } + {} ] ] ] diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception_invalid_handler.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception_invalid_handler.php index bd99855b8..ddce55565 100644 --- a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception_invalid_handler.php +++ b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception_invalid_handler.php @@ -146,10 +146,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "a" + "error.class": "RuntimeException" } ], [ @@ -167,11 +164,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "{closure}" - } + {} ] ] ] diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_unhandled_exception.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_unhandled_exception.php index 54269f072..00abae00d 100644 --- a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_unhandled_exception.php +++ b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_unhandled_exception.php @@ -138,10 +138,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ] ] 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 index 0e6fb6db1..142b300a2 100644 --- a/tests/integration/jit/tracing/test_span_events_error_collector_disabled.php +++ b/tests/integration/jit/tracing/test_span_events_error_collector_disabled.php @@ -103,11 +103,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ] ] ] 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 index 4ff854cf2..dab7c3411 100644 --- a/tests/integration/jit/tracing/test_span_events_exception_caught_nested.php +++ b/tests/integration/jit/tracing/test_span_events_exception_caught_nested.php @@ -78,11 +78,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -99,11 +95,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -122,10 +114,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ], [ @@ -143,11 +132,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -166,10 +151,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ] ] 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 index 1ec6df51b..28c743e7d 100644 --- 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 @@ -109,10 +109,7 @@ {}, { "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": "??" + "error.class": "RuntimeException" } ], [ @@ -132,10 +129,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ], [ @@ -155,10 +149,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ] ] 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 index 5b42d5280..42b75850f 100644 --- 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 @@ -104,11 +104,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -127,10 +123,7 @@ {}, { "error.message": "Noticed exception 'Exception' with message 'Notice me' in __FILE__:??", - "error.class": "Exception", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "Exception" } ] ] 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 index aaeb5a278..eeab19a43 100644 --- 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 @@ -104,11 +104,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -127,10 +123,7 @@ {}, { "error.message": "Noticed exception 'Exception' with message 'Notice me' in __FILE__:??", - "error.class": "Exception", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "Exception" } ], [ @@ -150,10 +143,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ], [ @@ -171,11 +161,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -194,10 +180,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ] ] 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 index d92e22d16..37c5316c0 100644 --- 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 @@ -77,11 +77,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -98,11 +94,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ] ] ] 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 index d352b174e..533b4ba62 100644 --- a/tests/integration/jit/tracing/test_span_events_exception_uncaught_nested.php +++ b/tests/integration/jit/tracing/test_span_events_exception_uncaught_nested.php @@ -135,10 +135,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ], [ @@ -158,10 +155,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ], [ @@ -181,10 +175,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ] ] diff --git a/tests/integration/jit/tracing/test_span_events_hsm_error.php b/tests/integration/jit/tracing/test_span_events_hsm_error.php index 9f75d20cb..8e31b2713 100644 --- a/tests/integration/jit/tracing/test_span_events_hsm_error.php +++ b/tests/integration/jit/tracing/test_span_events_hsm_error.php @@ -112,10 +112,7 @@ {}, { "error.message": "Message removed by New Relic high_security setting", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ] ] diff --git a/tests/integration/jit/tracing/test_span_events_notice_error.php b/tests/integration/jit/tracing/test_span_events_notice_error.php index a626285d5..1cb17e028 100644 --- a/tests/integration/jit/tracing/test_span_events_notice_error.php +++ b/tests/integration/jit/tracing/test_span_events_notice_error.php @@ -103,11 +103,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -126,10 +122,7 @@ {}, { "error.message": "Noticed exception 'Exception' with message 'Notice me' in __FILE__:??", - "error.class": "Exception", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "Exception" } ] ] diff --git a/tests/integration/jit/tracing/test_span_events_root_parent.php b/tests/integration/jit/tracing/test_span_events_root_parent.php index 1dc531ec9..15e165bbe 100644 --- a/tests/integration/jit/tracing/test_span_events_root_parent.php +++ b/tests/integration/jit/tracing/test_span_events_root_parent.php @@ -72,11 +72,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -93,11 +89,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -114,11 +106,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ] ] ] diff --git a/tests/integration/opcache/disabled/test_span_class_function.php b/tests/integration/opcache/disabled/test_span_class_function.php index d3438f6ec..fd81edaea 100644 --- a/tests/integration/opcache/disabled/test_span_class_function.php +++ b/tests/integration/opcache/disabled/test_span_class_function.php @@ -74,11 +74,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -95,11 +91,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -116,11 +108,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -137,12 +125,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.namespace": "Classname", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -159,12 +142,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.namespace": "Classname", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -181,12 +159,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.namespace": "Classname", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -203,12 +176,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.namespace": "Classname", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -225,12 +193,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.namespace": "Classname", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ] ] ] diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_from_segments.php b/tests/integration/opcache/disabled/test_span_events_are_created_from_segments.php index 232c68835..fe780a7a3 100644 --- a/tests/integration/opcache/disabled/test_span_events_are_created_from_segments.php +++ b/tests/integration/opcache/disabled/test_span_events_are_created_from_segments.php @@ -69,11 +69,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_caught_error.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_caught_error.php index ce62bfc12..6ad5cc504 100644 --- a/tests/integration/opcache/disabled/test_span_events_are_created_upon_caught_error.php +++ b/tests/integration/opcache/disabled/test_span_events_are_created_upon_caught_error.php @@ -134,10 +134,7 @@ {}, { "error.message": "foo", - "error.class": "E_USER_ERROR", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "E_USER_ERROR" } ], [ @@ -155,11 +152,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ] ] ] diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_caught_error.php84.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_caught_error.php84.php index 86c24a776..28e6ba7bf 100644 --- a/tests/integration/opcache/disabled/test_span_events_are_created_upon_caught_error.php84.php +++ b/tests/integration/opcache/disabled/test_span_events_are_created_upon_caught_error.php84.php @@ -134,10 +134,7 @@ {}, { "error.message": "foo", - "error.class": "E_USER_WARNING", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "E_USER_WARNING" } ], [ @@ -155,11 +152,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ] ] ] diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_exit.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_exit.php index 633ce880d..131c7856f 100644 --- a/tests/integration/opcache/disabled/test_span_events_are_created_upon_exit.php +++ b/tests/integration/opcache/disabled/test_span_events_are_created_upon_exit.php @@ -93,11 +93,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ] ] ] diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_error.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_error.php index 49320f19b..f5246a586 100644 --- a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_error.php +++ b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_error.php @@ -100,10 +100,7 @@ {}, { "error.message": "foo", - "error.class": "E_USER_ERROR", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "E_USER_ERROR" } ] ] diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_error.php84.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_error.php84.php index 35014d54f..73ba574d9 100644 --- a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_error.php84.php +++ b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_error.php84.php @@ -101,10 +101,7 @@ {}, { "error.message": "foo", - "error.class": "E_USER_WARNING", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "E_USER_WARNING" } ] ] diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php index 76dd4fe41..2cdc6168d 100644 --- a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php +++ b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php @@ -139,10 +139,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "a" + "error.class": "RuntimeException" } ], [ @@ -160,11 +157,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "{closure}" - } + {} ] ] ] diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php7.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php7.php index 67bc1b428..a6a7107d9 100644 --- a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php7.php +++ b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php7.php @@ -107,10 +107,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "a" + "error.class": "RuntimeException" } ], [ @@ -128,11 +125,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "{closure}" - } + {} ] ] ] diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php84.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php84.php index e4be687b9..623591904 100644 --- a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php84.php +++ b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php84.php @@ -137,10 +137,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "a" + "error.class": "RuntimeException" } ], [ @@ -158,11 +155,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "{closure:__FILE__:??}" - } + {} ] ] ] diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_unhandled_exception.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_unhandled_exception.php index 94b69f7a8..7c790ca39 100644 --- a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_unhandled_exception.php +++ b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_unhandled_exception.php @@ -134,10 +134,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ] ] diff --git a/tests/integration/opcache/disabled/test_span_events_error_collector_disabled.php b/tests/integration/opcache/disabled/test_span_events_error_collector_disabled.php index b8d5584dc..6f2f5dcdf 100644 --- a/tests/integration/opcache/disabled/test_span_events_error_collector_disabled.php +++ b/tests/integration/opcache/disabled/test_span_events_error_collector_disabled.php @@ -99,11 +99,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ] ] ] diff --git a/tests/integration/opcache/disabled/test_span_events_exception_caught_nested.php b/tests/integration/opcache/disabled/test_span_events_exception_caught_nested.php index 41d3db2b6..710233dc9 100644 --- a/tests/integration/opcache/disabled/test_span_events_exception_caught_nested.php +++ b/tests/integration/opcache/disabled/test_span_events_exception_caught_nested.php @@ -74,11 +74,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -95,11 +91,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -118,10 +110,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ], [ @@ -139,11 +128,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -162,10 +147,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ] ] diff --git a/tests/integration/opcache/disabled/test_span_events_exception_caught_nested_rethrown.php b/tests/integration/opcache/disabled/test_span_events_exception_caught_nested_rethrown.php index 5b5729498..921e07f8d 100644 --- a/tests/integration/opcache/disabled/test_span_events_exception_caught_nested_rethrown.php +++ b/tests/integration/opcache/disabled/test_span_events_exception_caught_nested_rethrown.php @@ -105,10 +105,7 @@ {}, { "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": "??" + "error.class": "RuntimeException" } ], [ @@ -128,10 +125,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ], [ @@ -151,10 +145,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ] ] diff --git a/tests/integration/opcache/disabled/test_span_events_exception_caught_notice_error.php b/tests/integration/opcache/disabled/test_span_events_exception_caught_notice_error.php index d51e9e210..552322715 100644 --- a/tests/integration/opcache/disabled/test_span_events_exception_caught_notice_error.php +++ b/tests/integration/opcache/disabled/test_span_events_exception_caught_notice_error.php @@ -100,11 +100,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -123,10 +119,7 @@ {}, { "error.message": "Noticed exception 'Exception' with message 'Notice me' in __FILE__:??", - "error.class": "Exception", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "Exception" } ] ] diff --git a/tests/integration/opcache/disabled/test_span_events_exception_caught_notice_error_nested.php b/tests/integration/opcache/disabled/test_span_events_exception_caught_notice_error_nested.php index 7a3586e22..18589d6ff 100644 --- a/tests/integration/opcache/disabled/test_span_events_exception_caught_notice_error_nested.php +++ b/tests/integration/opcache/disabled/test_span_events_exception_caught_notice_error_nested.php @@ -100,11 +100,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -123,10 +119,7 @@ {}, { "error.message": "Noticed exception 'Exception' with message 'Notice me' in __FILE__:??", - "error.class": "Exception", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "Exception" } ], [ @@ -146,10 +139,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ], [ @@ -167,10 +157,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??"} + {} ], [ { @@ -189,10 +176,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'Division by zero' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ] ] diff --git a/tests/integration/opcache/disabled/test_span_events_exception_caught_same_span.php b/tests/integration/opcache/disabled/test_span_events_exception_caught_same_span.php index 6de5a0aaf..580cd0db9 100644 --- a/tests/integration/opcache/disabled/test_span_events_exception_caught_same_span.php +++ b/tests/integration/opcache/disabled/test_span_events_exception_caught_same_span.php @@ -73,11 +73,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -94,11 +90,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ] ] ] diff --git a/tests/integration/opcache/disabled/test_span_events_exception_uncaught_nested.php b/tests/integration/opcache/disabled/test_span_events_exception_uncaught_nested.php index 658bcec9e..c9987bc5d 100644 --- a/tests/integration/opcache/disabled/test_span_events_exception_uncaught_nested.php +++ b/tests/integration/opcache/disabled/test_span_events_exception_uncaught_nested.php @@ -130,10 +130,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ], [ @@ -153,10 +150,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ], [ @@ -176,10 +170,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ] ] diff --git a/tests/integration/opcache/disabled/test_span_events_hsm_error.php b/tests/integration/opcache/disabled/test_span_events_hsm_error.php index 96fbe17e0..7589e0305 100644 --- a/tests/integration/opcache/disabled/test_span_events_hsm_error.php +++ b/tests/integration/opcache/disabled/test_span_events_hsm_error.php @@ -108,10 +108,7 @@ {}, { "error.message": "Message removed by New Relic high_security setting", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "RuntimeException" } ] ] diff --git a/tests/integration/opcache/disabled/test_span_events_notice_error.php b/tests/integration/opcache/disabled/test_span_events_notice_error.php index a5378ce38..8efdc5579 100644 --- a/tests/integration/opcache/disabled/test_span_events_notice_error.php +++ b/tests/integration/opcache/disabled/test_span_events_notice_error.php @@ -99,11 +99,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -122,10 +118,7 @@ {}, { "error.message": "Noticed exception 'Exception' with message 'Notice me' in __FILE__:??", - "error.class": "Exception", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" + "error.class": "Exception" } ] ] diff --git a/tests/integration/opcache/disabled/test_span_events_root_parent.php b/tests/integration/opcache/disabled/test_span_events_root_parent.php index 0f9a68af7..0d7f11d7d 100644 --- a/tests/integration/opcache/disabled/test_span_events_root_parent.php +++ b/tests/integration/opcache/disabled/test_span_events_root_parent.php @@ -68,11 +68,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -89,11 +85,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ], [ { @@ -110,11 +102,7 @@ "timestamp": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "??" - } + {} ] ] ] diff --git a/tests/integration/span_events/test_span_events_are_created_from_segments.php b/tests/integration/span_events/test_span_events_are_created_from_segments.php index 4457d1ff4..43bbc0aa4 100644 --- a/tests/integration/span_events/test_span_events_are_created_from_segments.php +++ b/tests/integration/span_events/test_span_events_are_created_from_segments.php @@ -8,13 +8,6 @@ Test that span events are correctly created from any eligible segment. */ -/*SKIPIF - 'FakeDB', -)); diff --git a/tests/integration/span_events/test_span_events_are_created_upon_caught_error.php b/tests/integration/span_events/test_span_events_are_created_upon_caught_error.php index 56e161179..0c9b15c1d 100644 --- a/tests/integration/span_events/test_span_events_are_created_upon_caught_error.php +++ b/tests/integration/span_events/test_span_events_are_created_upon_caught_error.php @@ -11,9 +11,6 @@ /*SKIPIF =")) { die("skip: newer test for PHP 8.4+\n"); } @@ -94,10 +91,7 @@ {}, { "error.message": "foo", - "error.class": "E_USER_ERROR", - "code.lineno": 139, - "code.filepath": "__FILE__", - "code.function": "a" + "error.class": "E_USER_ERROR" } ], [ @@ -115,11 +109,7 @@ "parentId": "??" }, {}, - { - "code.lineno": 133, - "code.filepath": "__FILE__", - "code.function": "{closure}" - } + {} ] ] ] diff --git a/tests/integration/span_events/test_span_events_are_created_upon_caught_error.php84.php b/tests/integration/span_events/test_span_events_are_created_upon_caught_error.php84.php index fabe4bddd..8e621eae4 100644 --- a/tests/integration/span_events/test_span_events_are_created_upon_caught_error.php84.php +++ b/tests/integration/span_events/test_span_events_are_created_upon_caught_error.php84.php @@ -92,10 +92,7 @@ {}, { "error.message": "foo", - "error.class": "E_USER_WARNING", - "code.lineno": 137, - "code.filepath": "__FILE__", - "code.function": "a" + "error.class": "E_USER_WARNING" } ], [ @@ -113,11 +110,7 @@ "parentId": "??" }, {}, - { - "code.lineno": 131, - "code.filepath": "__FILE__", - "code.function": "{closure:__FILE__:??}" - } + {} ] ] ] diff --git a/tests/integration/span_events/test_span_events_are_created_upon_exit.php b/tests/integration/span_events/test_span_events_are_created_upon_exit.php index 9e47469eb..30c291f72 100644 --- a/tests/integration/span_events/test_span_events_are_created_upon_exit.php +++ b/tests/integration/span_events/test_span_events_are_created_upon_exit.php @@ -9,13 +9,6 @@ when exit() is called. */ -/*SKIPIF - 'FakeDB', - ) -); -a(); diff --git a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php index a41838d3e..cd5284b69 100644 --- a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php +++ b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php @@ -11,9 +11,6 @@ /*SKIPIF =")) { die("skip: newer test for PHP 8.4\n"); } @@ -94,10 +91,7 @@ {}, { "error.message": "foo", - "error.class": "E_USER_ERROR", - "code.lineno": 111, - "code.filepath": "__FILE__", - "code.function": "a" + "error.class": "E_USER_ERROR" } ] ] diff --git a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php5.php b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php5.php deleted file mode 100644 index 3e17f5371..000000000 --- a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php5.php +++ /dev/null @@ -1,121 +0,0 @@ -=")) { - die("skip: newer test for PHP 8.4\n"); -} -*/ - -/*EXPECT_SPAN_EVENTS -[ - "?? agent run id", - { - "reservoir_size": 10000, - "events_seen": 3 - }, - [ - [ - { - "traceId": "??", - "duration": "??", - "transactionId": "??", - "name": "OtherTransaction\/php__FILE__", - "guid": "??", - "type": "Span", - "category": "generic", - "priority": "??", - "sampled": true, - "nr.entryPoint": true, - "timestamp": "??", - "transaction.name": "OtherTransaction\/php__FILE__" - }, - {}, - {} - ], - [ - { - "type": "Span", - "traceId": "??", - "transactionId": "??", - "sampled": true, - "priority": "??", - "name": "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" - } - ] - ] -] -*/ - -/*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/span_events/test_span_events_are_created_upon_uncaught_error.php84.php b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php84.php index b56ef56a2..cf5c9fc4e 100644 --- a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php84.php +++ b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php84.php @@ -92,10 +92,7 @@ {}, { "error.message": "foo", - "error.class": "E_USER_WARNING", - "code.lineno": 109, - "code.filepath": "__FILE__", - "code.function": "a" + "error.class": "E_USER_WARNING" } ] ] diff --git a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php index 24d3e6da2..3e0b2bcfa 100644 --- a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php +++ b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php @@ -126,10 +126,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "a" + "error.class": "RuntimeException" } ], [ @@ -147,11 +144,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "{closure}" - } + {} ] ] ] diff --git a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php7.php b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php7.php index 24c64e436..79a4db1ef 100644 --- a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php7.php +++ b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php7.php @@ -11,9 +11,6 @@ /*SKIPIF =")) { die("skip: test for non-oapi agent only\n"); } @@ -96,10 +93,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "a" + "error.class": "RuntimeException" } ], [ @@ -117,11 +111,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "{closure}" - } + {} ] ] ] diff --git a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php84.php b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php84.php index c9e6a3455..3210bb36c 100644 --- a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php84.php +++ b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php84.php @@ -124,10 +124,7 @@ {}, { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", - "error.class": "RuntimeException", - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "a" + "error.class": "RuntimeException" } ], [ @@ -145,11 +142,7 @@ "parentId": "??" }, {}, - { - "code.lineno": "??", - "code.filepath": "__FILE__", - "code.function": "{closure:__FILE__:??}" - } + {} ] ] ] diff --git a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_unhandled_exception.php b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_unhandled_exception.php index 9c5063753..1427a8f3f 100644 --- a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_unhandled_exception.php +++ b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_unhandled_exception.php @@ -9,13 +9,6 @@ when an uncaught exception is thrown. */ -/*SKIPIF - 'FakeDB', - ) -); -a(); - -echo 'this should never be printed'; diff --git a/tests/integration/span_events/test_span_events_error_collector_disabled.php b/tests/integration/span_events/test_span_events_error_collector_disabled.php index 9ecadc228..e9cc70123 100644 --- a/tests/integration/span_events/test_span_events_error_collector_disabled.php +++ b/tests/integration/span_events/test_span_events_error_collector_disabled.php @@ -7,13 +7,6 @@ Test that no span events error attributes are captured when error_collector is disabled */ -/*SKIPIF - 'FakeDB', - ) -); -a(); - -echo 'this should never be printed'; diff --git a/tests/integration/span_events/test_span_events_exception_caught_nested.php b/tests/integration/span_events/test_span_events_exception_caught_nested.php index b5cde73bb..a1a68019a 100644 --- a/tests/integration/span_events/test_span_events_exception_caught_nested.php +++ b/tests/integration/span_events/test_span_events_exception_caught_nested.php @@ -8,13 +8,6 @@ correctly handled. */ -/*SKIPIF -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/span_events/test_span_events_exception_caught_nested_rethrown.php b/tests/integration/span_events/test_span_events_exception_caught_nested_rethrown.php index c488afeaf..3b925e563 100644 --- a/tests/integration/span_events/test_span_events_exception_caught_nested_rethrown.php +++ b/tests/integration/span_events/test_span_events_exception_caught_nested_rethrown.php @@ -9,13 +9,6 @@ is "rethrown" is correctly handled. */ -/*SKIPIF -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/span_events/test_span_events_exception_caught_notice_error.php b/tests/integration/span_events/test_span_events_exception_caught_notice_error.php index c9bb5bf01..6c2e569c4 100644 --- a/tests/integration/span_events/test_span_events_exception_caught_notice_error.php +++ b/tests/integration/span_events/test_span_events_exception_caught_notice_error.php @@ -9,13 +9,6 @@ called. */ -/*SKIPIF -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/span_events/test_span_events_exception_caught_notice_error_nested.php b/tests/integration/span_events/test_span_events_exception_caught_notice_error_nested.php index 58a16af17..029b5d946 100644 --- a/tests/integration/span_events/test_span_events_exception_caught_notice_error_nested.php +++ b/tests/integration/span_events/test_span_events_exception_caught_notice_error_nested.php @@ -9,13 +9,6 @@ handled when a notice error is also called. */ -/*SKIPIF -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/span_events/test_span_events_exception_caught_same_span.php b/tests/integration/span_events/test_span_events_exception_caught_same_span.php index 66b8e62af..c054eb746 100644 --- a/tests/integration/span_events/test_span_events_exception_caught_same_span.php +++ b/tests/integration/span_events/test_span_events_exception_caught_same_span.php @@ -8,13 +8,6 @@ Test that a caught exception is correctly handled in the same span. */ -/*SKIPIF -getMessage() . "\n"); - } -} - -function a() -{ - time_nanosleep(0, 100000000); - echo "Hello\n"; -}; - -a(); -fraction(); diff --git a/tests/integration/span_events/test_span_events_exception_uncaught_nested.php b/tests/integration/span_events/test_span_events_exception_uncaught_nested.php index 0752d1fb6..d920264c8 100644 --- a/tests/integration/span_events/test_span_events_exception_uncaught_nested.php +++ b/tests/integration/span_events/test_span_events_exception_uncaught_nested.php @@ -7,13 +7,6 @@ Test that an uncaught exception that originated from a child span is correctly handled. */ -/*SKIPIF - 'FakeDB', - ) -); -a(); - -echo 'this should never be printed'; diff --git a/tests/integration/span_events/test_span_events_hsm_error.php b/tests/integration/span_events/test_span_events_hsm_error.php index 36be49682..1f722886b 100644 --- a/tests/integration/span_events/test_span_events_hsm_error.php +++ b/tests/integration/span_events/test_span_events_hsm_error.php @@ -7,13 +7,6 @@ Test that span events error attributes conform to high security mode. */ -/*SKIPIF -