From 302305460df3483fcbc497757a48fdb2b5a20b71 Mon Sep 17 00:00:00 2001 From: Michael Fulbright <89205663+mfulb@users.noreply.github.com> Date: Wed, 27 Sep 2023 16:19:08 -0400 Subject: [PATCH] feat(agent): Implements log decorating (#733) Adds linking metadata to the Monolog LogRecord by using the 'extra' array element to store a string containing the log decorating linking metadata. --------- Co-authored-by: bduranleau-nr <106178551+bduranleau-nr@users.noreply.github.com> --- agent/lib_monolog.c | 104 ++++++- agent/php_minit.c | 28 +- agent/php_newrelic.h | 3 + agent/php_nrini.c | 8 + agent/php_txn.c | 6 + axiom/nr_txn.c | 5 +- axiom/nr_txn.h | 1 + axiom/tests/test_txn.c | 41 +++ .../test_span_event_parameter_disabled.php | 4 +- .../test_span_event_parameter_duplicate.php | 6 +- ...st_span_event_parameter_duplicate.php5.php | 4 +- ..._span_event_parameter_duplicate_te_off.php | 6 +- ..._event_parameter_duplicate_te_off.php5.php | 4 +- .../test_span_event_parameter_filter.php | 6 +- .../test_span_event_parameter_filter.php5.php | 4 +- ...pan_event_parameter_filter_logging_off.php | 7 +- ...vent_parameter_filter_logging_off.php5.php | 5 +- .../test_span_event_parameter_max_key.php | 6 +- ...test_span_event_parameter_max_key.php5.php | 4 +- ...st_span_event_parameter_max_key_te_off.php | 6 +- ...an_event_parameter_max_key_te_off.php5.php | 4 +- ...st_span_event_parameter_max_parameters.php | 6 +- ...an_event_parameter_max_parameters.php5.php | 4 +- .../test_span_event_parameter_max_value.php | 6 +- ...st_span_event_parameter_max_value.php5.php | 4 +- ..._span_event_parameter_max_value_te_off.php | 6 +- ..._event_parameter_max_value_te_off.php5.php | 4 +- ...pan_event_parameter_maxplus_parameters.php | 6 +- ...vent_parameter_maxplus_parameters.php5.php | 4 +- ...nt_parameter_maxplus_parameters_te_off.php | 6 +- ...rameter_maxplus_parameters_te_off.php5.php | 4 +- ..._maxplus_parameters_te_off_logging_off.php | 8 +- ...lus_parameters_te_off_logging_off.php5.php | 6 +- ...an_event_parameter_maxplus_span_and_te.php | 6 +- ...ent_parameter_maxplus_span_and_te.php5.php | 4 +- ...t_parameter_maxplus_span_and_te_te_off.php | 6 +- ...ameter_maxplus_span_and_te_te_off.php5.php | 4 +- .../test_span_event_parameter_overwrite.php | 6 +- ...st_span_event_parameter_overwrite.php5.php | 4 +- .../test_span_event_parameter_te_off.php | 6 +- .../test_span_event_parameter_te_off.php5.php | 4 +- .../test_span_event_parameter_types.php | 6 +- .../test_span_event_parameter_types.php5.php | 4 +- .../api/add_custom_tracer/test_happy.php | 4 +- .../test_not_user_function.php | 4 +- .../add_custom_tracer/test_short_segments.php | 4 +- .../api/custom_metric/test_bad_input.php | 4 +- .../api/custom_metric/test_bad_input.php8.php | 4 +- .../api/custom_metric/test_happy.php | 4 +- .../custom_metric/test_happy_logging_off.php | 6 +- .../test_all_parameters_no_children.php | 4 +- .../datastore/test_all_parameters_nosql.php | 4 +- .../test_all_parameters_sql_no_query.php | 4 +- .../test_all_parameters_sql_obfuscated.php | 4 +- ..._parameters_sql_obfuscated_logging_off.php | 6 +- .../datastore/test_all_parameters_sql_raw.php | 4 +- .../integration/api/datastore/test_basic.php | 4 +- ...test_error_group_callback_bad_callback.php | 30 +- ...error_group_callback_bad_callback.php7.php | 32 ++- .../test_error_group_callback_bad_params.php | 32 ++- ...t_error_group_callback_bad_return_null.php | 32 ++- ...st_error_group_callback_bad_return_num.php | 32 ++- .../test_error_group_callback_clobber.php | 32 ++- ...st_error_group_callback_empty_callback.php | 32 ++- ...est_error_group_callback_error_non_web.php | 30 +- .../test_error_group_callback_error_web.php | 36 +-- ...error_group_callback_exception_non_web.php | 32 ++- ...est_error_group_callback_exception_web.php | 38 +-- ...st_error_group_callback_max_string_len.php | 32 ++- .../api/metadata/test_linking_metadata_dt.php | 4 +- .../test_linking_metadata_dt_logging_off.php | 6 +- .../test_linking_metadata_invalid.php | 4 +- .../test_linking_metadata_invalid.php8.php | 4 +- .../metadata/test_linking_metadata_no_dt.php | 4 +- .../api/metadata/test_trace_metadata_dt.php | 4 +- .../metadata/test_trace_metadata_invalid.php | 4 +- .../test_trace_metadata_invalid.php8.php | 4 +- .../metadata/test_trace_metadata_no_dt.php | 4 +- .../api/other/test_ignore_apdex.php | 4 +- .../other/test_is_sampled_cancelled_txn.php | 4 +- .../api/other/test_is_sampled_dt_disabled.php | 4 +- .../api/other/test_is_sampled_dt_enabled.php | 4 +- .../api/other/test_is_sampled_extra_param.php | 4 +- .../test_is_sampled_extra_param.php8.php | 4 +- .../api/set_appname/test_already_ended.php | 26 +- .../api/set_appname/test_appname_license.php | 28 +- .../test_appname_switch_license.php | 34 +-- .../test_appname_switch_license_lasp.php | 26 +- .../api/set_appname/test_bad_params.php | 4 +- .../api/set_appname/test_bad_params.php8.php | 4 +- .../api/set_appname/test_no_license.php | 26 +- .../api/set_appname/test_transmit_false.php | 29 +- .../api/set_appname/test_transmit_int.php | 4 +- .../api/set_appname/test_transmit_true.php | 4 +- .../api/set_user_id/test_set_user_id.php | 20 +- .../test_set_user_id_empty_string.php | 20 +- .../set_user_id/test_set_user_id_error.php | 30 +- .../test_set_user_id_exceeds_maxlen.php | 20 +- .../test_set_user_id_exception.php | 32 ++- .../set_user_id/test_set_user_id_noarg.php | 20 +- .../test_set_user_id_non_string.php | 20 +- .../api/set_user_id/test_set_user_id_null.php | 20 +- .../basic/test_call_user_func_array_0.php | 4 +- tests/integration/basic/test_dl.php | 4 +- .../integration/basic/test_output_buffer.php | 4 +- .../basic/test_output_buffer_logging_off.php | 6 +- ...inbound_payload_rejects_if_no_tx_or_id.php | 4 +- ...supportability_acceptpayload_exception.php | 4 +- ...ceptpayload_ignored_createBeforeAccept.php | 4 +- ...ity_acceptpayload_ignored_majorVersion.php | 4 +- ...ability_acceptpayload_ignored_multiple.php | 4 +- ...ptpayload_ignored_multiple_logging_off.php | 4 +- ...portability_acceptpayload_ignored_null.php | 4 +- ...acceptpayload_ignored_untrustedAccount.php | 4 +- ...load_ignored_untrustedAccount_httpsafe.php | 4 +- ...d_ignored_untrustedAccount_logging_off.php | 6 +- ...rtability_acceptpayload_parseexception.php | 4 +- ...t_supportability_acceptpayload_success.php | 4 +- .../test_insert_dt_headers_empty_array.php | 4 +- .../w3c/test_insert_dt_headers_happy.php | 4 +- ...st_insert_dt_headers_happy_logging_off.php | 6 +- .../w3c/test_insert_dt_headers_nonref.php | 4 +- .../test_insert_dt_headers_wrong_arg_type.php | 4 +- ..._insert_dt_headers_wrong_arg_type.php8.php | 4 +- .../w3c/test_invalid_inbound.php | 4 +- .../w3c/test_valid_inbound_headers.php | 4 +- ...test_valid_inbound_headers_logging_off.php | 6 +- .../test_valid_inbound_headers_parsed_key.php | 4 +- .../w3c/test_valid_inbound_no_sampled.php | 4 +- .../w3c/test_valid_inbound_non_newrelic.php | 4 +- .../w3c/test_valid_no_nr_state.php | 4 +- .../test_top_level_exception_tracer.php | 4 +- ...top_level_exception_tracer_logging_off.php | 6 +- .../test_cat_and_synthetics_disabled.php | 4 +- .../external/curl_exec/test_cat_disabled.php | 4 +- .../test_cat_disabled_by_default.php | 4 +- .../test_cat_request_headers_empty_array.php | 4 +- .../test_cat_request_headers_present.php | 4 +- ...test_cat_request_headers_present_array.php | 4 +- ...t_cat_request_headers_referenced_array.php | 4 +- .../test_cat_response_header_anonymous.php | 4 +- .../test_cat_response_header_function.php | 4 +- .../test_cat_response_header_returned.php | 4 +- .../test_cat_response_header_to_file.php | 4 +- .../test_cat_response_header_to_stdout.php | 4 +- .../external/curl_exec/test_cat_simple.php | 4 +- .../curl_exec/test_dt_enabled_cat_enabled.php | 4 +- .../test_dt_newrelic_header_disabled.php | 4 +- .../test_dt_request_headers_empty_array.php | 4 +- .../test_dt_request_headers_present.php | 4 +- .../test_dt_request_headers_present_array.php | 4 +- ...uest_headers_present_array_logging_off.php | 6 +- ...st_dt_request_headers_referenced_array.php | 4 +- .../external/curl_exec/test_dt_simple.php | 4 +- .../external/curl_exec/test_file_proto.php | 4 +- .../external/curl_exec/test_http.php | 4 +- .../external/curl_exec/test_malformed_url.php | 4 +- .../curl_exec/test_missing_handle.php | 4 +- .../test_request_headers_referenced_array.php | 4 +- .../external/curl_exec/test_synthetics.php | 4 +- .../curl_exec/test_synthetics_disabled.php | 4 +- .../test_synthetics_with_cat_disabled.php | 4 +- .../curl_exec/test_synthetics_with_dt.php | 4 +- .../test_synthetics_with_dt_logging_off.php | 6 +- .../external/curl_exec/test_type_mismatch.php | 4 +- .../curl_multi_exec/test_cat_simple.php | 4 +- .../test_curl_multi_exec_params.php | 31 ++- .../curl_multi_exec/test_custom_header.php | 4 +- .../curl_multi_exec/test_dt_custom_header.php | 4 +- .../test_dt_custom_header_logging_off.php | 6 +- .../test_dt_newrelic_header_disabled.php | 4 +- .../curl_multi_exec/test_dt_simple.php | 4 +- .../curl_multi_exec/test_exec_add_handles.php | 4 +- .../test_exec_remove_handles.php | 4 +- .../test_exec_remove_handles_logging_off.php | 6 +- .../external/curl_multi_exec/test_http.php | 4 +- .../curl_multi_exec/test_malformed_url.php | 4 +- .../curl_multi_exec/test_missing_arg.php | 4 +- .../external/curl_multi_exec/test_simple.php | 4 +- .../curl_multi_exec/test_txn_restart.php | 6 +- .../curl_multi_exec/test_type_mismatch.php | 4 +- .../external/drupal6/test_basic.php | 24 +- .../test_cat_and_synthetics_disabled.php | 30 +- .../external/drupal6/test_cat_disabled.php | 24 +- .../test_cross_process_empty_headers.php | 29 +- .../test_cross_process_existing_header.php | 29 +- .../drupal6/test_cross_process_no_headers.php | 29 +- .../drupal6/test_dt_empty_headers.php | 38 ++- .../drupal6/test_dt_existing_headers.php | 38 ++- .../test_dt_newrelic_header_disabled.php | 35 ++- .../external/drupal6/test_dt_no_headers.php | 38 ++- .../external/drupal6/test_multiple_calls.php | 26 +- .../external/drupal6/test_synthetics.php | 35 +-- .../drupal6/test_synthetics_disabled.php | 35 +-- .../test_synthetics_with_cat_disabled.php | 30 +- .../drupal6/test_synthetics_with_dt.php | 44 ++- .../test_bad_params_integer_headers.php | 30 +- .../test_bad_params_integer_options.php | 22 +- .../drupal7/test_bad_params_null_headers.php | 30 +- .../drupal7/test_bad_params_null_options.php | 22 +- .../external/drupal7/test_bad_url.php | 16 +- .../external/drupal7/test_basic.php | 24 +- .../test_cat_and_synthetics_disabled.php | 30 +- .../external/drupal7/test_cat_disabled.php | 24 +- .../test_cross_process_empty_headers.php | 29 +- .../test_cross_process_empty_options.php | 29 +- .../test_cross_process_existing_header.php | 29 +- .../drupal7/test_cross_process_no_options.php | 29 +- .../drupal7/test_dt_empty_headers.php | 38 ++- .../drupal7/test_dt_existing_headers.php | 38 ++- .../test_dt_newrelic_header_disabled.php | 35 ++- .../external/drupal7/test_dt_no_headers.php | 38 ++- .../external/drupal7/test_multiple_calls.php | 26 +- .../external/drupal7/test_synthetics.php | 35 +-- .../drupal7/test_synthetics_disabled.php | 35 +-- .../test_synthetics_with_cat_disabled.php | 30 +- .../drupal7/test_synthetics_with_dt.php | 44 ++- .../test_cat_and_synthetics_disabled.php | 4 +- .../test_cat_context_provided.php | 4 +- .../test_cat_default_context.php | 4 +- .../file_get_contents/test_cat_disabled.php | 4 +- .../file_get_contents/test_cat_no_context.php | 4 +- .../test_dt_context_provided.php | 4 +- .../test_dt_context_provided_logging_off.php | 6 +- .../test_dt_default_context.php | 4 +- .../file_get_contents/test_dt_disabled.php | 4 +- .../test_dt_disabled_cat_disabled.php | 4 +- .../test_dt_newrelic_header_disabled.php | 4 +- .../file_get_contents/test_dt_no_context.php | 4 +- .../test_http_response_header_cv.php | 4 +- .../test_synthetics_context_provided.php | 4 +- .../test_synthetics_default_context.php | 4 +- .../test_synthetics_disabled.php | 4 +- .../test_synthetics_no_context.php | 4 +- .../test_synthetics_with_cat_disabled.php | 4 +- .../test_synthetics_with_dt.php | 4 +- .../test_synthetics_with_dt_logging_off.php | 6 +- .../integration/external/guzzle5/test_cat.php | 4 +- .../integration/external/guzzle5/test_dt.php | 4 +- .../test_dt_newrelic_header_disabled.php | 4 +- .../external/guzzle5/test_dt_synthetics.php | 4 +- .../test_dt_synthetics_logging_off.php | 6 +- .../external/guzzle5/test_no_cat_no_dt.php | 4 +- .../integration/external/guzzle6/test_cat.php | 4 +- .../integration/external/guzzle6/test_dt.php | 4 +- .../test_dt_newrelic_header_disabled.php | 4 +- .../external/guzzle6/test_dt_synthetics.php | 4 +- .../test_dt_synthetics_logging_off.php | 6 +- .../external/guzzle6/test_no_cat_no_dt.php | 4 +- .../integration/external/guzzle7/test_cat.php | 17 +- .../integration/external/guzzle7/test_dt.php | 14 +- .../test_dt_newrelic_header_disabled.php | 24 +- .../external/guzzle7/test_dt_synthetics.php | 32 +-- .../external/guzzle7/test_no_cat_no_dt.php | 10 +- .../integration/external/http/test_v1_cat.php | 4 +- .../test_v1_cat_and_synthetics_disabled.php | 4 +- .../external/http/test_v1_cat_disabled.php | 4 +- .../external/http/test_v1_synthetics.php | 4 +- .../http/test_v1_synthetics_disabled.php | 4 +- .../test_v1_synthetics_with_cat_disabled.php | 4 +- .../integration/external/http/test_v2_cat.php | 4 +- .../test_curl_multi_add_remove_handles.php | 4 +- .../drupal/test_invoke_all_with.php | 4 +- .../frameworks/laravel/test_artisan_name.php | 4 +- .../laravel/test_artisan_name_logging_off.php | 6 +- .../laravel/test_artisan_name_non_input.php | 4 +- .../laravel/test_artisan_name_non_string.php | 4 +- .../frameworks/magento/test_temp_tables.php | 66 ++--- .../magento/test_temp_tables_logging_off.php | 66 ++--- .../frameworks/silex/test_basic.php | 4 +- .../silex/test_basic_logging_off.php | 6 +- .../silex/test_invalid_attributes.php | 4 +- .../frameworks/silex/test_invalid_request.php | 4 +- .../wordpress/test_site_specific_tables.php | 4 +- .../test_site_specific_tables_logging_off.php | 6 +- .../ini/test_force_framework_0.php | 4 +- .../ini/test_force_framework_1.php | 4 +- .../ini/test_force_framework_2.php | 4 +- .../ini/test_force_framework_3.php | 4 +- .../ini/test_force_framework_5.php | 4 +- .../ini/test_force_framework_6.php | 4 +- tests/integration/ini/test_ini_001.php | 4 +- tests/integration/ini/test_ini_002.php | 4 +- tests/integration/ini/test_ini_003.php | 4 +- .../ini/test_ini_003_logging_off.php | 6 +- tests/integration/ini/test_ini_004.php | 4 +- .../test_transaction_tracer_max_segments.php | 4 +- ...transaction_tracer_max_segments_nested.php | 22 +- ...action_tracer_max_segments_nested.php5.php | 4 +- ...transaction_tracer_max_segments_no_cap.php | 4 +- ...ion_tracer_max_segments_with_datastore.php | 6 +- ...racer_max_segments_with_datastore.php5.php | 4 +- .../lang/test_generator_5.6-7.0.php | 4 +- tests/integration/lang/test_generator_7.1.php | 4 +- .../analog/test_supportability_metric.php | 22 +- .../test_supportability_metric.php | 22 +- .../test_supportability_metric.php | 22 +- .../test_supportability_metric.php | 22 +- .../monolog2/checkdecorateformatter.php | 38 +++ .../logging/monolog2/test_monolog_basic.php | 1 + .../logging/monolog2/test_monolog_cat.php | 2 +- ...test_monolog_decoration_and_forwarding.php | 259 ++++++++++++++++++ .../test_monolog_decoration_basic.php | 170 ++++++++++++ ...t_monolog_decoration_multiple_handlers.php | 227 +++++++++++++++ .../test_monolog_disable_forwarding.php | 1 + .../monolog2/test_monolog_disable_logging.php | 1 + .../monolog2/test_monolog_disable_metrics.php | 1 + .../monolog2/test_monolog_drop_empty.php | 1 + .../monolog2/test_monolog_escape_chars.php | 1 + .../test_monolog_hsm_disable_forwarding.php | 1 + .../test_monolog_large_message_limit.php | 1 + ...test_monolog_large_message_limit_drops.php | 1 + .../test_monolog_limit_log_events.php | 1 + .../test_monolog_limit_zero_events.php | 1 + ...log_events_max_samples_stored_invalid1.php | 1 + ...log_events_max_samples_stored_invalid2.php | 1 + ...log_events_max_samples_stored_invalid3.php | 1 + ...log_events_max_samples_stored_invalid4.php | 1 + .../test_monolog_log_level_filter.php | 1 + .../test_monolog_log_level_filter_invalid.php | 1 + .../test_monolog_truncate_long_msgs.php | 1 + .../monolog3/checkdecorateformatter.php | 41 +++ .../logging/monolog3/test_monolog_basic.php | 1 + .../monolog3/test_monolog_basic_clm.php | 1 + .../monolog3/test_monolog_basic_clm_off.php | 1 + .../logging/monolog3/test_monolog_cat.php | 1 + ...test_monolog_decoration_and_forwarding.php | 259 ++++++++++++++++++ .../test_monolog_decoration_basic.php | 170 ++++++++++++ ...t_monolog_decoration_multiple_handlers.php | 228 +++++++++++++++ .../test_monolog_disable_forwarding.php | 1 + .../monolog3/test_monolog_disable_logging.php | 1 + .../monolog3/test_monolog_disable_metrics.php | 1 + .../monolog3/test_monolog_drop_empty.php | 1 + .../monolog3/test_monolog_escape_chars.php | 1 + .../test_monolog_hsm_disable_forwarding.php | 1 + .../test_monolog_large_message_limit.php | 1 + ...test_monolog_large_message_limit_drops.php | 1 + .../test_monolog_limit_log_events.php | 1 + .../test_monolog_limit_zero_events.php | 1 + ...log_events_max_samples_stored_invalid1.php | 1 + ...log_events_max_samples_stored_invalid2.php | 1 + ...log_events_max_samples_stored_invalid3.php | 1 + ...log_events_max_samples_stored_invalid4.php | 1 + .../test_monolog_log_level_filter.php | 1 + .../test_monolog_log_level_filter_invalid.php | 1 + .../test_monolog_truncate_long_msgs.php | 1 + tests/integration/memcache/test_add.php | 4 +- tests/integration/memcache/test_add.php82.php | 4 +- tests/integration/memcache/test_incr_decr.php | 4 +- .../memcache/test_incr_decr.php82.php | 4 +- .../memcache/test_memcache_add.php | 4 +- .../memcache/test_memcache_add.php82.php | 4 +- .../test_memcache_add_logging_off.php | 6 +- .../test_memcache_add_logging_off.php82.php | 4 +- .../memcache/test_memcache_incr_decr.php | 4 +- .../test_memcache_incr_decr.php82.php | 4 +- .../memcache/test_memcache_replace.php | 4 +- .../memcache/test_memcache_replace.php82.php | 4 +- .../memcache/test_memcache_set.php | 4 +- .../memcache/test_memcache_set.php82.php | 4 +- tests/integration/memcache/test_replace.php | 4 +- .../memcache/test_replace.php82.php | 4 +- tests/integration/memcache/test_set.php | 4 +- tests/integration/memcache/test_set.php82.php | 4 +- tests/integration/memcached/test_basic.php | 4 +- .../memcached/test_basic_logging_off.php | 6 +- tests/integration/memcached/test_by_key.php | 4 +- tests/integration/memcached/test_cas.php5.php | 4 +- tests/integration/memcached/test_cas.php7.php | 4 +- .../memcached/test_cas_by_key.php5.php | 4 +- .../memcached/test_cas_by_key.php7.php | 4 +- tests/integration/memcached/test_concat.php | 4 +- .../memcached/test_concat_by_key.php | 4 +- .../test_concat_by_key_logging_off.php | 6 +- tests/integration/memcached/test_multi.php | 4 +- .../memcached/test_multi_by_key.php | 4 +- tests/integration/mongo/test_execute.php | 4 +- .../mongo/test_execute_logging_off.php | 6 +- tests/integration/mongo/test_find.php | 4 +- tests/integration/mysql/test_db_query.php | 4 +- .../integration/mysql/test_db_query_error.php | 4 +- .../mysql/test_db_query_logging_off.php | 6 +- tests/integration/mysql/test_query.php | 4 +- tests/integration/mysql/test_query_error.php | 4 +- .../mysql/test_unbuffered_query.php | 4 +- .../test_unbuffered_query_logging_off.php | 5 +- .../mysqli/test_bind_param_object_oo.php | 4 +- .../test_bind_param_object_oo_logging_off.php | 6 +- .../integration/mysqli/test_bind_param_oo.php | 4 +- .../mysqli/test_bind_param_proc.php | 4 +- .../mysqli/test_explain_connect.php | 28 +- .../mysqli/test_explain_construct.php | 28 +- .../mysqli/test_explain_database_no_user.php | 28 +- ...t_explain_database_no_user_logging_off.php | 1 + .../mysqli/test_explain_init_oo.php | 28 +- .../test_explain_init_oo_persistent.php | 28 +- .../mysqli/test_explain_init_proc.php | 28 +- .../test_explain_leading_whitespace.php | 28 +- .../mysqli/test_explain_options_garbage.php | 22 +- .../test_explain_real_connect_garbage.php | 22 +- ...plain_real_connect_garbage_logging_off.php | 1 + .../mysqli/test_explain_reused_id.php | 28 +- .../mysqli/test_explain_select_db_oo.php | 28 +- .../mysqli/test_explain_select_db_proc.php | 28 +- .../mysqli/test_multi_query_oo.php | 4 +- .../mysqli/test_multi_query_proc.php | 4 +- .../test_multi_query_proc_logging_off.php | 4 +- .../mysqli/test_mysqli_query_1.php | 4 +- tests/integration/mysqli/test_prepare_oo.php | 26 +- .../integration/mysqli/test_prepare_proc.php | 28 +- tests/integration/mysqli/test_query_oo.php | 28 +- tests/integration/mysqli/test_query_proc.php | 28 +- .../integration/mysqli/test_real_query_oo.php | 4 +- .../mysqli/test_real_query_oo_logging_off.php | 4 +- .../mysqli/test_real_query_proc.php | 28 +- .../mysqli/test_stmt_prepare_oo.php | 4 +- .../mysqli/test_stmt_prepare_proc.php | 4 +- tests/integration/mysqli/test_subclassing.php | 4 +- .../mysqli/test_subclassing.php81.php | 4 +- tests/integration/pdo/test_bad_input_1.php | 4 +- .../pdo/test_bad_input_1_logging_off.php | 6 +- tests/integration/pdo/test_query_1.php | 4 +- tests/integration/pdo/test_query_1.php81.php | 4 +- tests/integration/pdo/test_query_2.php | 4 +- .../pdo/test_query_2_logging_off.php | 6 +- tests/integration/pdo/test_query_3.php | 4 +- tests/integration/pdo/test_query_4.php | 4 +- .../pgsql/test_pg_execute_mixed_use.php | 4 +- .../test_pg_execute_mixed_use_logging_off.php | 6 +- .../pgsql/test_pg_execute_with_resource.php | 4 +- .../test_pg_execute_without_resource.php | 4 +- .../integration/pgsql/test_pg_query_error.php | 4 +- .../pgsql/test_pg_query_params_error.php | 4 +- ...test_pg_query_params_error_logging_off.php | 6 +- .../test_pg_query_params_with_resource.php | 4 +- .../test_pg_query_params_without_resource.php | 4 +- .../pgsql/test_pg_query_with_resource.php | 4 +- ...est_pg_query_with_resource_logging_off.php | 6 +- .../pgsql/test_pg_query_without_resource.php | 4 +- tests/integration/predis/test_basic.php | 46 ++-- .../predis/test_basic_logging_off.php | 46 ++-- .../predis/test_basic_reporting_disabled.php | 19 +- .../predis/test_cross_transaction.php | 42 +-- tests/integration/predis/test_pipeline.php | 50 ++-- .../predis/test_pipeline_atomic.php | 50 ++-- .../predis/test_pipeline_fire_and_forget.php | 50 ++-- ...t_pipeline_fire_and_forget_logging_off.php | 50 ++-- .../integration/predis/test_txn_restarted.php | 19 +- tests/integration/queue/test_basic.php | 4 +- .../queue/test_basic_logging_off.php | 6 +- tests/integration/queue/test_capitalized.php | 4 +- tests/integration/queue/test_malformed.php | 4 +- tests/integration/queue/test_with_prefix.php | 4 +- tests/integration/redis/test_basic.php | 4 +- .../redis/test_basic_logging_off.php | 6 +- tests/integration/redis/test_bitops.php | 4 +- tests/integration/redis/test_decr.php | 4 +- tests/integration/redis/test_geo.php | 4 +- tests/integration/redis/test_hash.php | 4 +- tests/integration/redis/test_incr.php | 4 +- tests/integration/redis/test_list.php | 4 +- .../redis/test_list_logging_off.php | 6 +- tests/integration/redis/test_set.php | 4 +- tests/integration/redis/test_set.redis6.php | 4 +- tests/integration/redis/test_setex.php | 4 +- .../integration/redis/test_stream.redis5.php | 4 +- tests/integration/redis/test_zset.php | 4 +- tests/integration/redis/test_zset.redis5.php | 4 +- tests/integration/sqlite/test_bad_input_1.php | 4 +- tests/integration/sqlite/test_bad_input_2.php | 4 +- tests/integration/sqlite/test_bad_input_3.php | 4 +- tests/integration/sqlite/test_bad_input_4.php | 4 +- tests/integration/sqlite/test_bad_input_5.php | 4 +- tests/integration/sqlite/test_exec.php | 4 +- .../sqlite/test_exec_logging_off.php | 6 +- tests/integration/sqlite/test_query_1.php | 4 +- tests/integration/sqlite/test_query_2.php | 4 +- .../integration/sqlite/test_unbuffered_1.php | 4 +- .../integration/sqlite/test_unbuffered_2.php | 4 +- .../sqlite/test_unbuffered_2_logging_off.php | 6 +- .../integration/sqlite3/test_bad_input_1.php | 4 +- .../integration/sqlite3/test_bad_input_2.php | 4 +- .../integration/sqlite3/test_bad_input_3.php | 4 +- .../sqlite3/test_bad_input_3_logging_off.php | 4 +- .../integration/sqlite3/test_bad_input_4.php | 4 +- .../integration/sqlite3/test_bad_input_5.php | 4 +- tests/integration/sqlite3/test_bad_sql_1.php | 4 +- tests/integration/sqlite3/test_bad_sql_2.php | 4 +- tests/integration/sqlite3/test_query.php | 4 +- .../sqlite3/test_query_logging_off.php | 6 +- .../sqlite3/test_querysingle_1.php | 4 +- .../sqlite3/test_querysingle_2.php | 4 +- .../sqlitedatabase/test_bad_input_1.php | 4 +- .../sqlitedatabase/test_bad_input_2.php | 4 +- .../sqlitedatabase/test_bad_input_3.php | 4 +- .../integration/sqlitedatabase/test_query.php | 4 +- .../sqlitedatabase/test_query_logging_off.php | 6 +- .../sqlitedatabase/test_unbuffered.php | 4 +- 498 files changed, 4299 insertions(+), 1871 deletions(-) create mode 100644 tests/integration/logging/monolog2/checkdecorateformatter.php create mode 100644 tests/integration/logging/monolog2/test_monolog_decoration_and_forwarding.php create mode 100644 tests/integration/logging/monolog2/test_monolog_decoration_basic.php create mode 100644 tests/integration/logging/monolog2/test_monolog_decoration_multiple_handlers.php create mode 100644 tests/integration/logging/monolog3/checkdecorateformatter.php create mode 100644 tests/integration/logging/monolog3/test_monolog_decoration_and_forwarding.php create mode 100644 tests/integration/logging/monolog3/test_monolog_decoration_basic.php create mode 100644 tests/integration/logging/monolog3/test_monolog_decoration_multiple_handlers.php diff --git a/agent/lib_monolog.c b/agent/lib_monolog.c index 2b6e59614..3ea482b9a 100644 --- a/agent/lib_monolog.c +++ b/agent/lib_monolog.c @@ -19,6 +19,14 @@ #include "util_strings.h" #include "util_sleep.h" +/* + * Define name of log decorating processor function + */ +#define LOG_DECORATE_NAMESPACE "Newrelic\\Monolog" +#define LOG_DECORATE_NAMESPACE_LC "newrelic\\monolog" +#define LOG_DECORATE_PROC_FUNC_NAME \ + "newrelic_phpagent_monolog_decorating_processor" + // clang-format off /* * This macro affects how instrumentation $context argument of @@ -400,7 +408,7 @@ NR_PHP_WRAPPER(nr_monolog_logger_addrecord) { timestamp = nr_monolog_get_timestamp(api, argc, NR_EXECUTE_ORIG_ARGS TSRMLS_CC); } - + /* Record the log event */ nr_txn_record_log_event(NRPRG(txn), level_name, message, timestamp, NRPRG(app)); @@ -415,6 +423,54 @@ NR_PHP_WRAPPER(nr_monolog_logger_addrecord) { } NR_PHP_WRAPPER_END +/* + * Create processor function used for log decorating as needed + */ +static int nr_monolog_create_decorate_processor_function(TSRMLS_D) { + int retval = SUCCESS; + zend_function* processor_func = NULL; + + /* see if processor function exists and if not create */ + processor_func = nr_php_find_function(LOG_DECORATE_NAMESPACE_LC "\\" LOG_DECORATE_PROC_FUNC_NAME); + if (NULL == processor_func) { + nrl_verbosedebug(NRL_INSTRUMENT, + "Creating Monolog decorating processor func"); + + /* this function will add NR-LINKING data to the 'extra' array + * entry in the log record. It is careful to confirm all the + * expected linking metadata is present as well as escaping + * special chars in the entity.name */ + retval = zend_eval_string( + "namespace " LOG_DECORATE_NAMESPACE + ";" + "function " LOG_DECORATE_PROC_FUNC_NAME + "($record) {" + " $linkmeta = newrelic_get_linking_metadata();" + " $guid = $linkmeta['entity.guid'] ?? '';" + " $hostname = $linkmeta['hostname'] ?? '';" + " $traceid = $linkmeta['trace.id'] ?? '';" + " $spanid = $linkmeta['span.id'] ?? '';" + " $name = $linkmeta['entity.name'] ?? '';" + " $name = urlencode($name);" + " $data = 'NR-LINKING|' . $guid . '|' . $hostname . '|' ." + " $traceid . '|' . $spanid . '|' . $name . '|';" + " $record['extra']['NR-LINKING'] = $data;" + " return $record;" + "}", + NULL, "newrelic/Monolog/" LOG_DECORATE_PROC_FUNC_NAME TSRMLS_CC); + + if (SUCCESS != retval) { + nrl_warning(NRL_FRAMEWORK, + "%s: error creating Monolog decorating processor function!", + __func__); + } + } else { + nrl_verbosedebug(NRL_INSTRUMENT, "Using existing Monolog decorating processor func"); + } + + return retval; +} + NR_PHP_WRAPPER(nr_monolog_logger_pushhandler) { (void)wraprec; @@ -424,6 +480,11 @@ NR_PHP_WRAPPER(nr_monolog_logger_pushhandler) { goto end; } + nrl_verbosedebug( + NRL_INSTRUMENT, "%s : Monolog handler = %*s", __func__, + NRSAFELEN(nr_php_class_entry_name_length(Z_OBJCE_P(handler))), + nr_php_class_entry_name(Z_OBJCE_P(handler))); + if (nr_txn_log_forwarding_enabled(NRPRG(txn)) && nr_php_object_instanceof_class( handler, "NewRelic\\Monolog\\Enricher\\Handler" TSRMLS_CC)) { @@ -432,6 +493,47 @@ NR_PHP_WRAPPER(nr_monolog_logger_pushhandler) { "application may be sending logs to New Relic twice."); } + if (nr_txn_log_decorating_enabled(NRPRG(txn))) { + zval* callback_name = NULL; + zval* ph_retval = NULL; + + /* Verify the handler implements pushProcessor () */ + if (!nr_php_object_has_method(handler, "pushProcessor" TSRMLS_CC)) { + nrl_warning( + NRL_INSTRUMENT, + "Monolog handler %*s does not implement the pushProcessor() " + "method so log decoration will not occur!", + NRSAFELEN(nr_php_class_entry_name_length(Z_OBJCE_P(handler))), + nr_php_class_entry_name(Z_OBJCE_P(handler))); + + goto end; + } + + /* Create function used to decorate Monolog log records */ + nr_monolog_create_decorate_processor_function(); + + /* + * Actually call pushProcessor + */ + callback_name = nr_php_zval_alloc(); + nr_php_zval_str(callback_name, + LOG_DECORATE_NAMESPACE "\\" LOG_DECORATE_PROC_FUNC_NAME); + + ph_retval = nr_php_call(handler, "pushProcessor", callback_name TSRMLS_CC); + if (!nr_php_is_zval_true(ph_retval)) { + nrl_warning( + NRL_FRAMEWORK, + "%s: error registering Monolog decorating processor function!", + __func__); + } else { + nrl_verbosedebug(NRL_INSTRUMENT, + "Monolog log decorating processor registered"); + } + + nr_php_zval_free(&ph_retval); + nr_php_zval_free(&callback_name); + } + end: NR_PHP_WRAPPER_CALL nr_php_arg_release(&handler); diff --git a/agent/php_minit.c b/agent/php_minit.c index 0980594f2..64aea90ec 100644 --- a/agent/php_minit.c +++ b/agent/php_minit.c @@ -263,16 +263,16 @@ static void nr_php_check_CAT_DT_config(TSRMLS_D) { "the 'newrelic.cross_application_tracer.enabled' INI setting " "in your INI file and enabling DT via the " "'newrelic.distributed_tracing_enabled' INI setting."); - + // set CAT INI value to disabled (just to be safe) NRINI(cross_process_enabled) = 0; } } /* - * @brief Check the INI values for 'logging_enabled' and - * 'log_forwarding_enabled' and log a warning on - * invalid configuration state. + * @brief Check the INI values for 'logging_enabled', + * 'log_forwarding_enabled', and 'log_decorating_enabled' and log a + * warning on invalid configuration state. * */ static void nr_php_check_logging_config(TSRMLS_D) { @@ -283,6 +283,24 @@ static void nr_php_check_logging_config(TSRMLS_D) { "'newrelic.application_logging.logging.enabled' in the agent " "configuration."); } + + if (!NRINI(logging_enabled) && NRINI(log_decorating_enabled)) { + nrl_warning(NRL_INIT, + "Log Decorating will be DISABLED because logging is disabled. " + "Log Decorating requires Logging to be enabled. Please check " + "'newrelic.application_logging.logging.enabled' in the agent " + "configuration."); + } + + if (NRINI(logging_enabled) && NRINI(log_forwarding_enabled) + && NRINI(log_decorating_enabled)) { + nrl_warning(NRL_INIT, + "Log Forwarding and Log Decorating have been enabled! " + "This could lead to duplicated ingest of log messages! " + "Check newrelic.application_logging.forwarding.enabled and " + "newrelic.application_logging.local_decorating.enabled in the " + "agent configuration."); + } } /* @@ -618,7 +636,7 @@ PHP_MINIT_FUNCTION(newrelic) { nr_agent_close_daemon_connection(); } - /* Do some sanity checking of configuration settings and handle accordingly */ + /* Do some checking of configuration settings and handle accordingly */ /* If infinite tracing (8T) is enabled but distributed tracing (DT) is * disabled this is an unworkable combination because span IDs cannot be diff --git a/agent/php_newrelic.h b/agent/php_newrelic.h index 89ebbcf8d..3f1f4b9b5 100644 --- a/agent/php_newrelic.h +++ b/agent/php_newrelic.h @@ -474,6 +474,9 @@ nrinitime_t */ nrinibool_t logging_enabled; /* newrelic.application_logging.enabled */ +nrinibool_t + log_decorating_enabled; /* newrelic.application_logging.local_decorating.enabled + */ nrinibool_t log_forwarding_enabled; /* newrelic.application_logging.forwarding.enabled */ diff --git a/agent/php_nrini.c b/agent/php_nrini.c index e8314c221..ef1be6694 100644 --- a/agent/php_nrini.c +++ b/agent/php_nrini.c @@ -2943,6 +2943,14 @@ STD_PHP_INI_ENTRY_EX("newrelic.application_logging.enabled", zend_newrelic_globals, newrelic_globals, nr_enabled_disabled_dh) +STD_PHP_INI_ENTRY_EX("newrelic.application_logging.local_decorating.enabled", + "0", + NR_PHP_REQUEST, + nr_boolean_mh, + log_decorating_enabled, + zend_newrelic_globals, + newrelic_globals, + nr_enabled_disabled_dh) STD_PHP_INI_ENTRY_EX("newrelic.application_logging.forwarding.enabled", "1", NR_PHP_REQUEST, diff --git a/agent/php_txn.c b/agent/php_txn.c index f2bf9e816..61a32a872 100644 --- a/agent/php_txn.c +++ b/agent/php_txn.c @@ -637,6 +637,11 @@ static void nr_php_txn_send_metrics_once(nrtxn_t* txn TSRMLS_DC) { #define FMT_BOOL(v) (v) ? "enabled" : "disabled" + metname = nr_formatf("Supportability/Logging/LocalDecorating/PHP/%s", + FMT_BOOL(nr_txn_log_decorating_enabled(txn))); + nrm_force_add(NRTXN(unscoped_metrics), metname, 0); + nr_free(metname); + metname = nr_formatf("Supportability/Logging/Forwarding/PHP/%s", FMT_BOOL(nr_txn_log_forwarding_enabled(txn))); nrm_force_add(NRTXN(unscoped_metrics), metname, 0); @@ -740,6 +745,7 @@ nr_status_t nr_php_txn_begin(const char* appnames, opts.span_queue_batch_size = NRINI(agent_span_queue_size); opts.span_queue_batch_timeout = NRINI(agent_span_queue_timeout); opts.logging_enabled = NRINI(logging_enabled); + opts.log_decorating_enabled = NRINI(log_decorating_enabled); opts.log_forwarding_enabled = NRINI(log_forwarding_enabled); opts.log_forwarding_log_level = NRINI(log_forwarding_log_level); opts.log_events_max_samples_stored = NRINI(log_events_max_samples_stored); diff --git a/axiom/nr_txn.c b/axiom/nr_txn.c index 986440b1f..aa0c91c92 100644 --- a/axiom/nr_txn.c +++ b/axiom/nr_txn.c @@ -3316,12 +3316,11 @@ bool nr_txn_log_decorating_enabled(nrtxn_t* txn) { return false; } - if (!txn->options - .logging_enabled /* || !txn->options.log_decorating_enabled */) { + if (!txn->options.logging_enabled || !txn->options.log_decorating_enabled) { return false; } - return false; + return true; } #define ENSURE_LOG_LEVEL_NAME(level_name) \ diff --git a/axiom/nr_txn.h b/axiom/nr_txn.h index ee37667c1..a51424b6a 100644 --- a/axiom/nr_txn.h +++ b/axiom/nr_txn.h @@ -120,6 +120,7 @@ typedef struct _nrtxnopt_t { nrtime_t span_queue_batch_timeout; /* Span queue batch timeout in us. */ bool logging_enabled; /* An overall configuration for enabling/disabling all application logging features */ + bool log_decorating_enabled; /* Whether log decorating is enabled */ bool log_forwarding_enabled; /* Whether log forwarding is enabled */ int log_forwarding_log_level; /* minimum log level to forward to the collector */ diff --git a/axiom/tests/test_txn.c b/axiom/tests/test_txn.c index 74e4c33b2..d3571d6b1 100644 --- a/axiom/tests/test_txn.c +++ b/axiom/tests/test_txn.c @@ -8102,6 +8102,7 @@ static nrtxn_t* new_txn_for_record_log_event_test(char* entity_name) { opts.logging_enabled = true; opts.log_forwarding_enabled = true; opts.log_forwarding_log_level = LOG_LEVEL_WARNING; + opts.log_decorating_enabled = false; opts.log_events_max_samples_stored = 10; opts.log_metrics_enabled = true; @@ -8398,6 +8399,7 @@ static void test_txn_log_configuration(void) { txn->options.logging_enabled = false; txn->high_security = false; + txn->options.log_decorating_enabled = false; txn->options.log_forwarding_enabled = false; txn->options.log_events_max_samples_stored = 0; txn->options.log_metrics_enabled = false; @@ -8419,10 +8421,20 @@ static void test_txn_log_configuration(void) { txn->options.log_events_max_samples_stored = 1; tlib_pass_if_false(__func__, nr_txn_log_forwarding_enabled(txn), "global=0, high_security=0, forwarding=1, samples=1 -> off"); + txn->options.log_forwarding_enabled = false; + txn->options.log_decorating_enabled = true; + tlib_pass_if_false(__func__, nr_txn_log_decorating_enabled(txn), "global=0, high_security=0, decorating=1 -> off"); + + txn->options.log_forwarding_enabled = true; + txn->options.log_decorating_enabled = true; + tlib_pass_if_false(__func__, nr_txn_log_forwarding_enabled(txn), "global=0, high_security=0, forwarding=1, samples=1, decorating=1 -> forwarding off"); + tlib_pass_if_false(__func__, nr_txn_log_decorating_enabled(txn), "global=0, high_security=0, forwarding=1, samples=1, decorating=1 -> decorating off"); + /* log features globally enabled, high security disabled */ txn->options.logging_enabled = true; txn->high_security = false; + txn->options.log_decorating_enabled = false; txn->options.log_forwarding_enabled = false; txn->options.log_events_max_samples_stored = 0; txn->options.log_metrics_enabled = false; @@ -8444,8 +8456,18 @@ static void test_txn_log_configuration(void) { txn->options.log_events_max_samples_stored = 1; tlib_pass_if_true(__func__, nr_txn_log_forwarding_enabled(txn), "global=1, high_security=0, forwarding=1, samples=1 -> on"); + txn->options.log_forwarding_enabled = false; + txn->options.log_decorating_enabled = true; + tlib_pass_if_true(__func__, nr_txn_log_decorating_enabled(txn), "global=1, high_security=0, decorating=1 -> on"); + + txn->options.log_forwarding_enabled = true; + txn->options.log_decorating_enabled = true; + tlib_pass_if_true(__func__, nr_txn_log_forwarding_enabled(txn), "global=1, high_security=0, forwarding=1, samples=1, decorating=1 -> forwarding on"); + tlib_pass_if_true(__func__, nr_txn_log_decorating_enabled(txn), "global=1, high_security=0, forwarding=1, samples=1, decorating=1 -> decorating on"); + /* log features globally disabled, high security enabled */ txn->options.logging_enabled = false; + txn->options.log_decorating_enabled = false; txn->high_security = true; txn->options.log_forwarding_enabled = false; @@ -8469,10 +8491,20 @@ static void test_txn_log_configuration(void) { txn->options.log_events_max_samples_stored = 1; tlib_pass_if_false(__func__, nr_txn_log_forwarding_enabled(txn), "global=0, high_security=1, forwarding=1, samples=1 -> off"); + txn->options.log_forwarding_enabled = false; + txn->options.log_decorating_enabled = true; + tlib_pass_if_false(__func__, nr_txn_log_decorating_enabled(txn), "global=0, high_security=1, decorating=1 -> off"); + + txn->options.log_forwarding_enabled = true; + txn->options.log_decorating_enabled = true; + tlib_pass_if_false(__func__, nr_txn_log_forwarding_enabled(txn), "global=0, high_security=1, forwarding=1, samples=1, decorating=1 -> forwarding off"); + tlib_pass_if_false(__func__, nr_txn_log_decorating_enabled(txn), "global=0, high_security=1, forwarding=1, samples=1, decorating=1 -> decorating off"); + /* log features globally enabled, high security enabled */ txn->options.logging_enabled = true; txn->high_security = true; + txn->options.log_decorating_enabled = false; txn->options.log_forwarding_enabled = false; txn->options.log_events_max_samples_stored = 0; txn->options.log_metrics_enabled = false; @@ -8493,6 +8525,15 @@ static void test_txn_log_configuration(void) { txn->options.log_forwarding_enabled = true; txn->options.log_events_max_samples_stored = 1; tlib_pass_if_false(__func__, nr_txn_log_forwarding_enabled(txn), "global=1, high_security=1, forwarding=1, samples=1 -> off"); + + txn->options.log_forwarding_enabled = false; + txn->options.log_decorating_enabled = true; + tlib_pass_if_true(__func__, nr_txn_log_decorating_enabled(txn), "global=1, high_security=1, decorating=1 -> on"); + + txn->options.log_forwarding_enabled = true; + txn->options.log_decorating_enabled = true; + tlib_pass_if_false(__func__, nr_txn_log_forwarding_enabled(txn), "global=1, high_security=1, forwarding=1, samples=1, decorating=1 -> forwarding off"); + tlib_pass_if_true(__func__, nr_txn_log_decorating_enabled(txn), "global=1, high_security=1, forwarding=1, samples=1, decorating=1 -> decorating on"); // clang-format on } diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_disabled.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_disabled.php index 377595b7c..8a15fabe7 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_disabled.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_disabled.php @@ -88,12 +88,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_duplicate.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_duplicate.php index 29668c04e..9d8f8fc30 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_duplicate.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_duplicate.php @@ -114,7 +114,7 @@ "string": "span str" }, { - "code.lineno": 155, + "code.lineno": 157, "code.filepath": "__FILE__", "code.function": "a" } @@ -142,12 +142,14 @@ [{"name":"Supportability/api/add_custom_span_parameter"}, [3, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_parameter"}, [5, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_duplicate.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_duplicate.php5.php index ba473dac1..2ced24f1d 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_duplicate.php5.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_duplicate.php5.php @@ -132,12 +132,14 @@ [{"name":"Supportability/api/add_custom_span_parameter"}, [3, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_parameter"}, [5, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_duplicate_te_off.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_duplicate_te_off.php index 53599e934..682057acb 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_duplicate_te_off.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_duplicate_te_off.php @@ -88,7 +88,7 @@ "string": "span str" }, { - "code.lineno": 129, + "code.lineno": 131, "code.filepath": "__FILE__", "code.function": "a" } @@ -116,12 +116,14 @@ [{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_parameter"}, [4, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_duplicate_te_off.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_duplicate_te_off.php5.php index a40ca60ae..6726eda98 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_duplicate_te_off.php5.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_duplicate_te_off.php5.php @@ -106,12 +106,14 @@ [{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_parameter"}, [4, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_filter.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_filter.php index bfdd05b29..9e6b356d7 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_filter.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_filter.php @@ -76,7 +76,7 @@ "double": 1.50000 }, { - "code.lineno": 116, + "code.lineno": 118, "code.filepath": "__FILE__", "code.function": "a" } @@ -103,12 +103,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_filter.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_filter.php5.php index 13a6b50b1..2e97dc5f2 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_filter.php5.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_filter.php5.php @@ -93,12 +93,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_filter_logging_off.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_filter_logging_off.php index 4f20b2434..40ca3c916 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_filter_logging_off.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_filter_logging_off.php @@ -79,7 +79,7 @@ "double": 1.50000 }, { - "code.lineno": 118, + "code.lineno": 121, "code.filepath": "__FILE__", "code.function": "a" } @@ -106,11 +106,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_filter_logging_off.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_filter_logging_off.php5.php index f78466738..0f4804782 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_filter_logging_off.php5.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_filter_logging_off.php5.php @@ -96,11 +96,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_key.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_key.php index 4041d05e1..342c3f15e 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_key.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_key.php @@ -76,7 +76,7 @@ "int": 7 }, { - "code.lineno": 116, + "code.lineno": 118, "code.filepath": "__FILE__", "code.function": "a" } @@ -103,12 +103,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_key.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_key.php5.php index ca5fdb1e6..d181a4691 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_key.php5.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_key.php5.php @@ -93,12 +93,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_key_te_off.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_key_te_off.php index bc56402fe..544ff70e7 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_key_te_off.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_key_te_off.php @@ -81,7 +81,7 @@ "int": 7 }, { - "code.lineno": 121, + "code.lineno": 123, "code.filepath": "__FILE__", "code.function": "a" } @@ -108,12 +108,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_key_te_off.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_key_te_off.php5.php index ffd1d6dc8..c3060a4dd 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_key_te_off.php5.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_key_te_off.php5.php @@ -98,12 +98,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_parameters.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_parameters.php index 3d202de87..bef117bfd 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_parameters.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_parameters.php @@ -198,7 +198,7 @@ "1": 1 }, { - "code.lineno": 238, + "code.lineno": 240, "code.filepath": "__FILE__", "code.function": "a" } @@ -225,12 +225,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [64, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_parameters.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_parameters.php5.php index cbf808271..71d1cca08 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_parameters.php5.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_parameters.php5.php @@ -215,12 +215,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [64, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_value.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_value.php index 198162c17..658402980 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_value.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_value.php @@ -76,7 +76,7 @@ "string": "012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234" }, { - "code.lineno": 116, + "code.lineno": 118, "code.filepath": "__FILE__", "code.function": "a" } @@ -103,12 +103,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_value.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_value.php5.php index ee454037c..f1896cd76 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_value.php5.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_value.php5.php @@ -93,12 +93,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_value_te_off.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_value_te_off.php index 4718f7f3c..21bfa0911 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_value_te_off.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_value_te_off.php @@ -86,7 +86,7 @@ "string": "012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234" }, { - "code.lineno": 126, + "code.lineno": 128, "code.filepath": "__FILE__", "code.function": "a" } @@ -113,12 +113,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_value_te_off.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_value_te_off.php5.php index b61f501b3..fe1b596fc 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_value_te_off.php5.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_value_te_off.php5.php @@ -103,12 +103,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters.php index f3fb91bfb..040bf7d00 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters.php @@ -198,7 +198,7 @@ "1": 1 }, { - "code.lineno": 238, + "code.lineno": 240, "code.filepath": "__FILE__", "code.function": "a" } @@ -225,12 +225,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [65, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters.php5.php index a0e3f757c..0e2cf9f14 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters.php5.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters.php5.php @@ -215,12 +215,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [65, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters_te_off.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters_te_off.php index 02a7eb422..0aa959429 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters_te_off.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters_te_off.php @@ -204,7 +204,7 @@ "1": 1 }, { - "code.lineno": 244, + "code.lineno": 246, "code.filepath": "__FILE__", "code.function": "a" } @@ -231,12 +231,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [65, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters_te_off.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters_te_off.php5.php index 5f16b9e21..a9837b59c 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters_te_off.php5.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters_te_off.php5.php @@ -221,12 +221,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [65, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters_te_off_logging_off.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters_te_off_logging_off.php index cb0f1e7ea..ae622e252 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters_te_off_logging_off.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters_te_off_logging_off.php @@ -207,7 +207,7 @@ "1": 1 }, { - "code.lineno": 247, + "code.lineno": 249, "code.filepath": "__FILE__", "code.function": "a" } @@ -233,13 +233,15 @@ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [65, 0, 0, 0, 0, 0]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters_te_off_logging_off.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters_te_off_logging_off.php5.php index 07d22c195..4489ff0fa 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters_te_off_logging_off.php5.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_parameters_te_off_logging_off.php5.php @@ -223,13 +223,15 @@ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [65, 0, 0, 0, 0, 0]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_span_and_te.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_span_and_te.php index bd2aa29af..8096885ba 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_span_and_te.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_span_and_te.php @@ -324,7 +324,7 @@ "35": 35 }, { - "code.lineno": 365, + "code.lineno": 367, "code.filepath": "__FILE__", "code.function": "a" } @@ -352,12 +352,14 @@ [{"name":"Supportability/api/add_custom_parameter"}, [65, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [34, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_span_and_te.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_span_and_te.php5.php index adf592280..15625a351 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_span_and_te.php5.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_span_and_te.php5.php @@ -342,12 +342,14 @@ [{"name":"Supportability/api/add_custom_parameter"}, [65, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [34, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_span_and_te_te_off.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_span_and_te_te_off.php index d9e7c8fe4..851350df5 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_span_and_te_te_off.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_span_and_te_te_off.php @@ -238,7 +238,7 @@ "35": 35 }, { - "code.lineno": 279, + "code.lineno": 281, "code.filepath": "__FILE__", "code.function": "a" } @@ -266,12 +266,14 @@ [{"name":"Supportability/api/add_custom_parameter"}, [65, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [34, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_span_and_te_te_off.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_span_and_te_te_off.php5.php index c0e476e35..ed843a542 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_span_and_te_te_off.php5.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_maxplus_span_and_te_te_off.php5.php @@ -256,12 +256,14 @@ [{"name":"Supportability/api/add_custom_parameter"}, [65, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [34, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_overwrite.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_overwrite.php index e15e09520..605734190 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_overwrite.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_overwrite.php @@ -76,7 +76,7 @@ "bool": false }, { - "code.lineno": 117, + "code.lineno": 119, "code.filepath": "__FILE__", "code.function": "a" } @@ -104,12 +104,14 @@ [{"name":"Supportability/api/add_custom_parameter"}, [3, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [2, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_overwrite.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_overwrite.php5.php index 2b50e41c2..2603a0908 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_overwrite.php5.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_overwrite.php5.php @@ -94,12 +94,14 @@ [{"name":"Supportability/api/add_custom_parameter"}, [3, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [2, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_te_off.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_te_off.php index d30168673..104d198ea 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_te_off.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_te_off.php @@ -78,7 +78,7 @@ "string": "str" }, { - "code.lineno": 118, + "code.lineno": 120, "code.filepath": "__FILE__", "code.function": "a" } @@ -105,12 +105,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_te_off.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_te_off.php5.php index 9a19e34e3..95fc61f19 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_te_off.php5.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_te_off.php5.php @@ -95,12 +95,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_types.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_types.php index a565c9c4c..dc91ae467 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_types.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_types.php @@ -77,7 +77,7 @@ "string": "str" }, { - "code.lineno": 117, + "code.lineno": 119, "code.filepath": "__FILE__", "code.function": "a" } @@ -104,12 +104,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_types.php5.php b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_types.php5.php index 416c7e64b..e26ea6bc3 100644 --- a/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_types.php5.php +++ b/tests/integration/api/add_custom_span_parameter/test_span_event_parameter_types.php5.php @@ -94,12 +94,14 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); newrelic_add_custom_tracer("a"); diff --git a/tests/integration/api/add_custom_tracer/test_happy.php b/tests/integration/api/add_custom_tracer/test_happy.php index 8967c0364..ba65a7aed 100644 --- a/tests/integration/api/add_custom_tracer/test_happy.php +++ b/tests/integration/api/add_custom_tracer/test_happy.php @@ -36,13 +36,15 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/add_custom_tracer"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + function MY_function($x) { echo $x; } diff --git a/tests/integration/api/add_custom_tracer/test_not_user_function.php b/tests/integration/api/add_custom_tracer/test_not_user_function.php index 5c53d1fcb..aa6d08324 100644 --- a/tests/integration/api/add_custom_tracer/test_not_user_function.php +++ b/tests/integration/api/add_custom_tracer/test_not_user_function.php @@ -25,12 +25,14 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/add_custom_tracer"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + newrelic_add_custom_tracer("header"); newrelic_add_custom_tracer("mysqli::close"); diff --git a/tests/integration/api/add_custom_tracer/test_short_segments.php b/tests/integration/api/add_custom_tracer/test_short_segments.php index 71bc1d644..fde7bcee3 100644 --- a/tests/integration/api/add_custom_tracer/test_short_segments.php +++ b/tests/integration/api/add_custom_tracer/test_short_segments.php @@ -75,13 +75,15 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/add_custom_tracer"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + function my_function() { printf(''); } diff --git a/tests/integration/api/custom_metric/test_bad_input.php b/tests/integration/api/custom_metric/test_bad_input.php index fc9da9429..60780c548 100644 --- a/tests/integration/api/custom_metric/test_bad_input.php +++ b/tests/integration/api/custom_metric/test_bad_input.php @@ -43,13 +43,15 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/custom_metric"}, [7, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../../include/tap.php'); $result = @newrelic_custom_metric(); diff --git a/tests/integration/api/custom_metric/test_bad_input.php8.php b/tests/integration/api/custom_metric/test_bad_input.php8.php index b9d5259eb..0fda2de37 100644 --- a/tests/integration/api/custom_metric/test_bad_input.php8.php +++ b/tests/integration/api/custom_metric/test_bad_input.php8.php @@ -43,11 +43,13 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/custom_metric"}, [7, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../../include/tap.php'); $result = @newrelic_custom_metric(); diff --git a/tests/integration/api/custom_metric/test_happy.php b/tests/integration/api/custom_metric/test_happy.php index 938a0acbb..02413bd60 100644 --- a/tests/integration/api/custom_metric/test_happy.php +++ b/tests/integration/api/custom_metric/test_happy.php @@ -34,11 +34,13 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/custom_metric"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../../include/tap.php'); /* diff --git a/tests/integration/api/custom_metric/test_happy_logging_off.php b/tests/integration/api/custom_metric/test_happy_logging_off.php index ed51dc627..8b90ccc42 100644 --- a/tests/integration/api/custom_metric/test_happy_logging_off.php +++ b/tests/integration/api/custom_metric/test_happy_logging_off.php @@ -36,12 +36,14 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/custom_metric"}, [3, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../../include/tap.php'); /* diff --git a/tests/integration/api/datastore/test_all_parameters_no_children.php b/tests/integration/api/datastore/test_all_parameters_no_children.php index bc04939a3..5dfc19488 100644 --- a/tests/integration/api/datastore/test_all_parameters_no_children.php +++ b/tests/integration/api/datastore/test_all_parameters_no_children.php @@ -38,13 +38,15 @@ [{"name":"Supportability/api/add_custom_span_parameter"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/record_datastore_segment"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TXN_TRACES [ "?? agent run id", diff --git a/tests/integration/api/datastore/test_all_parameters_nosql.php b/tests/integration/api/datastore/test_all_parameters_nosql.php index b5a1b8a93..f318b31db 100644 --- a/tests/integration/api/datastore/test_all_parameters_nosql.php +++ b/tests/integration/api/datastore/test_all_parameters_nosql.php @@ -37,13 +37,15 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/record_datastore_segment"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TXN_TRACES [ "?? agent run id", diff --git a/tests/integration/api/datastore/test_all_parameters_sql_no_query.php b/tests/integration/api/datastore/test_all_parameters_sql_no_query.php index 5099764cd..897e877e6 100644 --- a/tests/integration/api/datastore/test_all_parameters_sql_no_query.php +++ b/tests/integration/api/datastore/test_all_parameters_sql_no_query.php @@ -38,13 +38,15 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/record_datastore_segment"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TXN_TRACES [ "?? agent run id", diff --git a/tests/integration/api/datastore/test_all_parameters_sql_obfuscated.php b/tests/integration/api/datastore/test_all_parameters_sql_obfuscated.php index 339a52350..735d04364 100644 --- a/tests/integration/api/datastore/test_all_parameters_sql_obfuscated.php +++ b/tests/integration/api/datastore/test_all_parameters_sql_obfuscated.php @@ -38,13 +38,15 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/record_datastore_segment"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TXN_TRACES [ "?? agent run id", diff --git a/tests/integration/api/datastore/test_all_parameters_sql_obfuscated_logging_off.php b/tests/integration/api/datastore/test_all_parameters_sql_obfuscated_logging_off.php index c579d48dd..cd8da7672 100644 --- a/tests/integration/api/datastore/test_all_parameters_sql_obfuscated_logging_off.php +++ b/tests/integration/api/datastore/test_all_parameters_sql_obfuscated_logging_off.php @@ -40,14 +40,16 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/record_datastore_segment"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TXN_TRACES [ "?? agent run id", diff --git a/tests/integration/api/datastore/test_all_parameters_sql_raw.php b/tests/integration/api/datastore/test_all_parameters_sql_raw.php index 0cd5b1c60..17ead98f8 100644 --- a/tests/integration/api/datastore/test_all_parameters_sql_raw.php +++ b/tests/integration/api/datastore/test_all_parameters_sql_raw.php @@ -38,13 +38,15 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/record_datastore_segment"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TXN_TRACES [ "?? agent run id", diff --git a/tests/integration/api/datastore/test_basic.php b/tests/integration/api/datastore/test_basic.php index 322a135c6..6cf6eab22 100644 --- a/tests/integration/api/datastore/test_basic.php +++ b/tests/integration/api/datastore/test_basic.php @@ -37,13 +37,15 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/record_datastore_segment"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TXN_TRACES [ "?? agent run id", diff --git a/tests/integration/api/error_group_callback/test_error_group_callback_bad_callback.php b/tests/integration/api/error_group_callback/test_error_group_callback_bad_callback.php index dbe235f83..ef04b1766 100644 --- a/tests/integration/api/error_group_callback/test_error_group_callback_bad_callback.php +++ b/tests/integration/api/error_group_callback/test_error_group_callback_bad_callback.php @@ -32,24 +32,26 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + function alpha() { newrelic_notice_error(new Exception('Sample Exception')); diff --git a/tests/integration/api/error_group_callback/test_error_group_callback_bad_callback.php7.php b/tests/integration/api/error_group_callback/test_error_group_callback_bad_callback.php7.php index c0246e6cf..2b46375fd 100644 --- a/tests/integration/api/error_group_callback/test_error_group_callback_bad_callback.php7.php +++ b/tests/integration/api/error_group_callback/test_error_group_callback_bad_callback.php7.php @@ -28,25 +28,27 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/notice_error"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/notice_error"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + function alpha() { newrelic_notice_error(new Exception('Sample Exception')); diff --git a/tests/integration/api/error_group_callback/test_error_group_callback_bad_params.php b/tests/integration/api/error_group_callback/test_error_group_callback_bad_params.php index 7e56d8843..6bb76d45f 100644 --- a/tests/integration/api/error_group_callback/test_error_group_callback_bad_params.php +++ b/tests/integration/api/error_group_callback/test_error_group_callback_bad_params.php @@ -21,25 +21,27 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/notice_error"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/notice_error"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_ERROR_EVENTS [ "?? agent run id", diff --git a/tests/integration/api/error_group_callback/test_error_group_callback_bad_return_null.php b/tests/integration/api/error_group_callback/test_error_group_callback_bad_return_null.php index 9c735aa18..261e82249 100644 --- a/tests/integration/api/error_group_callback/test_error_group_callback_bad_return_null.php +++ b/tests/integration/api/error_group_callback/test_error_group_callback_bad_return_null.php @@ -30,25 +30,27 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/notice_error"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/notice_error"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_ERROR_EVENTS [ "?? agent run id", diff --git a/tests/integration/api/error_group_callback/test_error_group_callback_bad_return_num.php b/tests/integration/api/error_group_callback/test_error_group_callback_bad_return_num.php index 305547e9a..d18bda2d9 100644 --- a/tests/integration/api/error_group_callback/test_error_group_callback_bad_return_num.php +++ b/tests/integration/api/error_group_callback/test_error_group_callback_bad_return_num.php @@ -30,25 +30,27 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/notice_error"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/notice_error"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_ERROR_EVENTS [ "?? agent run id", diff --git a/tests/integration/api/error_group_callback/test_error_group_callback_clobber.php b/tests/integration/api/error_group_callback/test_error_group_callback_clobber.php index 4c7762964..100bcb498 100644 --- a/tests/integration/api/error_group_callback/test_error_group_callback_clobber.php +++ b/tests/integration/api/error_group_callback/test_error_group_callback_clobber.php @@ -29,25 +29,27 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/notice_error"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/set_error_group_callback"}, [2, 0, 0, 0, 0, 0]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/notice_error"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/set_error_group_callback"}, [2, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_ERROR_EVENTS [ "?? agent run id", diff --git a/tests/integration/api/error_group_callback/test_error_group_callback_empty_callback.php b/tests/integration/api/error_group_callback/test_error_group_callback_empty_callback.php index 2993b6007..17b44ce01 100644 --- a/tests/integration/api/error_group_callback/test_error_group_callback_empty_callback.php +++ b/tests/integration/api/error_group_callback/test_error_group_callback_empty_callback.php @@ -21,25 +21,27 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/notice_error"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/notice_error"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_ERROR_EVENTS [ "?? agent run id", diff --git a/tests/integration/api/error_group_callback/test_error_group_callback_error_non_web.php b/tests/integration/api/error_group_callback/test_error_group_callback_error_non_web.php index 92d302377..07d061e99 100644 --- a/tests/integration/api/error_group_callback/test_error_group_callback_error_non_web.php +++ b/tests/integration/api/error_group_callback/test_error_group_callback_error_non_web.php @@ -28,24 +28,26 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_ERROR_EVENTS [ "?? agent run id", diff --git a/tests/integration/api/error_group_callback/test_error_group_callback_error_web.php b/tests/integration/api/error_group_callback/test_error_group_callback_error_web.php index 678b89d4e..ace92ad23 100644 --- a/tests/integration/api/error_group_callback/test_error_group_callback_error_web.php +++ b/tests/integration/api/error_group_callback/test_error_group_callback_error_web.php @@ -34,27 +34,29 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Apdex"}, [0, "??", "??", "??", "??", "??"]], - [{"name": "Apdex/Uri__FILE__"}, [0, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allWeb"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/allWeb"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allWeb"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "HttpDispatcher"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]], - [{"name": "WebTransaction"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "WebTransaction/Uri__FILE__" }, [1, "??", "??", "??", "??", "??"]], - [{"name": "WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Apdex"}, [0, "??", "??", "??", "??", "??"]], + [{"name":"Apdex/Uri__FILE__"}, [0, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allWeb"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/allWeb"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allWeb"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"HttpDispatcher"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]], + [{"name":"WebTransaction"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_ERROR_EVENTS [ "?? agent run id", diff --git a/tests/integration/api/error_group_callback/test_error_group_callback_exception_non_web.php b/tests/integration/api/error_group_callback/test_error_group_callback_exception_non_web.php index 56ed9ef17..974edabe3 100644 --- a/tests/integration/api/error_group_callback/test_error_group_callback_exception_non_web.php +++ b/tests/integration/api/error_group_callback/test_error_group_callback_exception_non_web.php @@ -28,25 +28,27 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/notice_error"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/notice_error"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_ERROR_EVENTS [ "?? agent run id", diff --git a/tests/integration/api/error_group_callback/test_error_group_callback_exception_web.php b/tests/integration/api/error_group_callback/test_error_group_callback_exception_web.php index 0716b9102..5d2db7d6b 100644 --- a/tests/integration/api/error_group_callback/test_error_group_callback_exception_web.php +++ b/tests/integration/api/error_group_callback/test_error_group_callback_exception_web.php @@ -32,28 +32,30 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Apdex"}, [0, "??", "??", "??", "??", "??"]], - [{"name": "Apdex/Uri__FILE__"}, [0, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allWeb"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/allWeb"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allWeb"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "HttpDispatcher"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/notice_error"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]], - [{"name": "WebTransaction"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "WebTransaction/Uri__FILE__" }, [1, "??", "??", "??", "??", "??"]], - [{"name": "WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Apdex"}, [0, "??", "??", "??", "??", "??"]], + [{"name":"Apdex/Uri__FILE__"}, [0, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allWeb"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/allWeb"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allWeb"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"HttpDispatcher"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/notice_error"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]], + [{"name":"WebTransaction"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_ERROR_EVENTS [ "?? agent run id", diff --git a/tests/integration/api/error_group_callback/test_error_group_callback_max_string_len.php b/tests/integration/api/error_group_callback/test_error_group_callback_max_string_len.php index f263cddee..ddc4df3fd 100644 --- a/tests/integration/api/error_group_callback/test_error_group_callback_max_string_len.php +++ b/tests/integration/api/error_group_callback/test_error_group_callback_max_string_len.php @@ -31,25 +31,27 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/notice_error"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/notice_error"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/set_error_group_callback"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_ERROR_EVENTS [ "?? agent run id", diff --git a/tests/integration/api/metadata/test_linking_metadata_dt.php b/tests/integration/api/metadata/test_linking_metadata_dt.php index f318ce978..82e898b09 100644 --- a/tests/integration/api/metadata/test_linking_metadata_dt.php +++ b/tests/integration/api/metadata/test_linking_metadata_dt.php @@ -40,13 +40,15 @@ [{"name":"Supportability/api/create_distributed_trace_payload"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/get_linking_metadata"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); $metadata = newrelic_get_linking_metadata(); diff --git a/tests/integration/api/metadata/test_linking_metadata_dt_logging_off.php b/tests/integration/api/metadata/test_linking_metadata_dt_logging_off.php index 8a621157b..9c0897aeb 100644 --- a/tests/integration/api/metadata/test_linking_metadata_dt_logging_off.php +++ b/tests/integration/api/metadata/test_linking_metadata_dt_logging_off.php @@ -42,14 +42,16 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"},[1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/create_distributed_trace_payload"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/get_linking_metadata"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); $metadata = newrelic_get_linking_metadata(); diff --git a/tests/integration/api/metadata/test_linking_metadata_invalid.php b/tests/integration/api/metadata/test_linking_metadata_invalid.php index a4876e825..66796fef3 100644 --- a/tests/integration/api/metadata/test_linking_metadata_invalid.php +++ b/tests/integration/api/metadata/test_linking_metadata_invalid.php @@ -39,13 +39,15 @@ [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/get_linking_metadata"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); $metadata = newrelic_get_linking_metadata("arg"); diff --git a/tests/integration/api/metadata/test_linking_metadata_invalid.php8.php b/tests/integration/api/metadata/test_linking_metadata_invalid.php8.php index b787d4ca9..831e5840d 100644 --- a/tests/integration/api/metadata/test_linking_metadata_invalid.php8.php +++ b/tests/integration/api/metadata/test_linking_metadata_invalid.php8.php @@ -39,13 +39,15 @@ [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/get_linking_metadata"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); tap_equal(array(), newrelic_get_linking_metadata("arg"), 'empty metadata'); diff --git a/tests/integration/api/metadata/test_linking_metadata_no_dt.php b/tests/integration/api/metadata/test_linking_metadata_no_dt.php index cdcd36798..af9c1dcc1 100644 --- a/tests/integration/api/metadata/test_linking_metadata_no_dt.php +++ b/tests/integration/api/metadata/test_linking_metadata_no_dt.php @@ -34,13 +34,15 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/get_linking_metadata"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); $metadata = newrelic_get_linking_metadata(); diff --git a/tests/integration/api/metadata/test_trace_metadata_dt.php b/tests/integration/api/metadata/test_trace_metadata_dt.php index 982ce77cd..66cc4d43a 100644 --- a/tests/integration/api/metadata/test_trace_metadata_dt.php +++ b/tests/integration/api/metadata/test_trace_metadata_dt.php @@ -36,13 +36,15 @@ [{"name":"Supportability/api/create_distributed_trace_payload"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/get_trace_metadata"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); $metadata = newrelic_get_trace_metadata(); diff --git a/tests/integration/api/metadata/test_trace_metadata_invalid.php b/tests/integration/api/metadata/test_trace_metadata_invalid.php index 3d969bd5f..9d574f0b1 100644 --- a/tests/integration/api/metadata/test_trace_metadata_invalid.php +++ b/tests/integration/api/metadata/test_trace_metadata_invalid.php @@ -42,13 +42,15 @@ [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/get_trace_metadata"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); tap_equal(array(), newrelic_get_trace_metadata("42"), 'empty metadata'); diff --git a/tests/integration/api/metadata/test_trace_metadata_invalid.php8.php b/tests/integration/api/metadata/test_trace_metadata_invalid.php8.php index b42579c3e..20f2bf13d 100644 --- a/tests/integration/api/metadata/test_trace_metadata_invalid.php8.php +++ b/tests/integration/api/metadata/test_trace_metadata_invalid.php8.php @@ -42,13 +42,15 @@ [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/get_trace_metadata"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); tap_equal(array(), newrelic_get_trace_metadata("42"), 'empty metadata'); diff --git a/tests/integration/api/metadata/test_trace_metadata_no_dt.php b/tests/integration/api/metadata/test_trace_metadata_no_dt.php index dd8e9718c..ddb3c9553 100644 --- a/tests/integration/api/metadata/test_trace_metadata_no_dt.php +++ b/tests/integration/api/metadata/test_trace_metadata_no_dt.php @@ -30,13 +30,15 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/get_trace_metadata"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); $metadata = newrelic_get_trace_metadata(); diff --git a/tests/integration/api/other/test_ignore_apdex.php b/tests/integration/api/other/test_ignore_apdex.php index 78cba370a..966336baa 100644 --- a/tests/integration/api/other/test_ignore_apdex.php +++ b/tests/integration/api/other/test_ignore_apdex.php @@ -27,13 +27,15 @@ [{"name":"Supportability/api/background_job"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/ignore_apdex"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /* Ensure that this is a web transaction. */ newrelic_background_job(false); diff --git a/tests/integration/api/other/test_is_sampled_cancelled_txn.php b/tests/integration/api/other/test_is_sampled_cancelled_txn.php index b032593bd..509caa29e 100644 --- a/tests/integration/api/other/test_is_sampled_cancelled_txn.php +++ b/tests/integration/api/other/test_is_sampled_cancelled_txn.php @@ -26,13 +26,15 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/end_transaction"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT ok - newrelic_is_sampled() returns false when transaction is manually ended */ diff --git a/tests/integration/api/other/test_is_sampled_dt_disabled.php b/tests/integration/api/other/test_is_sampled_dt_disabled.php index 1978192a6..ed035ee1a 100644 --- a/tests/integration/api/other/test_is_sampled_dt_disabled.php +++ b/tests/integration/api/other/test_is_sampled_dt_disabled.php @@ -24,13 +24,15 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/is_sampled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT ok - newrelic_is_sampled() returned false with DT disabled */ diff --git a/tests/integration/api/other/test_is_sampled_dt_enabled.php b/tests/integration/api/other/test_is_sampled_dt_enabled.php index 1edbc3519..cee406079 100644 --- a/tests/integration/api/other/test_is_sampled_dt_enabled.php +++ b/tests/integration/api/other/test_is_sampled_dt_enabled.php @@ -26,13 +26,15 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/is_sampled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT ok - newrelic_is_sampled() returned true with DT enabled */ diff --git a/tests/integration/api/other/test_is_sampled_extra_param.php b/tests/integration/api/other/test_is_sampled_extra_param.php index 43ef49b4e..a6e69c592 100644 --- a/tests/integration/api/other/test_is_sampled_extra_param.php +++ b/tests/integration/api/other/test_is_sampled_extra_param.php @@ -38,13 +38,15 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/is_sampled"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_REGEX .*Warning.*newrelic_is_sampled\(\) expects exactly 0 parameters, 1 given.* ok - newrelic_is_sampled\(\) unaffected by inclusion of parameter in call, but logs warning diff --git a/tests/integration/api/other/test_is_sampled_extra_param.php8.php b/tests/integration/api/other/test_is_sampled_extra_param.php8.php index 8ff0f7a24..5aec50923 100644 --- a/tests/integration/api/other/test_is_sampled_extra_param.php8.php +++ b/tests/integration/api/other/test_is_sampled_extra_param.php8.php @@ -38,13 +38,15 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/is_sampled"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_REGEX ^\s*(PHP )?Fatal error:.*Uncaught ArgumentCountError:.*newrelic_is_sampled\(\) expects exactly 0 arguments, 1 given.* */ diff --git a/tests/integration/api/set_appname/test_already_ended.php b/tests/integration/api/set_appname/test_already_ended.php index af7dd0df2..a4cf8824d 100644 --- a/tests/integration/api/set_appname/test_already_ended.php +++ b/tests/integration/api/set_appname/test_already_ended.php @@ -19,23 +19,23 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"see_me"}, [1, 1, 1, 1, 1, 1]], - [{"name":"Supportability/api/custom_metric"}, [1, 0, 0, 0, 0, 0]], - [{"name":"Supportability/api/set_appname/after"}, [1, 0, 0, 0, 0, 0]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"see_me"}, [1, 1, 1, 1, 1, 1]], + [{"name":"Supportability/api/custom_metric"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/api/set_appname/after"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); $appname = ini_get("newrelic.appname"); diff --git a/tests/integration/api/set_appname/test_appname_license.php b/tests/integration/api/set_appname/test_appname_license.php index 746f19307..1e59554f3 100644 --- a/tests/integration/api/set_appname/test_appname_license.php +++ b/tests/integration/api/set_appname/test_appname_license.php @@ -18,24 +18,24 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"see_me"}, [1, 1, 1, 1, 1, 1]], - [{"name":"Supportability/api/custom_metric"}, [1, 0, 0, 0, 0, 0]], - [{"name":"Supportability/api/set_appname/after"}, [1, 0, 0, 0, 0, 0]], - [{"name":"Supportability/api/set_appname/with_license"},[1, 0, 0, 0, 0, 0]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"see_me"}, [1, 1, 1, 1, 1, 1]], + [{"name":"Supportability/api/custom_metric"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/api/set_appname/after"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/api/set_appname/with_license"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); $appname = ini_get("newrelic.appname"); diff --git a/tests/integration/api/set_appname/test_appname_switch_license.php b/tests/integration/api/set_appname/test_appname_switch_license.php index dab456bb5..86a973ef6 100644 --- a/tests/integration/api/set_appname/test_appname_switch_license.php +++ b/tests/integration/api/set_appname/test_appname_switch_license.php @@ -18,27 +18,27 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, - [2, "??", "??", "??", "??", "??"]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, - [2, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"see_me"}, [1, 1, 1, 1, 1, 1]], - [{"name":"see_me_also"}, [1, 1, 1, 1, 1, 1]], - [{"name":"Supportability/api/custom_metric"}, [2, 0, 0, 0, 0, 0]], - [{"name":"Supportability/api/set_appname/before"}, [1, 0, 0, 0, 0, 0]], - [{"name":"Supportability/api/set_appname/after"}, [2, 0, 0, 0, 0, 0]], - [{"name":"Supportability/api/set_appname/switched_license"}, [2, 0, 0, 0, 0, 0]], - [{"name":"Supportability/api/set_appname/with_license"}, [2, 0, 0, 0, 0, 0]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [2, "??", "??", "??", "??", "??"]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"},[2, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"see_me"}, [1, 1, 1, 1, 1, 1]], + [{"name":"see_me_also"}, [1, 1, 1, 1, 1, 1]], + [{"name":"Supportability/api/custom_metric"}, [2, 0, 0, 0, 0, 0]], + [{"name":"Supportability/api/set_appname/before"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/api/set_appname/after"}, [2, 0, 0, 0, 0, 0]], + [{"name":"Supportability/api/set_appname/switched_license"}, [2, 0, 0, 0, 0, 0]], + [{"name":"Supportability/api/set_appname/with_license"}, [2, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [2, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); $appname = ini_get("newrelic.appname"); diff --git a/tests/integration/api/set_appname/test_appname_switch_license_lasp.php b/tests/integration/api/set_appname/test_appname_switch_license_lasp.php index 07aa35752..47c2aa0d2 100644 --- a/tests/integration/api/set_appname/test_appname_switch_license_lasp.php +++ b/tests/integration/api/set_appname/test_appname_switch_license_lasp.php @@ -24,23 +24,23 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/api/custom_metric"}, [1, 0, 0, 0, 0, 0]], - [{"name":"Supportability/api/start_transaction"}, [1, 0, 0, 0, 0, 0]], - [{"name":"see_me"}, [1, 1, 1, 1, 1, 1]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"},[1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/custom_metric"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/api/start_transaction"}, [1, 0, 0, 0, 0, 0]], + [{"name":"see_me"}, [1, 1, 1, 1, 1, 1]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); $appname = ini_get("newrelic.appname"); diff --git a/tests/integration/api/set_appname/test_bad_params.php b/tests/integration/api/set_appname/test_bad_params.php index f64792574..30d1d5242 100644 --- a/tests/integration/api/set_appname/test_bad_params.php +++ b/tests/integration/api/set_appname/test_bad_params.php @@ -48,13 +48,15 @@ [{"name":"Supportability/api/custom_metric"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/set_appname/before"}, [5, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); $appname = ini_get("newrelic.appname"); diff --git a/tests/integration/api/set_appname/test_bad_params.php8.php b/tests/integration/api/set_appname/test_bad_params.php8.php index 8a0a2a02f..4397b395a 100644 --- a/tests/integration/api/set_appname/test_bad_params.php8.php +++ b/tests/integration/api/set_appname/test_bad_params.php8.php @@ -42,13 +42,15 @@ [{"name":"Supportability/api/custom_metric"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/set_appname/before"}, [5, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); $appname = ini_get("newrelic.appname"); diff --git a/tests/integration/api/set_appname/test_no_license.php b/tests/integration/api/set_appname/test_no_license.php index 73e03fb3a..0a507cf55 100644 --- a/tests/integration/api/set_appname/test_no_license.php +++ b/tests/integration/api/set_appname/test_no_license.php @@ -18,23 +18,23 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"see_me"}, [1, 1, 1, 1, 1, 1]], - [{"name":"Supportability/api/custom_metric"}, [1, 0, 0, 0, 0, 0]], - [{"name":"Supportability/api/set_appname/after"}, [1, 0, 0, 0, 0, 0]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"see_me"}, [1, 1, 1, 1, 1, 1]], + [{"name":"Supportability/api/custom_metric"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/api/set_appname/after"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); $appname = ini_get("newrelic.appname"); diff --git a/tests/integration/api/set_appname/test_transmit_false.php b/tests/integration/api/set_appname/test_transmit_false.php index 1f631384f..9bc2b23f7 100644 --- a/tests/integration/api/set_appname/test_transmit_false.php +++ b/tests/integration/api/set_appname/test_transmit_false.php @@ -19,25 +19,24 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"see_me"}, [1, 1, 1, 1, 1, 1]], - [{"name":"Supportability/api/custom_metric"}, [1, 0, 0, 0, 0, 0]], - [{"name":"Supportability/api/set_appname/after"}, [1, 0, 0, 0, 0, 0]], - [{"name":"Supportability/api/set_appname/with_license"},[1, 0, 0, 0, 0, 0]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] - + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"see_me"}, [1, 1, 1, 1, 1, 1]], + [{"name":"Supportability/api/custom_metric"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/api/set_appname/after"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/api/set_appname/with_license"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); $appname = ini_get("newrelic.appname"); diff --git a/tests/integration/api/set_appname/test_transmit_int.php b/tests/integration/api/set_appname/test_transmit_int.php index fbae44f51..340de0855 100644 --- a/tests/integration/api/set_appname/test_transmit_int.php +++ b/tests/integration/api/set_appname/test_transmit_int.php @@ -32,13 +32,15 @@ [{"name":"Supportability/api/set_appname/after"}, [2, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/set_appname/before"}, [2, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [3, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [3, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [3, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [3, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); $appname = ini_get("newrelic.appname"); diff --git a/tests/integration/api/set_appname/test_transmit_true.php b/tests/integration/api/set_appname/test_transmit_true.php index 9e9e837df..c6e3fe22b 100644 --- a/tests/integration/api/set_appname/test_transmit_true.php +++ b/tests/integration/api/set_appname/test_transmit_true.php @@ -33,13 +33,15 @@ [{"name":"Supportability/api/set_appname/before"}, [2, 0, 0, 0, 0, 0]], [{"name":"Supportability/api/set_appname/with_license"}, [2, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [3, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [3, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [3, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [3, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); $appname = ini_get("newrelic.appname"); diff --git a/tests/integration/api/set_user_id/test_set_user_id.php b/tests/integration/api/set_user_id/test_set_user_id.php index cec19cbe9..38afe8c23 100644 --- a/tests/integration/api/set_user_id/test_set_user_id.php +++ b/tests/integration/api/set_user_id/test_set_user_id.php @@ -24,19 +24,21 @@ "??", "??", [ - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/set_user_id"}, [1, 0, 0, 0, 0, 0]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/set_user_id"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SPAN_EVENTS [ "?? agent run id", diff --git a/tests/integration/api/set_user_id/test_set_user_id_empty_string.php b/tests/integration/api/set_user_id/test_set_user_id_empty_string.php index 3d526be59..a51035d71 100644 --- a/tests/integration/api/set_user_id/test_set_user_id_empty_string.php +++ b/tests/integration/api/set_user_id/test_set_user_id_empty_string.php @@ -27,19 +27,21 @@ "??", "??", [ - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/set_user_id"}, [1, 0, 0, 0, 0, 0]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/set_user_id"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SPAN_EVENTS [ "?? agent run id", diff --git a/tests/integration/api/set_user_id/test_set_user_id_error.php b/tests/integration/api/set_user_id/test_set_user_id_error.php index 1a8029c3a..7f296eead 100644 --- a/tests/integration/api/set_user_id/test_set_user_id_error.php +++ b/tests/integration/api/set_user_id/test_set_user_id_error.php @@ -16,24 +16,26 @@ "??", "??", [ - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/set_user_id"}, [1, 0, 0, 0, 0, 0]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/set_user_id"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/api/set_user_id/test_set_user_id_exceeds_maxlen.php b/tests/integration/api/set_user_id/test_set_user_id_exceeds_maxlen.php index 01faa83bb..1a369a76b 100644 --- a/tests/integration/api/set_user_id/test_set_user_id_exceeds_maxlen.php +++ b/tests/integration/api/set_user_id/test_set_user_id_exceeds_maxlen.php @@ -23,19 +23,21 @@ "??", "??", [ - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/set_user_id"}, [1, 0, 0, 0, 0, 0]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/set_user_id"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SPAN_EVENTS [ "?? agent run id", diff --git a/tests/integration/api/set_user_id/test_set_user_id_exception.php b/tests/integration/api/set_user_id/test_set_user_id_exception.php index cbb977f74..224f729d7 100644 --- a/tests/integration/api/set_user_id/test_set_user_id_exception.php +++ b/tests/integration/api/set_user_id/test_set_user_id_exception.php @@ -16,25 +16,27 @@ "??", "??", [ - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/notice_error"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/set_user_id"}, [1, 0, 0, 0, 0, 0]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/notice_error"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/set_user_id"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/api/set_user_id/test_set_user_id_noarg.php b/tests/integration/api/set_user_id/test_set_user_id_noarg.php index f06496260..09c18914a 100644 --- a/tests/integration/api/set_user_id/test_set_user_id_noarg.php +++ b/tests/integration/api/set_user_id/test_set_user_id_noarg.php @@ -23,19 +23,21 @@ "??", "??", [ - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/set_user_id"}, [1, 0, 0, 0, 0, 0]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/set_user_id"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SPAN_EVENTS [ "?? agent run id", diff --git a/tests/integration/api/set_user_id/test_set_user_id_non_string.php b/tests/integration/api/set_user_id/test_set_user_id_non_string.php index 226131972..b54b24c4f 100644 --- a/tests/integration/api/set_user_id/test_set_user_id_non_string.php +++ b/tests/integration/api/set_user_id/test_set_user_id_non_string.php @@ -23,19 +23,21 @@ "??", "??", [ - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/set_user_id"}, [1, 0, 0, 0, 0, 0]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/set_user_id"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SPAN_EVENTS [ "?? agent run id", diff --git a/tests/integration/api/set_user_id/test_set_user_id_null.php b/tests/integration/api/set_user_id/test_set_user_id_null.php index 076dd30ec..beae49a97 100644 --- a/tests/integration/api/set_user_id/test_set_user_id_null.php +++ b/tests/integration/api/set_user_id/test_set_user_id_null.php @@ -23,19 +23,21 @@ "??", "??", [ - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/api/set_user_id"}, [1, 0, 0, 0, 0, 0]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/set_user_id"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SPAN_EVENTS [ "?? agent run id", diff --git a/tests/integration/basic/test_call_user_func_array_0.php b/tests/integration/basic/test_call_user_func_array_0.php index a38a99e2f..fda267f67 100644 --- a/tests/integration/basic/test_call_user_func_array_0.php +++ b/tests/integration/basic/test_call_user_func_array_0.php @@ -35,13 +35,15 @@ [{"name":"Supportability/api/add_custom_tracer"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/framework/CodeIgniter/forced"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + function foo($n) { printf("foo=%d\n", $n); } diff --git a/tests/integration/basic/test_dl.php b/tests/integration/basic/test_dl.php index db080ab10..d7f70ba78 100644 --- a/tests/integration/basic/test_dl.php +++ b/tests/integration/basic/test_dl.php @@ -30,13 +30,15 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/InstrumentedFunction/dl"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "??", diff --git a/tests/integration/basic/test_output_buffer.php b/tests/integration/basic/test_output_buffer.php index 89eee764c..8b8dbd0c2 100644 --- a/tests/integration/basic/test_output_buffer.php +++ b/tests/integration/basic/test_output_buffer.php @@ -40,13 +40,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + echo "junk0\n"; ob_end_clean (); echo "junk1\n"; ob_end_flush (); diff --git a/tests/integration/basic/test_output_buffer_logging_off.php b/tests/integration/basic/test_output_buffer_logging_off.php index cc768f16e..d559d4140 100644 --- a/tests/integration/basic/test_output_buffer_logging_off.php +++ b/tests/integration/basic/test_output_buffer_logging_off.php @@ -42,14 +42,16 @@ [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + echo "junk0\n"; ob_end_clean (); echo "junk1\n"; ob_end_flush (); diff --git a/tests/integration/distributed_tracing/newrelic/test_inbound_payload_rejects_if_no_tx_or_id.php b/tests/integration/distributed_tracing/newrelic/test_inbound_payload_rejects_if_no_tx_or_id.php index 41438d97b..9ff046acd 100644 --- a/tests/integration/distributed_tracing/newrelic/test_inbound_payload_rejects_if_no_tx_or_id.php +++ b/tests/integration/distributed_tracing/newrelic/test_inbound_payload_rejects_if_no_tx_or_id.php @@ -38,13 +38,15 @@ [{"name":"Supportability/api/accept_distributed_trace_payload"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/AcceptPayload/ParseException"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + $payload = "{\"v\":[0,1],\"d\":{\"ty\":\"App\",\"ac\":\"000000\",\"ap\":\"1111111\",\"tr\":\"3925aa3552e648dd\",\"pr\":1.82236,\"sa\":true,\"ti\":1538512769934,\"tk\":\"{$_ENV['ACCOUNT_supportability_trusted']}\"}}"; newrelic_accept_distributed_trace_payload($payload); diff --git a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_exception.php b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_exception.php index 10b2957cd..6c28d7158 100644 --- a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_exception.php +++ b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_exception.php @@ -33,12 +33,14 @@ [{"name":"Supportability/api/accept_distributed_trace_payload"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Exception"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + $payload = newrelic_create_distributed_trace_payload(); newrelic_accept_distributed_trace_payload($payload); diff --git a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_createBeforeAccept.php b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_createBeforeAccept.php index 379393fa7..5b9a4cc83 100644 --- a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_createBeforeAccept.php +++ b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_createBeforeAccept.php @@ -36,12 +36,14 @@ [{"name":"Supportability/DistributedTrace/AcceptPayload/Ignored/CreateBeforeAccept"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"},[1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + $payload = newrelic_create_distributed_trace_payload(); newrelic_accept_distributed_trace_payload($payload); diff --git a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_majorVersion.php b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_majorVersion.php index f9137fd29..be5197d5a 100644 --- a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_majorVersion.php +++ b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_majorVersion.php @@ -39,13 +39,15 @@ [{"name":"Supportability/api/accept_distributed_trace_payload"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/AcceptPayload/Ignored/MajorVersion"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + $payload = "{\"v\":[1,1],\"d\":{\"ty\":\"App\",\"ac\":\"000000\",\"ap\":\"1111111\",\"id\":\"3925aa3552e648dd\",\"tr\":\"3925aa3552e648dd\",\"pr\":1.82236,\"sa\":true,\"ti\":1538512769934,\"tk\":\"{$_ENV['ACCOUNT_supportability_trusted']}\"}}"; newrelic_accept_distributed_trace_payload($payload); diff --git a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_multiple.php b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_multiple.php index adb32108d..d567b2e31 100644 --- a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_multiple.php +++ b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_multiple.php @@ -41,13 +41,15 @@ [{"name":"TransportDuration/App/ENV[ACCOUNT_supportability]/ENV[APP_supportability]/Unknown/all"},[1, "??", "??", "??", "??", "??"]], [{"name":"TransportDuration/App/ENV[ACCOUNT_supportability]/ENV[APP_supportability]/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + $payload = "{\"v\":[0,1],\"d\":{\"ty\":\"App\",\"ac\":\"{$_ENV['ACCOUNT_supportability']}\",\"ap\":\"{$_ENV['APP_supportability']}\",\"id\":\"3925aa3552e648dd\",\"tr\":\"3925aa3552e648dd\",\"pr\":1.82236,\"sa\":true,\"ti\":1538512769934,\"tk\":\"{$_ENV['ACCOUNT_supportability_trusted']}\"}}"; newrelic_accept_distributed_trace_payload($payload); newrelic_accept_distributed_trace_payload($payload); diff --git a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_multiple_logging_off.php b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_multiple_logging_off.php index 9e209a5bc..d5857bde0 100644 --- a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_multiple_logging_off.php +++ b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_multiple_logging_off.php @@ -44,13 +44,15 @@ [{"name":"TransportDuration/App/ENV[ACCOUNT_supportability]/ENV[APP_supportability]/Unknown/all"},[1, "??", "??", "??", "??", "??"]], [{"name":"TransportDuration/App/ENV[ACCOUNT_supportability]/ENV[APP_supportability]/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + $payload = "{\"v\":[0,1],\"d\":{\"ty\":\"App\",\"ac\":\"{$_ENV['ACCOUNT_supportability']}\",\"ap\":\"{$_ENV['APP_supportability']}\",\"id\":\"3925aa3552e648dd\",\"tr\":\"3925aa3552e648dd\",\"pr\":1.82236,\"sa\":true,\"ti\":1538512769934,\"tk\":\"{$_ENV['ACCOUNT_supportability_trusted']}\"}}"; newrelic_accept_distributed_trace_payload($payload); newrelic_accept_distributed_trace_payload($payload); diff --git a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_null.php b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_null.php index 3a9f02491..d6a8a3477 100644 --- a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_null.php +++ b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_null.php @@ -34,11 +34,13 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/AcceptPayload/Ignored/Null"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + newrelic_accept_distributed_trace_payload(); diff --git a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_untrustedAccount.php b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_untrustedAccount.php index f5cc9fb87..a2c2eb33f 100644 --- a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_untrustedAccount.php +++ b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_untrustedAccount.php @@ -30,13 +30,15 @@ [{"name":"Supportability/api/accept_distributed_trace_payload"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/AcceptPayload/Ignored/UntrustedAccount"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + $payload = '{"v":[0,1],"d":{"ty":"App","ac":"000000","ap":"1111111","id":"3925aa3552e648dd","tr":"3925aa3552e648dd","pr":1.82236,"sa":true,"ti":1538512769934,"tk":"12345"}}'; newrelic_accept_distributed_trace_payload($payload); diff --git a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_untrustedAccount_httpsafe.php b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_untrustedAccount_httpsafe.php index c7030a03b..043bfa0fc 100644 --- a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_untrustedAccount_httpsafe.php +++ b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_untrustedAccount_httpsafe.php @@ -31,13 +31,15 @@ [{"name":"Supportability/api/accept_distributed_trace_payload"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/AcceptPayload/Ignored/UntrustedAccount"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + $payload = '{"v":[0,1],"d":{"ty":"App","ac":"000000","ap":"1111111","id":"3925aa3552e648dd","tr":"3925aa3552e648dd","pr":1.82236,"sa":true,"ti":1538512769934,"tk":"123456"}}'; $encodedPayload = base64_encode($payload); diff --git a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_untrustedAccount_logging_off.php b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_untrustedAccount_logging_off.php index f7915c23b..bf9974f71 100644 --- a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_untrustedAccount_logging_off.php +++ b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_ignored_untrustedAccount_logging_off.php @@ -32,14 +32,16 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/accept_distributed_trace_payload"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/AcceptPayload/Ignored/UntrustedAccount"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + $payload = '{"v":[0,1],"d":{"ty":"App","ac":"000000","ap":"1111111","id":"3925aa3552e648dd","tr":"3925aa3552e648dd","pr":1.82236,"sa":true,"ti":1538512769934,"tk":"12345"}}'; newrelic_accept_distributed_trace_payload($payload); diff --git a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_parseexception.php b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_parseexception.php index cb22b754b..470fcb13a 100644 --- a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_parseexception.php +++ b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_parseexception.php @@ -30,13 +30,15 @@ [{"name":"Supportability/api/accept_distributed_trace_payload"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/AcceptPayload/ParseException"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + $payload = '{"v":[0,1],"d":{"ac":"000000","ap":"1111111","id":"2222222222222222","tr":"4444444444444444","pr":1.55555,"sa":true,"ti":7777777777777,"tk":"888888"}}'; newrelic_accept_distributed_trace_payload($payload); diff --git a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_success.php b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_success.php index e10599e91..6c8bf8ac2 100644 --- a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_success.php +++ b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_success.php @@ -39,13 +39,15 @@ [{"name":"TransportDuration/App/ENV[ACCOUNT_supportability]/ENV[APP_supportability]/Unknown/all"},[1, "??", "??", "??", "??", "??"]], [{"name":"TransportDuration/App/ENV[ACCOUNT_supportability]/ENV[APP_supportability]/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + $payload = "{\"v\":[0,1],\"d\":{\"ty\":\"App\",\"ac\":\"{$_ENV['ACCOUNT_supportability']}\",\"ap\":\"{$_ENV['APP_supportability']}\",\"id\":\"3925aa3552e648dd\",\"tr\":\"3925aa3552e648dd\",\"pr\":1.82236,\"sa\":true,\"ti\":1538512769934,\"tk\":\"{$_ENV['ACCOUNT_supportability_trusted']}\"}}"; newrelic_accept_distributed_trace_payload($payload); diff --git a/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_empty_array.php b/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_empty_array.php index 8a1225b88..722db3181 100644 --- a/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_empty_array.php +++ b/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_empty_array.php @@ -34,13 +34,15 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/insert_distributed_trace_headers"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT ok - insert function succeeded ok - newrelic header is present diff --git a/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_happy.php b/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_happy.php index cf70a31dd..c4e961fc8 100644 --- a/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_happy.php +++ b/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_happy.php @@ -34,13 +34,15 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/insert_distributed_trace_headers"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT ok - insert function succeeded ok - preexisting header is present diff --git a/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_happy_logging_off.php b/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_happy_logging_off.php index d1ebb9cdc..fa8e0d92c 100644 --- a/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_happy_logging_off.php +++ b/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_happy_logging_off.php @@ -36,14 +36,16 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"},[1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/insert_distributed_trace_headers"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT ok - insert function succeeded ok - preexisting header is present diff --git a/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_nonref.php b/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_nonref.php index 0bbf5ffd7..275e1544b 100644 --- a/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_nonref.php +++ b/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_nonref.php @@ -29,13 +29,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_REGEX ^\s*(PHP )?Fatal error:.*passed by reference.* */ diff --git a/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_wrong_arg_type.php b/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_wrong_arg_type.php index 7bbe11901..7da4a6eb4 100644 --- a/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_wrong_arg_type.php +++ b/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_wrong_arg_type.php @@ -37,13 +37,15 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/insert_distributed_trace_headers"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_REGEX Warning: newrelic_insert_distributed_trace_headers\(\) expects parameter 1 to be array,.* ok - rejected non-array argument diff --git a/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_wrong_arg_type.php8.php b/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_wrong_arg_type.php8.php index 81f77d597..427f1f121 100644 --- a/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_wrong_arg_type.php8.php +++ b/tests/integration/distributed_tracing/w3c/test_insert_dt_headers_wrong_arg_type.php8.php @@ -37,13 +37,15 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/insert_distributed_trace_headers"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_REGEX ^\s*(PHP )?Fatal error:.*Uncaught TypeError:.*newrelic_insert_distributed_trace_headers\(\).* */ diff --git a/tests/integration/distributed_tracing/w3c/test_invalid_inbound.php b/tests/integration/distributed_tracing/w3c/test_invalid_inbound.php index 8789d5137..b6f2ce76e 100644 --- a/tests/integration/distributed_tracing/w3c/test_invalid_inbound.php +++ b/tests/integration/distributed_tracing/w3c/test_invalid_inbound.php @@ -28,13 +28,15 @@ [{"name":"Supportability/api/accept_distributed_trace_headers"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/TraceContext/TraceParent/Parse/Exception"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + $payload = array( 'traceparent' => "00-00000000-7d3efb1b173fecfa-00", 'tracestate' => "dd=YzRiMTIxODk1NmVmZTE4ZQ" diff --git a/tests/integration/distributed_tracing/w3c/test_valid_inbound_headers.php b/tests/integration/distributed_tracing/w3c/test_valid_inbound_headers.php index 384c1159c..112d6f429 100644 --- a/tests/integration/distributed_tracing/w3c/test_valid_inbound_headers.php +++ b/tests/integration/distributed_tracing/w3c/test_valid_inbound_headers.php @@ -39,13 +39,15 @@ [{"name":"TransportDuration/App/1349956/41346604/Unknown/all"},[1, "??", "??", "??", "??", "??"]], [{"name":"TransportDuration/App/1349956/41346604/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + $payload = array( 'traceparent' => "00-74be672b84ddc4e4b28be285632bbc0a-27ddd2d8890283b4-01", 'tracestate' => "{$_ENV['ACCOUNT_supportability_trusted']}@nr=0-0-1349956-41346604-27ddd2d8890283b4-b28be285632bbc0a-1-1.1273-1569367663277" diff --git a/tests/integration/distributed_tracing/w3c/test_valid_inbound_headers_logging_off.php b/tests/integration/distributed_tracing/w3c/test_valid_inbound_headers_logging_off.php index b53ac857d..87a75d3fa 100644 --- a/tests/integration/distributed_tracing/w3c/test_valid_inbound_headers_logging_off.php +++ b/tests/integration/distributed_tracing/w3c/test_valid_inbound_headers_logging_off.php @@ -41,14 +41,16 @@ [{"name":"Supportability/api/accept_distributed_trace_headers"}, [1, "??", "??", "??", "??", "??"]], [{"name":"TransportDuration/App/1349956/41346604/Unknown/all"},[1, "??", "??", "??", "??", "??"]], [{"name":"TransportDuration/App/1349956/41346604/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + $payload = array( 'traceparent' => "00-74be672b84ddc4e4b28be285632bbc0a-27ddd2d8890283b4-01", 'tracestate' => "{$_ENV['ACCOUNT_supportability_trusted']}@nr=0-0-1349956-41346604-27ddd2d8890283b4-b28be285632bbc0a-1-1.1273-1569367663277" diff --git a/tests/integration/distributed_tracing/w3c/test_valid_inbound_headers_parsed_key.php b/tests/integration/distributed_tracing/w3c/test_valid_inbound_headers_parsed_key.php index 50ede62a6..63950f174 100644 --- a/tests/integration/distributed_tracing/w3c/test_valid_inbound_headers_parsed_key.php +++ b/tests/integration/distributed_tracing/w3c/test_valid_inbound_headers_parsed_key.php @@ -39,13 +39,15 @@ [{"name":"TransportDuration/App/1349956/41346604/Unknown/all"},[1, "??", "??", "??", "??", "??"]], [{"name":"TransportDuration/App/1349956/41346604/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + $payload = array( 'HtTp_tRacepArent' => "00-74be672b84ddc4e4b28be285632bbc0a-27ddd2d8890283b4-01", 'hTtP_trAceState' => "{$_ENV['ACCOUNT_supportability_trusted']}@nr=0-0-1349956-41346604-27ddd2d8890283b4-b28be285632bbc0a-1-1.1273-1569367663277" diff --git a/tests/integration/distributed_tracing/w3c/test_valid_inbound_no_sampled.php b/tests/integration/distributed_tracing/w3c/test_valid_inbound_no_sampled.php index 6167f69c1..06b7a437d 100644 --- a/tests/integration/distributed_tracing/w3c/test_valid_inbound_no_sampled.php +++ b/tests/integration/distributed_tracing/w3c/test_valid_inbound_no_sampled.php @@ -39,13 +39,15 @@ [{"name":"TransportDuration/Mobile/111111/2827902/HTTP/all"},[1, "??", "??", "??", "??", "??"]], [{"name":"TransportDuration/Mobile/111111/2827902/HTTP/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_ANALYTICS_EVENTS [ "?? agent run id", diff --git a/tests/integration/distributed_tracing/w3c/test_valid_inbound_non_newrelic.php b/tests/integration/distributed_tracing/w3c/test_valid_inbound_non_newrelic.php index 3b1e150f3..5f4dff7c0 100644 --- a/tests/integration/distributed_tracing/w3c/test_valid_inbound_non_newrelic.php +++ b/tests/integration/distributed_tracing/w3c/test_valid_inbound_non_newrelic.php @@ -38,13 +38,15 @@ [{"name":"TransportDuration/App/33/5043/HTTPS/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"TransportDuration/App/33/5043/HTTPS/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_ANALYTICS_EVENTS [ "?? agent run id", diff --git a/tests/integration/distributed_tracing/w3c/test_valid_no_nr_state.php b/tests/integration/distributed_tracing/w3c/test_valid_no_nr_state.php index 1b80b914d..14767c2c6 100644 --- a/tests/integration/distributed_tracing/w3c/test_valid_no_nr_state.php +++ b/tests/integration/distributed_tracing/w3c/test_valid_no_nr_state.php @@ -32,13 +32,15 @@ [{"name":"TransportDuration/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"TransportDuration/Unknown/Unknown/Unknown/Unknown/all"},[1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_ANALYTICS_EVENTS [ "?? agent run id", diff --git a/tests/integration/errors/test_top_level_exception_tracer.php b/tests/integration/errors/test_top_level_exception_tracer.php index f37c8cd61..4b697582d 100644 --- a/tests/integration/errors/test_top_level_exception_tracer.php +++ b/tests/integration/errors/test_top_level_exception_tracer.php @@ -33,13 +33,15 @@ [{"name":"Custom/handler", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_ERROR_EVENTS null */ diff --git a/tests/integration/errors/test_top_level_exception_tracer_logging_off.php b/tests/integration/errors/test_top_level_exception_tracer_logging_off.php index ea4ebefea..23139b2a3 100644 --- a/tests/integration/errors/test_top_level_exception_tracer_logging_off.php +++ b/tests/integration/errors/test_top_level_exception_tracer_logging_off.php @@ -35,14 +35,16 @@ [{"name":"Custom/handler"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Custom/handler", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_ERROR_EVENTS null */ diff --git a/tests/integration/external/curl_exec/test_cat_and_synthetics_disabled.php b/tests/integration/external/curl_exec/test_cat_and_synthetics_disabled.php index 7e3353462..6e60d4b95 100644 --- a/tests/integration/external/curl_exec/test_cat_and_synthetics_disabled.php +++ b/tests/integration/external/curl_exec/test_cat_and_synthetics_disabled.php @@ -67,13 +67,15 @@ [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + if (!extension_loaded("curl")) { die("skip: curl extension required"); } diff --git a/tests/integration/external/curl_exec/test_cat_disabled.php b/tests/integration/external/curl_exec/test_cat_disabled.php index 49c7567d3..3b874ad5b 100644 --- a/tests/integration/external/curl_exec/test_cat_disabled.php +++ b/tests/integration/external/curl_exec/test_cat_disabled.php @@ -38,13 +38,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + if (!extension_loaded("curl")) { die("skip: curl extension required"); } diff --git a/tests/integration/external/curl_exec/test_cat_disabled_by_default.php b/tests/integration/external/curl_exec/test_cat_disabled_by_default.php index 3f92b26d9..bdd21d61f 100644 --- a/tests/integration/external/curl_exec/test_cat_disabled_by_default.php +++ b/tests/integration/external/curl_exec/test_cat_disabled_by_default.php @@ -38,13 +38,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + if (!extension_loaded("curl")) { die("skip: curl extension required"); } diff --git a/tests/integration/external/curl_exec/test_cat_request_headers_empty_array.php b/tests/integration/external/curl_exec/test_cat_request_headers_empty_array.php index a839ceff7..6fb3177ad 100644 --- a/tests/integration/external/curl_exec/test_cat_request_headers_empty_array.php +++ b/tests/integration/external/curl_exec/test_cat_request_headers_empty_array.php @@ -56,13 +56,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_exec/test_cat_request_headers_present.php b/tests/integration/external/curl_exec/test_cat_request_headers_present.php index 1b909e22f..cdf0aa712 100644 --- a/tests/integration/external/curl_exec/test_cat_request_headers_present.php +++ b/tests/integration/external/curl_exec/test_cat_request_headers_present.php @@ -56,13 +56,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_exec/test_cat_request_headers_present_array.php b/tests/integration/external/curl_exec/test_cat_request_headers_present_array.php index 2dbe8e01a..d1d873414 100644 --- a/tests/integration/external/curl_exec/test_cat_request_headers_present_array.php +++ b/tests/integration/external/curl_exec/test_cat_request_headers_present_array.php @@ -56,13 +56,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_exec/test_cat_request_headers_referenced_array.php b/tests/integration/external/curl_exec/test_cat_request_headers_referenced_array.php index 2ce9b0bd8..28a19930d 100644 --- a/tests/integration/external/curl_exec/test_cat_request_headers_referenced_array.php +++ b/tests/integration/external/curl_exec/test_cat_request_headers_referenced_array.php @@ -56,13 +56,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_exec/test_cat_response_header_anonymous.php b/tests/integration/external/curl_exec/test_cat_response_header_anonymous.php index 07d3b1822..5457f11e8 100644 --- a/tests/integration/external/curl_exec/test_cat_response_header_anonymous.php +++ b/tests/integration/external/curl_exec/test_cat_response_header_anonymous.php @@ -51,13 +51,15 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Unsupported/curl_setopt/CURLOPT_HEADERFUNCTION/closure"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_exec/test_cat_response_header_function.php b/tests/integration/external/curl_exec/test_cat_response_header_function.php index a5ad6b12d..79fc67f6a 100644 --- a/tests/integration/external/curl_exec/test_cat_response_header_function.php +++ b/tests/integration/external/curl_exec/test_cat_response_header_function.php @@ -56,13 +56,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_exec/test_cat_response_header_returned.php b/tests/integration/external/curl_exec/test_cat_response_header_returned.php index a5533b679..8a27c4371 100644 --- a/tests/integration/external/curl_exec/test_cat_response_header_returned.php +++ b/tests/integration/external/curl_exec/test_cat_response_header_returned.php @@ -54,13 +54,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_exec/test_cat_response_header_to_file.php b/tests/integration/external/curl_exec/test_cat_response_header_to_file.php index 647f3a59d..c0d0da723 100644 --- a/tests/integration/external/curl_exec/test_cat_response_header_to_file.php +++ b/tests/integration/external/curl_exec/test_cat_response_header_to_file.php @@ -51,13 +51,15 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Unsupported/curl_setopt/CURLOPT_WRITEHEADER"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_exec/test_cat_response_header_to_stdout.php b/tests/integration/external/curl_exec/test_cat_response_header_to_stdout.php index 2f4762cf0..44aeb1aac 100644 --- a/tests/integration/external/curl_exec/test_cat_response_header_to_stdout.php +++ b/tests/integration/external/curl_exec/test_cat_response_header_to_stdout.php @@ -54,13 +54,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_exec/test_cat_simple.php b/tests/integration/external/curl_exec/test_cat_simple.php index da2b9ae18..5edb87f68 100644 --- a/tests/integration/external/curl_exec/test_cat_simple.php +++ b/tests/integration/external/curl_exec/test_cat_simple.php @@ -55,13 +55,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_exec/test_dt_enabled_cat_enabled.php b/tests/integration/external/curl_exec/test_dt_enabled_cat_enabled.php index 3c2596f30..8f9cd8880 100644 --- a/tests/integration/external/curl_exec/test_dt_enabled_cat_enabled.php +++ b/tests/integration/external/curl_exec/test_dt_enabled_cat_enabled.php @@ -54,11 +54,13 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_exec/test_dt_newrelic_header_disabled.php b/tests/integration/external/curl_exec/test_dt_newrelic_header_disabled.php index 85ea264d9..6ee09ead9 100644 --- a/tests/integration/external/curl_exec/test_dt_newrelic_header_disabled.php +++ b/tests/integration/external/curl_exec/test_dt_newrelic_header_disabled.php @@ -52,13 +52,15 @@ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_exec/test_dt_request_headers_empty_array.php b/tests/integration/external/curl_exec/test_dt_request_headers_empty_array.php index db483a276..dcfd62c5a 100644 --- a/tests/integration/external/curl_exec/test_dt_request_headers_empty_array.php +++ b/tests/integration/external/curl_exec/test_dt_request_headers_empty_array.php @@ -53,13 +53,15 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_exec/test_dt_request_headers_present.php b/tests/integration/external/curl_exec/test_dt_request_headers_present.php index b64145814..d2affbff3 100644 --- a/tests/integration/external/curl_exec/test_dt_request_headers_present.php +++ b/tests/integration/external/curl_exec/test_dt_request_headers_present.php @@ -53,13 +53,15 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_exec/test_dt_request_headers_present_array.php b/tests/integration/external/curl_exec/test_dt_request_headers_present_array.php index d93c6ebde..adeb4c633 100644 --- a/tests/integration/external/curl_exec/test_dt_request_headers_present_array.php +++ b/tests/integration/external/curl_exec/test_dt_request_headers_present_array.php @@ -53,13 +53,15 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_exec/test_dt_request_headers_present_array_logging_off.php b/tests/integration/external/curl_exec/test_dt_request_headers_present_array_logging_off.php index 54a305af9..5ccce861f 100644 --- a/tests/integration/external/curl_exec/test_dt_request_headers_present_array_logging_off.php +++ b/tests/integration/external/curl_exec/test_dt_request_headers_present_array_logging_off.php @@ -55,14 +55,16 @@ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_exec/test_dt_request_headers_referenced_array.php b/tests/integration/external/curl_exec/test_dt_request_headers_referenced_array.php index 2f593921a..1e7a2a4be 100644 --- a/tests/integration/external/curl_exec/test_dt_request_headers_referenced_array.php +++ b/tests/integration/external/curl_exec/test_dt_request_headers_referenced_array.php @@ -54,13 +54,15 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_exec/test_dt_simple.php b/tests/integration/external/curl_exec/test_dt_simple.php index 5943080d1..5574bcf38 100644 --- a/tests/integration/external/curl_exec/test_dt_simple.php +++ b/tests/integration/external/curl_exec/test_dt_simple.php @@ -52,13 +52,15 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_exec/test_file_proto.php b/tests/integration/external/curl_exec/test_file_proto.php index e5d50b956..3cebd2e6a 100644 --- a/tests/integration/external/curl_exec/test_file_proto.php +++ b/tests/integration/external/curl_exec/test_file_proto.php @@ -35,13 +35,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../../include/tap.php'); if (FALSE === function_exists('curl_escape')) { diff --git a/tests/integration/external/curl_exec/test_http.php b/tests/integration/external/curl_exec/test_http.php index 81d6a12f9..b626b2f7a 100644 --- a/tests/integration/external/curl_exec/test_http.php +++ b/tests/integration/external/curl_exec/test_http.php @@ -46,13 +46,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname( __FILE__ )) . '/../../../include/tap.php'); require_once(realpath(dirname( __FILE__ )) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_exec/test_malformed_url.php b/tests/integration/external/curl_exec/test_malformed_url.php index 0875c5681..4131f55e9 100644 --- a/tests/integration/external/curl_exec/test_malformed_url.php +++ b/tests/integration/external/curl_exec/test_malformed_url.php @@ -43,13 +43,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../../include/tap.php'); function test_curl() { diff --git a/tests/integration/external/curl_exec/test_missing_handle.php b/tests/integration/external/curl_exec/test_missing_handle.php index 8a049ce9f..a4bc7d750 100644 --- a/tests/integration/external/curl_exec/test_missing_handle.php +++ b/tests/integration/external/curl_exec/test_missing_handle.php @@ -37,13 +37,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "??", diff --git a/tests/integration/external/curl_exec/test_request_headers_referenced_array.php b/tests/integration/external/curl_exec/test_request_headers_referenced_array.php index 4612917e6..cf90cc31d 100644 --- a/tests/integration/external/curl_exec/test_request_headers_referenced_array.php +++ b/tests/integration/external/curl_exec/test_request_headers_referenced_array.php @@ -42,13 +42,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_exec/test_synthetics.php b/tests/integration/external/curl_exec/test_synthetics.php index 49f2b7c14..9a78fab80 100644 --- a/tests/integration/external/curl_exec/test_synthetics.php +++ b/tests/integration/external/curl_exec/test_synthetics.php @@ -66,13 +66,15 @@ [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + if (!extension_loaded("curl")) { die("skip: curl extension required"); } diff --git a/tests/integration/external/curl_exec/test_synthetics_disabled.php b/tests/integration/external/curl_exec/test_synthetics_disabled.php index 895aecd39..0ce24aa42 100644 --- a/tests/integration/external/curl_exec/test_synthetics_disabled.php +++ b/tests/integration/external/curl_exec/test_synthetics_disabled.php @@ -67,13 +67,15 @@ [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + if (!extension_loaded("curl")) { die("skip: curl extension required"); } diff --git a/tests/integration/external/curl_exec/test_synthetics_with_cat_disabled.php b/tests/integration/external/curl_exec/test_synthetics_with_cat_disabled.php index f8abecfd1..743d463b6 100644 --- a/tests/integration/external/curl_exec/test_synthetics_with_cat_disabled.php +++ b/tests/integration/external/curl_exec/test_synthetics_with_cat_disabled.php @@ -65,13 +65,15 @@ [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + if (!extension_loaded("curl")) { die("skip: curl extension required"); } diff --git a/tests/integration/external/curl_exec/test_synthetics_with_dt.php b/tests/integration/external/curl_exec/test_synthetics_with_dt.php index 9bcb9d75a..2bc43a7f5 100644 --- a/tests/integration/external/curl_exec/test_synthetics_with_dt.php +++ b/tests/integration/external/curl_exec/test_synthetics_with_dt.php @@ -66,13 +66,15 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + if (!extension_loaded("curl")) { die("skip: curl extension required"); } diff --git a/tests/integration/external/curl_exec/test_synthetics_with_dt_logging_off.php b/tests/integration/external/curl_exec/test_synthetics_with_dt_logging_off.php index ed6590481..93890d009 100644 --- a/tests/integration/external/curl_exec/test_synthetics_with_dt_logging_off.php +++ b/tests/integration/external/curl_exec/test_synthetics_with_dt_logging_off.php @@ -68,14 +68,16 @@ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allWeb"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + if (!extension_loaded("curl")) { die("skip: curl extension required"); } diff --git a/tests/integration/external/curl_exec/test_type_mismatch.php b/tests/integration/external/curl_exec/test_type_mismatch.php index ec36365da..558e86d80 100644 --- a/tests/integration/external/curl_exec/test_type_mismatch.php +++ b/tests/integration/external/curl_exec/test_type_mismatch.php @@ -36,13 +36,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + function test_curl() { global $EXTERNAL_HOST; diff --git a/tests/integration/external/curl_multi_exec/test_cat_simple.php b/tests/integration/external/curl_multi_exec/test_cat_simple.php index 597b06d74..ff56296e1 100644 --- a/tests/integration/external/curl_multi_exec/test_cat_simple.php +++ b/tests/integration/external/curl_multi_exec/test_cat_simple.php @@ -58,13 +58,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_multi_exec/test_curl_multi_exec_params.php b/tests/integration/external/curl_multi_exec/test_curl_multi_exec_params.php index 0241d3cf6..edf70a708 100644 --- a/tests/integration/external/curl_multi_exec/test_curl_multi_exec_params.php +++ b/tests/integration/external/curl_multi_exec/test_curl_multi_exec_params.php @@ -26,24 +26,27 @@ "?? start time", "?? stop time", [ - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"},[1,"??","??","??","??","??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"},[1,"??","??","??","??","??"]], - [{"name": "External/all"},[1,"??","??","??","??","??"]], - [{"name": "External/allOther"},[1,"??","??","??","??","??"]], - [{"name": "External/127.0.0.1/all"},[1,"??","??","??","??","??"]], - [{"name": "OtherTransaction/all"},[1,"??","??","??","??","??"]], - [{"name": "OtherTransaction/php__FILE__"},[1,"??","??","??","??","??"]], - [{"name": "OtherTransactionTotalTime"},[1,"??","??","??","??","??"]], - [{"name": "OtherTransactionTotalTime/php__FILE__"},[1,"??","??","??","??","??"]], - [{"name": "Supportability/DistributedTrace/CreatePayload/Success"},[1,"??","??","??","??","??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"},[1,"??","??","??","??","??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"},[1,"??","??","??","??","??"]], - [{"name": "Supportability/TraceContext/Create/Success"},[1,"??","??","??","??","??"]], - [{"name": "External/127.0.0.1/all","scope": "OtherTransaction/php__FILE__"},[1,"??","??","??","??","??"]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/DistributedTrace/CreatePayload/Success"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all", + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + ini_set('display_errors', 1); ini_set('display_startup_errors', 1); error_reporting(E_ALL); diff --git a/tests/integration/external/curl_multi_exec/test_custom_header.php b/tests/integration/external/curl_multi_exec/test_custom_header.php index 9e99b8b54..90c8a5a0e 100644 --- a/tests/integration/external/curl_multi_exec/test_custom_header.php +++ b/tests/integration/external/curl_multi_exec/test_custom_header.php @@ -42,13 +42,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_multi_exec/test_dt_custom_header.php b/tests/integration/external/curl_multi_exec/test_dt_custom_header.php index a9ed09da1..e6e31a2ca 100644 --- a/tests/integration/external/curl_multi_exec/test_dt_custom_header.php +++ b/tests/integration/external/curl_multi_exec/test_dt_custom_header.php @@ -52,13 +52,15 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_multi_exec/test_dt_custom_header_logging_off.php b/tests/integration/external/curl_multi_exec/test_dt_custom_header_logging_off.php index a9dfa6711..033b9b53d 100644 --- a/tests/integration/external/curl_multi_exec/test_dt_custom_header_logging_off.php +++ b/tests/integration/external/curl_multi_exec/test_dt_custom_header_logging_off.php @@ -54,14 +54,16 @@ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_multi_exec/test_dt_newrelic_header_disabled.php b/tests/integration/external/curl_multi_exec/test_dt_newrelic_header_disabled.php index 0f446d92a..23b262a9a 100644 --- a/tests/integration/external/curl_multi_exec/test_dt_newrelic_header_disabled.php +++ b/tests/integration/external/curl_multi_exec/test_dt_newrelic_header_disabled.php @@ -54,13 +54,15 @@ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/TraceContext/Create/Success"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_multi_exec/test_dt_simple.php b/tests/integration/external/curl_multi_exec/test_dt_simple.php index 5ccbbc66b..d079b0c39 100644 --- a/tests/integration/external/curl_multi_exec/test_dt_simple.php +++ b/tests/integration/external/curl_multi_exec/test_dt_simple.php @@ -54,13 +54,15 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_multi_exec/test_exec_add_handles.php b/tests/integration/external/curl_multi_exec/test_exec_add_handles.php index e05204929..92c327975 100644 --- a/tests/integration/external/curl_multi_exec/test_exec_add_handles.php +++ b/tests/integration/external/curl_multi_exec/test_exec_add_handles.php @@ -134,13 +134,15 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_multi_exec/test_exec_remove_handles.php b/tests/integration/external/curl_multi_exec/test_exec_remove_handles.php index f894bac9f..995a1eb27 100644 --- a/tests/integration/external/curl_multi_exec/test_exec_remove_handles.php +++ b/tests/integration/external/curl_multi_exec/test_exec_remove_handles.php @@ -133,13 +133,15 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [6, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [6, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_multi_exec/test_exec_remove_handles_logging_off.php b/tests/integration/external/curl_multi_exec/test_exec_remove_handles_logging_off.php index bc813b429..7573811a1 100644 --- a/tests/integration/external/curl_multi_exec/test_exec_remove_handles_logging_off.php +++ b/tests/integration/external/curl_multi_exec/test_exec_remove_handles_logging_off.php @@ -135,14 +135,16 @@ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/TraceContext/Create/Success"}, [6, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [6, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_multi_exec/test_http.php b/tests/integration/external/curl_multi_exec/test_http.php index 5f8adb39d..76f44e184 100644 --- a/tests/integration/external/curl_multi_exec/test_http.php +++ b/tests/integration/external/curl_multi_exec/test_http.php @@ -46,13 +46,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname( __FILE__ )) . '/../../../include/tap.php'); require_once(realpath(dirname( __FILE__ )) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_multi_exec/test_malformed_url.php b/tests/integration/external/curl_multi_exec/test_malformed_url.php index fa4e2f017..4250faeef 100644 --- a/tests/integration/external/curl_multi_exec/test_malformed_url.php +++ b/tests/integration/external/curl_multi_exec/test_malformed_url.php @@ -44,13 +44,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../../include/tap.php'); function test_curl() { diff --git a/tests/integration/external/curl_multi_exec/test_missing_arg.php b/tests/integration/external/curl_multi_exec/test_missing_arg.php index 879fb725f..e60852a87 100644 --- a/tests/integration/external/curl_multi_exec/test_missing_arg.php +++ b/tests/integration/external/curl_multi_exec/test_missing_arg.php @@ -37,13 +37,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "??", diff --git a/tests/integration/external/curl_multi_exec/test_simple.php b/tests/integration/external/curl_multi_exec/test_simple.php index d01f7a5d9..19e1258af 100644 --- a/tests/integration/external/curl_multi_exec/test_simple.php +++ b/tests/integration/external/curl_multi_exec/test_simple.php @@ -134,13 +134,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_multi_exec/test_txn_restart.php b/tests/integration/external/curl_multi_exec/test_txn_restart.php index 92d04efa8..23de9b40d 100644 --- a/tests/integration/external/curl_multi_exec/test_txn_restart.php +++ b/tests/integration/external/curl_multi_exec/test_txn_restart.php @@ -52,14 +52,16 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/start_transaction"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/curl_multi_exec/test_type_mismatch.php b/tests/integration/external/curl_multi_exec/test_type_mismatch.php index 02ee0b1a4..ccc8567a6 100644 --- a/tests/integration/external/curl_multi_exec/test_type_mismatch.php +++ b/tests/integration/external/curl_multi_exec/test_type_mismatch.php @@ -36,13 +36,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + $ch = curl_init(); $active = null; diff --git a/tests/integration/external/drupal6/test_basic.php b/tests/integration/external/drupal6/test_basic.php index e0b9c45d6..66f36a717 100644 --- a/tests/integration/external/drupal6/test_basic.php +++ b/tests/integration/external/drupal6/test_basic.php @@ -25,22 +25,24 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"External/127.0.0.1/all", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal6/test_cat_and_synthetics_disabled.php b/tests/integration/external/drupal6/test_cat_and_synthetics_disabled.php index b3ce9faa8..c21f306f7 100644 --- a/tests/integration/external/drupal6/test_cat_and_synthetics_disabled.php +++ b/tests/integration/external/drupal6/test_cat_and_synthetics_disabled.php @@ -48,25 +48,27 @@ "?? start time", "?? stop time", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Apdex"}, ["??", "??", "??", "??", "??", 0]], - [{"name":"Apdex/Uri__FILE__"}, ["??", "??", "??", "??", "??", 0]], - [{"name":"External/all"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/allWeb"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [ 1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Apdex"}, ["??", "??", "??", "??", "??", 0]], + [{"name":"Apdex/Uri__FILE__"}, ["??", "??", "??", "??", "??", 0]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allWeb"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"External/127.0.0.1/all", - "scope":"WebTransaction/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"HttpDispatcher"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [ 1, 0, 0, 0, 0, 0]], - [{"name":"WebTransaction"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransaction/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransactionTotalTime"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]] + "scope":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"HttpDispatcher"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"WebTransaction"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal6/test_cat_disabled.php b/tests/integration/external/drupal6/test_cat_disabled.php index de021cd01..fc6fef0be 100644 --- a/tests/integration/external/drupal6/test_cat_disabled.php +++ b/tests/integration/external/drupal6/test_cat_disabled.php @@ -30,22 +30,24 @@ "?? start time", "?? stop time", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"External/127.0.0.1/all", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal6/test_cross_process_empty_headers.php b/tests/integration/external/drupal6/test_cross_process_empty_headers.php index d686ee49d..f7500fd6b 100644 --- a/tests/integration/external/drupal6/test_cross_process_empty_headers.php +++ b/tests/integration/external/drupal6/test_cross_process_empty_headers.php @@ -31,25 +31,26 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal6/test_cross_process_existing_header.php b/tests/integration/external/drupal6/test_cross_process_existing_header.php index 7bc4b6e64..b5fe8ce79 100644 --- a/tests/integration/external/drupal6/test_cross_process_existing_header.php +++ b/tests/integration/external/drupal6/test_cross_process_existing_header.php @@ -31,25 +31,26 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal6/test_cross_process_no_headers.php b/tests/integration/external/drupal6/test_cross_process_no_headers.php index 9cec8a27d..9025c5eec 100644 --- a/tests/integration/external/drupal6/test_cross_process_no_headers.php +++ b/tests/integration/external/drupal6/test_cross_process_no_headers.php @@ -31,25 +31,26 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal6/test_dt_empty_headers.php b/tests/integration/external/drupal6/test_dt_empty_headers.php index 1a5309a73..964347339 100644 --- a/tests/integration/external/drupal6/test_dt_empty_headers.php +++ b/tests/integration/external/drupal6/test_dt_empty_headers.php @@ -30,30 +30,28 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/TraceContext/Create/Success"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, - [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all", + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal6/test_dt_existing_headers.php b/tests/integration/external/drupal6/test_dt_existing_headers.php index d7f12d461..c2f9f7d0f 100644 --- a/tests/integration/external/drupal6/test_dt_existing_headers.php +++ b/tests/integration/external/drupal6/test_dt_existing_headers.php @@ -30,30 +30,28 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"External/all"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"External/allOther"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/TraceContext/Create/Success"}, - [2, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, - [2, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all", + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/TraceContext/Create/Success"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal6/test_dt_newrelic_header_disabled.php b/tests/integration/external/drupal6/test_dt_newrelic_header_disabled.php index 4781c96fa..bf593565b 100644 --- a/tests/integration/external/drupal6/test_dt_newrelic_header_disabled.php +++ b/tests/integration/external/drupal6/test_dt_newrelic_header_disabled.php @@ -30,28 +30,27 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/TraceContext/Create/Success"}, - [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all", + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal6/test_dt_no_headers.php b/tests/integration/external/drupal6/test_dt_no_headers.php index b41e8d662..8060c353e 100644 --- a/tests/integration/external/drupal6/test_dt_no_headers.php +++ b/tests/integration/external/drupal6/test_dt_no_headers.php @@ -29,30 +29,28 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/TraceContext/Create/Success"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, - [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all", + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal6/test_multiple_calls.php b/tests/integration/external/drupal6/test_multiple_calls.php index 581c83ea0..a983a0ab7 100644 --- a/tests/integration/external/drupal6/test_multiple_calls.php +++ b/tests/integration/external/drupal6/test_multiple_calls.php @@ -27,22 +27,24 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [3,"??","??","??","??","??"]], - [{"name":"External/all"}, [3,"??","??","??","??","??"]], - [{"name":"External/allOther"}, [3,"??","??","??","??","??"]], - [{"name":"OtherTransaction/all"}, [1,"??","??","??","??","??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1,"??","??","??","??","??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all","scope":"OtherTransaction/php__FILE__"}, - [3,"??","??","??","??","??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1,0,0,0,0,0]] + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [3, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [3, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [3, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all", + "scope":"OtherTransaction/php__FILE__"}, [3, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal6/test_synthetics.php b/tests/integration/external/drupal6/test_synthetics.php index 26d35faa4..2203dbbb1 100644 --- a/tests/integration/external/drupal6/test_synthetics.php +++ b/tests/integration/external/drupal6/test_synthetics.php @@ -50,28 +50,29 @@ "?? start time", "?? stop time", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Apdex"}, ["??", "??", "??", "??", "??", 0]], - [{"name":"Apdex/Uri__FILE__"}, ["??", "??", "??", "??", "??", 0]], - [{"name":"External/all"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/allWeb"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, - [ 1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Apdex"}, ["??", "??", "??", "??", "??", 0]], + [{"name":"Apdex/Uri__FILE__"}, ["??", "??", "??", "??", "??", 0]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allWeb"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, [1, "??", "??", "??", "??", "??"]], [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing", - "scope":"WebTransaction/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"HttpDispatcher"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [ 1, 0, 0, 0, 0, 0]], - [{"name":"WebTransaction"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransaction/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransactionTotalTime"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]] + "scope":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"HttpDispatcher"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"WebTransaction"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal6/test_synthetics_disabled.php b/tests/integration/external/drupal6/test_synthetics_disabled.php index d69230a2e..45f99a634 100644 --- a/tests/integration/external/drupal6/test_synthetics_disabled.php +++ b/tests/integration/external/drupal6/test_synthetics_disabled.php @@ -47,28 +47,29 @@ "?? start time", "?? stop time", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Apdex"}, ["??", "??", "??", "??", "??", 0]], - [{"name":"Apdex/Uri__FILE__"}, ["??", "??", "??", "??", "??", 0]], - [{"name":"External/all"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/allWeb"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, - [ 1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Apdex"}, ["??", "??", "??", "??", "??", 0]], + [{"name":"Apdex/Uri__FILE__"}, ["??", "??", "??", "??", "??", 0]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allWeb"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, [1, "??", "??", "??", "??", "??"]], [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing", - "scope":"WebTransaction/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"HttpDispatcher"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [ 1, 0, 0, 0, 0, 0]], - [{"name":"WebTransaction"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransaction/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransactionTotalTime"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]] + "scope":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"HttpDispatcher"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"WebTransaction"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal6/test_synthetics_with_cat_disabled.php b/tests/integration/external/drupal6/test_synthetics_with_cat_disabled.php index 5d5b6843f..6211d4479 100644 --- a/tests/integration/external/drupal6/test_synthetics_with_cat_disabled.php +++ b/tests/integration/external/drupal6/test_synthetics_with_cat_disabled.php @@ -50,25 +50,27 @@ "?? start time", "?? stop time", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Apdex"}, ["??", "??", "??", "??", "??", 0]], - [{"name":"Apdex/Uri__FILE__"}, ["??", "??", "??", "??", "??", 0]], - [{"name":"External/all"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/allWeb"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [ 1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Apdex"}, ["??", "??", "??", "??", "??", 0]], + [{"name":"Apdex/Uri__FILE__"}, ["??", "??", "??", "??", "??", 0]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allWeb"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"External/127.0.0.1/all", - "scope":"WebTransaction/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"HttpDispatcher"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [ 1, 0, 0, 0, 0, 0]], - [{"name":"WebTransaction"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransaction/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransactionTotalTime"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]] + "scope":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"HttpDispatcher"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"WebTransaction"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal6/test_synthetics_with_dt.php b/tests/integration/external/drupal6/test_synthetics_with_dt.php index 6af782360..d42dbd5c0 100644 --- a/tests/integration/external/drupal6/test_synthetics_with_dt.php +++ b/tests/integration/external/drupal6/test_synthetics_with_dt.php @@ -48,33 +48,31 @@ "?? start time", "?? stop time", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Apdex"}, ["??", "??", "??", "??", "??", 0]], - [{"name":"Apdex/Uri__FILE__"}, ["??", "??", "??", "??", "??", 0]], - [{"name":"External/all"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/allWeb"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all", - "scope":"WebTransaction/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"HttpDispatcher"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [ 1, 0, 0, 0, 0, 0]], - [{"name":"WebTransaction"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransaction/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransactionTotalTime"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, - [ 1, "??", "??", "??", "??", "??"]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allWeb"}, - [ 1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/TraceContext/Create/Success"}, - [ 1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, - [ 1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Apdex"}, ["??", "??", "??", "??", "??", 0]], + [{"name":"Apdex/Uri__FILE__"}, ["??", "??", "??", "??", "??", 0]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allWeb"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all", + "scope":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"HttpDispatcher"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"WebTransaction"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allWeb"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_6_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal7/test_bad_params_integer_headers.php b/tests/integration/external/drupal7/test_bad_params_integer_headers.php index b717584c4..cbc0935d9 100644 --- a/tests/integration/external/drupal7/test_bad_params_integer_headers.php +++ b/tests/integration/external/drupal7/test_bad_params_integer_headers.php @@ -22,25 +22,27 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, 0, 0, 0, 0, 0]], - [{"name":"Errors/all"}, [1, 0, 0, 0, 0, 0]], - [{"name":"Errors/allOther"}, [1, 0, 0, 0, 0, 0]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], - [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Errors/all"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Errors/allOther"}, [1, 0, 0, 0, 0, 0]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"External/127.0.0.1/all", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal7/test_bad_params_integer_options.php b/tests/integration/external/drupal7/test_bad_params_integer_options.php index 63cd65175..20be1df50 100644 --- a/tests/integration/external/drupal7/test_bad_params_integer_options.php +++ b/tests/integration/external/drupal7/test_bad_params_integer_options.php @@ -22,20 +22,22 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, 0, 0, 0, 0, 0]], - [{"name":"Errors/all"}, [1, 0, 0, 0, 0, 0]], - [{"name":"Errors/allOther"}, [1, 0, 0, 0, 0, 0]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]] + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Errors/all"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Errors/allOther"}, [1, 0, 0, 0, 0, 0]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal7/test_bad_params_null_headers.php b/tests/integration/external/drupal7/test_bad_params_null_headers.php index 6ace16115..12875d57b 100644 --- a/tests/integration/external/drupal7/test_bad_params_null_headers.php +++ b/tests/integration/external/drupal7/test_bad_params_null_headers.php @@ -22,25 +22,27 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, 0, 0, 0, 0, 0]], - [{"name":"Errors/all"}, [1, 0, 0, 0, 0, 0]], - [{"name":"Errors/allOther"}, [1, 0, 0, 0, 0, 0]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], - [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Errors/all"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Errors/allOther"}, [1, 0, 0, 0, 0, 0]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"External/127.0.0.1/all", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal7/test_bad_params_null_options.php b/tests/integration/external/drupal7/test_bad_params_null_options.php index 8d582967e..1db7121b5 100644 --- a/tests/integration/external/drupal7/test_bad_params_null_options.php +++ b/tests/integration/external/drupal7/test_bad_params_null_options.php @@ -26,20 +26,22 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, 0, 0, 0, 0, 0]], - [{"name":"Errors/all"}, [1, 0, 0, 0, 0, 0]], - [{"name":"Errors/allOther"}, [1, 0, 0, 0, 0, 0]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]] + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Errors/all"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Errors/allOther"}, [1, 0, 0, 0, 0, 0]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal7/test_bad_url.php b/tests/integration/external/drupal7/test_bad_url.php index 7b5301200..8729feae8 100644 --- a/tests/integration/external/drupal7/test_bad_url.php +++ b/tests/integration/external/drupal7/test_bad_url.php @@ -27,17 +27,19 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]] + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal7/test_basic.php b/tests/integration/external/drupal7/test_basic.php index 2f9ff08e4..ee8db6724 100644 --- a/tests/integration/external/drupal7/test_basic.php +++ b/tests/integration/external/drupal7/test_basic.php @@ -25,22 +25,24 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"External/127.0.0.1/all", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal7/test_cat_and_synthetics_disabled.php b/tests/integration/external/drupal7/test_cat_and_synthetics_disabled.php index 32b5e9510..58d6fdfb0 100644 --- a/tests/integration/external/drupal7/test_cat_and_synthetics_disabled.php +++ b/tests/integration/external/drupal7/test_cat_and_synthetics_disabled.php @@ -48,25 +48,27 @@ "?? start time", "?? stop time", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Apdex"}, ["??", "??", "??", "??", "??", 0]], - [{"name":"Apdex/Uri__FILE__"}, ["??", "??", "??", "??", "??", 0]], - [{"name":"External/all"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/allWeb"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [ 1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Apdex"}, ["??", "??", "??", "??", "??", 0]], + [{"name":"Apdex/Uri__FILE__"}, ["??", "??", "??", "??", "??", 0]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allWeb"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"External/127.0.0.1/all", - "scope":"WebTransaction/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"HttpDispatcher"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [ 1, 0, 0, 0, 0, 0]], - [{"name":"WebTransaction"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransaction/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransactionTotalTime"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]] + "scope":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"HttpDispatcher"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"WebTransaction"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal7/test_cat_disabled.php b/tests/integration/external/drupal7/test_cat_disabled.php index 3dae42b91..98c7cbde8 100644 --- a/tests/integration/external/drupal7/test_cat_disabled.php +++ b/tests/integration/external/drupal7/test_cat_disabled.php @@ -34,22 +34,24 @@ "?? start time", "?? stop time", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"External/127.0.0.1/all", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal7/test_cross_process_empty_headers.php b/tests/integration/external/drupal7/test_cross_process_empty_headers.php index bbbb3e5ee..b9aa2d73b 100644 --- a/tests/integration/external/drupal7/test_cross_process_empty_headers.php +++ b/tests/integration/external/drupal7/test_cross_process_empty_headers.php @@ -31,25 +31,26 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal7/test_cross_process_empty_options.php b/tests/integration/external/drupal7/test_cross_process_empty_options.php index cdb2f7a9d..a583181c9 100644 --- a/tests/integration/external/drupal7/test_cross_process_empty_options.php +++ b/tests/integration/external/drupal7/test_cross_process_empty_options.php @@ -31,25 +31,26 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal7/test_cross_process_existing_header.php b/tests/integration/external/drupal7/test_cross_process_existing_header.php index b0741979d..2c8ff316b 100644 --- a/tests/integration/external/drupal7/test_cross_process_existing_header.php +++ b/tests/integration/external/drupal7/test_cross_process_existing_header.php @@ -35,25 +35,26 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal7/test_cross_process_no_options.php b/tests/integration/external/drupal7/test_cross_process_no_options.php index 9d658c44a..e873a7a50 100644 --- a/tests/integration/external/drupal7/test_cross_process_no_options.php +++ b/tests/integration/external/drupal7/test_cross_process_no_options.php @@ -31,25 +31,26 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal7/test_dt_empty_headers.php b/tests/integration/external/drupal7/test_dt_empty_headers.php index 1bb2b0dd4..a228bc11b 100644 --- a/tests/integration/external/drupal7/test_dt_empty_headers.php +++ b/tests/integration/external/drupal7/test_dt_empty_headers.php @@ -30,30 +30,28 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/TraceContext/Create/Success"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, - [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all", + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal7/test_dt_existing_headers.php b/tests/integration/external/drupal7/test_dt_existing_headers.php index 538a66c7a..31c0a4f18 100644 --- a/tests/integration/external/drupal7/test_dt_existing_headers.php +++ b/tests/integration/external/drupal7/test_dt_existing_headers.php @@ -29,30 +29,28 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"External/all"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"External/allOther"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/TraceContext/Create/Success"}, - [2, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, - [2, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all", + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/TraceContext/Create/Success"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal7/test_dt_newrelic_header_disabled.php b/tests/integration/external/drupal7/test_dt_newrelic_header_disabled.php index d3ee2219f..3651f7fce 100644 --- a/tests/integration/external/drupal7/test_dt_newrelic_header_disabled.php +++ b/tests/integration/external/drupal7/test_dt_newrelic_header_disabled.php @@ -30,28 +30,27 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/TraceContext/Create/Success"}, - [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all", + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal7/test_dt_no_headers.php b/tests/integration/external/drupal7/test_dt_no_headers.php index 9f60bf427..84e4dd1df 100644 --- a/tests/integration/external/drupal7/test_dt_no_headers.php +++ b/tests/integration/external/drupal7/test_dt_no_headers.php @@ -29,30 +29,28 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/TraceContext/Create/Success"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, - [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all", + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal7/test_multiple_calls.php b/tests/integration/external/drupal7/test_multiple_calls.php index 9279a8801..982b1a6e8 100644 --- a/tests/integration/external/drupal7/test_multiple_calls.php +++ b/tests/integration/external/drupal7/test_multiple_calls.php @@ -26,22 +26,24 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [2,"??","??","??","??","??"]], - [{"name":"External/all"}, [2,"??","??","??","??","??"]], - [{"name":"External/allOther"}, [2,"??","??","??","??","??"]], - [{"name":"OtherTransaction/all"}, [1,"??","??","??","??","??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1,"??","??","??","??","??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all","scope":"OtherTransaction/php__FILE__"}, - [2,"??","??","??","??","??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [1,0,0,0,0,0]] + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"External/all"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"External/allOther"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all", + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal7/test_synthetics.php b/tests/integration/external/drupal7/test_synthetics.php index a0312e00d..9a7d6782f 100644 --- a/tests/integration/external/drupal7/test_synthetics.php +++ b/tests/integration/external/drupal7/test_synthetics.php @@ -46,28 +46,29 @@ "?? start time", "?? stop time", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Apdex"}, ["??", "??", "??", "??", "??", 0]], - [{"name":"Apdex/Uri__FILE__"}, ["??", "??", "??", "??", "??", 0]], - [{"name":"External/all"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/allWeb"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, - [ 1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Apdex"}, ["??", "??", "??", "??", "??", 0]], + [{"name":"Apdex/Uri__FILE__"}, ["??", "??", "??", "??", "??", 0]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allWeb"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, [1, "??", "??", "??", "??", "??"]], [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing", - "scope":"WebTransaction/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"HttpDispatcher"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [ 1, 0, 0, 0, 0, 0]], - [{"name":"WebTransaction"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransaction/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransactionTotalTime"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]] + "scope":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"HttpDispatcher"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"WebTransaction"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc'); diff --git a/tests/integration/external/drupal7/test_synthetics_disabled.php b/tests/integration/external/drupal7/test_synthetics_disabled.php index bdc4ff73a..89590c71d 100644 --- a/tests/integration/external/drupal7/test_synthetics_disabled.php +++ b/tests/integration/external/drupal7/test_synthetics_disabled.php @@ -51,28 +51,29 @@ "?? start time", "?? stop time", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Apdex"}, ["??", "??", "??", "??", "??", 0]], - [{"name":"Apdex/Uri__FILE__"}, ["??", "??", "??", "??", "??", 0]], - [{"name":"External/all"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/allWeb"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, - [ 1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Apdex"}, ["??", "??", "??", "??", "??", 0]], + [{"name":"Apdex/Uri__FILE__"}, ["??", "??", "??", "??", "??", 0]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allWeb"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalApp/127.0.0.1/432507#4741547/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing"}, [1, "??", "??", "??", "??", "??"]], [{"name":"ExternalTransaction/127.0.0.1/432507#4741547/WebTransaction/Custom/tracing", - "scope":"WebTransaction/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"HttpDispatcher"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [ 1, 0, 0, 0, 0, 0]], - [{"name":"WebTransaction"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransaction/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransactionTotalTime"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]] + "scope":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"HttpDispatcher"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"WebTransaction"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal7/test_synthetics_with_cat_disabled.php b/tests/integration/external/drupal7/test_synthetics_with_cat_disabled.php index 8a27df9cb..68065bca3 100644 --- a/tests/integration/external/drupal7/test_synthetics_with_cat_disabled.php +++ b/tests/integration/external/drupal7/test_synthetics_with_cat_disabled.php @@ -49,25 +49,27 @@ "?? start time", "?? stop time", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Apdex"}, ["??", "??", "??", "??", "??", 0]], - [{"name":"Apdex/Uri__FILE__"}, ["??", "??", "??", "??", "??", 0]], - [{"name":"External/all"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/allWeb"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [ 1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Apdex"}, ["??", "??", "??", "??", "??", 0]], + [{"name":"Apdex/Uri__FILE__"}, ["??", "??", "??", "??", "??", 0]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allWeb"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"External/127.0.0.1/all", - "scope":"WebTransaction/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"HttpDispatcher"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [ 1, 0, 0, 0, 0, 0]], - [{"name":"WebTransaction"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransaction/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransactionTotalTime"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]] + "scope":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"HttpDispatcher"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"WebTransaction"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/drupal7/test_synthetics_with_dt.php b/tests/integration/external/drupal7/test_synthetics_with_dt.php index af960b29d..386ebef10 100644 --- a/tests/integration/external/drupal7/test_synthetics_with_dt.php +++ b/tests/integration/external/drupal7/test_synthetics_with_dt.php @@ -44,33 +44,31 @@ "?? start time", "?? stop time", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Apdex"}, ["??", "??", "??", "??", "??", 0]], - [{"name":"Apdex/Uri__FILE__"}, ["??", "??", "??", "??", "??", 0]], - [{"name":"External/all"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/allWeb"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"External/127.0.0.1/all", - "scope":"WebTransaction/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"HttpDispatcher"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/framework/Drupal/forced"}, [ 1, 0, 0, 0, 0, 0]], - [{"name":"WebTransaction"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransaction/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransactionTotalTime"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [ 1, "??", "??", "??", "??", "??"]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, - [ 1, "??", "??", "??", "??", "??"]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allWeb"}, - [ 1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/TraceContext/Create/Success"}, - [ 1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, - [ 1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Apdex"}, ["??", "??", "??", "??", "??", 0]], + [{"name":"Apdex/Uri__FILE__"}, ["??", "??", "??", "??", "??", 0]], + [{"name":"External/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/allWeb"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"External/127.0.0.1/all", + "scope":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"HttpDispatcher"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], + [{"name":"WebTransaction"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allWeb"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/TraceContext/Create/Success"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_bootstrap.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/drupal_7_common.inc'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/file_get_contents/test_cat_and_synthetics_disabled.php b/tests/integration/external/file_get_contents/test_cat_and_synthetics_disabled.php index 9cc2f3df1..4ed8a7e3b 100644 --- a/tests/integration/external/file_get_contents/test_cat_and_synthetics_disabled.php +++ b/tests/integration/external/file_get_contents/test_cat_and_synthetics_disabled.php @@ -65,13 +65,15 @@ [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); $url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php'); diff --git a/tests/integration/external/file_get_contents/test_cat_context_provided.php b/tests/integration/external/file_get_contents/test_cat_context_provided.php index 221a76cfc..64f4d5c70 100644 --- a/tests/integration/external/file_get_contents/test_cat_context_provided.php +++ b/tests/integration/external/file_get_contents/test_cat_context_provided.php @@ -69,13 +69,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/file_get_contents/test_cat_default_context.php b/tests/integration/external/file_get_contents/test_cat_default_context.php index 6ee7912b7..1ce724a67 100644 --- a/tests/integration/external/file_get_contents/test_cat_default_context.php +++ b/tests/integration/external/file_get_contents/test_cat_default_context.php @@ -51,13 +51,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); /* diff --git a/tests/integration/external/file_get_contents/test_cat_disabled.php b/tests/integration/external/file_get_contents/test_cat_disabled.php index bee97ad6d..d27a0db6a 100644 --- a/tests/integration/external/file_get_contents/test_cat_disabled.php +++ b/tests/integration/external/file_get_contents/test_cat_disabled.php @@ -37,13 +37,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); $url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php'); diff --git a/tests/integration/external/file_get_contents/test_cat_no_context.php b/tests/integration/external/file_get_contents/test_cat_no_context.php index a4295401a..5785fd06c 100644 --- a/tests/integration/external/file_get_contents/test_cat_no_context.php +++ b/tests/integration/external/file_get_contents/test_cat_no_context.php @@ -54,13 +54,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); $url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php'); diff --git a/tests/integration/external/file_get_contents/test_dt_context_provided.php b/tests/integration/external/file_get_contents/test_dt_context_provided.php index 7e039dd34..fd184ba69 100644 --- a/tests/integration/external/file_get_contents/test_dt_context_provided.php +++ b/tests/integration/external/file_get_contents/test_dt_context_provided.php @@ -54,13 +54,15 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [13, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [13, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/file_get_contents/test_dt_context_provided_logging_off.php b/tests/integration/external/file_get_contents/test_dt_context_provided_logging_off.php index d65e66db7..a745bbaa7 100644 --- a/tests/integration/external/file_get_contents/test_dt_context_provided_logging_off.php +++ b/tests/integration/external/file_get_contents/test_dt_context_provided_logging_off.php @@ -56,14 +56,16 @@ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/TraceContext/Create/Success"}, [13, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [13, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/tap.php'); require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); diff --git a/tests/integration/external/file_get_contents/test_dt_default_context.php b/tests/integration/external/file_get_contents/test_dt_default_context.php index 3f7487bce..ba7b5e3e8 100644 --- a/tests/integration/external/file_get_contents/test_dt_default_context.php +++ b/tests/integration/external/file_get_contents/test_dt_default_context.php @@ -43,13 +43,15 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); /* diff --git a/tests/integration/external/file_get_contents/test_dt_disabled.php b/tests/integration/external/file_get_contents/test_dt_disabled.php index 6d6c9aa0f..1eec54186 100644 --- a/tests/integration/external/file_get_contents/test_dt_disabled.php +++ b/tests/integration/external/file_get_contents/test_dt_disabled.php @@ -47,13 +47,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); /* diff --git a/tests/integration/external/file_get_contents/test_dt_disabled_cat_disabled.php b/tests/integration/external/file_get_contents/test_dt_disabled_cat_disabled.php index 7edff19cb..a009c685e 100644 --- a/tests/integration/external/file_get_contents/test_dt_disabled_cat_disabled.php +++ b/tests/integration/external/file_get_contents/test_dt_disabled_cat_disabled.php @@ -38,13 +38,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); $url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php'); diff --git a/tests/integration/external/file_get_contents/test_dt_newrelic_header_disabled.php b/tests/integration/external/file_get_contents/test_dt_newrelic_header_disabled.php index 7256d3d1d..46d5b2446 100644 --- a/tests/integration/external/file_get_contents/test_dt_newrelic_header_disabled.php +++ b/tests/integration/external/file_get_contents/test_dt_newrelic_header_disabled.php @@ -43,13 +43,15 @@ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/TraceContext/Create/Success"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); $url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php'); diff --git a/tests/integration/external/file_get_contents/test_dt_no_context.php b/tests/integration/external/file_get_contents/test_dt_no_context.php index 107099ca4..f6674b95c 100644 --- a/tests/integration/external/file_get_contents/test_dt_no_context.php +++ b/tests/integration/external/file_get_contents/test_dt_no_context.php @@ -43,13 +43,15 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); $url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php'); diff --git a/tests/integration/external/file_get_contents/test_http_response_header_cv.php b/tests/integration/external/file_get_contents/test_http_response_header_cv.php index 66cf56704..c0120cc4c 100644 --- a/tests/integration/external/file_get_contents/test_http_response_header_cv.php +++ b/tests/integration/external/file_get_contents/test_http_response_header_cv.php @@ -60,13 +60,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); function f() { diff --git a/tests/integration/external/file_get_contents/test_synthetics_context_provided.php b/tests/integration/external/file_get_contents/test_synthetics_context_provided.php index 5ff3e9b60..183a838ee 100644 --- a/tests/integration/external/file_get_contents/test_synthetics_context_provided.php +++ b/tests/integration/external/file_get_contents/test_synthetics_context_provided.php @@ -87,13 +87,15 @@ [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); $url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php'); diff --git a/tests/integration/external/file_get_contents/test_synthetics_default_context.php b/tests/integration/external/file_get_contents/test_synthetics_default_context.php index 1e64cc45b..b6ef4ffce 100644 --- a/tests/integration/external/file_get_contents/test_synthetics_default_context.php +++ b/tests/integration/external/file_get_contents/test_synthetics_default_context.php @@ -69,13 +69,15 @@ [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); /* diff --git a/tests/integration/external/file_get_contents/test_synthetics_disabled.php b/tests/integration/external/file_get_contents/test_synthetics_disabled.php index 09b7fa4ca..17835608c 100644 --- a/tests/integration/external/file_get_contents/test_synthetics_disabled.php +++ b/tests/integration/external/file_get_contents/test_synthetics_disabled.php @@ -66,13 +66,15 @@ [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); $url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php'); diff --git a/tests/integration/external/file_get_contents/test_synthetics_no_context.php b/tests/integration/external/file_get_contents/test_synthetics_no_context.php index 595ffa550..cb6adf4b8 100644 --- a/tests/integration/external/file_get_contents/test_synthetics_no_context.php +++ b/tests/integration/external/file_get_contents/test_synthetics_no_context.php @@ -73,13 +73,15 @@ [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); $url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php'); diff --git a/tests/integration/external/file_get_contents/test_synthetics_with_cat_disabled.php b/tests/integration/external/file_get_contents/test_synthetics_with_cat_disabled.php index b43639d74..8ad02a415 100644 --- a/tests/integration/external/file_get_contents/test_synthetics_with_cat_disabled.php +++ b/tests/integration/external/file_get_contents/test_synthetics_with_cat_disabled.php @@ -67,13 +67,15 @@ [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); $url = "http://" . make_tracing_url(realpath(dirname(__FILE__)) . '/../../../include/tracing_endpoint.php'); diff --git a/tests/integration/external/file_get_contents/test_synthetics_with_dt.php b/tests/integration/external/file_get_contents/test_synthetics_with_dt.php index ff02c8c35..72b816cd0 100644 --- a/tests/integration/external/file_get_contents/test_synthetics_with_dt.php +++ b/tests/integration/external/file_get_contents/test_synthetics_with_dt.php @@ -68,13 +68,15 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); /* diff --git a/tests/integration/external/file_get_contents/test_synthetics_with_dt_logging_off.php b/tests/integration/external/file_get_contents/test_synthetics_with_dt_logging_off.php index 0b5f11e03..f6a829dd4 100644 --- a/tests/integration/external/file_get_contents/test_synthetics_with_dt_logging_off.php +++ b/tests/integration/external/file_get_contents/test_synthetics_with_dt_logging_off.php @@ -70,14 +70,16 @@ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allWeb"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/TraceContext/Create/Success"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [3, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath(dirname(__FILE__)) . '/../../../include/config.php'); /* diff --git a/tests/integration/external/guzzle5/test_cat.php b/tests/integration/external/guzzle5/test_cat.php index 1c852c2a6..2b74411ff 100644 --- a/tests/integration/external/guzzle5/test_cat.php +++ b/tests/integration/external/guzzle5/test_cat.php @@ -54,12 +54,14 @@ [{"name":"Supportability/library/Guzzle 4-5/detected"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/Unsupported/curl_setopt/CURLOPT_HEADERFUNCTION/closure"}, [3, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + ?> ', $matches[2], "entity.guid correct"); + tap_equal($linkmeta['hostname'] ?? '', $matches[3], "hostname correct"); + tap_equal($linkmeta['trace.id'] ?? '', $matches[4], "trace.id correct"); + tap_equal(true, strlen($matches[5]) > 0 && preg_match("/[\w\d]+/",$matches[5]), "span.id is non-zero length and alphanumeric"); + if (isset($linkmeta['entity.name'])) { + $name = urlencode($linkmeta['entity.name']); + } else { + $name = ''; + } + tap_equal($name, $matches[6], "entity.name correct"); + } + + /* have to return a non-null value which is the output string */ + return ""; + } + + public function formatBatch(array $records) { + foreach ($records as $key => $record) { + $records[$key] = $this->format($record); + } + + return $records; + } +} diff --git a/tests/integration/logging/monolog2/test_monolog_basic.php b/tests/integration/logging/monolog2/test_monolog_basic.php index ada3ab2d1..50003fb6e 100644 --- a/tests/integration/logging/monolog2/test_monolog_basic.php +++ b/tests/integration/logging/monolog2/test_monolog_basic.php @@ -56,6 +56,7 @@ [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], diff --git a/tests/integration/logging/monolog2/test_monolog_cat.php b/tests/integration/logging/monolog2/test_monolog_cat.php index 64f71b25b..97a61b77d 100644 --- a/tests/integration/logging/monolog2/test_monolog_cat.php +++ b/tests/integration/logging/monolog2/test_monolog_cat.php @@ -57,13 +57,13 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ - /*EXPECT_LOG_EVENTS [ { diff --git a/tests/integration/logging/monolog2/test_monolog_decoration_and_forwarding.php b/tests/integration/logging/monolog2/test_monolog_decoration_and_forwarding.php new file mode 100644 index 000000000..01ce34da8 --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_decoration_and_forwarding.php @@ -0,0 +1,259 @@ +setFormatter($formatter); + + $logger->pushHandler($stdoutHandler); + + // insert delays between log messages to allow priority sampling + // to resolve that later messages have higher precedence + // since timestamps are only millisecond resolution + // without delays sometimes order in output will reflect + // all having the same timestamp. + $logger->debug("debug"); + usleep(10000); + $logger->info("info"); + usleep(10000); + $logger->notice("notice"); + usleep(10000); + $logger->warning("warning"); + usleep(10000); + $logger->error("error"); + usleep(10000); + $logger->critical("critical"); + usleep(10000); + $logger->alert("alert"); + usleep(10000); + $logger->emergency("emergency"); +} + +test_logging(); \ No newline at end of file diff --git a/tests/integration/logging/monolog2/test_monolog_decoration_basic.php b/tests/integration/logging/monolog2/test_monolog_decoration_basic.php new file mode 100644 index 000000000..4ae75c9e4 --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_decoration_basic.php @@ -0,0 +1,170 @@ +setFormatter($formatter); + + $logger->pushHandler($stdoutHandler); + + // insert delays between log messages to allow priority sampling + // to resolve that later messages have higher precedence + // since timestamps are only millisecond resolution + // without delays sometimes order in output will reflect + // all having the same timestamp. + $logger->debug("debug"); + usleep(10000); + $logger->info("info"); + usleep(10000); + $logger->notice("notice"); + usleep(10000); + $logger->warning("warning"); + usleep(10000); + $logger->error("error"); + usleep(10000); + $logger->critical("critical"); + usleep(10000); + $logger->alert("alert"); + usleep(10000); + $logger->emergency("emergency"); +} + +test_logging(); \ No newline at end of file diff --git a/tests/integration/logging/monolog2/test_monolog_decoration_multiple_handlers.php b/tests/integration/logging/monolog2/test_monolog_decoration_multiple_handlers.php new file mode 100644 index 000000000..4467366f2 --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_decoration_multiple_handlers.php @@ -0,0 +1,227 @@ +setFormatter($formatter); + $noopHandler = new NoopHandler(); + $processHandler = new ProcessHandler('cat > /dev/null', logger::DEBUG); + $processHandler->setFormatter($formatter); + + $logger->pushHandler($stdoutHandler); + $logger->pushHandler($noopHandler); + $logger->pushHandler($processHandler); + + // insert delays between log messages to allow priority sampling + // to resolve that later messages have higher precedence + // since timestamps are only millisecond resolution + // without delays sometimes order in output will reflect + // all having the same timestamp. + $logger->debug("debug"); + usleep(10000); + $logger->info("info"); + usleep(10000); + $logger->notice("notice"); + usleep(10000); + $logger->warning("warning"); + usleep(10000); + $logger->error("error"); + usleep(10000); + $logger->critical("critical"); + usleep(10000); + $logger->alert("alert"); + usleep(10000); + $logger->emergency("emergency"); +} + +test_logging(); \ No newline at end of file diff --git a/tests/integration/logging/monolog2/test_monolog_disable_forwarding.php b/tests/integration/logging/monolog2/test_monolog_disable_forwarding.php index db6529de2..ccfa6931b 100644 --- a/tests/integration/logging/monolog2/test_monolog_disable_forwarding.php +++ b/tests/integration/logging/monolog2/test_monolog_disable_forwarding.php @@ -58,6 +58,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog2/test_monolog_disable_logging.php b/tests/integration/logging/monolog2/test_monolog_disable_logging.php index 34d7905c1..c6a3756df 100644 --- a/tests/integration/logging/monolog2/test_monolog_disable_logging.php +++ b/tests/integration/logging/monolog2/test_monolog_disable_logging.php @@ -49,6 +49,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog2/test_monolog_disable_metrics.php b/tests/integration/logging/monolog2/test_monolog_disable_metrics.php index 260c7c2e3..9f9682652 100644 --- a/tests/integration/logging/monolog2/test_monolog_disable_metrics.php +++ b/tests/integration/logging/monolog2/test_monolog_disable_metrics.php @@ -52,6 +52,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog2/test_monolog_drop_empty.php b/tests/integration/logging/monolog2/test_monolog_drop_empty.php index 79f8b7f2f..e9d236e77 100644 --- a/tests/integration/logging/monolog2/test_monolog_drop_empty.php +++ b/tests/integration/logging/monolog2/test_monolog_drop_empty.php @@ -58,6 +58,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog2/test_monolog_escape_chars.php b/tests/integration/logging/monolog2/test_monolog_escape_chars.php index 00aee4d29..6018682f0 100644 --- a/tests/integration/logging/monolog2/test_monolog_escape_chars.php +++ b/tests/integration/logging/monolog2/test_monolog_escape_chars.php @@ -39,6 +39,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog2/test_monolog_hsm_disable_forwarding.php b/tests/integration/logging/monolog2/test_monolog_hsm_disable_forwarding.php index 4dabd23d8..90f78660e 100644 --- a/tests/integration/logging/monolog2/test_monolog_hsm_disable_forwarding.php +++ b/tests/integration/logging/monolog2/test_monolog_hsm_disable_forwarding.php @@ -59,6 +59,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog2/test_monolog_large_message_limit.php b/tests/integration/logging/monolog2/test_monolog_large_message_limit.php index 60ec874ff..a6790497b 100644 --- a/tests/integration/logging/monolog2/test_monolog_large_message_limit.php +++ b/tests/integration/logging/monolog2/test_monolog_large_message_limit.php @@ -41,6 +41,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog2/test_monolog_large_message_limit_drops.php b/tests/integration/logging/monolog2/test_monolog_large_message_limit_drops.php index 43afaf811..f21657f53 100644 --- a/tests/integration/logging/monolog2/test_monolog_large_message_limit_drops.php +++ b/tests/integration/logging/monolog2/test_monolog_large_message_limit_drops.php @@ -41,6 +41,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog2/test_monolog_limit_log_events.php b/tests/integration/logging/monolog2/test_monolog_limit_log_events.php index 29ba36334..ea2104892 100644 --- a/tests/integration/logging/monolog2/test_monolog_limit_log_events.php +++ b/tests/integration/logging/monolog2/test_monolog_limit_log_events.php @@ -59,6 +59,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog2/test_monolog_limit_zero_events.php b/tests/integration/logging/monolog2/test_monolog_limit_zero_events.php index bc0c740cd..0aa718275 100644 --- a/tests/integration/logging/monolog2/test_monolog_limit_zero_events.php +++ b/tests/integration/logging/monolog2/test_monolog_limit_zero_events.php @@ -59,6 +59,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog2/test_monolog_log_events_max_samples_stored_invalid1.php b/tests/integration/logging/monolog2/test_monolog_log_events_max_samples_stored_invalid1.php index a0e853d88..28a670681 100644 --- a/tests/integration/logging/monolog2/test_monolog_log_events_max_samples_stored_invalid1.php +++ b/tests/integration/logging/monolog2/test_monolog_log_events_max_samples_stored_invalid1.php @@ -41,6 +41,7 @@ [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], diff --git a/tests/integration/logging/monolog2/test_monolog_log_events_max_samples_stored_invalid2.php b/tests/integration/logging/monolog2/test_monolog_log_events_max_samples_stored_invalid2.php index bdac9f17f..0999ba3b0 100644 --- a/tests/integration/logging/monolog2/test_monolog_log_events_max_samples_stored_invalid2.php +++ b/tests/integration/logging/monolog2/test_monolog_log_events_max_samples_stored_invalid2.php @@ -41,6 +41,7 @@ [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], diff --git a/tests/integration/logging/monolog2/test_monolog_log_events_max_samples_stored_invalid3.php b/tests/integration/logging/monolog2/test_monolog_log_events_max_samples_stored_invalid3.php index e134edb24..afb9e5bbb 100644 --- a/tests/integration/logging/monolog2/test_monolog_log_events_max_samples_stored_invalid3.php +++ b/tests/integration/logging/monolog2/test_monolog_log_events_max_samples_stored_invalid3.php @@ -41,6 +41,7 @@ [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], diff --git a/tests/integration/logging/monolog2/test_monolog_log_events_max_samples_stored_invalid4.php b/tests/integration/logging/monolog2/test_monolog_log_events_max_samples_stored_invalid4.php index da4843af1..8696024df 100644 --- a/tests/integration/logging/monolog2/test_monolog_log_events_max_samples_stored_invalid4.php +++ b/tests/integration/logging/monolog2/test_monolog_log_events_max_samples_stored_invalid4.php @@ -41,6 +41,7 @@ [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], diff --git a/tests/integration/logging/monolog2/test_monolog_log_level_filter.php b/tests/integration/logging/monolog2/test_monolog_log_level_filter.php index d071f438f..f24a2a62f 100644 --- a/tests/integration/logging/monolog2/test_monolog_log_level_filter.php +++ b/tests/integration/logging/monolog2/test_monolog_log_level_filter.php @@ -56,6 +56,7 @@ [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], diff --git a/tests/integration/logging/monolog2/test_monolog_log_level_filter_invalid.php b/tests/integration/logging/monolog2/test_monolog_log_level_filter_invalid.php index e14ef1c2b..6259670f0 100644 --- a/tests/integration/logging/monolog2/test_monolog_log_level_filter_invalid.php +++ b/tests/integration/logging/monolog2/test_monolog_log_level_filter_invalid.php @@ -57,6 +57,7 @@ [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], diff --git a/tests/integration/logging/monolog2/test_monolog_truncate_long_msgs.php b/tests/integration/logging/monolog2/test_monolog_truncate_long_msgs.php index e3fafefa9..db912a727 100644 --- a/tests/integration/logging/monolog2/test_monolog_truncate_long_msgs.php +++ b/tests/integration/logging/monolog2/test_monolog_truncate_long_msgs.php @@ -44,6 +44,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog3/checkdecorateformatter.php b/tests/integration/logging/monolog3/checkdecorateformatter.php new file mode 100644 index 000000000..46945b656 --- /dev/null +++ b/tests/integration/logging/monolog3/checkdecorateformatter.php @@ -0,0 +1,41 @@ +', $matches[2], "entity.guid correct"); + tap_equal($linkmeta['hostname'] ?? '', $matches[3], "hostname correct"); + tap_equal($linkmeta['trace.id'] ?? '', $matches[4], "trace.id correct"); + tap_equal(true, strlen($matches[5]) > 0 && preg_match("/[\w\d]+/",$matches[5]), "span.id is non-zero length and alphanumeric"); + if (isset($linkmeta['entity.name'])) { + $name = urlencode($linkmeta['entity.name']); + } else { + $name = ''; + } + tap_equal($name, $matches[6], "entity.name correct"); + } + + /* have to return a non-null value which is the output string */ + return ""; + } + + public function formatBatch(array $records) { + foreach ($records as $key => $record) { + $records[$key] = $this->format($record); + } + + return $records; + } +} diff --git a/tests/integration/logging/monolog3/test_monolog_basic.php b/tests/integration/logging/monolog3/test_monolog_basic.php index 5f3bd39f6..538d5c9c9 100644 --- a/tests/integration/logging/monolog3/test_monolog_basic.php +++ b/tests/integration/logging/monolog3/test_monolog_basic.php @@ -57,6 +57,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog3/test_monolog_basic_clm.php b/tests/integration/logging/monolog3/test_monolog_basic_clm.php index 9c0586ec8..675f292bb 100644 --- a/tests/integration/logging/monolog3/test_monolog_basic_clm.php +++ b/tests/integration/logging/monolog3/test_monolog_basic_clm.php @@ -46,6 +46,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog3/test_monolog_basic_clm_off.php b/tests/integration/logging/monolog3/test_monolog_basic_clm_off.php index ced5afb07..2ca2e988c 100644 --- a/tests/integration/logging/monolog3/test_monolog_basic_clm_off.php +++ b/tests/integration/logging/monolog3/test_monolog_basic_clm_off.php @@ -45,6 +45,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog3/test_monolog_cat.php b/tests/integration/logging/monolog3/test_monolog_cat.php index b2657fc03..1c68774d4 100644 --- a/tests/integration/logging/monolog3/test_monolog_cat.php +++ b/tests/integration/logging/monolog3/test_monolog_cat.php @@ -57,6 +57,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog3/test_monolog_decoration_and_forwarding.php b/tests/integration/logging/monolog3/test_monolog_decoration_and_forwarding.php new file mode 100644 index 000000000..20b201daa --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_decoration_and_forwarding.php @@ -0,0 +1,259 @@ +setFormatter($formatter); + + $logger->pushHandler($stdoutHandler); + + // insert delays between log messages to allow priority sampling + // to resolve that later messages have higher precedence + // since timestamps are only millisecond resolution + // without delays sometimes order in output will reflect + // all having the same timestamp. + $logger->debug("debug"); + usleep(10000); + $logger->info("info"); + usleep(10000); + $logger->notice("notice"); + usleep(10000); + $logger->warning("warning"); + usleep(10000); + $logger->error("error"); + usleep(10000); + $logger->critical("critical"); + usleep(10000); + $logger->alert("alert"); + usleep(10000); + $logger->emergency("emergency"); +} + +test_logging(); \ No newline at end of file diff --git a/tests/integration/logging/monolog3/test_monolog_decoration_basic.php b/tests/integration/logging/monolog3/test_monolog_decoration_basic.php new file mode 100644 index 000000000..cd73f05e3 --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_decoration_basic.php @@ -0,0 +1,170 @@ +setFormatter($formatter); + + $logger->pushHandler($stdoutHandler); + + // insert delays between log messages to allow priority sampling + // to resolve that later messages have higher precedence + // since timestamps are only millisecond resolution + // without delays sometimes order in output will reflect + // all having the same timestamp. + $logger->debug("debug"); + usleep(10000); + $logger->info("info"); + usleep(10000); + $logger->notice("notice"); + usleep(10000); + $logger->warning("warning"); + usleep(10000); + $logger->error("error"); + usleep(10000); + $logger->critical("critical"); + usleep(10000); + $logger->alert("alert"); + usleep(10000); + $logger->emergency("emergency"); +} + +test_logging(); \ No newline at end of file diff --git a/tests/integration/logging/monolog3/test_monolog_decoration_multiple_handlers.php b/tests/integration/logging/monolog3/test_monolog_decoration_multiple_handlers.php new file mode 100644 index 000000000..881f23b51 --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_decoration_multiple_handlers.php @@ -0,0 +1,228 @@ +setFormatter($formatter); + $noopHandler = new NoopHandler(); + $processHandler = new ProcessHandler('cat > /dev/null', logger::DEBUG); + $processHandler->setFormatter($formatter); + + $logger->pushHandler($stdoutHandler); + $logger->pushHandler($noopHandler); + $logger->pushHandler($processHandler); + + + // insert delays between log messages to allow priority sampling + // to resolve that later messages have higher precedence + // since timestamps are only millisecond resolution + // without delays sometimes order in output will reflect + // all having the same timestamp. + $logger->debug("debug"); + usleep(10000); + $logger->info("info"); + usleep(10000); + $logger->notice("notice"); + usleep(10000); + $logger->warning("warning"); + usleep(10000); + $logger->error("error"); + usleep(10000); + $logger->critical("critical"); + usleep(10000); + $logger->alert("alert"); + usleep(10000); + $logger->emergency("emergency"); +} + +test_logging(); \ No newline at end of file diff --git a/tests/integration/logging/monolog3/test_monolog_disable_forwarding.php b/tests/integration/logging/monolog3/test_monolog_disable_forwarding.php index afa4dfacd..08a8c0914 100644 --- a/tests/integration/logging/monolog3/test_monolog_disable_forwarding.php +++ b/tests/integration/logging/monolog3/test_monolog_disable_forwarding.php @@ -58,6 +58,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog3/test_monolog_disable_logging.php b/tests/integration/logging/monolog3/test_monolog_disable_logging.php index 070845168..949f02102 100644 --- a/tests/integration/logging/monolog3/test_monolog_disable_logging.php +++ b/tests/integration/logging/monolog3/test_monolog_disable_logging.php @@ -49,6 +49,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog3/test_monolog_disable_metrics.php b/tests/integration/logging/monolog3/test_monolog_disable_metrics.php index 17b1b7968..90e6767fb 100644 --- a/tests/integration/logging/monolog3/test_monolog_disable_metrics.php +++ b/tests/integration/logging/monolog3/test_monolog_disable_metrics.php @@ -52,6 +52,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog3/test_monolog_drop_empty.php b/tests/integration/logging/monolog3/test_monolog_drop_empty.php index e806bb493..4cee51f79 100644 --- a/tests/integration/logging/monolog3/test_monolog_drop_empty.php +++ b/tests/integration/logging/monolog3/test_monolog_drop_empty.php @@ -58,6 +58,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog3/test_monolog_escape_chars.php b/tests/integration/logging/monolog3/test_monolog_escape_chars.php index f32d2f9ab..c7978a7a2 100644 --- a/tests/integration/logging/monolog3/test_monolog_escape_chars.php +++ b/tests/integration/logging/monolog3/test_monolog_escape_chars.php @@ -39,6 +39,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog3/test_monolog_hsm_disable_forwarding.php b/tests/integration/logging/monolog3/test_monolog_hsm_disable_forwarding.php index 557b59fa7..64232c566 100644 --- a/tests/integration/logging/monolog3/test_monolog_hsm_disable_forwarding.php +++ b/tests/integration/logging/monolog3/test_monolog_hsm_disable_forwarding.php @@ -59,6 +59,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog3/test_monolog_large_message_limit.php b/tests/integration/logging/monolog3/test_monolog_large_message_limit.php index 368e955f0..1e25b451f 100644 --- a/tests/integration/logging/monolog3/test_monolog_large_message_limit.php +++ b/tests/integration/logging/monolog3/test_monolog_large_message_limit.php @@ -41,6 +41,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog3/test_monolog_large_message_limit_drops.php b/tests/integration/logging/monolog3/test_monolog_large_message_limit_drops.php index fb2150e26..66de51989 100644 --- a/tests/integration/logging/monolog3/test_monolog_large_message_limit_drops.php +++ b/tests/integration/logging/monolog3/test_monolog_large_message_limit_drops.php @@ -41,6 +41,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog3/test_monolog_limit_log_events.php b/tests/integration/logging/monolog3/test_monolog_limit_log_events.php index 2b9701891..69bdb618c 100644 --- a/tests/integration/logging/monolog3/test_monolog_limit_log_events.php +++ b/tests/integration/logging/monolog3/test_monolog_limit_log_events.php @@ -59,6 +59,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog3/test_monolog_limit_zero_events.php b/tests/integration/logging/monolog3/test_monolog_limit_zero_events.php index 0341fa0af..a9dd71587 100644 --- a/tests/integration/logging/monolog3/test_monolog_limit_zero_events.php +++ b/tests/integration/logging/monolog3/test_monolog_limit_zero_events.php @@ -59,6 +59,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog3/test_monolog_log_events_max_samples_stored_invalid1.php b/tests/integration/logging/monolog3/test_monolog_log_events_max_samples_stored_invalid1.php index 0765f4e32..7b5892cc0 100644 --- a/tests/integration/logging/monolog3/test_monolog_log_events_max_samples_stored_invalid1.php +++ b/tests/integration/logging/monolog3/test_monolog_log_events_max_samples_stored_invalid1.php @@ -43,6 +43,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/logging/monolog3/test_monolog_log_events_max_samples_stored_invalid2.php b/tests/integration/logging/monolog3/test_monolog_log_events_max_samples_stored_invalid2.php index f0ccdbce8..644512bc2 100644 --- a/tests/integration/logging/monolog3/test_monolog_log_events_max_samples_stored_invalid2.php +++ b/tests/integration/logging/monolog3/test_monolog_log_events_max_samples_stored_invalid2.php @@ -41,6 +41,7 @@ [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], diff --git a/tests/integration/logging/monolog3/test_monolog_log_events_max_samples_stored_invalid3.php b/tests/integration/logging/monolog3/test_monolog_log_events_max_samples_stored_invalid3.php index 96c63494e..d64021bad 100644 --- a/tests/integration/logging/monolog3/test_monolog_log_events_max_samples_stored_invalid3.php +++ b/tests/integration/logging/monolog3/test_monolog_log_events_max_samples_stored_invalid3.php @@ -41,6 +41,7 @@ [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], diff --git a/tests/integration/logging/monolog3/test_monolog_log_events_max_samples_stored_invalid4.php b/tests/integration/logging/monolog3/test_monolog_log_events_max_samples_stored_invalid4.php index 593dd94d2..7879dba27 100644 --- a/tests/integration/logging/monolog3/test_monolog_log_events_max_samples_stored_invalid4.php +++ b/tests/integration/logging/monolog3/test_monolog_log_events_max_samples_stored_invalid4.php @@ -41,6 +41,7 @@ [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], diff --git a/tests/integration/logging/monolog3/test_monolog_log_level_filter.php b/tests/integration/logging/monolog3/test_monolog_log_level_filter.php index b7ac16ad8..14a0a0c95 100644 --- a/tests/integration/logging/monolog3/test_monolog_log_level_filter.php +++ b/tests/integration/logging/monolog3/test_monolog_log_level_filter.php @@ -56,6 +56,7 @@ [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], diff --git a/tests/integration/logging/monolog3/test_monolog_log_level_filter_invalid.php b/tests/integration/logging/monolog3/test_monolog_log_level_filter_invalid.php index c351c181c..5659971f3 100644 --- a/tests/integration/logging/monolog3/test_monolog_log_level_filter_invalid.php +++ b/tests/integration/logging/monolog3/test_monolog_log_level_filter_invalid.php @@ -57,6 +57,7 @@ [{"name": "OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], diff --git a/tests/integration/logging/monolog3/test_monolog_truncate_long_msgs.php b/tests/integration/logging/monolog3/test_monolog_truncate_long_msgs.php index 69c679218..ac7e15bcf 100644 --- a/tests/integration/logging/monolog3/test_monolog_truncate_long_msgs.php +++ b/tests/integration/logging/monolog3/test_monolog_truncate_long_msgs.php @@ -44,6 +44,7 @@ [{"name": "OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] ] diff --git a/tests/integration/memcache/test_add.php b/tests/integration/memcache/test_add.php index 8afc2045c..a144c1386 100644 --- a/tests/integration/memcache/test_add.php +++ b/tests/integration/memcache/test_add.php @@ -60,13 +60,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/config.php'); diff --git a/tests/integration/memcache/test_add.php82.php b/tests/integration/memcache/test_add.php82.php index f08463eff..fe1223d17 100644 --- a/tests/integration/memcache/test_add.php82.php +++ b/tests/integration/memcache/test_add.php82.php @@ -60,12 +60,14 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/config.php'); diff --git a/tests/integration/memcache/test_incr_decr.php b/tests/integration/memcache/test_incr_decr.php index 156952a86..859b53f99 100644 --- a/tests/integration/memcache/test_incr_decr.php +++ b/tests/integration/memcache/test_incr_decr.php @@ -64,13 +64,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/config.php'); diff --git a/tests/integration/memcache/test_incr_decr.php82.php b/tests/integration/memcache/test_incr_decr.php82.php index 2e04a32a3..a7d5bc224 100644 --- a/tests/integration/memcache/test_incr_decr.php82.php +++ b/tests/integration/memcache/test_incr_decr.php82.php @@ -64,13 +64,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/config.php'); diff --git a/tests/integration/memcache/test_memcache_add.php b/tests/integration/memcache/test_memcache_add.php index 0f042aaf5..3d6f6e3cb 100644 --- a/tests/integration/memcache/test_memcache_add.php +++ b/tests/integration/memcache/test_memcache_add.php @@ -61,13 +61,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/config.php'); diff --git a/tests/integration/memcache/test_memcache_add.php82.php b/tests/integration/memcache/test_memcache_add.php82.php index c568d1929..9c3efc63d 100644 --- a/tests/integration/memcache/test_memcache_add.php82.php +++ b/tests/integration/memcache/test_memcache_add.php82.php @@ -61,13 +61,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/config.php'); diff --git a/tests/integration/memcache/test_memcache_add_logging_off.php b/tests/integration/memcache/test_memcache_add_logging_off.php index 68e9a5439..9d63ac00e 100644 --- a/tests/integration/memcache/test_memcache_add_logging_off.php +++ b/tests/integration/memcache/test_memcache_add_logging_off.php @@ -63,14 +63,16 @@ [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/config.php'); diff --git a/tests/integration/memcache/test_memcache_add_logging_off.php82.php b/tests/integration/memcache/test_memcache_add_logging_off.php82.php index d102fda87..28fac43ce 100644 --- a/tests/integration/memcache/test_memcache_add_logging_off.php82.php +++ b/tests/integration/memcache/test_memcache_add_logging_off.php82.php @@ -64,13 +64,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/config.php'); diff --git a/tests/integration/memcache/test_memcache_incr_decr.php b/tests/integration/memcache/test_memcache_incr_decr.php index 3bb90c753..91188b071 100644 --- a/tests/integration/memcache/test_memcache_incr_decr.php +++ b/tests/integration/memcache/test_memcache_incr_decr.php @@ -64,13 +64,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/config.php'); diff --git a/tests/integration/memcache/test_memcache_incr_decr.php82.php b/tests/integration/memcache/test_memcache_incr_decr.php82.php index a08338d63..59be46d06 100644 --- a/tests/integration/memcache/test_memcache_incr_decr.php82.php +++ b/tests/integration/memcache/test_memcache_incr_decr.php82.php @@ -64,13 +64,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/config.php'); diff --git a/tests/integration/memcache/test_memcache_replace.php b/tests/integration/memcache/test_memcache_replace.php index 5223f8738..99734e5bc 100644 --- a/tests/integration/memcache/test_memcache_replace.php +++ b/tests/integration/memcache/test_memcache_replace.php @@ -66,13 +66,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/config.php'); diff --git a/tests/integration/memcache/test_memcache_replace.php82.php b/tests/integration/memcache/test_memcache_replace.php82.php index b1d8e9443..f52a39fde 100644 --- a/tests/integration/memcache/test_memcache_replace.php82.php +++ b/tests/integration/memcache/test_memcache_replace.php82.php @@ -66,13 +66,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/config.php'); diff --git a/tests/integration/memcache/test_memcache_set.php b/tests/integration/memcache/test_memcache_set.php index dee261355..78b1f01b9 100644 --- a/tests/integration/memcache/test_memcache_set.php +++ b/tests/integration/memcache/test_memcache_set.php @@ -63,13 +63,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/config.php'); diff --git a/tests/integration/memcache/test_memcache_set.php82.php b/tests/integration/memcache/test_memcache_set.php82.php index b2b2381f3..329cb3c5f 100644 --- a/tests/integration/memcache/test_memcache_set.php82.php +++ b/tests/integration/memcache/test_memcache_set.php82.php @@ -63,13 +63,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/config.php'); diff --git a/tests/integration/memcache/test_replace.php b/tests/integration/memcache/test_replace.php index 6464eeb57..9efac30cc 100644 --- a/tests/integration/memcache/test_replace.php +++ b/tests/integration/memcache/test_replace.php @@ -65,13 +65,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/config.php'); diff --git a/tests/integration/memcache/test_replace.php82.php b/tests/integration/memcache/test_replace.php82.php index 2f123b22a..0b5124782 100644 --- a/tests/integration/memcache/test_replace.php82.php +++ b/tests/integration/memcache/test_replace.php82.php @@ -65,13 +65,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/config.php'); diff --git a/tests/integration/memcache/test_set.php b/tests/integration/memcache/test_set.php index ca8cda721..eb0bcdd42 100644 --- a/tests/integration/memcache/test_set.php +++ b/tests/integration/memcache/test_set.php @@ -62,13 +62,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/config.php'); diff --git a/tests/integration/memcache/test_set.php82.php b/tests/integration/memcache/test_set.php82.php index 457be6b89..8e4df3b52 100644 --- a/tests/integration/memcache/test_set.php82.php +++ b/tests/integration/memcache/test_set.php82.php @@ -62,13 +62,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/config.php'); diff --git a/tests/integration/memcached/test_basic.php b/tests/integration/memcached/test_basic.php index f79e1be6e..6ccde57b7 100644 --- a/tests/integration/memcached/test_basic.php +++ b/tests/integration/memcached/test_basic.php @@ -72,13 +72,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/memcache.inc'); diff --git a/tests/integration/memcached/test_basic_logging_off.php b/tests/integration/memcached/test_basic_logging_off.php index bf0d4469a..521fc1d44 100644 --- a/tests/integration/memcached/test_basic_logging_off.php +++ b/tests/integration/memcached/test_basic_logging_off.php @@ -74,12 +74,14 @@ [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/memcache.inc'); diff --git a/tests/integration/memcached/test_by_key.php b/tests/integration/memcached/test_by_key.php index e0329732d..006d6cd7d 100644 --- a/tests/integration/memcached/test_by_key.php +++ b/tests/integration/memcached/test_by_key.php @@ -68,13 +68,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ diff --git a/tests/integration/memcached/test_cas.php5.php b/tests/integration/memcached/test_cas.php5.php index 5a75fd4d1..c96dd94b3 100644 --- a/tests/integration/memcached/test_cas.php5.php +++ b/tests/integration/memcached/test_cas.php5.php @@ -57,13 +57,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ diff --git a/tests/integration/memcached/test_cas.php7.php b/tests/integration/memcached/test_cas.php7.php index cdd8dff3a..b69010e59 100644 --- a/tests/integration/memcached/test_cas.php7.php +++ b/tests/integration/memcached/test_cas.php7.php @@ -59,13 +59,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ diff --git a/tests/integration/memcached/test_cas_by_key.php5.php b/tests/integration/memcached/test_cas_by_key.php5.php index 97ac86f8e..7dda968dc 100644 --- a/tests/integration/memcached/test_cas_by_key.php5.php +++ b/tests/integration/memcached/test_cas_by_key.php5.php @@ -57,13 +57,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ diff --git a/tests/integration/memcached/test_cas_by_key.php7.php b/tests/integration/memcached/test_cas_by_key.php7.php index 0eeec1fff..f43a6dc29 100644 --- a/tests/integration/memcached/test_cas_by_key.php7.php +++ b/tests/integration/memcached/test_cas_by_key.php7.php @@ -59,13 +59,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ diff --git a/tests/integration/memcached/test_concat.php b/tests/integration/memcached/test_concat.php index a447e1421..092bd5683 100644 --- a/tests/integration/memcached/test_concat.php +++ b/tests/integration/memcached/test_concat.php @@ -52,13 +52,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ diff --git a/tests/integration/memcached/test_concat_by_key.php b/tests/integration/memcached/test_concat_by_key.php index 3d77194e3..7339eed12 100644 --- a/tests/integration/memcached/test_concat_by_key.php +++ b/tests/integration/memcached/test_concat_by_key.php @@ -52,13 +52,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ diff --git a/tests/integration/memcached/test_concat_by_key_logging_off.php b/tests/integration/memcached/test_concat_by_key_logging_off.php index 506b024f5..d4e3f2d60 100644 --- a/tests/integration/memcached/test_concat_by_key_logging_off.php +++ b/tests/integration/memcached/test_concat_by_key_logging_off.php @@ -54,12 +54,14 @@ [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ diff --git a/tests/integration/memcached/test_multi.php b/tests/integration/memcached/test_multi.php index 3bffaba28..82328762a 100644 --- a/tests/integration/memcached/test_multi.php +++ b/tests/integration/memcached/test_multi.php @@ -53,13 +53,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ diff --git a/tests/integration/memcached/test_multi_by_key.php b/tests/integration/memcached/test_multi_by_key.php index 2561ff1cc..d5867c36d 100644 --- a/tests/integration/memcached/test_multi_by_key.php +++ b/tests/integration/memcached/test_multi_by_key.php @@ -53,13 +53,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ diff --git a/tests/integration/mongo/test_execute.php b/tests/integration/mongo/test_execute.php index 5df48a835..245e92036 100644 --- a/tests/integration/mongo/test_execute.php +++ b/tests/integration/mongo/test_execute.php @@ -35,13 +35,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ diff --git a/tests/integration/mongo/test_execute_logging_off.php b/tests/integration/mongo/test_execute_logging_off.php index 280412ae5..29661c7c7 100644 --- a/tests/integration/mongo/test_execute_logging_off.php +++ b/tests/integration/mongo/test_execute_logging_off.php @@ -37,12 +37,14 @@ [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ diff --git a/tests/integration/mongo/test_find.php b/tests/integration/mongo/test_find.php index 8cb7a3e07..00d023364 100644 --- a/tests/integration/mongo/test_find.php +++ b/tests/integration/mongo/test_find.php @@ -36,13 +36,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ diff --git a/tests/integration/mysql/test_db_query.php b/tests/integration/mysql/test_db_query.php index badf502d4..d57281ddd 100644 --- a/tests/integration/mysql/test_db_query.php +++ b/tests/integration/mysql/test_db_query.php @@ -50,13 +50,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysql/test_db_query_error.php b/tests/integration/mysql/test_db_query_error.php index 3444ca25c..61c145b34 100644 --- a/tests/integration/mysql/test_db_query_error.php +++ b/tests/integration/mysql/test_db_query_error.php @@ -44,13 +44,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/mysql/test_db_query_logging_off.php b/tests/integration/mysql/test_db_query_logging_off.php index 10dfe8acd..751d62fc7 100644 --- a/tests/integration/mysql/test_db_query_logging_off.php +++ b/tests/integration/mysql/test_db_query_logging_off.php @@ -52,14 +52,16 @@ [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysql/test_query.php b/tests/integration/mysql/test_query.php index 73c6d306d..a0b7c4c33 100644 --- a/tests/integration/mysql/test_query.php +++ b/tests/integration/mysql/test_query.php @@ -50,13 +50,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysql/test_query_error.php b/tests/integration/mysql/test_query_error.php index 736d2ee1f..b042605c0 100644 --- a/tests/integration/mysql/test_query_error.php +++ b/tests/integration/mysql/test_query_error.php @@ -44,13 +44,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/mysql/test_unbuffered_query.php b/tests/integration/mysql/test_unbuffered_query.php index de8286fbb..f4d95edb4 100644 --- a/tests/integration/mysql/test_unbuffered_query.php +++ b/tests/integration/mysql/test_unbuffered_query.php @@ -50,13 +50,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysql/test_unbuffered_query_logging_off.php b/tests/integration/mysql/test_unbuffered_query_logging_off.php index cb11a1a67..6779f1885 100644 --- a/tests/integration/mysql/test_unbuffered_query_logging_off.php +++ b/tests/integration/mysql/test_unbuffered_query_logging_off.php @@ -52,8 +52,9 @@ [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] */ diff --git a/tests/integration/mysqli/test_bind_param_object_oo.php b/tests/integration/mysqli/test_bind_param_object_oo.php index a1545069e..bd000429a 100644 --- a/tests/integration/mysqli/test_bind_param_object_oo.php +++ b/tests/integration/mysqli/test_bind_param_object_oo.php @@ -54,13 +54,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysqli/test_bind_param_object_oo_logging_off.php b/tests/integration/mysqli/test_bind_param_object_oo_logging_off.php index 610cf92cc..941e89555 100644 --- a/tests/integration/mysqli/test_bind_param_object_oo_logging_off.php +++ b/tests/integration/mysqli/test_bind_param_object_oo_logging_off.php @@ -56,14 +56,16 @@ [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysqli/test_bind_param_oo.php b/tests/integration/mysqli/test_bind_param_oo.php index a48e3ac1c..2b7dc5d0a 100644 --- a/tests/integration/mysqli/test_bind_param_oo.php +++ b/tests/integration/mysqli/test_bind_param_oo.php @@ -46,13 +46,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysqli/test_bind_param_proc.php b/tests/integration/mysqli/test_bind_param_proc.php index b8d5a8aba..6efc982a9 100644 --- a/tests/integration/mysqli/test_bind_param_proc.php +++ b/tests/integration/mysqli/test_bind_param_proc.php @@ -45,13 +45,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysqli/test_explain_connect.php b/tests/integration/mysqli/test_explain_connect.php index 75de2039c..7ee1f130b 100644 --- a/tests/integration/mysqli/test_explain_connect.php +++ b/tests/integration/mysqli/test_explain_connect.php @@ -32,25 +32,27 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/MySQL/tables/select", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysqli/test_explain_construct.php b/tests/integration/mysqli/test_explain_construct.php index 6b31f9f66..ce7357bc4 100644 --- a/tests/integration/mysqli/test_explain_construct.php +++ b/tests/integration/mysqli/test_explain_construct.php @@ -33,25 +33,27 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/MySQL/tables/select", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysqli/test_explain_database_no_user.php b/tests/integration/mysqli/test_explain_database_no_user.php index 797428b2a..07836dbb1 100644 --- a/tests/integration/mysqli/test_explain_database_no_user.php +++ b/tests/integration/mysqli/test_explain_database_no_user.php @@ -32,25 +32,27 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/MySQL/tables/select", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysqli/test_explain_database_no_user_logging_off.php b/tests/integration/mysqli/test_explain_database_no_user_logging_off.php index b8b2a25c7..1ea8a0741 100644 --- a/tests/integration/mysqli/test_explain_database_no_user_logging_off.php +++ b/tests/integration/mysqli/test_explain_database_no_user_logging_off.php @@ -35,6 +35,7 @@ [ [{"name": "Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, diff --git a/tests/integration/mysqli/test_explain_init_oo.php b/tests/integration/mysqli/test_explain_init_oo.php index 40f72e43c..4b0395788 100644 --- a/tests/integration/mysqli/test_explain_init_oo.php +++ b/tests/integration/mysqli/test_explain_init_oo.php @@ -32,25 +32,27 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/MySQL/tables/select", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysqli/test_explain_init_oo_persistent.php b/tests/integration/mysqli/test_explain_init_oo_persistent.php index 407f2f7c9..c3ff9268f 100644 --- a/tests/integration/mysqli/test_explain_init_oo_persistent.php +++ b/tests/integration/mysqli/test_explain_init_oo_persistent.php @@ -32,25 +32,27 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/MySQL/tables/select", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysqli/test_explain_init_proc.php b/tests/integration/mysqli/test_explain_init_proc.php index 5761b1fbf..05ce43f39 100644 --- a/tests/integration/mysqli/test_explain_init_proc.php +++ b/tests/integration/mysqli/test_explain_init_proc.php @@ -32,25 +32,27 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/MySQL/tables/select", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysqli/test_explain_leading_whitespace.php b/tests/integration/mysqli/test_explain_leading_whitespace.php index acc3ac332..d0b165ea6 100644 --- a/tests/integration/mysqli/test_explain_leading_whitespace.php +++ b/tests/integration/mysqli/test_explain_leading_whitespace.php @@ -31,25 +31,27 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/MySQL/tables/select", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysqli/test_explain_options_garbage.php b/tests/integration/mysqli/test_explain_options_garbage.php index 7761a38da..420a489af 100644 --- a/tests/integration/mysqli/test_explain_options_garbage.php +++ b/tests/integration/mysqli/test_explain_options_garbage.php @@ -27,20 +27,22 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Errors/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Errors/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + mysqli_options(null); diff --git a/tests/integration/mysqli/test_explain_real_connect_garbage.php b/tests/integration/mysqli/test_explain_real_connect_garbage.php index 753429e9a..c12a3d07b 100644 --- a/tests/integration/mysqli/test_explain_real_connect_garbage.php +++ b/tests/integration/mysqli/test_explain_real_connect_garbage.php @@ -27,20 +27,22 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"ErrorsByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Errors/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Errors/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Errors/OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + mysqli_real_connect(null); diff --git a/tests/integration/mysqli/test_explain_real_connect_garbage_logging_off.php b/tests/integration/mysqli/test_explain_real_connect_garbage_logging_off.php index f8f2566fc..511f1b1c9 100644 --- a/tests/integration/mysqli/test_explain_real_connect_garbage_logging_off.php +++ b/tests/integration/mysqli/test_explain_real_connect_garbage_logging_off.php @@ -30,6 +30,7 @@ [ [{"name": "Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, diff --git a/tests/integration/mysqli/test_explain_reused_id.php b/tests/integration/mysqli/test_explain_reused_id.php index 28bbf8ecf..21382def1 100644 --- a/tests/integration/mysqli/test_explain_reused_id.php +++ b/tests/integration/mysqli/test_explain_reused_id.php @@ -33,25 +33,27 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/all"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/allOther"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/statement/MySQL/tables/select"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/all"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/allOther"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/statement/MySQL/tables/select"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/MySQL/tables/select", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/MySQL/select"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/MySQL/select"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysqli/test_explain_select_db_oo.php b/tests/integration/mysqli/test_explain_select_db_oo.php index 02c6d3c4a..f03d91a6a 100644 --- a/tests/integration/mysqli/test_explain_select_db_oo.php +++ b/tests/integration/mysqli/test_explain_select_db_oo.php @@ -32,25 +32,27 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/MySQL/tables/select", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysqli/test_explain_select_db_proc.php b/tests/integration/mysqli/test_explain_select_db_proc.php index b762161b9..21c326ce9 100644 --- a/tests/integration/mysqli/test_explain_select_db_proc.php +++ b/tests/integration/mysqli/test_explain_select_db_proc.php @@ -32,25 +32,27 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/MySQL/tables/select", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysqli/test_multi_query_oo.php b/tests/integration/mysqli/test_multi_query_oo.php index 63db104c9..1d1e3006a 100644 --- a/tests/integration/mysqli/test_multi_query_oo.php +++ b/tests/integration/mysqli/test_multi_query_oo.php @@ -50,13 +50,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ diff --git a/tests/integration/mysqli/test_multi_query_proc.php b/tests/integration/mysqli/test_multi_query_proc.php index e934c4921..3f3014b0d 100644 --- a/tests/integration/mysqli/test_multi_query_proc.php +++ b/tests/integration/mysqli/test_multi_query_proc.php @@ -50,13 +50,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ diff --git a/tests/integration/mysqli/test_multi_query_proc_logging_off.php b/tests/integration/mysqli/test_multi_query_proc_logging_off.php index e934c4921..3f3014b0d 100644 --- a/tests/integration/mysqli/test_multi_query_proc_logging_off.php +++ b/tests/integration/mysqli/test_multi_query_proc_logging_off.php @@ -50,13 +50,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ diff --git a/tests/integration/mysqli/test_mysqli_query_1.php b/tests/integration/mysqli/test_mysqli_query_1.php index 9a54efbaa..dc44166af 100644 --- a/tests/integration/mysqli/test_mysqli_query_1.php +++ b/tests/integration/mysqli/test_mysqli_query_1.php @@ -47,13 +47,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysqli/test_prepare_oo.php b/tests/integration/mysqli/test_prepare_oo.php index b7f60b1a6..791b36a07 100644 --- a/tests/integration/mysqli/test_prepare_oo.php +++ b/tests/integration/mysqli/test_prepare_oo.php @@ -107,24 +107,26 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [40, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [40, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/all"}, [40, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/allOther"}, [40, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/MySQL/select"}, [40, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [40, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [40, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/all"}, [40, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/allOther"}, [40, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/MySQL/select"}, [40, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/MySQL/select", - "scope":"OtherTransaction/php__FILE__"}, [40, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [40, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/mysqli.inc'); diff --git a/tests/integration/mysqli/test_prepare_proc.php b/tests/integration/mysqli/test_prepare_proc.php index a9d32f10b..d18ad19bc 100644 --- a/tests/integration/mysqli/test_prepare_proc.php +++ b/tests/integration/mysqli/test_prepare_proc.php @@ -31,25 +31,27 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/MySQL/tables/select", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysqli/test_query_oo.php b/tests/integration/mysqli/test_query_oo.php index 87a18f032..770692bda 100644 --- a/tests/integration/mysqli/test_query_oo.php +++ b/tests/integration/mysqli/test_query_oo.php @@ -33,25 +33,27 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/all"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/allOther"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/statement/MySQL/tables/select"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/all"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/allOther"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/statement/MySQL/tables/select"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/MySQL/tables/select", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/MySQL/select"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/MySQL/select"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ diff --git a/tests/integration/mysqli/test_query_proc.php b/tests/integration/mysqli/test_query_proc.php index 6299c636c..c9dbc6f4e 100644 --- a/tests/integration/mysqli/test_query_proc.php +++ b/tests/integration/mysqli/test_query_proc.php @@ -33,25 +33,27 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/all"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/allOther"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/statement/MySQL/tables/select"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/all"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/allOther"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/statement/MySQL/tables/select"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/MySQL/tables/select", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/MySQL/select"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/MySQL/select"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ diff --git a/tests/integration/mysqli/test_real_query_oo.php b/tests/integration/mysqli/test_real_query_oo.php index a39d5b2d1..0bc63707c 100644 --- a/tests/integration/mysqli/test_real_query_oo.php +++ b/tests/integration/mysqli/test_real_query_oo.php @@ -50,13 +50,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysqli/test_real_query_oo_logging_off.php b/tests/integration/mysqli/test_real_query_oo_logging_off.php index a39d5b2d1..0bc63707c 100644 --- a/tests/integration/mysqli/test_real_query_oo_logging_off.php +++ b/tests/integration/mysqli/test_real_query_oo_logging_off.php @@ -50,13 +50,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysqli/test_real_query_proc.php b/tests/integration/mysqli/test_real_query_proc.php index d1640b737..33e04bc4f 100644 --- a/tests/integration/mysqli/test_real_query_proc.php +++ b/tests/integration/mysqli/test_real_query_proc.php @@ -39,25 +39,27 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/MySQL/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/MySQL/select"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/statement/MySQL/tables/select"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/MySQL/tables/select", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysqli/test_stmt_prepare_oo.php b/tests/integration/mysqli/test_stmt_prepare_oo.php index efe7cd8c8..a75325b94 100644 --- a/tests/integration/mysqli/test_stmt_prepare_oo.php +++ b/tests/integration/mysqli/test_stmt_prepare_oo.php @@ -45,13 +45,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ diff --git a/tests/integration/mysqli/test_stmt_prepare_proc.php b/tests/integration/mysqli/test_stmt_prepare_proc.php index b0511ee5f..7a70943e4 100644 --- a/tests/integration/mysqli/test_stmt_prepare_proc.php +++ b/tests/integration/mysqli/test_stmt_prepare_proc.php @@ -45,13 +45,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/mysqli/test_subclassing.php b/tests/integration/mysqli/test_subclassing.php index 8d442c710..c19b763fd 100644 --- a/tests/integration/mysqli/test_subclassing.php +++ b/tests/integration/mysqli/test_subclassing.php @@ -46,13 +46,15 @@ classes. [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ diff --git a/tests/integration/mysqli/test_subclassing.php81.php b/tests/integration/mysqli/test_subclassing.php81.php index d0aa70720..220962fa6 100644 --- a/tests/integration/mysqli/test_subclassing.php81.php +++ b/tests/integration/mysqli/test_subclassing.php81.php @@ -46,13 +46,15 @@ classes. [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ diff --git a/tests/integration/pdo/test_bad_input_1.php b/tests/integration/pdo/test_bad_input_1.php index 23902ec6e..c9b3ee07b 100644 --- a/tests/integration/pdo/test_bad_input_1.php +++ b/tests/integration/pdo/test_bad_input_1.php @@ -41,13 +41,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/pdo/test_bad_input_1_logging_off.php b/tests/integration/pdo/test_bad_input_1_logging_off.php index 0026e1d7b..571d7dc23 100644 --- a/tests/integration/pdo/test_bad_input_1_logging_off.php +++ b/tests/integration/pdo/test_bad_input_1_logging_off.php @@ -43,14 +43,16 @@ [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/pdo/test_query_1.php b/tests/integration/pdo/test_query_1.php index 9f91e2ee0..21b932f49 100644 --- a/tests/integration/pdo/test_query_1.php +++ b/tests/integration/pdo/test_query_1.php @@ -63,13 +63,15 @@ [{"name":"Datastore/statement/SQLite/test/select", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(dirname(__FILE__).'/../../include/tap.php'); function test_pdo_query() { diff --git a/tests/integration/pdo/test_query_1.php81.php b/tests/integration/pdo/test_query_1.php81.php index 0a1f2f99a..c773c6ebc 100644 --- a/tests/integration/pdo/test_query_1.php81.php +++ b/tests/integration/pdo/test_query_1.php81.php @@ -63,13 +63,15 @@ [{"name":"Datastore/statement/SQLite/test/select", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(dirname(__FILE__).'/../../include/tap.php'); function test_pdo_query() { diff --git a/tests/integration/pdo/test_query_2.php b/tests/integration/pdo/test_query_2.php index f54269ba6..e0269144c 100644 --- a/tests/integration/pdo/test_query_2.php +++ b/tests/integration/pdo/test_query_2.php @@ -60,13 +60,15 @@ [{"name":"Datastore/statement/SQLite/test/select", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(dirname(__FILE__).'/../../include/tap.php'); function test_pdo_query() { diff --git a/tests/integration/pdo/test_query_2_logging_off.php b/tests/integration/pdo/test_query_2_logging_off.php index 86b5f981d..f3d2da948 100644 --- a/tests/integration/pdo/test_query_2_logging_off.php +++ b/tests/integration/pdo/test_query_2_logging_off.php @@ -62,14 +62,16 @@ "scope":"OtherTransaction/php__FILE__"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/SQLite/test/select", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(dirname(__FILE__).'/../../include/tap.php'); function test_pdo_query() { diff --git a/tests/integration/pdo/test_query_3.php b/tests/integration/pdo/test_query_3.php index 5d6c9397d..e37919a72 100644 --- a/tests/integration/pdo/test_query_3.php +++ b/tests/integration/pdo/test_query_3.php @@ -58,13 +58,15 @@ [{"name":"Datastore/statement/SQLite/test/select", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(dirname(__FILE__).'/../../include/tap.php'); class Row { diff --git a/tests/integration/pdo/test_query_4.php b/tests/integration/pdo/test_query_4.php index 4a41f1c4a..884bb1f8d 100644 --- a/tests/integration/pdo/test_query_4.php +++ b/tests/integration/pdo/test_query_4.php @@ -58,13 +58,15 @@ [{"name":"Datastore/statement/SQLite/test/select", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(dirname(__FILE__).'/../../include/tap.php'); class Row { diff --git a/tests/integration/pgsql/test_pg_execute_mixed_use.php b/tests/integration/pgsql/test_pg_execute_mixed_use.php index 400c80acb..ab6e0903b 100644 --- a/tests/integration/pgsql/test_pg_execute_mixed_use.php +++ b/tests/integration/pgsql/test_pg_execute_mixed_use.php @@ -53,13 +53,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/pgsql/test_pg_execute_mixed_use_logging_off.php b/tests/integration/pgsql/test_pg_execute_mixed_use_logging_off.php index e1e708f85..72e451039 100644 --- a/tests/integration/pgsql/test_pg_execute_mixed_use_logging_off.php +++ b/tests/integration/pgsql/test_pg_execute_mixed_use_logging_off.php @@ -55,14 +55,16 @@ [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/pgsql/test_pg_execute_with_resource.php b/tests/integration/pgsql/test_pg_execute_with_resource.php index 9775a5ec2..c4f83c929 100644 --- a/tests/integration/pgsql/test_pg_execute_with_resource.php +++ b/tests/integration/pgsql/test_pg_execute_with_resource.php @@ -48,13 +48,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/pgsql/test_pg_execute_without_resource.php b/tests/integration/pgsql/test_pg_execute_without_resource.php index 8c5e35477..77e4bfa6b 100644 --- a/tests/integration/pgsql/test_pg_execute_without_resource.php +++ b/tests/integration/pgsql/test_pg_execute_without_resource.php @@ -50,13 +50,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/pgsql/test_pg_query_error.php b/tests/integration/pgsql/test_pg_query_error.php index 3f9e36af7..7aff7ea25 100644 --- a/tests/integration/pgsql/test_pg_query_error.php +++ b/tests/integration/pgsql/test_pg_query_error.php @@ -47,13 +47,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/pgsql/test_pg_query_params_error.php b/tests/integration/pgsql/test_pg_query_params_error.php index f632001e4..5151a9896 100644 --- a/tests/integration/pgsql/test_pg_query_params_error.php +++ b/tests/integration/pgsql/test_pg_query_params_error.php @@ -47,13 +47,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/pgsql/test_pg_query_params_error_logging_off.php b/tests/integration/pgsql/test_pg_query_params_error_logging_off.php index 1e3cfa13a..23d688c7e 100644 --- a/tests/integration/pgsql/test_pg_query_params_error_logging_off.php +++ b/tests/integration/pgsql/test_pg_query_params_error_logging_off.php @@ -49,14 +49,16 @@ [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/pgsql/test_pg_query_params_with_resource.php b/tests/integration/pgsql/test_pg_query_params_with_resource.php index 9ca92eed7..12f064520 100644 --- a/tests/integration/pgsql/test_pg_query_params_with_resource.php +++ b/tests/integration/pgsql/test_pg_query_params_with_resource.php @@ -45,13 +45,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/pgsql/test_pg_query_params_without_resource.php b/tests/integration/pgsql/test_pg_query_params_without_resource.php index d17d9ae0d..d8fc4e0fc 100644 --- a/tests/integration/pgsql/test_pg_query_params_without_resource.php +++ b/tests/integration/pgsql/test_pg_query_params_without_resource.php @@ -47,13 +47,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/pgsql/test_pg_query_with_resource.php b/tests/integration/pgsql/test_pg_query_with_resource.php index 8ebd3d9bd..45d17ecf2 100644 --- a/tests/integration/pgsql/test_pg_query_with_resource.php +++ b/tests/integration/pgsql/test_pg_query_with_resource.php @@ -45,13 +45,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/pgsql/test_pg_query_with_resource_logging_off.php b/tests/integration/pgsql/test_pg_query_with_resource_logging_off.php index 19db01fb2..1828881a5 100644 --- a/tests/integration/pgsql/test_pg_query_with_resource_logging_off.php +++ b/tests/integration/pgsql/test_pg_query_with_resource_logging_off.php @@ -47,14 +47,16 @@ [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/pgsql/test_pg_query_without_resource.php b/tests/integration/pgsql/test_pg_query_without_resource.php index 7487dac55..b6f17acec 100644 --- a/tests/integration/pgsql/test_pg_query_without_resource.php +++ b/tests/integration/pgsql/test_pg_query_without_resource.php @@ -47,13 +47,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_SLOW_SQLS [ [ diff --git a/tests/integration/predis/test_basic.php b/tests/integration/predis/test_basic.php index 9c4dcd674..0adfeaa04 100644 --- a/tests/integration/predis/test_basic.php +++ b/tests/integration/predis/test_basic.php @@ -30,38 +30,40 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [8, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [8, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/Redis/all"}, [8, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/Redis/allOther"}, [8, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/instance/Redis/redisdb/6379"}, [8, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/del"}, [3, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [8, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [8, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/Redis/all"}, [8, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/Redis/allOther"}, [8, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/instance/Redis/redisdb/6379"}, [8, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/del"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/del", - "scope":"OtherTransaction/php__FILE__"}, [3, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/exists"}, [1, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [3, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/exists"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/exists", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/get"}, [1, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/get"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/get", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/set"}, [1, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/set"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/set", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/setnx"}, [2, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/setnx"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/setnx", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/library/Predis/detected"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/library/Predis/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ require_once(__DIR__.'/../../include/config.php'); diff --git a/tests/integration/predis/test_basic_logging_off.php b/tests/integration/predis/test_basic_logging_off.php index 1a53a6e43..4355fd359 100644 --- a/tests/integration/predis/test_basic_logging_off.php +++ b/tests/integration/predis/test_basic_logging_off.php @@ -33,38 +33,40 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [8, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [8, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/Redis/all"}, [8, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/Redis/allOther"}, [8, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/instance/Redis/redisdb/6379"}, [8, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/del"}, [3, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [8, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [8, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/Redis/all"}, [8, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/Redis/allOther"}, [8, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/instance/Redis/redisdb/6379"}, [8, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/del"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/del", - "scope":"OtherTransaction/php__FILE__"}, [3, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/exists"}, [1, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [3, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/exists"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/exists", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/get"}, [1, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/get"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/get", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/set"}, [1, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/set"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/set", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/setnx"}, [2, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/setnx"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/setnx", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/library/Predis/detected"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/library/Predis/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ require_once(__DIR__.'/../../include/config.php'); diff --git a/tests/integration/predis/test_basic_reporting_disabled.php b/tests/integration/predis/test_basic_reporting_disabled.php index 6583c6f1d..b8ad0d057 100644 --- a/tests/integration/predis/test_basic_reporting_disabled.php +++ b/tests/integration/predis/test_basic_reporting_disabled.php @@ -39,15 +39,20 @@ [{"name":"Datastore/Redis/all"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Redis/allOther"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/del"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/del","scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/del", + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/exists"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/exists","scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/exists", + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/get"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/get","scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/get", + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/incr"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/incr","scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/incr", + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/set"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/set","scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/set", + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], @@ -56,11 +61,13 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/library/Predis/detected"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ use NewRelic\Integration\Transaction; diff --git a/tests/integration/predis/test_cross_transaction.php b/tests/integration/predis/test_cross_transaction.php index d1e478f48..005364920 100644 --- a/tests/integration/predis/test_cross_transaction.php +++ b/tests/integration/predis/test_cross_transaction.php @@ -26,35 +26,37 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [4, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [4, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/Redis/all"}, [4, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/Redis/allOther"}, [4, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/instance/Redis/redisdb/6379"}, [4, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/del"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [4, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [4, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/Redis/all"}, [4, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/Redis/allOther"}, [4, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/instance/Redis/redisdb/6379"}, [4, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/del"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/del", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/exists"}, [1, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/exists"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/exists", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/get"}, [1, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/get"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/get", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/set"}, [1, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/set"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/set", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/api/set_appname/after"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/set_appname/after"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ require_once(__DIR__.'/../../include/config.php'); diff --git a/tests/integration/predis/test_pipeline.php b/tests/integration/predis/test_pipeline.php index ef0043038..fc5191bff 100644 --- a/tests/integration/predis/test_pipeline.php +++ b/tests/integration/predis/test_pipeline.php @@ -20,41 +20,43 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [12, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [12, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/Redis/all"}, [12, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/Redis/allOther"}, [12, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/instance/Redis/redisdb/6379"}, [12, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/del"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [12, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [12, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/Redis/all"}, [12, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/Redis/allOther"}, [12, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/instance/Redis/redisdb/6379"}, [12, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/del"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/del", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/exists"}, [3, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/exists"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/exists", - "scope":"OtherTransaction/php__FILE__"}, [3, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/flushdb"}, [2, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [3, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/flushdb"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/flushdb", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/incrby"}, [2, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/incrby"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/incrby", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/mget"}, [2, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/mget"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/mget", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/ping"}, [2, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/ping"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/ping", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/library/Predis/detected"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/library/Predis/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ require_once(__DIR__.'/../../include/config.php'); diff --git a/tests/integration/predis/test_pipeline_atomic.php b/tests/integration/predis/test_pipeline_atomic.php index e2aac9dac..620336534 100644 --- a/tests/integration/predis/test_pipeline_atomic.php +++ b/tests/integration/predis/test_pipeline_atomic.php @@ -20,41 +20,43 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [12, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [12, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/Redis/all"}, [12, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/Redis/allOther"}, [12, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/instance/Redis/redisdb/6379"}, [12, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/del"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [12, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [12, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/Redis/all"}, [12, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/Redis/allOther"}, [12, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/instance/Redis/redisdb/6379"}, [12, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/del"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/del", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/exists"}, [3, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/exists"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/exists", - "scope":"OtherTransaction/php__FILE__"}, [3, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/flushdb"}, [2, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [3, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/flushdb"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/flushdb", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/incrby"}, [2, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/incrby"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/incrby", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/mget"}, [2, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/mget"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/mget", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/ping"}, [2, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/ping"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/ping", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/library/Predis/detected"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/library/Predis/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ require_once(__DIR__.'/../../include/config.php'); diff --git a/tests/integration/predis/test_pipeline_fire_and_forget.php b/tests/integration/predis/test_pipeline_fire_and_forget.php index 4def76323..ef3fdc2c6 100644 --- a/tests/integration/predis/test_pipeline_fire_and_forget.php +++ b/tests/integration/predis/test_pipeline_fire_and_forget.php @@ -20,41 +20,43 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [12, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [12, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/Redis/all"}, [12, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/Redis/allOther"}, [12, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/instance/Redis/redisdb/6379"}, [12, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/del"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [12, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [12, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/Redis/all"}, [12, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/Redis/allOther"}, [12, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/instance/Redis/redisdb/6379"}, [12, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/del"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/del", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/exists"}, [3, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/exists"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/exists", - "scope":"OtherTransaction/php__FILE__"}, [3, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/flushdb"}, [2, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [3, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/flushdb"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/flushdb", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/incrby"}, [2, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/incrby"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/incrby", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/mget"}, [2, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/mget"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/mget", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/ping"}, [2, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/ping"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/ping", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/library/Predis/detected"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/library/Predis/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ require_once(__DIR__.'/../../include/config.php'); diff --git a/tests/integration/predis/test_pipeline_fire_and_forget_logging_off.php b/tests/integration/predis/test_pipeline_fire_and_forget_logging_off.php index 33e4dcdf0..fc15d052c 100644 --- a/tests/integration/predis/test_pipeline_fire_and_forget_logging_off.php +++ b/tests/integration/predis/test_pipeline_fire_and_forget_logging_off.php @@ -23,41 +23,43 @@ [ [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/all"}, [12, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/allOther"}, [12, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/Redis/all"}, [12, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/Redis/allOther"}, [12, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/instance/Redis/redisdb/6379"}, [12, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/del"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/all"}, [12, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/allOther"}, [12, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/Redis/all"}, [12, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/Redis/allOther"}, [12, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/instance/Redis/redisdb/6379"}, [12, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/del"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/del", - "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/exists"}, [3, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/exists"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/exists", - "scope":"OtherTransaction/php__FILE__"}, [3, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/flushdb"}, [2, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [3, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/flushdb"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/flushdb", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/incrby"}, [2, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/incrby"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/incrby", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/mget"}, [2, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/mget"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/mget", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/ping"}, [2, "??", "??", "??", "??", "??"]], + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/ping"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/ping", - "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/library/Predis/detected"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/library/Predis/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ require_once(__DIR__.'/../../include/config.php'); diff --git a/tests/integration/predis/test_txn_restarted.php b/tests/integration/predis/test_txn_restarted.php index caa713af5..f6276883d 100644 --- a/tests/integration/predis/test_txn_restarted.php +++ b/tests/integration/predis/test_txn_restarted.php @@ -40,15 +40,20 @@ [{"name":"Datastore/Redis/all"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Redis/allOther"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/del"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/del","scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/del", + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/exists"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/exists","scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/exists", + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/get"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/get","scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/get", + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/incr"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/incr","scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/incr", + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Redis/set"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/operation/Redis/set","scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/operation/Redis/set", + "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], @@ -58,11 +63,13 @@ [{"name":"Supportability/api/set_appname/after"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/api/set_appname/with_license"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS null */ /* diff --git a/tests/integration/queue/test_basic.php b/tests/integration/queue/test_basic.php index eb244dd8f..888938f50 100644 --- a/tests/integration/queue/test_basic.php +++ b/tests/integration/queue/test_basic.php @@ -32,11 +32,13 @@ [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + echo "hello world"; diff --git a/tests/integration/queue/test_basic_logging_off.php b/tests/integration/queue/test_basic_logging_off.php index 79e3d60b9..0170289bc 100644 --- a/tests/integration/queue/test_basic_logging_off.php +++ b/tests/integration/queue/test_basic_logging_off.php @@ -34,12 +34,14 @@ [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + echo "hello world"; diff --git a/tests/integration/queue/test_capitalized.php b/tests/integration/queue/test_capitalized.php index eb244dd8f..888938f50 100644 --- a/tests/integration/queue/test_capitalized.php +++ b/tests/integration/queue/test_capitalized.php @@ -32,11 +32,13 @@ [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + echo "hello world"; diff --git a/tests/integration/queue/test_malformed.php b/tests/integration/queue/test_malformed.php index 17914699b..981333eb9 100644 --- a/tests/integration/queue/test_malformed.php +++ b/tests/integration/queue/test_malformed.php @@ -31,11 +31,13 @@ [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + echo "hello world"; diff --git a/tests/integration/queue/test_with_prefix.php b/tests/integration/queue/test_with_prefix.php index cee5ad0c6..ce2b55511 100644 --- a/tests/integration/queue/test_with_prefix.php +++ b/tests/integration/queue/test_with_prefix.php @@ -32,11 +32,13 @@ [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + echo "hello world"; diff --git a/tests/integration/redis/test_basic.php b/tests/integration/redis/test_basic.php index 9ab8701a0..65f8a7e07 100644 --- a/tests/integration/redis/test_basic.php +++ b/tests/integration/redis/test_basic.php @@ -179,13 +179,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/redis.inc'); diff --git a/tests/integration/redis/test_basic_logging_off.php b/tests/integration/redis/test_basic_logging_off.php index eb538c9bf..d62670605 100644 --- a/tests/integration/redis/test_basic_logging_off.php +++ b/tests/integration/redis/test_basic_logging_off.php @@ -181,14 +181,16 @@ [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/redis.inc'); diff --git a/tests/integration/redis/test_bitops.php b/tests/integration/redis/test_bitops.php index d6b80db02..54a23e98d 100644 --- a/tests/integration/redis/test_bitops.php +++ b/tests/integration/redis/test_bitops.php @@ -84,13 +84,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/redis.inc'); diff --git a/tests/integration/redis/test_decr.php b/tests/integration/redis/test_decr.php index 023a7f46f..b49fa0525 100644 --- a/tests/integration/redis/test_decr.php +++ b/tests/integration/redis/test_decr.php @@ -68,13 +68,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/redis.inc'); diff --git a/tests/integration/redis/test_geo.php b/tests/integration/redis/test_geo.php index 9b495f977..a64989bd6 100644 --- a/tests/integration/redis/test_geo.php +++ b/tests/integration/redis/test_geo.php @@ -81,13 +81,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/redis.inc'); diff --git a/tests/integration/redis/test_hash.php b/tests/integration/redis/test_hash.php index 4bfd7261a..1926c12b3 100644 --- a/tests/integration/redis/test_hash.php +++ b/tests/integration/redis/test_hash.php @@ -109,13 +109,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/redis.inc'); diff --git a/tests/integration/redis/test_incr.php b/tests/integration/redis/test_incr.php index 78b21c014..6492c78f9 100644 --- a/tests/integration/redis/test_incr.php +++ b/tests/integration/redis/test_incr.php @@ -68,13 +68,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/redis.inc'); diff --git a/tests/integration/redis/test_list.php b/tests/integration/redis/test_list.php index b8733f032..8ed77cc67 100644 --- a/tests/integration/redis/test_list.php +++ b/tests/integration/redis/test_list.php @@ -135,13 +135,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/redis.inc'); diff --git a/tests/integration/redis/test_list_logging_off.php b/tests/integration/redis/test_list_logging_off.php index 2cfcb5a52..f693065da 100644 --- a/tests/integration/redis/test_list_logging_off.php +++ b/tests/integration/redis/test_list_logging_off.php @@ -137,14 +137,16 @@ [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/redis.inc'); diff --git a/tests/integration/redis/test_set.php b/tests/integration/redis/test_set.php index ad3e7920c..29c9db1ab 100644 --- a/tests/integration/redis/test_set.php +++ b/tests/integration/redis/test_set.php @@ -115,13 +115,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + use NewRelic\Integration\Transaction; require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); diff --git a/tests/integration/redis/test_set.redis6.php b/tests/integration/redis/test_set.redis6.php index 11cd4bf0c..a1c7b9814 100644 --- a/tests/integration/redis/test_set.redis6.php +++ b/tests/integration/redis/test_set.redis6.php @@ -56,13 +56,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + use NewRelic\Integration\Transaction; require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); diff --git a/tests/integration/redis/test_setex.php b/tests/integration/redis/test_setex.php index 975adcddc..0c593d25f 100644 --- a/tests/integration/redis/test_setex.php +++ b/tests/integration/redis/test_setex.php @@ -90,13 +90,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/redis.inc'); diff --git a/tests/integration/redis/test_stream.redis5.php b/tests/integration/redis/test_stream.redis5.php index 5047dd875..a6c2290ec 100644 --- a/tests/integration/redis/test_stream.redis5.php +++ b/tests/integration/redis/test_stream.redis5.php @@ -113,13 +113,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); require_once(realpath (dirname ( __FILE__ )) . '/../../include/tap.php'); require_once(realpath (dirname ( __FILE__ )) . '/redis.inc'); diff --git a/tests/integration/redis/test_zset.php b/tests/integration/redis/test_zset.php index 1a4393148..dabeb9f7d 100644 --- a/tests/integration/redis/test_zset.php +++ b/tests/integration/redis/test_zset.php @@ -134,13 +134,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + use NewRelic\Integration\Transaction; require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); diff --git a/tests/integration/redis/test_zset.redis5.php b/tests/integration/redis/test_zset.redis5.php index 3ce31fec1..da2b9a266 100644 --- a/tests/integration/redis/test_zset.redis5.php +++ b/tests/integration/redis/test_zset.redis5.php @@ -64,13 +64,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + use NewRelic\Integration\Transaction; require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php'); diff --git a/tests/integration/sqlite/test_bad_input_1.php b/tests/integration/sqlite/test_bad_input_1.php index 2e0b58c17..87c158600 100644 --- a/tests/integration/sqlite/test_bad_input_1.php +++ b/tests/integration/sqlite/test_bad_input_1.php @@ -37,13 +37,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/sqlite/test_bad_input_2.php b/tests/integration/sqlite/test_bad_input_2.php index 08ca1ad76..780c6e2ec 100644 --- a/tests/integration/sqlite/test_bad_input_2.php +++ b/tests/integration/sqlite/test_bad_input_2.php @@ -37,13 +37,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/sqlite/test_bad_input_3.php b/tests/integration/sqlite/test_bad_input_3.php index d01b90e54..1e858bea5 100644 --- a/tests/integration/sqlite/test_bad_input_3.php +++ b/tests/integration/sqlite/test_bad_input_3.php @@ -37,13 +37,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/sqlite/test_bad_input_4.php b/tests/integration/sqlite/test_bad_input_4.php index 1dec017a9..3e9c5593b 100644 --- a/tests/integration/sqlite/test_bad_input_4.php +++ b/tests/integration/sqlite/test_bad_input_4.php @@ -37,13 +37,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/sqlite/test_bad_input_5.php b/tests/integration/sqlite/test_bad_input_5.php index 2e4414c48..03472b118 100644 --- a/tests/integration/sqlite/test_bad_input_5.php +++ b/tests/integration/sqlite/test_bad_input_5.php @@ -37,13 +37,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/sqlite/test_exec.php b/tests/integration/sqlite/test_exec.php index 7e3af5518..c131e1437 100644 --- a/tests/integration/sqlite/test_exec.php +++ b/tests/integration/sqlite/test_exec.php @@ -43,13 +43,15 @@ [{"name":"Datastore/statement/SQLite/test/insert", "scope":"OtherTransaction/php__FILE__"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + function test_sqlite() { $conn = sqlite_open(":memory:"); sqlite_exec($conn, "CREATE TABLE test (id INT, desc VARCHAR(10));"); diff --git a/tests/integration/sqlite/test_exec_logging_off.php b/tests/integration/sqlite/test_exec_logging_off.php index b64651608..44aaecb81 100644 --- a/tests/integration/sqlite/test_exec_logging_off.php +++ b/tests/integration/sqlite/test_exec_logging_off.php @@ -45,12 +45,14 @@ "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/SQLite/test/insert", "scope":"OtherTransaction/php__FILE__"}, [3, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + function test_sqlite() { $conn = sqlite_open(":memory:"); sqlite_exec($conn, "CREATE TABLE test (id INT, desc VARCHAR(10));"); diff --git a/tests/integration/sqlite/test_query_1.php b/tests/integration/sqlite/test_query_1.php index b575b1326..c076372fd 100644 --- a/tests/integration/sqlite/test_query_1.php +++ b/tests/integration/sqlite/test_query_1.php @@ -70,13 +70,15 @@ [{"name":"Datastore/statement/SQLite/test/select", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + function test_sqlite() { $conn = sqlite_open(":memory:"); sqlite_exec($conn, "CREATE TABLE test (id INT, desc VARCHAR(10));"); diff --git a/tests/integration/sqlite/test_query_2.php b/tests/integration/sqlite/test_query_2.php index b067d5c76..d66ef49a8 100644 --- a/tests/integration/sqlite/test_query_2.php +++ b/tests/integration/sqlite/test_query_2.php @@ -70,13 +70,15 @@ [{"name":"Datastore/statement/SQLite/test/select", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + function test_sqlite() { $conn = sqlite_open(":memory:"); sqlite_exec($conn, "CREATE TABLE test (id INT, desc VARCHAR(10));"); diff --git a/tests/integration/sqlite/test_unbuffered_1.php b/tests/integration/sqlite/test_unbuffered_1.php index 0804bcce5..0d7928ddb 100644 --- a/tests/integration/sqlite/test_unbuffered_1.php +++ b/tests/integration/sqlite/test_unbuffered_1.php @@ -70,13 +70,15 @@ [{"name":"Datastore/statement/SQLite/test/select", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + function test_sqlite() { $conn = sqlite_open(":memory:"); sqlite_exec($conn, "CREATE TABLE test (id INT, desc VARCHAR(10));"); diff --git a/tests/integration/sqlite/test_unbuffered_2.php b/tests/integration/sqlite/test_unbuffered_2.php index e47d08f1e..1029d3355 100644 --- a/tests/integration/sqlite/test_unbuffered_2.php +++ b/tests/integration/sqlite/test_unbuffered_2.php @@ -70,13 +70,15 @@ [{"name":"Datastore/statement/SQLite/test/select", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + function test_sqlite() { $conn = sqlite_open(":memory:"); sqlite_exec($conn, "CREATE TABLE test (id INT, desc VARCHAR(10));"); diff --git a/tests/integration/sqlite/test_unbuffered_2_logging_off.php b/tests/integration/sqlite/test_unbuffered_2_logging_off.php index d71fab636..0ffeecaa7 100644 --- a/tests/integration/sqlite/test_unbuffered_2_logging_off.php +++ b/tests/integration/sqlite/test_unbuffered_2_logging_off.php @@ -72,12 +72,14 @@ "scope":"OtherTransaction/php__FILE__"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/SQLite/test/select", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + function test_sqlite() { $conn = sqlite_open(":memory:"); sqlite_exec($conn, "CREATE TABLE test (id INT, desc VARCHAR(10));"); diff --git a/tests/integration/sqlite3/test_bad_input_1.php b/tests/integration/sqlite3/test_bad_input_1.php index ba42993d5..af07e095c 100644 --- a/tests/integration/sqlite3/test_bad_input_1.php +++ b/tests/integration/sqlite3/test_bad_input_1.php @@ -41,13 +41,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/sqlite3/test_bad_input_2.php b/tests/integration/sqlite3/test_bad_input_2.php index d860850c7..2530f6fa7 100644 --- a/tests/integration/sqlite3/test_bad_input_2.php +++ b/tests/integration/sqlite3/test_bad_input_2.php @@ -41,13 +41,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/sqlite3/test_bad_input_3.php b/tests/integration/sqlite3/test_bad_input_3.php index 816119e86..d6e7640f6 100644 --- a/tests/integration/sqlite3/test_bad_input_3.php +++ b/tests/integration/sqlite3/test_bad_input_3.php @@ -41,13 +41,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/sqlite3/test_bad_input_3_logging_off.php b/tests/integration/sqlite3/test_bad_input_3_logging_off.php index 10f974392..eb70bd4b3 100644 --- a/tests/integration/sqlite3/test_bad_input_3_logging_off.php +++ b/tests/integration/sqlite3/test_bad_input_3_logging_off.php @@ -44,11 +44,13 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/sqlite3/test_bad_input_4.php b/tests/integration/sqlite3/test_bad_input_4.php index f1a9fcfab..2c0a95c42 100644 --- a/tests/integration/sqlite3/test_bad_input_4.php +++ b/tests/integration/sqlite3/test_bad_input_4.php @@ -41,13 +41,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/sqlite3/test_bad_input_5.php b/tests/integration/sqlite3/test_bad_input_5.php index d0d1cac9e..c416aabc3 100644 --- a/tests/integration/sqlite3/test_bad_input_5.php +++ b/tests/integration/sqlite3/test_bad_input_5.php @@ -41,13 +41,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/sqlite3/test_bad_sql_1.php b/tests/integration/sqlite3/test_bad_sql_1.php index bf6dd3fa4..e698afff3 100644 --- a/tests/integration/sqlite3/test_bad_sql_1.php +++ b/tests/integration/sqlite3/test_bad_sql_1.php @@ -41,13 +41,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/sqlite3/test_bad_sql_2.php b/tests/integration/sqlite3/test_bad_sql_2.php index 6a9ea55f0..dba75b332 100644 --- a/tests/integration/sqlite3/test_bad_sql_2.php +++ b/tests/integration/sqlite3/test_bad_sql_2.php @@ -41,13 +41,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/sqlite3/test_query.php b/tests/integration/sqlite3/test_query.php index 213b0734c..6f1ee56c1 100644 --- a/tests/integration/sqlite3/test_query.php +++ b/tests/integration/sqlite3/test_query.php @@ -66,13 +66,15 @@ [{"name":"Datastore/statement/SQLite/test/select", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + function test_sqlite3() { $conn = new SQLite3(":memory:"); $conn->exec("CREATE TABLE test (id INT, desc VARCHAR(10));"); diff --git a/tests/integration/sqlite3/test_query_logging_off.php b/tests/integration/sqlite3/test_query_logging_off.php index 977af9193..2993110af 100644 --- a/tests/integration/sqlite3/test_query_logging_off.php +++ b/tests/integration/sqlite3/test_query_logging_off.php @@ -68,12 +68,14 @@ "scope":"OtherTransaction/php__FILE__"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/SQLite/test/select", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + function test_sqlite3() { $conn = new SQLite3(":memory:"); $conn->exec("CREATE TABLE test (id INT, desc VARCHAR(10));"); diff --git a/tests/integration/sqlite3/test_querysingle_1.php b/tests/integration/sqlite3/test_querysingle_1.php index 4e71ee3d5..d78af0d02 100644 --- a/tests/integration/sqlite3/test_querysingle_1.php +++ b/tests/integration/sqlite3/test_querysingle_1.php @@ -52,13 +52,15 @@ [{"name":"Datastore/statement/SQLite/test/select", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + function test_sqlite3() { $conn = new SQLite3(":memory:"); $conn->exec("CREATE TABLE test (id INT, desc VARCHAR(10));"); diff --git a/tests/integration/sqlite3/test_querysingle_2.php b/tests/integration/sqlite3/test_querysingle_2.php index 7d92ffadf..542161a63 100644 --- a/tests/integration/sqlite3/test_querysingle_2.php +++ b/tests/integration/sqlite3/test_querysingle_2.php @@ -56,13 +56,15 @@ [{"name":"Datastore/statement/SQLite/test/select", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ + function test_sqlite3() { $conn = new SQLite3(":memory:"); $conn->exec("CREATE TABLE test (id INT, desc VARCHAR(10));"); diff --git a/tests/integration/sqlitedatabase/test_bad_input_1.php b/tests/integration/sqlitedatabase/test_bad_input_1.php index a30d97923..556ca4df5 100644 --- a/tests/integration/sqlitedatabase/test_bad_input_1.php +++ b/tests/integration/sqlitedatabase/test_bad_input_1.php @@ -37,13 +37,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/sqlitedatabase/test_bad_input_2.php b/tests/integration/sqlitedatabase/test_bad_input_2.php index d1e957303..3593729e8 100644 --- a/tests/integration/sqlitedatabase/test_bad_input_2.php +++ b/tests/integration/sqlitedatabase/test_bad_input_2.php @@ -37,13 +37,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/sqlitedatabase/test_bad_input_3.php b/tests/integration/sqlitedatabase/test_bad_input_3.php index d973ac2ae..57b23031d 100644 --- a/tests/integration/sqlitedatabase/test_bad_input_3.php +++ b/tests/integration/sqlitedatabase/test_bad_input_3.php @@ -37,13 +37,15 @@ [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + /*EXPECT_TRACED_ERRORS [ "?? agent run id", diff --git a/tests/integration/sqlitedatabase/test_query.php b/tests/integration/sqlitedatabase/test_query.php index 3610d0c70..90bd49a5c 100644 --- a/tests/integration/sqlitedatabase/test_query.php +++ b/tests/integration/sqlitedatabase/test_query.php @@ -71,13 +71,15 @@ [{"name":"Datastore/statement/SQLite/test/select", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + function test_sqlite() { $conn = new SQLiteDatabase(":memory:"); $conn->queryExec("CREATE TABLE test (id INT, desc VARCHAR(10));"); diff --git a/tests/integration/sqlitedatabase/test_query_logging_off.php b/tests/integration/sqlitedatabase/test_query_logging_off.php index 1839566ea..4aed4020e 100644 --- a/tests/integration/sqlitedatabase/test_query_logging_off.php +++ b/tests/integration/sqlitedatabase/test_query_logging_off.php @@ -73,14 +73,16 @@ "scope":"OtherTransaction/php__FILE__"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/SQLite/test/select", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + function test_sqlite() { $conn = new SQLiteDatabase(":memory:"); $conn->queryExec("CREATE TABLE test (id INT, desc VARCHAR(10));"); diff --git a/tests/integration/sqlitedatabase/test_unbuffered.php b/tests/integration/sqlitedatabase/test_unbuffered.php index 003240686..a22824010 100644 --- a/tests/integration/sqlitedatabase/test_unbuffered.php +++ b/tests/integration/sqlitedatabase/test_unbuffered.php @@ -70,13 +70,15 @@ [{"name":"Datastore/statement/SQLite/test/select", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ + function test_sqlite() { $conn = new SQLiteDatabase(":memory:"); $conn->queryExec("CREATE TABLE test (id INT, desc VARCHAR(10));");