From 012793dfe016dbd086a2b39b25e57c832d7cd126 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Tue, 11 Feb 2025 12:32:59 -0500 Subject: [PATCH 01/60] feat(agent): Adds INI values for labels for forwarded logs --- agent/php_newrelic.h | 6 ++++++ agent/php_nrini.c | 16 ++++++++++++++++ agent/scripts/newrelic.ini.template | 26 +++++++++++++++++++++++++- 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/agent/php_newrelic.h b/agent/php_newrelic.h index 6afaf531a..f1aa20cce 100644 --- a/agent/php_newrelic.h +++ b/agent/php_newrelic.h @@ -580,6 +580,12 @@ nrinibool_t nriniuint_t log_forwarding_log_level; /* newrelic.application_logging.forwarding.log_level */ +nrinibool_t + log_forwarding_labels_enabled; /* newrelic.application_logging.forwarding.labels.enabled */ + +nrinistr_t + log_forwarding_labels_exclude; /* newrelic.application_logging.forwarding.labels.exclude */ + /* * Configuration option to toggle code level metrics collection. diff --git a/agent/php_nrini.c b/agent/php_nrini.c index 4a2f7c471..a01561dbb 100644 --- a/agent/php_nrini.c +++ b/agent/php_nrini.c @@ -3078,6 +3078,22 @@ STD_PHP_INI_ENTRY_EX("newrelic.application_logging.forwarding.context_data.exclu zend_newrelic_globals, newrelic_globals, 0) +STD_PHP_INI_ENTRY_EX("newrelic.application_logging.forwarding.labels.enabled", + "0", + NR_PHP_REQUEST, + nr_boolean_mh, + log_forwarding_labels_enabled, + zend_newrelic_globals, + newrelic_globals, + nr_enabled_disabled_dh) +STD_PHP_INI_ENTRY_EX("newrelic.application_logging.forwarding.labels.exclude", + "", + NR_PHP_REQUEST, + nr_string_mh, + log_forwarding_labels_exclude, + zend_newrelic_globals, + newrelic_globals, + 0) /* * Vulnerability Management diff --git a/agent/scripts/newrelic.ini.template b/agent/scripts/newrelic.ini.template index b406628a9..c7b36b5db 100644 --- a/agent/scripts/newrelic.ini.template +++ b/agent/scripts/newrelic.ini.template @@ -1242,7 +1242,6 @@ newrelic.daemon.logfile = "/var/log/newrelic/newrelic-daemon.log" ; ;newrelic.application_logging.forwarding.log_level = "WARNING" - ; Setting: newrelic.application_logging.local_decorating.enabled ; Type : boolean ; Scope : per-directory @@ -1305,6 +1304,31 @@ newrelic.daemon.logfile = "/var/log/newrelic/newrelic-daemon.log" ;newrelic.application_logging.forwarding.context_data.include = "" ;newrelic.application_logging.forwarding.context_data.exclude = "" +; Setting: newrelic.application_logging.forwarding.labels.enabled +; Type : boolean +; Scope : per-directory +; Default: false +; Info : Toggles whether the agent adds labels as attributes to log records for +; sending to New Relic. The labels can be defined by the newrelic.labels +; configuration value, and filtered using the +; newrelic.application_logging.forwawrding.labels.exclude configuration value. +; +;newrelic.application_logging.forwarding.labels.enabled = false + +; Setting: newrelic.application_logging.forwarding.labels.exclude +; Type : string +; Scope : per-directory +; Default: "" +; Info : A list of labels to NOT add as attributes to logs which are forwarded +; to New Relic. This list can be separated by spaces or commas. +; +; Ex: +; newrelic.application_logging.forwarding.labels.exclude = "label1 label2" +; or +; newrelic.application_logging.forwarding.labels.exclude = "label1, label2" +; +;newrelic.application_logging.forwarding.labels.exclude = "" + ; Setting: newrelic.code_level_metrics.enabled ; Type : boolean ; Scope : per-directory From 6c84bb984e4bb7f731eec626e0033f4721877daf Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Tue, 11 Feb 2025 12:34:00 -0500 Subject: [PATCH 02/60] feat(agent): Adds processing of log label from labels --- agent/php_txn.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++ axiom/nr_app.h | 1 + 2 files changed, 112 insertions(+) diff --git a/agent/php_txn.c b/agent/php_txn.c index bc0ea6b7e..115de032e 100644 --- a/agent/php_txn.c +++ b/agent/php_txn.c @@ -536,6 +536,116 @@ static nrobj_t* nr_php_txn_get_labels() { return nr_labels_parse(NR_PHP_PROCESS_GLOBALS(env_labels)); } +static nr_status_t nr_php_txn_collect_label_keys_iter(const char* key, + const nrobj_t* value, + void* ptr) { + nrobj_t* user_data = (nrobj_t*)ptr; + + if (NULL == user_data) { + return NR_FAILURE; + } + + nro_set_array_string(user_data, 0, key); + + return NR_SUCCESS; +} + +/* + * Purpose : Filter the labels hash to exclude any labels that are in the + * newrelic.application_logging.forwarding.labels.exclude list. + * + * Params : 1. The labels hash to filter. + * + * Returns : A new hash containing the filtered labels. + * If no labels exist or all labels are excluded, then return NULL. + * + */ + +static nrobj_t* nr_php_txn_get_log_labels(nrobj_t* labels) { + nrobj_t* label_keys = NULL; + nrobj_t* exclude_labels_list = NULL; + nrobj_t* exclude_labels_hash = NULL; + nrobj_t* log_labels = NULL; + + if (NULL == labels || 0 == nro_getsize(labels)) { + nrl_verbosedebug(NRL_TXN, "nr_php_txn_get_log_labels(): No labels defined"); + return NULL; + } + + /* if logging labels are disabled then nothing to do */ + if (0 == NRINI(log_forwarding_labels_enabled)) { + nrl_verbosedebug( + NRL_TXN, "nr_php_txn_get_log_labels(): Log forwarding labels disabled"); + return NULL; + } + + /* split exclude string on commas - nr_strsplit() will trim leading + * and trailing whitespace from each string extracted, as well as + * ignoring empty strings after whitespace trimming + */ + exclude_labels_list + = nr_strsplit(NRINI(log_forwarding_labels_exclude), ",", 0); + + /* convert to lowercase to support case insensitive search below + * will store lowercase version in a hash for more convenient lookup + */ + exclude_labels_hash = nro_new(NR_OBJECT_HASH); + for (int i = 0; i < nro_getsize(exclude_labels_list); i++) { + char* label = nr_string_to_lowercase( + nro_get_array_string(exclude_labels_list, i + 1, NULL)); + + if (!nr_strempty(label)) { + nro_set_hash_boolean(exclude_labels_hash, label, 1); + } + nr_free(label); + } + + /* original parsed exclude list is no longer needed */ + nro_delete(exclude_labels_list); + + /* collect label keys from existing labels */ + label_keys = nro_new(NR_OBJECT_ARRAY); + nro_iteratehash(labels, nr_php_txn_collect_label_keys_iter, + (void*)label_keys); + + /* filter by going over the list of label keys, seeing if it exists in the + * exclude hash, and if it does skip it otherwise copy key/value for label + * to the log labels + */ + log_labels = nro_new(NR_OBJECT_HASH); + for (int i = 0; i < nro_getsize(label_keys); i++) { + const char* key = nro_get_array_string(label_keys, i + 1, NULL); + const char* value = nro_get_hash_string(labels, key, NULL); + char* lower_key = nr_string_to_lowercase(key); + bool exclude = false; + nr_status_t rv; + + exclude = nro_get_hash_boolean(exclude_labels_hash, lower_key, &rv); + if (NR_SUCCESS != rv) { + exclude = false; + } + if (!exclude) { + nro_set_hash_string(log_labels, key, value); + } else { + nrl_verbosedebug(NRL_TXN, + "nr_php_txn_get_log_labels(): Excluding label %s", key); + } + + nr_free(lower_key); + } + + nro_delete(exclude_labels_hash); + nro_delete(label_keys); + + /* return NULL if all labels were excluded */ + if (0 == nro_getsize(log_labels)) { + nro_delete(log_labels); + log_labels = NULL; + } + + return log_labels; +} + static void nr_php_txn_prepared_statement_destroy(void* sql) { nr_free(sql); } @@ -879,6 +989,7 @@ nr_status_t nr_php_txn_begin(const char* appnames, info.environment = nro_copy(NR_PHP_PROCESS_GLOBALS(appenv)); info.metadata = nro_copy(NR_PHP_PROCESS_GLOBALS(metadata)); info.labels = nr_php_txn_get_labels(); + info.log_labels = nr_php_txn_get_log_labels(info.labels); info.host_display_name = nr_strdup(NRINI(process_host_display_name)); info.lang = nr_strdup("php"); info.version = nr_strdup(nr_version()); diff --git a/axiom/nr_app.h b/axiom/nr_app.h index d05a7f364..19dfb706d 100644 --- a/axiom/nr_app.h +++ b/axiom/nr_app.h @@ -62,6 +62,7 @@ typedef struct _nr_app_info_t { nrobj_t* settings; /* New Relic settings */ nrobj_t* environment; /* Application environment */ nrobj_t* labels; /* Labels for Language Agents */ + nrobj_t* log_labels; /* Labels for log events (possibly filtered version of labels) */ nrobj_t* metadata; /* Environment provided metadata for Language Agents */ char* host_display_name; /* Optional user-provided host name for UI */ char* lang; /* Language */ From f38315d0a207214339dc08ff994a30f1b594fd04 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Thu, 13 Feb 2025 16:00:04 -0500 Subject: [PATCH 03/60] feat(agent): Label forwarding for APM logs --- agent/php_txn.c | 24 ++++++----- axiom/cmd_txndata_transmit.c | 28 ++++++++++++- axiom/nr_app.h | 1 - axiom/nr_commands_private.h | 3 +- axiom/nr_txn.c | 16 +++++++- axiom/nr_txn.h | 12 +++++- daemon/internal/newrelic/commands.go | 5 +++ daemon/internal/newrelic/log_events.go | 40 +++++++++++++++++-- .../internal/newrelic/protocol/Transaction.go | 13 +++++- protocol/flatbuffers/protocol.fbs | 3 +- 10 files changed, 126 insertions(+), 19 deletions(-) diff --git a/agent/php_txn.c b/agent/php_txn.c index 115de032e..608c63c44 100644 --- a/agent/php_txn.c +++ b/agent/php_txn.c @@ -541,6 +541,8 @@ static nr_status_t nr_php_txn_collect_label_keys_iter(const char* key, void* ptr) { nrobj_t* user_data = (nrobj_t*)ptr; + (void)value; + if (NULL == user_data) { return NR_FAILURE; } @@ -561,21 +563,21 @@ static nr_status_t nr_php_txn_collect_label_keys_iter(const char* key, * */ -static nrobj_t* nr_php_txn_get_log_labels(nrobj_t* labels) { +static nrobj_t* nr_php_txn_get_log_forwarding_labels(nrobj_t* labels) { nrobj_t* label_keys = NULL; nrobj_t* exclude_labels_list = NULL; nrobj_t* exclude_labels_hash = NULL; nrobj_t* log_labels = NULL; if (NULL == labels || 0 == nro_getsize(labels)) { - nrl_verbosedebug(NRL_TXN, "nr_php_txn_get_log_labels(): No labels defined"); + nrl_verbosedebug(NRL_TXN, "%s: No labels defined", __FUNCTION__); return NULL; } /* if logging labels are disabled then nothing to do */ if (0 == NRINI(log_forwarding_labels_enabled)) { - nrl_verbosedebug( - NRL_TXN, "nr_php_txn_get_log_labels(): Log forwarding labels disabled"); + nrl_verbosedebug(NRL_TXN, "%s: Log forwarding labels disabled", + __FUNCTION__); return NULL; } @@ -627,8 +629,7 @@ static nrobj_t* nr_php_txn_get_log_labels(nrobj_t* labels) { if (!exclude) { nro_set_hash_string(log_labels, key, value); } else { - nrl_verbosedebug(NRL_TXN, - "nr_php_txn_get_log_labels(): Excluding label %s", key); + nrl_verbosedebug(NRL_TXN, "%s: Excluding label %s", __FUNCTION__, key); } nr_free(lower_key); @@ -872,6 +873,7 @@ nr_status_t nr_php_txn_begin(const char* appnames, nrtxnopt_t opts; const char* lic_to_use; int pfd; + nrobj_t* log_forwarding_labels = NULL; nr_attribute_config_t* attribute_config; nr_app_info_t info; bool is_cli = (0 != NR_PHP_PROCESS_GLOBALS(cli)); @@ -964,6 +966,7 @@ nr_status_t nr_php_txn_begin(const char* appnames, opts.log_forwarding_log_level = NRINI(log_forwarding_log_level); opts.log_events_max_samples_stored = NRINI(log_events_max_samples_stored); opts.log_metrics_enabled = NRINI(log_metrics_enabled); + opts.log_forwarding_labels_enabled = NRINI(log_forwarding_labels_enabled); opts.message_tracer_segment_parameters_enabled = NRINI(message_tracer_segment_parameters_enabled); @@ -989,7 +992,6 @@ nr_status_t nr_php_txn_begin(const char* appnames, info.environment = nro_copy(NR_PHP_PROCESS_GLOBALS(appenv)); info.metadata = nro_copy(NR_PHP_PROCESS_GLOBALS(metadata)); info.labels = nr_php_txn_get_labels(); - info.log_labels = nr_php_txn_get_log_labels(info.labels); info.host_display_name = nr_strdup(NRINI(process_host_display_name)); info.lang = nr_strdup("php"); info.version = nr_strdup(nr_version()); @@ -1028,17 +1030,21 @@ nr_status_t nr_php_txn_begin(const char* appnames, &nr_php_app_settings, NR_PHP_PROCESS_GLOBALS(daemon_app_connect_timeout)); nr_app_info_destroy_fields(&info); - if (0 == NRPRG(app)) { + if (NULL == NRPRG(app)) { nrl_debug(NRL_INIT, "unable to begin transaction: app '%.128s' is unknown", appnames ? appnames : ""); return NR_FAILURE; } attribute_config = nr_php_create_attribute_config(TSRMLS_C); - NRPRG(txn) = nr_txn_begin(NRPRG(app), &opts, attribute_config); + log_forwarding_labels + = nr_php_txn_get_log_forwarding_labels(NRPRG(app)->info.labels); + NRPRG(txn) = nr_txn_begin(NRPRG(app), &opts, attribute_config, + log_forwarding_labels); nrt_mutex_unlock(&(NRPRG(app)->app_lock)); nr_attribute_config_destroy(&attribute_config); + nro_delete(log_forwarding_labels); if (0 == NRPRG(txn)) { nrl_debug(NRL_INIT, "no Axiom transaction this time around"); diff --git a/axiom/cmd_txndata_transmit.c b/axiom/cmd_txndata_transmit.c index 6f03dea77..220b5fe2c 100644 --- a/axiom/cmd_txndata_transmit.c +++ b/axiom/cmd_txndata_transmit.c @@ -32,6 +32,7 @@ #include "util_buffer.h" #include "util_errno.h" #include "util_flatbuffers.h" +#include "util_labels.h" #include "util_logging.h" #include "util_memory.h" #include "util_network.h" @@ -54,7 +55,7 @@ char* nr_txndata_error_to_json(const nrtxn_t* txn) { NR_ATTRIBUTE_DESTINATION_ERROR); // add guid to aid error linking ui - // make copy of txn->intrisics to not cause it to be modified for other + // make copy of txn->intrisics to not cause it to be modified for other // potential uses during conversion to flatbuffer intrinsics_attributes = nro_copy(txn->intrinsics); nro_set_hash_string(intrinsics_attributes, "guid", nr_txn_get_guid(txn)); @@ -198,6 +199,26 @@ static uint32_t nr_txndata_prepend_log_events(nr_flatbuffer_t* fb, return events; } +/* + * Send the log labels to the daemon. The format used is the same as + * the format used to send labels in a collector connect message and + * was chosen for convenience of unmarshalling in the daemon. + */ +static uint32_t nr_txndata_prepend_log_forwarding_labels(nr_flatbuffer_t* fb, + nrobj_t* log_labels) { + char* json; + nrobj_t* labels; + uint32_t offset; + + labels = nr_labels_connector_format(log_labels); + json = nro_to_json(labels); + offset = nr_flatbuffers_prepend_string(fb, json); + nro_delete(labels); + nr_free(json); + + return offset; +} + uint32_t nr_txndata_prepend_span_events(nr_flatbuffer_t* fb, nr_vector_t* span_events, size_t span_event_limit) { @@ -605,12 +626,15 @@ static uint32_t nr_txndata_prepend_transaction(nr_flatbuffer_t* fb, uint32_t span_events; uint32_t log_events; uint32_t php_packages; + uint32_t log_labels; txn_trace = nr_txndata_prepend_trace_to_flatbuffer(fb, txn); span_events = nr_txndata_prepend_span_events(fb, txn->final_data.span_events, txn->app_limits.span_events); log_events = nr_txndata_prepend_log_events(fb, txn, txn->app_limits.log_events); + log_labels = nr_txndata_prepend_log_forwarding_labels( + fb, txn->log_forwarding_labels); error_events = nr_txndata_prepend_error_events(fb, txn); custom_events = nr_txndata_prepend_custom_events(fb, txn); slowsqls = nr_txndata_prepend_slowsqls(fb, txn); @@ -653,6 +677,8 @@ static uint32_t nr_txndata_prepend_transaction(nr_flatbuffer_t* fb, log_events, 0); nr_flatbuffers_object_prepend_uoffset(fb, TRANSACTION_FIELD_PHP_PACKAGES, php_packages, 0); + nr_flatbuffers_object_prepend_uoffset(fb, TRANSACTION_FIELD_LOG_LABELS, + log_labels, 0); return nr_flatbuffers_object_end(fb); } diff --git a/axiom/nr_app.h b/axiom/nr_app.h index 19dfb706d..d05a7f364 100644 --- a/axiom/nr_app.h +++ b/axiom/nr_app.h @@ -62,7 +62,6 @@ typedef struct _nr_app_info_t { nrobj_t* settings; /* New Relic settings */ nrobj_t* environment; /* Application environment */ nrobj_t* labels; /* Labels for Language Agents */ - nrobj_t* log_labels; /* Labels for log events (possibly filtered version of labels) */ nrobj_t* metadata; /* Environment provided metadata for Language Agents */ char* host_display_name; /* Optional user-provided host name for UI */ char* lang; /* Language */ diff --git a/axiom/nr_commands_private.h b/axiom/nr_commands_private.h index 566a7db10..428df1310 100644 --- a/axiom/nr_commands_private.h +++ b/axiom/nr_commands_private.h @@ -115,7 +115,8 @@ enum { TRANSACTION_FIELD_SPAN_EVENTS = 12, TRANSACTION_FIELD_LOG_EVENTS = 13, TRANSACTION_FIELD_PHP_PACKAGES = 14, - TRANSACTION_NUM_FIELDS = 15 + TRANSACTION_FIELD_LOG_LABELS = 15, + TRANSACTION_NUM_FIELDS = 16 }; /* Generated from: table Event */ diff --git a/axiom/nr_txn.c b/axiom/nr_txn.c index 06c0214ef..85e7739af 100644 --- a/axiom/nr_txn.c +++ b/axiom/nr_txn.c @@ -35,6 +35,7 @@ #include "util_logging.h" #include "util_memory.h" #include "util_metrics.h" +#include "util_object.h" #include "util_random.h" #include "util_reply.h" #include "util_sampling.h" @@ -445,7 +446,8 @@ static bool nr_txn_flush_span_batch(nr_span_encoding_result_t* encoded_batch, nrtxn_t* nr_txn_begin(nrapp_t* app, const nrtxnopt_t* opts, - const nr_attribute_config_t* attribute_config) { + const nr_attribute_config_t* attribute_config, + const nrobj_t* log_forwarding_labels) { nrtxn_t* nt; char* guid; nr_status_t err = 0; @@ -541,6 +543,8 @@ nrtxn_t* nr_txn_begin(nrapp_t* app, nt->custom_events = nr_analytics_events_create(app->limits.custom_events); nt->log_events = nr_log_events_create(app->limits.log_events); + nt->log_forwarding_labels = nro_copy(log_forwarding_labels); + nt->php_packages = nr_php_packages_create(); nt->php_package_major_version_metrics_suggestions = nr_php_packages_create(); @@ -1276,6 +1280,8 @@ void nr_txn_destroy_fields(nrtxn_t* txn) { nro_delete(txn->cat.alternate_path_hashes); nr_free(txn->cat.client_cross_process_id); + nro_delete(txn->log_forwarding_labels); + nro_delete(txn->app_connect_reply); nr_free(txn->primary_app_name); nr_synthetics_destroy(&txn->synthetics); @@ -3369,6 +3375,14 @@ bool nr_txn_log_decorating_enabled(nrtxn_t* txn) { return true; } +bool nr_txn_log_forwarding_labels_enabled(nrtxn_t* txn) { + if (!nr_txn_log_forwarding_enabled(txn)) { + return false; + } + + return txn->options.log_forwarding_labels_enabled; +} + #define ENSURE_LOG_LEVEL_NAME(level_name) \ (nr_strempty(level_name) ? "UNKNOWN" : level_name) diff --git a/axiom/nr_txn.h b/axiom/nr_txn.h index 55871f1b1..2134c8f51 100644 --- a/axiom/nr_txn.h +++ b/axiom/nr_txn.h @@ -132,6 +132,8 @@ typedef struct _nrtxnopt_t { size_t log_events_max_samples_stored; /* The maximum number of log events per transaction */ bool log_metrics_enabled; /* Whether log metrics are enabled */ + bool log_forwarding_labels_enabled; /* Whether labels are forwarded with log + events */ bool message_tracer_segment_parameters_enabled; /* Determines whether to add message attr */ } nrtxnopt_t; @@ -287,6 +289,8 @@ typedef struct _nrtxn_t { nr_analytics_events_t* custom_events; /* Custom events created through the API. */ nr_log_events_t* log_events; /* Log events pool */ + nrobj_t* log_forwarding_labels; /* A hash of log labels to be added to log + events */ nr_php_packages_t* php_packages; /* Detected php packages */ nr_php_packages_t* php_package_major_version_metrics_suggestions; /* Suggested packages for @@ -389,7 +393,8 @@ void nr_txn_enforce_security_settings(nrtxnopt_t* opts, */ extern nrtxn_t* nr_txn_begin(nrapp_t* app, const nrtxnopt_t* opts, - const nr_attribute_config_t* attribute_config); + const nr_attribute_config_t* attribute_config, + const nrobj_t* log_forwarding_labels); /* * Purpose : End a transaction by finalizing all metrics and timers. @@ -687,6 +692,11 @@ extern void nr_txn_record_log_event(nrtxn_t* txn, nr_attributes_t* context_attributes, nrapp_t* app); +/* + * Purpose : Check log labels forwarding configuration + */ +extern bool nr_txn_log_forwarding_labels_enabled(nrtxn_t* txn); + /* * Purpose : Return the CAT trip ID for the current transaction. * diff --git a/daemon/internal/newrelic/commands.go b/daemon/internal/newrelic/commands.go index 109cf5298..8ff0ee220 100644 --- a/daemon/internal/newrelic/commands.go +++ b/daemon/internal/newrelic/commands.go @@ -167,6 +167,11 @@ func (t FlatTxn) AggregateInto(h *Harvest) { } } + logForwardingLabels := txn.LogForwardingLabels() + if logForwardingLabels != nil { + h.LogEvents.SetLogForwardingLabels(logForwardingLabels) + } + if n := txn.PhpPackages(nil); n != nil { h.PhpPackages.AddPhpPackagesFromData(n.Data()) } diff --git a/daemon/internal/newrelic/log_events.go b/daemon/internal/newrelic/log_events.go index f59310cde..f719d5eb4 100644 --- a/daemon/internal/newrelic/log_events.go +++ b/daemon/internal/newrelic/log_events.go @@ -7,6 +7,8 @@ package newrelic import ( "bytes" + "encoding/json" + "github.com/newrelic/newrelic-php-agent/daemon/internal/newrelic/log" "time" ) @@ -14,11 +16,18 @@ import ( // safety and proper FailedHarvest behavior. type LogEvents struct { *analyticsEvents + LogForwardingLabels []LogForwardingLabel +} + +// define a struct to represent the format of labels as sent by agent +type LogForwardingLabel struct { + LabelType string `json:"label_type"` + LabelValue string `json:"label_value"` } // NewLogEvents returns a new Log event reservoir with capacity max. func NewLogEvents(max int) *LogEvents { - return &LogEvents{newAnalyticsEvents(max)} + return &LogEvents{analyticsEvents: newAnalyticsEvents(max)} } // AddEventFromData observes the occurrence of an Log event. If the @@ -28,6 +37,17 @@ func (events *LogEvents) AddEventFromData(data []byte, priority SamplingPriority events.AddEvent(AnalyticsEvent{data: data, priority: priority}) } +// AddLogForwardingLabels accepts JSON in the format used to send labels +// to the collector. This is used to add labels to the log events. The +// labels are added to the log events when the events are sent to the +// collector. +func (events *LogEvents) SetLogForwardingLabels(data []byte) { + err := json.Unmarshal(data, &events.LogForwardingLabels) + if err != nil { + log.Warnf("Error unmarshalling log forwarding labels: %v", err) + } +} + // FailedHarvest is a callback invoked by the processor when an // attempt to deliver the contents of events to the collector // fails. After a failed delivery attempt, events is merged into @@ -46,10 +66,24 @@ func (events *LogEvents) CollectorJSON(id AgentRunID) ([]byte, error) { estimate := len(es) * 128 buf.Grow(estimate) buf.WriteString(`[{` + - `"common": {"attributes": {}},` + + `"common": {"attributes": {`) + nwrit := 0 + for _, value := range events.LogForwardingLabels { + if nwrit > 0 { + buf.WriteByte(',') + } + nwrit++ + buf.WriteString(`"tags.`) + buf.WriteString(value.LabelType) + buf.WriteString(`":"`) + buf.WriteString(value.LabelValue) + buf.WriteString(`"`) + } + + buf.WriteString(`}},` + `"logs": [`) - nwrit := 0 + nwrit = 0 for i := 0; i < len(es); i++ { // if obviously incomplete skip if len(es[i].data) < 4 { diff --git a/daemon/internal/newrelic/protocol/Transaction.go b/daemon/internal/newrelic/protocol/Transaction.go index b53972002..f0671de82 100644 --- a/daemon/internal/newrelic/protocol/Transaction.go +++ b/daemon/internal/newrelic/protocol/Transaction.go @@ -264,8 +264,16 @@ func (rcv *Transaction) PhpPackages(obj *Event) *Event { return nil } +func (rcv *Transaction) LogForwardingLabels() []byte { + o := flatbuffers.UOffsetT(rcv._tab.Offset(34)) + if o != 0 { + return rcv._tab.ByteVector(o + rcv._tab.Pos) + } + return nil +} + func TransactionStart(builder *flatbuffers.Builder) { - builder.StartObject(15) + builder.StartObject(16) } func TransactionAddName(builder *flatbuffers.Builder, name flatbuffers.UOffsetT) { builder.PrependUOffsetTSlot(0, flatbuffers.UOffsetT(name), 0) @@ -333,6 +341,9 @@ func TransactionStartLogEventsVector(builder *flatbuffers.Builder, numElems int) func TransactionAddPhpPackages(builder *flatbuffers.Builder, phpPackages flatbuffers.UOffsetT) { builder.PrependUOffsetTSlot(14, flatbuffers.UOffsetT(phpPackages), 0) } +func TransactionAddLogForwardingLabels(builder *flatbuffers.Builder, logForwardingLabels flatbuffers.UOffsetT) { + builder.PrependUOffsetTSlot(15, flatbuffers.UOffsetT(logForwardingLabels), 0) +} func TransactionEnd(builder *flatbuffers.Builder) flatbuffers.UOffsetT { return builder.EndObject() } diff --git a/protocol/flatbuffers/protocol.fbs b/protocol/flatbuffers/protocol.fbs index 394a190ce..8e0aef1db 100644 --- a/protocol/flatbuffers/protocol.fbs +++ b/protocol/flatbuffers/protocol.fbs @@ -118,7 +118,8 @@ table Transaction { sampling_priority: double; // added in the 8.2 PHP agent release span_events: [Event]; log_events: [Event]; // added in the 10.1 PHP agent release - php_packages: Event; // added in the ??? PHP agent release + php_packages: Event; // added in the ??? PHP agent release <- fix agent version + log_forwarding_labels Events; // added in the ??? PHP agent release <- rerun flatc to make sure it generates the same file - I accidentally deleted this line! } union MessageBody { App, AppReply, Transaction, SpanBatch } From 78c8388fc800c4320428916f1e982cffe4230d8c Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Tue, 18 Feb 2025 16:44:14 -0500 Subject: [PATCH 04/60] feat(agent): Adds log forwarding labels supportability metric --- agent/php_txn.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/agent/php_txn.c b/agent/php_txn.c index 608c63c44..3f55b2798 100644 --- a/agent/php_txn.c +++ b/agent/php_txn.c @@ -777,6 +777,11 @@ static void nr_php_txn_send_metrics_once(nrtxn_t* txn TSRMLS_DC) { nrm_force_add(NRTXN(unscoped_metrics), metname, 0); nr_free(metname); + metname = nr_formatf("Supportability/Logging/Labels/PHP/%s", + FMT_BOOL(nr_txn_log_forwarding_labels_enabled(txn))); + nrm_force_add(NRTXN(unscoped_metrics), metname, 0); + nr_free(metname); + txn->created_logging_onetime_metrics = true; #undef FMT_BOOL From 520169e21c526a920a50d590a47da817a0a70893 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Tue, 18 Feb 2025 16:49:48 -0500 Subject: [PATCH 05/60] tests(logging): Adds Monolog3 tests for log forwarding labels --- .../test_monolog_labels_forwarding_basic.php | 216 +++++++++++++++++ ...olog_labels_forwarding_basic_mixedcase.php | 219 +++++++++++++++++ ...g_labels_forwarding_basic_mixedsources.php | 227 ++++++++++++++++++ ...log_labels_forwarding_basic_withspaces.php | 218 +++++++++++++++++ ...est_monolog_labels_forwarding_disabled.php | 213 ++++++++++++++++ ...t_monolog_labels_forwarding_exclude_01.php | 216 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_02.php | 219 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_03.php | 219 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_04.php | 219 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_05.php | 216 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_06.php | 218 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_07.php | 219 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_08.php | 219 +++++++++++++++++ ..._monolog_labels_forwarding_exclude_08a.php | 219 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_09.php | 219 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_10.php | 218 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_11.php | 219 +++++++++++++++++ ..._monolog_labels_forwarding_exclude_11a.php | 219 +++++++++++++++++ 18 files changed, 3932 insertions(+) create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic_mixedcase.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic_mixedsources.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic_withspaces.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_01.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_02.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_03.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_04.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_05.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_06.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_07.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_08.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_08a.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_09.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_10.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_11.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_11a.php diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic.php new file mode 100644 index 000000000..c2b8470d1 --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic.php @@ -0,0 +1,216 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic_mixedcase.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic_mixedcase.php new file mode 100644 index 000000000..008b412e7 --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic_mixedcase.php @@ -0,0 +1,219 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic_mixedsources.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic_mixedsources.php new file mode 100644 index 000000000..6a1a71058 --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic_mixedsources.php @@ -0,0 +1,227 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic_withspaces.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic_withspaces.php new file mode 100644 index 000000000..c2299f734 --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic_withspaces.php @@ -0,0 +1,218 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled.php new file mode 100644 index 000000000..330c2513b --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled.php @@ -0,0 +1,213 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_01.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_01.php new file mode 100644 index 000000000..abc65e9fe --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_01.php @@ -0,0 +1,216 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_02.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_02.php new file mode 100644 index 000000000..96df334a5 --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_02.php @@ -0,0 +1,219 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_03.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_03.php new file mode 100644 index 000000000..8b00f549a --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_03.php @@ -0,0 +1,219 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_04.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_04.php new file mode 100644 index 000000000..6a2eb0af8 --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_04.php @@ -0,0 +1,219 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_05.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_05.php new file mode 100644 index 000000000..30d59ef21 --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_05.php @@ -0,0 +1,216 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_06.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_06.php new file mode 100644 index 000000000..eeb791d84 --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_06.php @@ -0,0 +1,218 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_07.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_07.php new file mode 100644 index 000000000..e5dd1f196 --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_07.php @@ -0,0 +1,219 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_08.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_08.php new file mode 100644 index 000000000..5f7df639e --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_08.php @@ -0,0 +1,219 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_08a.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_08a.php new file mode 100644 index 000000000..806da77d0 --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_08a.php @@ -0,0 +1,219 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_09.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_09.php new file mode 100644 index 000000000..e2d4f1747 --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_09.php @@ -0,0 +1,219 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_10.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_10.php new file mode 100644 index 000000000..7832c5027 --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_10.php @@ -0,0 +1,218 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_11.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_11.php new file mode 100644 index 000000000..86aa719ef --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_11.php @@ -0,0 +1,219 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_11a.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_11a.php new file mode 100644 index 000000000..b39c20c6d --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_11a.php @@ -0,0 +1,219 @@ +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(); From 9a3cd247827c22c41eb32d77471ae01057eeb3e3 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Tue, 18 Feb 2025 16:56:16 -0500 Subject: [PATCH 06/60] chore(tests): Removes unneeded spaces --- .../monolog3/test_monolog_labels_forwarding_basic.php | 6 +++--- .../test_monolog_labels_forwarding_basic_mixedsources.php | 6 +++--- .../monolog3/test_monolog_labels_forwarding_exclude_02.php | 6 +++--- .../monolog3/test_monolog_labels_forwarding_exclude_09.php | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic.php index c2b8470d1..54ba9bd1c 100644 --- a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic.php +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic.php @@ -145,7 +145,7 @@ "entity.guid": "??", "entity.name": "tests/integration/logging/monolog3__FILE__", "hostname": "__HOST__" - }, + }, { "message": "emergency", "level": "EMERGENCY", @@ -155,7 +155,7 @@ "entity.guid": "??", "entity.name": "tests/integration/logging/monolog3__FILE__", "hostname": "__HOST__" - }, + }, { "message": "debug", "level": "DEBUG", @@ -190,7 +190,7 @@ function test_logging() { $stdoutHandler->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 diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic_mixedsources.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic_mixedsources.php index 6a1a71058..68728a9f2 100644 --- a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic_mixedsources.php +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic_mixedsources.php @@ -156,7 +156,7 @@ "entity.guid": "??", "entity.name": "tests/integration/logging/monolog3__FILE__", "hostname": "__HOST__" - }, + }, { "message": "emergency", "level": "EMERGENCY", @@ -166,7 +166,7 @@ "entity.guid": "??", "entity.name": "tests/integration/logging/monolog3__FILE__", "hostname": "__HOST__" - }, + }, { "message": "debug", "level": "DEBUG", @@ -201,7 +201,7 @@ function test_logging() { $stdoutHandler->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 diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_02.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_02.php index 96df334a5..a128dd494 100644 --- a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_02.php +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_02.php @@ -148,7 +148,7 @@ "entity.guid": "??", "entity.name": "tests/integration/logging/monolog3__FILE__", "hostname": "__HOST__" - }, + }, { "message": "emergency", "level": "EMERGENCY", @@ -158,7 +158,7 @@ "entity.guid": "??", "entity.name": "tests/integration/logging/monolog3__FILE__", "hostname": "__HOST__" - }, + }, { "message": "debug", "level": "DEBUG", @@ -193,7 +193,7 @@ function test_logging() { $stdoutHandler->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 diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_09.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_09.php index e2d4f1747..27e890384 100644 --- a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_09.php +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_09.php @@ -148,7 +148,7 @@ "entity.guid": "??", "entity.name": "tests/integration/logging/monolog3__FILE__", "hostname": "__HOST__" - }, + }, { "message": "emergency", "level": "EMERGENCY", @@ -158,7 +158,7 @@ "entity.guid": "??", "entity.name": "tests/integration/logging/monolog3__FILE__", "hostname": "__HOST__" - }, + }, { "message": "debug", "level": "DEBUG", @@ -193,7 +193,7 @@ function test_logging() { $stdoutHandler->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 From 5983bc0ed6793725b0cf1cae3c8f13cf12f38626 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Wed, 19 Feb 2025 11:33:45 -0500 Subject: [PATCH 07/60] chore(daemon): Remove debugging statement --- daemon/internal/newrelic/log_events.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/daemon/internal/newrelic/log_events.go b/daemon/internal/newrelic/log_events.go index f719d5eb4..23134ed79 100644 --- a/daemon/internal/newrelic/log_events.go +++ b/daemon/internal/newrelic/log_events.go @@ -42,10 +42,7 @@ func (events *LogEvents) AddEventFromData(data []byte, priority SamplingPriority // labels are added to the log events when the events are sent to the // collector. func (events *LogEvents) SetLogForwardingLabels(data []byte) { - err := json.Unmarshal(data, &events.LogForwardingLabels) - if err != nil { - log.Warnf("Error unmarshalling log forwarding labels: %v", err) - } + json.Unmarshal(data, &events.LogForwardingLabels) } // FailedHarvest is a callback invoked by the processor when an From b8c415adb15bdfc7206cf05685b391db95596150 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Wed, 19 Feb 2025 11:34:25 -0500 Subject: [PATCH 08/60] tests(daemon): Add simple tests for LogEvents --- daemon/internal/newrelic/log_events_test.go | 85 +++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 daemon/internal/newrelic/log_events_test.go diff --git a/daemon/internal/newrelic/log_events_test.go b/daemon/internal/newrelic/log_events_test.go new file mode 100644 index 000000000..421df9708 --- /dev/null +++ b/daemon/internal/newrelic/log_events_test.go @@ -0,0 +1,85 @@ +// +// Copyright 2020 New Relic Corporation. All rights reserved. +// SPDX-License-Identifier: Apache-2.0 +// + +package newrelic + +import ( + "testing" +) + +// LogEvents is a wrapper over AnalyticsEvents created for additional type +// There are already unit tests for AnalyticsEvents in analytics_events_test.go +// These tests will focus on the methods specific to LogEvents + +func TestAddEventFromData(t *testing.T) { + events := NewLogEvents(10) + id := AgentRunID(`12345`) + data := []byte(`{"message":"test log event"}`) + priority := SamplingPriority(0.5) + + events.AddEventFromData(data, priority) + + if events.analyticsEvents.events.Len() != 1 { + t.Errorf("expected 1 event, got %d", events.analyticsEvents.events.Len()) + } + + es := *events.analyticsEvents.events + event := es[0] + + if string(event.data) != string(data) { + t.Errorf("expected event data %s, got %s", string(data), string(event.data)) + } + + if event.priority != priority { + t.Errorf("expected event priority %f, got %f", priority, event.priority) + } + + json, err := events.CollectorJSON(id) + if nil != err { + t.Fatal(err) + } + + expected := `[{"common": {"attributes": {}},"logs": [{"message":"test log event"}]}]` + if string(json) != expected { + t.Errorf("expected JSON %s, got %s", expected, string(json)) + } +} + +func TestSetLogForwardingLabels(t *testing.T) { + events := NewLogEvents(10) + id := AgentRunID(`12345`) + log_data := []byte(`{"message":"test log event"}`) + label_data := []byte(`[{"label_type":"type1","label_value":"value1"},{"label_type":"type2","label_value":"value2"}]`) + priority := SamplingPriority(0.5) + + events.AddEventFromData(log_data, priority) + events.SetLogForwardingLabels(label_data) + + if events.analyticsEvents.events.Len() != 1 { + t.Errorf("expected 1 event, got %d", events.analyticsEvents.events.Len()) + } + + es := *events.analyticsEvents.events + event := es[0] + + if string(event.data) != string(log_data) { + t.Errorf("expected event data %s, got %s", string(log_data), string(event.data)) + } + + if event.priority != priority { + t.Errorf("expected event priority %f, got %f", priority, event.priority) + } + + json, err := events.CollectorJSON(id) + if nil != err { + t.Fatal(err) + } + + expected := `[{"common": {"attributes": {"tags.type1":"value1","tags.type2":"value2"}},` + + `"logs": [{"message":"test log event"}]}]` + if string(json) != expected { + t.Errorf("expected JSON %s, got %s", expected, string(json)) + } +} From ed8cadac35094c7638e92c14434d49e8c607ea6c Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Wed, 19 Feb 2025 11:36:58 -0500 Subject: [PATCH 09/60] chore(daemon): Removes unneeded import --- daemon/internal/newrelic/log_events.go | 1 - 1 file changed, 1 deletion(-) diff --git a/daemon/internal/newrelic/log_events.go b/daemon/internal/newrelic/log_events.go index 23134ed79..3d31200c2 100644 --- a/daemon/internal/newrelic/log_events.go +++ b/daemon/internal/newrelic/log_events.go @@ -8,7 +8,6 @@ package newrelic import ( "bytes" "encoding/json" - "github.com/newrelic/newrelic-php-agent/daemon/internal/newrelic/log" "time" ) From 6c0b65f61c2f13534598aadaa858326de26c8c68 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Wed, 19 Feb 2025 11:49:13 -0500 Subject: [PATCH 10/60] chore(daemon): Logs unmarshall error --- daemon/internal/newrelic/log_events.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/daemon/internal/newrelic/log_events.go b/daemon/internal/newrelic/log_events.go index 3d31200c2..647516e7e 100644 --- a/daemon/internal/newrelic/log_events.go +++ b/daemon/internal/newrelic/log_events.go @@ -9,6 +9,7 @@ import ( "bytes" "encoding/json" "time" + "github.com/newrelic/newrelic-php-agent/daemon/internal/newrelic/log" ) // LogEvents is a wrapper over AnalyticsEvents created for additional type @@ -41,7 +42,10 @@ func (events *LogEvents) AddEventFromData(data []byte, priority SamplingPriority // labels are added to the log events when the events are sent to the // collector. func (events *LogEvents) SetLogForwardingLabels(data []byte) { - json.Unmarshal(data, &events.LogForwardingLabels) + err := json.Unmarshal(data, &events.LogForwardingLabels) + if nil != err { + log.Errorf("failed to unmarshal log labels json", err) + } } // FailedHarvest is a callback invoked by the processor when an From 0672ac05869ad9364cd1eeca19c48f5bf929e376 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Wed, 19 Feb 2025 11:49:52 -0500 Subject: [PATCH 11/60] tests(daemon): Adds log forwarded label to test --- daemon/internal/newrelic/processor_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/daemon/internal/newrelic/processor_test.go b/daemon/internal/newrelic/processor_test.go index 1c07ea331..105f5d1db 100644 --- a/daemon/internal/newrelic/processor_test.go +++ b/daemon/internal/newrelic/processor_test.go @@ -187,6 +187,7 @@ var ( }) txnLogEventSample = AggregaterIntoFn(func(h *Harvest) { h.LogEvents.AddEventFromData(sampleLogEvent, SamplingPriority(0.8)) + h.LogEvents.SetLogForwardingLabels([]byte(`[{"label_type":"label1","label_value":"value1"}]`)) }) txnPhpPackagesSample = AggregaterIntoFn(func(h *Harvest) { h.PhpPackages.AddPhpPackagesFromData(samplePhpPackages) @@ -382,7 +383,7 @@ func TestProcessorHarvestLogEvents(t *testing.T) { <-m.p.trackProgress // unblock processor after harvest - expected := `[{"common": {"attributes": {}},"logs": [log event test birthday]}]` + expected := `[{"common": {"attributes": {"tags.label1":"value1"}},"logs": [log event test birthday]}]` if string(cp.data) != expected { t.Fatalf("expected: %s \ngot: %s", expected, string(cp.data)) } From 5b23982231ea64f1a69ba582676abdf0be2f3e83 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Wed, 19 Feb 2025 12:54:39 -0500 Subject: [PATCH 12/60] fix(agent): Fixes log forwarded labels definition --- protocol/flatbuffers/protocol.fbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protocol/flatbuffers/protocol.fbs b/protocol/flatbuffers/protocol.fbs index 8e0aef1db..7d7e8d410 100644 --- a/protocol/flatbuffers/protocol.fbs +++ b/protocol/flatbuffers/protocol.fbs @@ -119,7 +119,7 @@ table Transaction { span_events: [Event]; log_events: [Event]; // added in the 10.1 PHP agent release php_packages: Event; // added in the ??? PHP agent release <- fix agent version - log_forwarding_labels Events; // added in the ??? PHP agent release <- rerun flatc to make sure it generates the same file - I accidentally deleted this line! + log_forwarding_labels Event; // added in the ??? PHP agent release } union MessageBody { App, AppReply, Transaction, SpanBatch } From 81860439cd44f171d58f21aaa1a67cbb103e5108 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Wed, 19 Feb 2025 15:51:59 -0500 Subject: [PATCH 13/60] fix(agent): Fixes encoding of forwarded log labels to an Event --- axiom/cmd_txndata_transmit.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/axiom/cmd_txndata_transmit.c b/axiom/cmd_txndata_transmit.c index 220b5fe2c..3bc60692d 100644 --- a/axiom/cmd_txndata_transmit.c +++ b/axiom/cmd_txndata_transmit.c @@ -208,15 +208,22 @@ static uint32_t nr_txndata_prepend_log_forwarding_labels(nr_flatbuffer_t* fb, nrobj_t* log_labels) { char* json; nrobj_t* labels; - uint32_t offset; + uint32_t data; labels = nr_labels_connector_format(log_labels); json = nro_to_json(labels); - offset = nr_flatbuffers_prepend_string(fb, json); nro_delete(labels); + + if (NULL == json) { + return 0; + } + + data = nr_flatbuffers_prepend_string(fb, json); nr_free(json); - return offset; + nr_flatbuffers_object_begin(fb, EVENT_NUM_FIELDS); + nr_flatbuffers_object_prepend_uoffset(fb, EVENT_FIELD_DATA, data, 0); + return nr_flatbuffers_object_end(fb); } uint32_t nr_txndata_prepend_span_events(nr_flatbuffer_t* fb, From 993403becfb140ea08b3053befc47612c544a92f Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Wed, 19 Feb 2025 15:54:32 -0500 Subject: [PATCH 14/60] tests(agent): Adds test for encoding forwarded log labels --- axiom/tests/test_cmd_txndata.c | 65 +++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/axiom/tests/test_cmd_txndata.c b/axiom/tests/test_cmd_txndata.c index ffb53a6c9..ddd91169b 100644 --- a/axiom/tests/test_cmd_txndata.c +++ b/axiom/tests/test_cmd_txndata.c @@ -11,7 +11,6 @@ #include "nr_app.h" #include "nr_attributes.h" #include "nr_commands.h" -#include "nr_commands.h" #include "nr_commands_private.h" #include "nr_custom_events.h" #include "nr_errors.h" @@ -1113,6 +1112,69 @@ static void test_encode_txn_event(void) { nr_txn_destroy_fields(&txn); } +static void test_encode_log_forwarding_labels(void) { + nrtxn_t txn; + nr_flatbuffers_table_t tbl; + nrobj_t* obj; + nr_flatbuffer_t* fb; + int data_type; + int did_pass; + const char* input = "alpha:beta;gamma:delta"; + + obj = nr_labels_parse(input); + + nr_memset(&txn, 0, sizeof(txn)); + txn.status.recording = 1; + txn.options.log_forwarding_enabled = 1; + txn.options.log_forwarding_labels_enabled = 1; + txn.log_forwarding_labels = nro_copy(obj); + + fb = nr_txndata_encode(&txn); + + nr_flatbuffers_table_init_root(&tbl, nr_flatbuffers_data(fb), + nr_flatbuffers_len(fb)); + + data_type = nr_flatbuffers_table_read_i8(&tbl, MESSAGE_FIELD_DATA_TYPE, + MESSAGE_BODY_NONE); + did_pass = tlib_pass_if_true(__func__, MESSAGE_BODY_TXN == data_type, + "data_type=%d", data_type); + if (0 != did_pass) { + goto done; + } + + did_pass = tlib_pass_if_true( + __func__, + 0 != nr_flatbuffers_table_read_union(&tbl, &tbl, MESSAGE_FIELD_DATA), + "transaction data missing"); + if (0 != did_pass) { + goto done; + } + + did_pass + = tlib_pass_if_true(__func__, + 0 + != nr_flatbuffers_table_read_union( + &tbl, &tbl, TRANSACTION_FIELD_LOG_LABELS), + "log labels missing"); + if (0 != did_pass) { + goto done; + } + + tlib_pass_if_bytes_equal_f( + __func__, + NR_PSTR("[{\"label_type\":\"alpha\",\"label_value\":\"beta\"}," + "{\"label_type\":\"gamma\",\"label_" + "value\":\"delta\"}]"), + nr_flatbuffers_table_read_bytes(&tbl, EVENT_FIELD_DATA), + nr_flatbuffers_table_read_vector_len(&tbl, EVENT_FIELD_DATA), __FILE__, + __LINE__); + +done: + nr_flatbuffers_destroy(&fb); + nr_txn_destroy_fields(&txn); + nro_delete(obj); +} + static void test_encode_php_packages(void) { nrtxn_t txn; nr_flatbuffers_table_t tbl; @@ -1280,6 +1342,7 @@ void test_main(void* p NRUNUSED) { test_encode_trace(); test_encode_txn_event(); test_encode_log_events(); + test_encode_log_forwarding_labels(); test_encode_php_packages(); test_bad_daemon_fd(); From b5616d0049891aea9bd9cc75da919acabb103837 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Wed, 19 Feb 2025 15:58:27 -0500 Subject: [PATCH 15/60] fix(agent): Updates function call for nr_txn_begin() The function nr_txn_begin() now accepts a nrobj_t *log_labels parameter which contains the logging labels to be associated with log events. --- axiom/tests/test_segment.c | 14 ++--- axiom/tests/test_segment_helpers.h | 2 +- axiom/tests/test_txn.c | 86 +++++++++++++++--------------- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/axiom/tests/test_segment.c b/axiom/tests/test_segment.c index 65f137408..1302e1761 100644 --- a/axiom/tests/test_segment.c +++ b/axiom/tests/test_segment.c @@ -1522,7 +1522,7 @@ static void test_segment_discard_not_keep_metrics_while_running(void) { int metric_count; nr_memset(&opts, 0, sizeof(opts)); - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); metric_count = nrm_table_size(txn->scoped_metrics); @@ -1552,7 +1552,7 @@ static void test_segment_discard_keep_metrics(void) { nr_segment_t* E; nr_memset(&opts, 0, sizeof(opts)); - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); /* Build a mock tree of segments with metrics * @@ -1629,7 +1629,7 @@ static void test_segment_discard_keep_metrics_while_running(void) { nr_segment_t* E; nr_memset(&opts, 0, sizeof(opts)); - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); /* Build a mock tree of segments with metrics * @@ -1746,7 +1746,7 @@ static void test_segment_discard_keep_metrics_no_exclusive(void) { */ opts.max_segments = 1000; - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); /* Build a mock tree of segments with metrics * @@ -2351,7 +2351,7 @@ static void test_segment_ensure_id(void) { nr_memset(&opts, 0, sizeof(opts)); opts.distributed_tracing_enabled = 1; opts.span_events_enabled = 1; - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); segment = nr_segment_start(txn, txn->segment_root, NULL); nr_distributed_trace_set_sampled(txn->distributed_trace, true); @@ -2548,7 +2548,7 @@ static void test_segment_to_span_event(void) { nr_memset(&opts, 0, sizeof(opts)); opts.distributed_tracing_enabled = 1; opts.span_events_enabled = 1; - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); segment = nr_segment_start(txn, txn->segment_root, NULL); nr_distributed_trace_set_sampled(txn->distributed_trace, true); nr_txn_set_string_attribute(txn, nr_txn_request_method, "GET"); @@ -2887,7 +2887,7 @@ static void test_segment_record_exception(void) { nr_memset(&opts, 0, sizeof(opts)); opts.distributed_tracing_enabled = 1; opts.span_events_enabled = 1; - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); segment = nr_segment_start(txn, NULL, NULL); nr_distributed_trace_set_sampled(txn->distributed_trace, true); txn->options.allow_raw_exception_messages = 1; diff --git a/axiom/tests/test_segment_helpers.h b/axiom/tests/test_segment_helpers.h index 9ff7f54f7..900ab235c 100644 --- a/axiom/tests/test_segment_helpers.h +++ b/axiom/tests/test_segment_helpers.h @@ -246,7 +246,7 @@ static NRUNUSED nrtxn_t* new_txn(int background) { .span_events = NR_DEFAULT_SPAN_EVENTS_MAX_SAMPLES_STORED, }; - txn = nr_txn_begin(&app, &nr_txn_test_options, 0); + txn = nr_txn_begin(&app, &nr_txn_test_options, NULL, NULL); if (0 == txn) { return txn; } diff --git a/axiom/tests/test_txn.c b/axiom/tests/test_txn.c index 5dc68deae..4cab1ff93 100644 --- a/axiom/tests/test_txn.c +++ b/axiom/tests/test_txn.c @@ -1604,7 +1604,7 @@ static void test_default_trace_id(void) { app.state = NR_APP_OK; nr_memset(&opts, 0, sizeof(opts)); - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); txnid = nr_txn_get_guid(txn); tlib_fail_if_null("txnid", txnid); @@ -1625,7 +1625,7 @@ static void test_root_segment_priority(void) { app.state = NR_APP_OK; nr_memset(&opts, 0, sizeof(opts)); - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); tlib_fail_if_null("txn", txn); tlib_fail_if_null("root segment", txn->segment_root); @@ -1651,21 +1651,21 @@ static void test_begin_bad_params(void) { app.state = NR_APP_OK; nr_memset(&opts, 0, sizeof(opts)); - txn = nr_txn_begin(0, 0, config); + txn = nr_txn_begin(0, 0, config, NULL); tlib_pass_if_true("null params", 0 == txn, "txn=%p", txn); - txn = nr_txn_begin(0, &opts, config); + txn = nr_txn_begin(0, &opts, config, NULL); tlib_pass_if_true("null app", 0 == txn, "txn=%p", txn); app.state = NR_APP_INVALID; - txn = nr_txn_begin(&app, &opts, config); + txn = nr_txn_begin(&app, &opts, config, NULL); tlib_pass_if_true("invalid app", 0 == txn, "txn=%p", txn); app.state = NR_APP_OK; - txn = nr_txn_begin(&app, NULL, config); + txn = nr_txn_begin(&app, NULL, config, NULL); tlib_pass_if_true("NULL options", 0 == txn, "txn=%p", txn); - txn = nr_txn_begin(&app, &opts, config); + txn = nr_txn_begin(&app, &opts, config, NULL); tlib_pass_if_true("tests valid", 0 != txn, "txn=%p", txn); nr_txn_destroy(&txn); @@ -1755,7 +1755,7 @@ static void test_begin(void) { correct.cross_process_enabled = 22; correct.max_segments = 0; - rv = nr_txn_begin(app, opts, attribute_config); + rv = nr_txn_begin(app, opts, attribute_config, NULL); test_created_txn("options provided", rv, &correct); json = nr_attributes_debug_json(rv->attributes); tlib_pass_if_str_equal("display host attribute created", json, @@ -1772,7 +1772,7 @@ static void test_begin(void) { correct.tt_threshold = 12; correct.tt_is_apdex_f = 0; - rv = nr_txn_begin(app, opts, attribute_config); + rv = nr_txn_begin(app, opts, attribute_config, NULL); test_created_txn("tt is not apdex_f", rv, &correct); nr_txn_destroy(&rv); @@ -1783,7 +1783,7 @@ static void test_begin(void) { correct.tt_enabled = 0; correct.ep_enabled = 0; correct.tt_slowsql = 0; - rv = nr_txn_begin(app, opts, attribute_config); + rv = nr_txn_begin(app, opts, attribute_config, NULL); test_created_txn("app turns off traces", rv, &correct); nr_txn_destroy(&rv); @@ -1792,7 +1792,7 @@ static void test_begin(void) { */ nro_set_hash_boolean(app->connect_reply, "collect_errors", 0); correct.err_enabled = 0; - rv = nr_txn_begin(app, opts, attribute_config); + rv = nr_txn_begin(app, opts, attribute_config, NULL); test_created_txn("app turns off errors", rv, &correct); nr_txn_destroy(&rv); @@ -1801,7 +1801,7 @@ static void test_begin(void) { */ nro_set_hash_boolean(app->connect_reply, "collect_analytics_events", 0); correct.analytics_events_enabled = 0; - rv = nr_txn_begin(app, opts, attribute_config); + rv = nr_txn_begin(app, opts, attribute_config, NULL); test_created_txn("app turns off analytics events", rv, &correct); nr_txn_destroy(&rv); @@ -1810,7 +1810,7 @@ static void test_begin(void) { */ nro_set_hash_boolean(app->connect_reply, "collect_custom_events", 0); correct.custom_events_enabled = 0; - rv = nr_txn_begin(app, opts, attribute_config); + rv = nr_txn_begin(app, opts, attribute_config, NULL); test_created_txn("app turns off custom events", rv, &correct); nr_txn_destroy(&rv); @@ -1819,7 +1819,7 @@ static void test_begin(void) { */ nro_set_hash_boolean(app->connect_reply, "collect_error_events", 0); correct.error_events_enabled = 0; - rv = nr_txn_begin(app, opts, attribute_config); + rv = nr_txn_begin(app, opts, attribute_config, NULL); test_created_txn("app turns off error events", rv, &correct); nr_txn_destroy(&rv); @@ -1828,7 +1828,7 @@ static void test_begin(void) { */ nro_set_hash_boolean(app->connect_reply, "collect_span_events", 0); correct.span_events_enabled = 0; - rv = nr_txn_begin(app, opts, attribute_config); + rv = nr_txn_begin(app, opts, attribute_config, NULL); test_created_txn("app turns off span events", rv, &correct); nr_txn_destroy(&rv); @@ -1836,7 +1836,7 @@ static void test_begin(void) { * Test : High security off */ app->info.high_security = 0; - rv = nr_txn_begin(app, opts, attribute_config); + rv = nr_txn_begin(app, opts, attribute_config, NULL); tlib_pass_if_int_equal("high security off", 0, rv->high_security); nr_txn_destroy(&rv); @@ -1844,7 +1844,7 @@ static void test_begin(void) { * Test : High Security On */ app->info.high_security = 1; - rv = nr_txn_begin(app, opts, attribute_config); + rv = nr_txn_begin(app, opts, attribute_config, NULL); tlib_pass_if_int_equal("app local high security copied to txn", 1, rv->high_security); nr_txn_destroy(&rv); @@ -1853,7 +1853,7 @@ static void test_begin(void) { /* * Test : CPU usage populated on create */ - rv = nr_txn_begin(app, opts, attribute_config); + rv = nr_txn_begin(app, opts, attribute_config, NULL); /* * It is tempting to think that the process has already * incurred some user and system time at the start. @@ -1873,7 +1873,7 @@ static void test_begin(void) { /* * Test : App name is populated in the new transaction. */ - rv = nr_txn_begin(app, opts, attribute_config); + rv = nr_txn_begin(app, opts, attribute_config, NULL); tlib_pass_if_str_equal("primary_app_name", "App Name", rv->primary_app_name); nr_txn_destroy(&rv); @@ -1883,7 +1883,7 @@ static void test_begin(void) { nro_set_hash_string(app->connect_reply, "trusted_account_key", "1"); nro_set_hash_string(app->connect_reply, "primary_application_id", "2"); nro_set_hash_string(app->connect_reply, "account_id", "3"); - rv = nr_txn_begin(app, opts, attribute_config); + rv = nr_txn_begin(app, opts, attribute_config, NULL); tlib_pass_if_str_equal( "connect response", "1", nr_distributed_trace_get_trusted_key(rv->distributed_trace)); @@ -1904,7 +1904,7 @@ static void test_begin(void) { .error_events = 0, .span_events = 0, }; - rv = nr_txn_begin(app, opts, attribute_config); + rv = nr_txn_begin(app, opts, attribute_config, NULL); tlib_pass_if_int_equal("analytics_events_enabled", 0, rv->options.analytics_events_enabled); tlib_pass_if_int_equal("custom_events_enabled", 0, @@ -1954,7 +1954,7 @@ static nrtxn_t* create_full_txn_and_reset(nrapp_t* app) { /* * Create the Transaction */ - txn = nr_txn_begin(app, &nr_txn_test_options, 0); + txn = nr_txn_begin(app, &nr_txn_test_options, 0, NULL); tlib_pass_if_not_null("nr_txn_begin succeeds", txn); if (0 == txn) { return txn; @@ -3730,7 +3730,7 @@ static nrtxn_t* test_namer_with_app_and_expressions_and_return_txn( nr_memset(&simple_test_app, 0, sizeof(simple_test_app)); simple_test_app.state = NR_APP_OK; - txn = nr_txn_begin(&simple_test_app, &nr_txn_test_options, NULL); + txn = nr_txn_begin(&simple_test_app, &nr_txn_test_options, NULL, NULL); tlib_pass_if_not_null("nr_txn_begin succeeds", txn); nr_txn_add_match_files(txn, test_pattern); @@ -3766,7 +3766,7 @@ static void test_namer(void) { nr_txn_match_file(NULL, NULL); nr_txn_add_file_naming_pattern(NULL, ""); - txn = nr_txn_begin(&simple_test_app, &nr_txn_test_options, NULL); + txn = nr_txn_begin(&simple_test_app, &nr_txn_test_options, NULL, NULL); nr_txn_add_file_naming_pattern(txn, NULL); nr_txn_add_file_naming_pattern(txn, ""); @@ -3827,7 +3827,7 @@ static void test_namer(void) { tlib_pass_if_str_equal("Match freezes transaction", "pkg/.", txn->path); nr_txn_destroy(&txn); - txn = nr_txn_begin(&simple_test_app, &nr_txn_test_options, NULL); + txn = nr_txn_begin(&simple_test_app, &nr_txn_test_options, NULL, NULL); txn->status.recording = 0; nr_txn_add_match_files(txn, "pattern"); @@ -4362,7 +4362,7 @@ static void test_txn_cat_map_cross_agent_testcase_fn(nrapp_t* app, nr_free(app->entity_name); app->entity_name = nr_strdup(appname); - txn = nr_txn_begin(app, &nr_txn_test_options, NULL); + txn = nr_txn_begin(app, &nr_txn_test_options, NULL, NULL); test_pass_if_true_file_line("tests valid", NULL != txn, file, line, "txn=%p", txn); if (NULL == txn) { @@ -4646,7 +4646,7 @@ static void test_txn_dt_cross_agent_testcase(nrapp_t* app, trusted_account_key); nro_set_hash_string(app->connect_reply, "account_id", account_id); - txn = nr_txn_begin(app, &nr_txn_test_options, NULL); + txn = nr_txn_begin(app, &nr_txn_test_options, NULL, NULL); tlib_pass_if_not_null(testname, txn); if (NULL == txn) { @@ -4908,7 +4908,7 @@ static void test_txn_trace_context_cross_agent_testcase(nrapp_t* app, trusted_account_key); nro_set_hash_string(app->connect_reply, "account_id", account_id); - txn = nr_txn_begin(app, &nr_txn_test_options, NULL); + txn = nr_txn_begin(app, &nr_txn_test_options, NULL, NULL); tlib_pass_if_not_null(testname, txn); if (NULL == txn) { @@ -5497,7 +5497,7 @@ static void test_custom_parameters_segment(void) { /* * Setup and start txn and custom segment. */ - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); txn->options.span_events_enabled = true; txn->options.distributed_tracing_enabled = true; nr_distributed_trace_set_sampled(txn->distributed_trace, true); @@ -7475,7 +7475,7 @@ static void test_force_current_segment(void) { /* * Setup and start txn. */ - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); /* * segment_1 is the current segment in the default context. @@ -7573,7 +7573,7 @@ static void test_get_current_trace_id(void) { nr_memset(&opts, 0, sizeof(opts)); app.state = NR_APP_OK; opts.distributed_tracing_enabled = 1; - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); /* * Test : Bad parameters @@ -7613,7 +7613,7 @@ static void test_get_current_trace_id(void) { app.state = NR_APP_OK; opts.distributed_tracing_enabled = 1; opts.distributed_tracing_pad_trace_id = true; - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); /* * Test : trace id != txn_id with trace_id padding enabled */ @@ -7643,7 +7643,7 @@ static void test_get_current_span_id(void) { nr_memset(&opts, 0, sizeof(opts)); app.state = NR_APP_OK; opts.distributed_tracing_enabled = 1; - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); segment = nr_segment_start(txn, txn->segment_root, NULL); nr_distributed_trace_set_sampled(txn->distributed_trace, true); nr_txn_set_current_segment(txn, segment); @@ -7696,7 +7696,7 @@ static void test_finalize_parent_stacks(void) { nr_memset(&app, 0, sizeof(app)); nr_memset(&opts, 0, sizeof(opts)); app.state = NR_APP_OK; - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); /* * Don't crash on a NULL stack @@ -7751,7 +7751,7 @@ static void test_max_segments_no_limit(void) { p->txns_app = &app; - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); /* * A segment heap must not be initialized. @@ -7808,7 +7808,7 @@ static void test_max_segments_count_tree(void) { p->txns_app = &app; - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); /* * A segment heap must be initialized. @@ -7858,7 +7858,7 @@ static void test_max_segments(void) { p->txns_app = &app; - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); /* * A segment heap must be initialized. @@ -7937,7 +7937,7 @@ static void test_allocated_segment_count(void) { /* * Initial state. */ - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); tlib_pass_if_size_t_equal("1 on initialized txn", 1, nr_txn_allocated_segment_count(txn)); @@ -7981,7 +7981,7 @@ static void test_allocate_segment(void) { */ tlib_pass_if_null("NULL segment on NULL txn", nr_txn_allocate_segment(NULL)); - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); /* * Allocate an uninitialized segment. @@ -8016,7 +8016,7 @@ static void test_span_queue(void) { /* * Test : Trace observer host with a zero batch size. */ - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); tlib_pass_if_null( "an app with a trace observer and a zero batch size should not create a " "span queue", @@ -8027,7 +8027,7 @@ static void test_span_queue(void) { * Test : Trace observer host with a non-zero batch size. */ opts.span_queue_batch_size = 1000; - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); tlib_pass_if_not_null( "an app with a trace observer and a non-zero batch size should create a " @@ -8069,7 +8069,7 @@ static void test_segment_record_error(void) { nr_memset(&opts, 0, sizeof(opts)); opts.distributed_tracing_enabled = 1; opts.span_events_enabled = 1; - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); segment = nr_segment_start(txn, NULL, NULL); nr_distributed_trace_set_sampled(txn->distributed_trace, true); txn->options.allow_raw_exception_messages = 1; @@ -8188,7 +8188,7 @@ static nrtxn_t* new_txn_for_record_log_event_test(char* entity_name) { opts.distributed_tracing_enabled = 1; /* for linking meta data */ /* Start txn and segment */ - txn = nr_txn_begin(&app, &opts, NULL); + txn = nr_txn_begin(&app, &opts, NULL, NULL); segment = nr_segment_start(txn, txn->segment_root, NULL); nr_distributed_trace_set_sampled(txn->distributed_trace, true); nr_txn_set_current_segment(txn, segment); From bea9a98a0ccb384e7112bbab5a7596d5f00f518f Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Wed, 19 Feb 2025 15:59:06 -0500 Subject: [PATCH 16/60] fix(agent): Fixes decoding of forwarded log labels as an Event --- daemon/internal/newrelic/commands.go | 5 ++--- daemon/internal/newrelic/protocol/Transaction.go | 9 +++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/daemon/internal/newrelic/commands.go b/daemon/internal/newrelic/commands.go index 8ff0ee220..65a380b7e 100644 --- a/daemon/internal/newrelic/commands.go +++ b/daemon/internal/newrelic/commands.go @@ -167,9 +167,8 @@ func (t FlatTxn) AggregateInto(h *Harvest) { } } - logForwardingLabels := txn.LogForwardingLabels() - if logForwardingLabels != nil { - h.LogEvents.SetLogForwardingLabels(logForwardingLabels) + if n:= txn.LogForwardingLabels(nil); n != nil { + h.LogEvents.SetLogForwardingLabels(n.Data()) } if n := txn.PhpPackages(nil); n != nil { diff --git a/daemon/internal/newrelic/protocol/Transaction.go b/daemon/internal/newrelic/protocol/Transaction.go index f0671de82..f8fd853cf 100644 --- a/daemon/internal/newrelic/protocol/Transaction.go +++ b/daemon/internal/newrelic/protocol/Transaction.go @@ -264,10 +264,15 @@ func (rcv *Transaction) PhpPackages(obj *Event) *Event { return nil } -func (rcv *Transaction) LogForwardingLabels() []byte { +func (rcv *Transaction) LogForwardingLabels(obj *Event) *Event { o := flatbuffers.UOffsetT(rcv._tab.Offset(34)) if o != 0 { - return rcv._tab.ByteVector(o + rcv._tab.Pos) + x := rcv._tab.Indirect(o + rcv._tab.Pos) + if obj == nil { + obj = new(Event) + } + obj.Init(rcv._tab.Bytes, x) + return obj } return nil } From 7c9d43619f27f9692b23de54f7c6ddc002cda81e Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Wed, 19 Feb 2025 15:59:56 -0500 Subject: [PATCH 17/60] fix(agent): Fixes log_forwarding_labels definition --- protocol/flatbuffers/protocol.fbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protocol/flatbuffers/protocol.fbs b/protocol/flatbuffers/protocol.fbs index 7d7e8d410..118e81a61 100644 --- a/protocol/flatbuffers/protocol.fbs +++ b/protocol/flatbuffers/protocol.fbs @@ -119,7 +119,7 @@ table Transaction { span_events: [Event]; log_events: [Event]; // added in the 10.1 PHP agent release php_packages: Event; // added in the ??? PHP agent release <- fix agent version - log_forwarding_labels Event; // added in the ??? PHP agent release + log_forwarding_labels: Event; // added in the ??? PHP agent release } union MessageBody { App, AppReply, Transaction, SpanBatch } From b476cda25c2e4dccf40b8d8a0f06e0028f0e0654 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Wed, 19 Feb 2025 16:08:17 -0500 Subject: [PATCH 18/60] chore(daemon): Restores original import order --- daemon/internal/newrelic/log_events.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/internal/newrelic/log_events.go b/daemon/internal/newrelic/log_events.go index 647516e7e..3d996310d 100644 --- a/daemon/internal/newrelic/log_events.go +++ b/daemon/internal/newrelic/log_events.go @@ -8,8 +8,8 @@ package newrelic import ( "bytes" "encoding/json" - "time" "github.com/newrelic/newrelic-php-agent/daemon/internal/newrelic/log" + "time" ) // LogEvents is a wrapper over AnalyticsEvents created for additional type From 75456360bfa34334eecb59342899ac07bb5d976e Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Wed, 19 Feb 2025 16:09:35 -0500 Subject: [PATCH 19/60] chore(daemon): Fixes formatting --- daemon/internal/newrelic/commands.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/internal/newrelic/commands.go b/daemon/internal/newrelic/commands.go index 65a380b7e..52a78e599 100644 --- a/daemon/internal/newrelic/commands.go +++ b/daemon/internal/newrelic/commands.go @@ -167,7 +167,7 @@ func (t FlatTxn) AggregateInto(h *Harvest) { } } - if n:= txn.LogForwardingLabels(nil); n != nil { + if n := txn.LogForwardingLabels(nil); n != nil { h.LogEvents.SetLogForwardingLabels(n.Data()) } From 5b906efefb0c410d1fb30ba826c24bca9c66327e Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Wed, 19 Feb 2025 16:27:40 -0500 Subject: [PATCH 20/60] tests(agent): Adds log label forwarding tests for Monolog2 --- .../test_monolog_labels_forwarding_basic.php | 216 +++++++++++++++++ ...olog_labels_forwarding_basic_mixedcase.php | 219 +++++++++++++++++ ...g_labels_forwarding_basic_mixedsources.php | 227 ++++++++++++++++++ ...log_labels_forwarding_basic_withspaces.php | 218 +++++++++++++++++ ...est_monolog_labels_forwarding_disabled.php | 213 ++++++++++++++++ ...t_monolog_labels_forwarding_exclude_01.php | 216 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_02.php | 219 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_03.php | 219 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_04.php | 219 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_05.php | 216 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_06.php | 218 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_07.php | 219 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_08.php | 219 +++++++++++++++++ ..._monolog_labels_forwarding_exclude_08a.php | 219 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_09.php | 219 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_10.php | 218 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_11.php | 219 +++++++++++++++++ ..._monolog_labels_forwarding_exclude_11a.php | 219 +++++++++++++++++ 18 files changed, 3932 insertions(+) create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_basic.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_basic_mixedcase.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_basic_mixedsources.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_basic_withspaces.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_01.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_02.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_03.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_04.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_05.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_06.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_07.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_08.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_08a.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_09.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_10.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_11.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_11a.php diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_basic.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_basic.php new file mode 100644 index 000000000..b4a8d03c5 --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_basic.php @@ -0,0 +1,216 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_basic_mixedcase.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_basic_mixedcase.php new file mode 100644 index 000000000..c91d88ca1 --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_basic_mixedcase.php @@ -0,0 +1,219 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_basic_mixedsources.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_basic_mixedsources.php new file mode 100644 index 000000000..0857491a9 --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_basic_mixedsources.php @@ -0,0 +1,227 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_basic_withspaces.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_basic_withspaces.php new file mode 100644 index 000000000..34ffafde0 --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_basic_withspaces.php @@ -0,0 +1,218 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled.php new file mode 100644 index 000000000..c84a4e784 --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled.php @@ -0,0 +1,213 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_01.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_01.php new file mode 100644 index 000000000..cd570d649 --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_01.php @@ -0,0 +1,216 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_02.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_02.php new file mode 100644 index 000000000..c9423d45a --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_02.php @@ -0,0 +1,219 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_03.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_03.php new file mode 100644 index 000000000..e86c53bbb --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_03.php @@ -0,0 +1,219 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_04.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_04.php new file mode 100644 index 000000000..f2ad40f0f --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_04.php @@ -0,0 +1,219 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_05.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_05.php new file mode 100644 index 000000000..7526e8210 --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_05.php @@ -0,0 +1,216 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_06.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_06.php new file mode 100644 index 000000000..a2ccce1d4 --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_06.php @@ -0,0 +1,218 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_07.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_07.php new file mode 100644 index 000000000..843e08fab --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_07.php @@ -0,0 +1,219 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_08.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_08.php new file mode 100644 index 000000000..7477c5823 --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_08.php @@ -0,0 +1,219 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_08a.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_08a.php new file mode 100644 index 000000000..b3da4cf03 --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_08a.php @@ -0,0 +1,219 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_09.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_09.php new file mode 100644 index 000000000..783bd276a --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_09.php @@ -0,0 +1,219 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_10.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_10.php new file mode 100644 index 000000000..aaf272ea6 --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_10.php @@ -0,0 +1,218 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_11.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_11.php new file mode 100644 index 000000000..b96840866 --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_11.php @@ -0,0 +1,219 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_11a.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_11a.php new file mode 100644 index 000000000..731e7fc6a --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_11a.php @@ -0,0 +1,219 @@ +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(); From 0b1b0b5a3a96b95de167cd5d972097b3b21dbeea Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Thu, 20 Feb 2025 15:10:14 -0500 Subject: [PATCH 21/60] tests(agent): Updates monolog (2 & 3) tests to include new log forwarding labels metric --- .../logging/monolog2/test_monolog_basic.php | 3 +- .../monolog2/test_monolog_basic_clm.php | 3 +- .../monolog2/test_monolog_basic_clm_off.php | 3 +- .../logging/monolog2/test_monolog_cat.php | 3 +- .../monolog2/test_monolog_context_default.php | 3 +- .../test_monolog_context_exception.php | 3 +- .../test_monolog_context_filter_extra1.php | 3 +- .../test_monolog_context_filter_extra2.php | 3 +- .../test_monolog_context_filter_extra3.php | 3 +- .../test_monolog_context_filter_extra4.php | 3 +- .../test_monolog_context_filter_extra5.php | 3 +- .../test_monolog_context_filter_rule1.php | 3 +- .../test_monolog_context_filter_rule10.php | 3 +- .../test_monolog_context_filter_rule11.php | 3 +- .../test_monolog_context_filter_rule2.php | 3 +- .../test_monolog_context_filter_rule3.php | 3 +- .../test_monolog_context_filter_rule4.php | 3 +- .../test_monolog_context_filter_rule5.php | 3 +- .../test_monolog_context_filter_rule6.php | 3 +- .../test_monolog_context_filter_rule7.php | 3 +- .../test_monolog_context_filter_rule8.php | 3 +- .../test_monolog_context_filter_rule9.php | 3 +- ...monolog_context_hsm_disable_forwarding.php | 3 +- .../test_monolog_context_limits_1.php | 3 +- .../test_monolog_context_limits_2.php | 3 +- .../test_monolog_context_precedence_1.php | 3 +- .../test_monolog_context_precedence_2.php | 3 +- .../monolog2/test_monolog_context_simple.php | 3 +- ...test_monolog_decoration_and_forwarding.php | 3 +- .../test_monolog_decoration_basic.php | 3 +- ...t_monolog_decoration_multiple_handlers.php | 3 +- .../test_monolog_disable_forwarding.php | 3 +- .../monolog2/test_monolog_disable_logging.php | 3 +- .../monolog2/test_monolog_disable_metrics.php | 3 +- .../monolog2/test_monolog_drop_empty.php | 3 +- .../monolog2/test_monolog_escape_chars.php | 3 +- .../test_monolog_hsm_disable_forwarding.php | 3 +- ...monolog_labels_forwarding_disabled_01.php} | 1 + ..._monolog_labels_forwarding_disabled_02.php | 126 ++++++++++++++++++ ..._monolog_labels_forwarding_disabled_03.php | 117 ++++++++++++++++ .../test_monolog_large_message_limit.php | 3 +- ...test_monolog_large_message_limit_drops.php | 3 +- .../test_monolog_limit_log_events.php | 3 +- .../test_monolog_limit_zero_events.php | 3 +- ...log_events_max_samples_stored_invalid1.php | 3 +- ...log_events_max_samples_stored_invalid2.php | 3 +- ...log_events_max_samples_stored_invalid3.php | 3 +- ...log_events_max_samples_stored_invalid4.php | 3 +- .../test_monolog_log_level_filter.php | 3 +- .../test_monolog_log_level_filter_invalid.php | 3 +- .../test_monolog_truncate_long_msgs.php | 3 +- .../logging/monolog3/test_monolog_basic.php | 3 +- .../monolog3/test_monolog_basic_clm.php | 3 +- .../monolog3/test_monolog_basic_clm_off.php | 3 +- .../logging/monolog3/test_monolog_cat.php | 3 +- .../monolog3/test_monolog_context_default.php | 3 +- .../test_monolog_context_exception.php | 3 +- .../test_monolog_context_filter_extra1.php | 3 +- .../test_monolog_context_filter_extra2.php | 3 +- .../test_monolog_context_filter_extra3.php | 3 +- .../test_monolog_context_filter_extra4.php | 3 +- .../test_monolog_context_filter_extra5.php | 3 +- .../test_monolog_context_filter_rule1.php | 3 +- .../test_monolog_context_filter_rule10.php | 3 +- .../test_monolog_context_filter_rule11.php | 3 +- .../test_monolog_context_filter_rule2.php | 3 +- .../test_monolog_context_filter_rule3.php | 3 +- .../test_monolog_context_filter_rule4.php | 3 +- .../test_monolog_context_filter_rule5.php | 3 +- .../test_monolog_context_filter_rule6.php | 3 +- .../test_monolog_context_filter_rule7.php | 3 +- .../test_monolog_context_filter_rule8.php | 3 +- .../test_monolog_context_filter_rule9.php | 3 +- ...monolog_context_hsm_disable_forwarding.php | 3 +- .../test_monolog_context_limits_1.php | 3 +- .../test_monolog_context_limits_2.php | 3 +- .../test_monolog_context_precedence_1.php | 3 +- .../test_monolog_context_precedence_2.php | 3 +- .../monolog3/test_monolog_context_simple.php | 3 +- ...test_monolog_decoration_and_forwarding.php | 3 +- .../test_monolog_decoration_basic.php | 3 +- ...t_monolog_decoration_multiple_handlers.php | 3 +- .../test_monolog_disable_forwarding.php | 3 +- .../monolog3/test_monolog_disable_logging.php | 3 +- .../monolog3/test_monolog_disable_metrics.php | 3 +- .../monolog3/test_monolog_drop_empty.php | 3 +- .../monolog3/test_monolog_escape_chars.php | 3 +- .../test_monolog_hsm_disable_forwarding.php | 3 +- ...monolog_labels_forwarding_disabled_01.php} | 1 + ..._monolog_labels_forwarding_disabled_02.php | 126 ++++++++++++++++++ ..._monolog_labels_forwarding_disabled_03.php | 118 ++++++++++++++++ .../test_monolog_large_message_limit.php | 3 +- ...test_monolog_large_message_limit_drops.php | 3 +- .../test_monolog_limit_log_events.php | 3 +- .../test_monolog_limit_zero_events.php | 3 +- ...log_events_max_samples_stored_invalid1.php | 3 +- ...log_events_max_samples_stored_invalid2.php | 3 +- ...log_events_max_samples_stored_invalid3.php | 3 +- ...log_events_max_samples_stored_invalid4.php | 3 +- .../test_monolog_log_level_filter.php | 3 +- .../test_monolog_log_level_filter_invalid.php | 3 +- .../test_monolog_truncate_long_msgs.php | 3 +- 102 files changed, 681 insertions(+), 96 deletions(-) rename tests/integration/logging/monolog2/{test_monolog_labels_forwarding_disabled.php => test_monolog_labels_forwarding_disabled_01.php} (99%) create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled_02.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled_03.php rename tests/integration/logging/monolog3/{test_monolog_labels_forwarding_disabled.php => test_monolog_labels_forwarding_disabled_01.php} (99%) create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_02.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_03.php diff --git a/tests/integration/logging/monolog2/test_monolog_basic.php b/tests/integration/logging/monolog2/test_monolog_basic.php index 8c04625eb..467e6fddd 100644 --- a/tests/integration/logging/monolog2/test_monolog_basic.php +++ b/tests/integration/logging/monolog2/test_monolog_basic.php @@ -61,7 +61,8 @@ [{"name": "Supportability/PHP/package/monolog/monolog/2/detected"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/library/Monolog/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/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_basic_clm.php b/tests/integration/logging/monolog2/test_monolog_basic_clm.php index 00e2527e7..18ff817c2 100644 --- a/tests/integration/logging/monolog2/test_monolog_basic_clm.php +++ b/tests/integration/logging/monolog2/test_monolog_basic_clm.php @@ -49,7 +49,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_basic_clm_off.php b/tests/integration/logging/monolog2/test_monolog_basic_clm_off.php index 3c656ac97..9174b57a7 100644 --- a/tests/integration/logging/monolog2/test_monolog_basic_clm_off.php +++ b/tests/integration/logging/monolog2/test_monolog_basic_clm_off.php @@ -48,7 +48,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_cat.php b/tests/integration/logging/monolog2/test_monolog_cat.php index b192b9ce9..28b07a510 100644 --- a/tests/integration/logging/monolog2/test_monolog_cat.php +++ b/tests/integration/logging/monolog2/test_monolog_cat.php @@ -60,7 +60,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_default.php b/tests/integration/logging/monolog2/test_monolog_context_default.php index 859ce1ffe..dcf714534 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_default.php +++ b/tests/integration/logging/monolog2/test_monolog_context_default.php @@ -48,7 +48,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_exception.php b/tests/integration/logging/monolog2/test_monolog_context_exception.php index c806bddc8..1a3af273e 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_exception.php +++ b/tests/integration/logging/monolog2/test_monolog_context_exception.php @@ -50,7 +50,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_filter_extra1.php b/tests/integration/logging/monolog2/test_monolog_context_filter_extra1.php index 13875a0a6..2ca1f2861 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_filter_extra1.php +++ b/tests/integration/logging/monolog2/test_monolog_context_filter_extra1.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_filter_extra2.php b/tests/integration/logging/monolog2/test_monolog_context_filter_extra2.php index b55735e92..4d2797632 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_filter_extra2.php +++ b/tests/integration/logging/monolog2/test_monolog_context_filter_extra2.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_filter_extra3.php b/tests/integration/logging/monolog2/test_monolog_context_filter_extra3.php index e90245135..a9f8a6b9d 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_filter_extra3.php +++ b/tests/integration/logging/monolog2/test_monolog_context_filter_extra3.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_filter_extra4.php b/tests/integration/logging/monolog2/test_monolog_context_filter_extra4.php index dc232b6dc..047fb2027 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_filter_extra4.php +++ b/tests/integration/logging/monolog2/test_monolog_context_filter_extra4.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_filter_extra5.php b/tests/integration/logging/monolog2/test_monolog_context_filter_extra5.php index 1d3934a1d..d0a0b4d91 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_filter_extra5.php +++ b/tests/integration/logging/monolog2/test_monolog_context_filter_extra5.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_filter_rule1.php b/tests/integration/logging/monolog2/test_monolog_context_filter_rule1.php index 0cb138798..8dbfdddc4 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_filter_rule1.php +++ b/tests/integration/logging/monolog2/test_monolog_context_filter_rule1.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_filter_rule10.php b/tests/integration/logging/monolog2/test_monolog_context_filter_rule10.php index eeff02ad8..18697f092 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_filter_rule10.php +++ b/tests/integration/logging/monolog2/test_monolog_context_filter_rule10.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_filter_rule11.php b/tests/integration/logging/monolog2/test_monolog_context_filter_rule11.php index 854579344..ffd6f579b 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_filter_rule11.php +++ b/tests/integration/logging/monolog2/test_monolog_context_filter_rule11.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_filter_rule2.php b/tests/integration/logging/monolog2/test_monolog_context_filter_rule2.php index 2b7847f73..5a248a86a 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_filter_rule2.php +++ b/tests/integration/logging/monolog2/test_monolog_context_filter_rule2.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_filter_rule3.php b/tests/integration/logging/monolog2/test_monolog_context_filter_rule3.php index 864173103..9876b0a80 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_filter_rule3.php +++ b/tests/integration/logging/monolog2/test_monolog_context_filter_rule3.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_filter_rule4.php b/tests/integration/logging/monolog2/test_monolog_context_filter_rule4.php index 3f2f01cdd..54706fcd8 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_filter_rule4.php +++ b/tests/integration/logging/monolog2/test_monolog_context_filter_rule4.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_filter_rule5.php b/tests/integration/logging/monolog2/test_monolog_context_filter_rule5.php index ed6e512b5..b37e07c53 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_filter_rule5.php +++ b/tests/integration/logging/monolog2/test_monolog_context_filter_rule5.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_filter_rule6.php b/tests/integration/logging/monolog2/test_monolog_context_filter_rule6.php index 22ec5cebe..ed89207a6 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_filter_rule6.php +++ b/tests/integration/logging/monolog2/test_monolog_context_filter_rule6.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_filter_rule7.php b/tests/integration/logging/monolog2/test_monolog_context_filter_rule7.php index f9be37447..ae85e5201 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_filter_rule7.php +++ b/tests/integration/logging/monolog2/test_monolog_context_filter_rule7.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_filter_rule8.php b/tests/integration/logging/monolog2/test_monolog_context_filter_rule8.php index 9e36e3bcb..8f9e4ca28 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_filter_rule8.php +++ b/tests/integration/logging/monolog2/test_monolog_context_filter_rule8.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_filter_rule9.php b/tests/integration/logging/monolog2/test_monolog_context_filter_rule9.php index ba6ba4cc7..3b01a0dfc 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_filter_rule9.php +++ b/tests/integration/logging/monolog2/test_monolog_context_filter_rule9.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_hsm_disable_forwarding.php b/tests/integration/logging/monolog2/test_monolog_context_hsm_disable_forwarding.php index bd10ed610..9d7deb336 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_hsm_disable_forwarding.php +++ b/tests/integration/logging/monolog2/test_monolog_context_hsm_disable_forwarding.php @@ -65,7 +65,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_limits_1.php b/tests/integration/logging/monolog2/test_monolog_context_limits_1.php index a01498ead..5d55319d8 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_limits_1.php +++ b/tests/integration/logging/monolog2/test_monolog_context_limits_1.php @@ -49,7 +49,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_limits_2.php b/tests/integration/logging/monolog2/test_monolog_context_limits_2.php index 213b7379a..f314a45c1 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_limits_2.php +++ b/tests/integration/logging/monolog2/test_monolog_context_limits_2.php @@ -49,7 +49,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_precedence_1.php b/tests/integration/logging/monolog2/test_monolog_context_precedence_1.php index 6d571330c..498cef79b 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_precedence_1.php +++ b/tests/integration/logging/monolog2/test_monolog_context_precedence_1.php @@ -52,7 +52,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_precedence_2.php b/tests/integration/logging/monolog2/test_monolog_context_precedence_2.php index 7bf8b13ce..929c7c5ac 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_precedence_2.php +++ b/tests/integration/logging/monolog2/test_monolog_context_precedence_2.php @@ -52,7 +52,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_context_simple.php b/tests/integration/logging/monolog2/test_monolog_context_simple.php index a0f0b7260..977d3c139 100644 --- a/tests/integration/logging/monolog2/test_monolog_context_simple.php +++ b/tests/integration/logging/monolog2/test_monolog_context_simple.php @@ -63,7 +63,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_decoration_and_forwarding.php b/tests/integration/logging/monolog2/test_monolog_decoration_and_forwarding.php index 82ad4be61..8bab481b2 100644 --- a/tests/integration/logging/monolog2/test_monolog_decoration_and_forwarding.php +++ b/tests/integration/logging/monolog2/test_monolog_decoration_and_forwarding.php @@ -117,7 +117,8 @@ [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/LocalDecorating/PHP/enabled"}, [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/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_decoration_basic.php b/tests/integration/logging/monolog2/test_monolog_decoration_basic.php index 4ae75c9e4..1b3141a65 100644 --- a/tests/integration/logging/monolog2/test_monolog_decoration_basic.php +++ b/tests/integration/logging/monolog2/test_monolog_decoration_basic.php @@ -115,7 +115,8 @@ [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/LocalDecorating/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_decoration_multiple_handlers.php b/tests/integration/logging/monolog2/test_monolog_decoration_multiple_handlers.php index 4467366f2..bd0a93b75 100644 --- a/tests/integration/logging/monolog2/test_monolog_decoration_multiple_handlers.php +++ b/tests/integration/logging/monolog2/test_monolog_decoration_multiple_handlers.php @@ -165,7 +165,8 @@ [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/LocalDecorating/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_disable_forwarding.php b/tests/integration/logging/monolog2/test_monolog_disable_forwarding.php index ccfa6931b..99bc62edc 100644 --- a/tests/integration/logging/monolog2/test_monolog_disable_forwarding.php +++ b/tests/integration/logging/monolog2/test_monolog_disable_forwarding.php @@ -60,7 +60,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_disable_logging.php b/tests/integration/logging/monolog2/test_monolog_disable_logging.php index c6a3756df..e6ccdfe0e 100644 --- a/tests/integration/logging/monolog2/test_monolog_disable_logging.php +++ b/tests/integration/logging/monolog2/test_monolog_disable_logging.php @@ -51,7 +51,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/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 eaed5d5d4..718b14468 100644 --- a/tests/integration/logging/monolog2/test_monolog_disable_metrics.php +++ b/tests/integration/logging/monolog2/test_monolog_disable_metrics.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/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 5d48030ca..45504d370 100644 --- a/tests/integration/logging/monolog2/test_monolog_drop_empty.php +++ b/tests/integration/logging/monolog2/test_monolog_drop_empty.php @@ -61,7 +61,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_escape_chars.php b/tests/integration/logging/monolog2/test_monolog_escape_chars.php index b95a67b1f..fbba6143c 100644 --- a/tests/integration/logging/monolog2/test_monolog_escape_chars.php +++ b/tests/integration/logging/monolog2/test_monolog_escape_chars.php @@ -42,7 +42,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 90f78660e..3fd7ae3bb 100644 --- a/tests/integration/logging/monolog2/test_monolog_hsm_disable_forwarding.php +++ b/tests/integration/logging/monolog2/test_monolog_hsm_disable_forwarding.php @@ -61,7 +61,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled_01.php similarity index 99% rename from tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled.php rename to tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled_01.php index c84a4e784..8a3769dec 100644 --- a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled.php +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled_01.php @@ -6,6 +6,7 @@ /*DESCRIPTION Test that Monolog2 instrumentation will NOT forward logs with labels when: + - logging and log forwarding are enabled - label forwarding is disabled - newrelic.labels set to "label1:value1;label2:value2" - default value for label exclusion rule diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled_02.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled_02.php new file mode 100644 index 000000000..f29ebff4e --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled_02.php @@ -0,0 +1,126 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled_03.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled_03.php new file mode 100644 index 000000000..b9c15401f --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled_03.php @@ -0,0 +1,117 @@ +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(); 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 7a0e1eacd..58898c208 100644 --- a/tests/integration/logging/monolog2/test_monolog_large_message_limit.php +++ b/tests/integration/logging/monolog2/test_monolog_large_message_limit.php @@ -44,7 +44,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 313e73edd..23ba7f185 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 @@ -44,7 +44,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 ccc75de41..61d3e9ac1 100644 --- a/tests/integration/logging/monolog2/test_monolog_limit_log_events.php +++ b/tests/integration/logging/monolog2/test_monolog_limit_log_events.php @@ -62,7 +62,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 573850d3a..27259ec45 100644 --- a/tests/integration/logging/monolog2/test_monolog_limit_zero_events.php +++ b/tests/integration/logging/monolog2/test_monolog_limit_zero_events.php @@ -62,7 +62,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 c346aa55e..45d6d243c 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 @@ -46,7 +46,8 @@ [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/PHP/package/monolog/monolog/2/detected"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 ab55e0359..c755300e8 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 @@ -46,7 +46,8 @@ [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/PHP/package/monolog/monolog/2/detected"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 616eb81f8..4a8bda669 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 @@ -46,7 +46,8 @@ [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/PHP/package/monolog/monolog/2/detected"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 0f13144eb..48ce72595 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 @@ -46,7 +46,8 @@ [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/PHP/package/monolog/monolog/2/detected"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 fa7902395..527546f47 100644 --- a/tests/integration/logging/monolog2/test_monolog_log_level_filter.php +++ b/tests/integration/logging/monolog2/test_monolog_log_level_filter.php @@ -61,7 +61,8 @@ [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/PHP/package/monolog/monolog/2/detected"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 22107fd98..75a63ad64 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 @@ -62,7 +62,8 @@ [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/PHP/package/monolog/monolog/2/detected"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 4b8303eb1..eb09c117e 100644 --- a/tests/integration/logging/monolog2/test_monolog_truncate_long_msgs.php +++ b/tests/integration/logging/monolog2/test_monolog_truncate_long_msgs.php @@ -47,7 +47,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_basic.php b/tests/integration/logging/monolog3/test_monolog_basic.php index 0e494b078..fde0fa773 100644 --- a/tests/integration/logging/monolog3/test_monolog_basic.php +++ b/tests/integration/logging/monolog3/test_monolog_basic.php @@ -60,7 +60,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_basic_clm.php b/tests/integration/logging/monolog3/test_monolog_basic_clm.php index 8896ba209..ed86b56d2 100644 --- a/tests/integration/logging/monolog3/test_monolog_basic_clm.php +++ b/tests/integration/logging/monolog3/test_monolog_basic_clm.php @@ -49,7 +49,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 e4ed19192..848fb4e5d 100644 --- a/tests/integration/logging/monolog3/test_monolog_basic_clm_off.php +++ b/tests/integration/logging/monolog3/test_monolog_basic_clm_off.php @@ -48,7 +48,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_cat.php b/tests/integration/logging/monolog3/test_monolog_cat.php index 12b0c76ae..5fe59bc0a 100644 --- a/tests/integration/logging/monolog3/test_monolog_cat.php +++ b/tests/integration/logging/monolog3/test_monolog_cat.php @@ -60,7 +60,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_default.php b/tests/integration/logging/monolog3/test_monolog_context_default.php index 9080370e6..98406c7a4 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_default.php +++ b/tests/integration/logging/monolog3/test_monolog_context_default.php @@ -48,7 +48,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_exception.php b/tests/integration/logging/monolog3/test_monolog_context_exception.php index f64a6fc29..1440756f7 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_exception.php +++ b/tests/integration/logging/monolog3/test_monolog_context_exception.php @@ -50,7 +50,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_filter_extra1.php b/tests/integration/logging/monolog3/test_monolog_context_filter_extra1.php index 7eed2a0b7..b711eb871 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_filter_extra1.php +++ b/tests/integration/logging/monolog3/test_monolog_context_filter_extra1.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_filter_extra2.php b/tests/integration/logging/monolog3/test_monolog_context_filter_extra2.php index 7949d2f62..d46aa28e1 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_filter_extra2.php +++ b/tests/integration/logging/monolog3/test_monolog_context_filter_extra2.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_filter_extra3.php b/tests/integration/logging/monolog3/test_monolog_context_filter_extra3.php index c55dda857..4283e6aa5 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_filter_extra3.php +++ b/tests/integration/logging/monolog3/test_monolog_context_filter_extra3.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_filter_extra4.php b/tests/integration/logging/monolog3/test_monolog_context_filter_extra4.php index 842d5f85b..94d994f1a 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_filter_extra4.php +++ b/tests/integration/logging/monolog3/test_monolog_context_filter_extra4.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_filter_extra5.php b/tests/integration/logging/monolog3/test_monolog_context_filter_extra5.php index 8eff9169e..d4f181642 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_filter_extra5.php +++ b/tests/integration/logging/monolog3/test_monolog_context_filter_extra5.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_filter_rule1.php b/tests/integration/logging/monolog3/test_monolog_context_filter_rule1.php index f21b520c4..d0be4ff36 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_filter_rule1.php +++ b/tests/integration/logging/monolog3/test_monolog_context_filter_rule1.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_filter_rule10.php b/tests/integration/logging/monolog3/test_monolog_context_filter_rule10.php index 528764c59..2f7a7d347 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_filter_rule10.php +++ b/tests/integration/logging/monolog3/test_monolog_context_filter_rule10.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_filter_rule11.php b/tests/integration/logging/monolog3/test_monolog_context_filter_rule11.php index ea0cedc02..bb4a0911a 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_filter_rule11.php +++ b/tests/integration/logging/monolog3/test_monolog_context_filter_rule11.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_filter_rule2.php b/tests/integration/logging/monolog3/test_monolog_context_filter_rule2.php index febcd5f39..e927f8e08 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_filter_rule2.php +++ b/tests/integration/logging/monolog3/test_monolog_context_filter_rule2.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_filter_rule3.php b/tests/integration/logging/monolog3/test_monolog_context_filter_rule3.php index 602226e89..a90a8a77e 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_filter_rule3.php +++ b/tests/integration/logging/monolog3/test_monolog_context_filter_rule3.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_filter_rule4.php b/tests/integration/logging/monolog3/test_monolog_context_filter_rule4.php index ba03f7696..36506085b 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_filter_rule4.php +++ b/tests/integration/logging/monolog3/test_monolog_context_filter_rule4.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_filter_rule5.php b/tests/integration/logging/monolog3/test_monolog_context_filter_rule5.php index ad9337295..5a07e3c42 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_filter_rule5.php +++ b/tests/integration/logging/monolog3/test_monolog_context_filter_rule5.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_filter_rule6.php b/tests/integration/logging/monolog3/test_monolog_context_filter_rule6.php index 60bd29813..e764a9271 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_filter_rule6.php +++ b/tests/integration/logging/monolog3/test_monolog_context_filter_rule6.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_filter_rule7.php b/tests/integration/logging/monolog3/test_monolog_context_filter_rule7.php index 95f97c449..47627d215 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_filter_rule7.php +++ b/tests/integration/logging/monolog3/test_monolog_context_filter_rule7.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_filter_rule8.php b/tests/integration/logging/monolog3/test_monolog_context_filter_rule8.php index 527c79a7e..9a65b85ca 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_filter_rule8.php +++ b/tests/integration/logging/monolog3/test_monolog_context_filter_rule8.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_filter_rule9.php b/tests/integration/logging/monolog3/test_monolog_context_filter_rule9.php index 98fc8b5e2..ce3056def 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_filter_rule9.php +++ b/tests/integration/logging/monolog3/test_monolog_context_filter_rule9.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_hsm_disable_forwarding.php b/tests/integration/logging/monolog3/test_monolog_context_hsm_disable_forwarding.php index 18d211b35..206dbbb37 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_hsm_disable_forwarding.php +++ b/tests/integration/logging/monolog3/test_monolog_context_hsm_disable_forwarding.php @@ -65,7 +65,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_limits_1.php b/tests/integration/logging/monolog3/test_monolog_context_limits_1.php index 9d5836311..d82678e1e 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_limits_1.php +++ b/tests/integration/logging/monolog3/test_monolog_context_limits_1.php @@ -49,7 +49,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_limits_2.php b/tests/integration/logging/monolog3/test_monolog_context_limits_2.php index 6925fc905..475d21fcf 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_limits_2.php +++ b/tests/integration/logging/monolog3/test_monolog_context_limits_2.php @@ -49,7 +49,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_precedence_1.php b/tests/integration/logging/monolog3/test_monolog_context_precedence_1.php index 301164d11..3ff167db1 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_precedence_1.php +++ b/tests/integration/logging/monolog3/test_monolog_context_precedence_1.php @@ -52,7 +52,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_precedence_2.php b/tests/integration/logging/monolog3/test_monolog_context_precedence_2.php index b05977c22..4e3d80a7b 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_precedence_2.php +++ b/tests/integration/logging/monolog3/test_monolog_context_precedence_2.php @@ -52,7 +52,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_context_simple.php b/tests/integration/logging/monolog3/test_monolog_context_simple.php index ddcfd65f9..cb4330cf0 100644 --- a/tests/integration/logging/monolog3/test_monolog_context_simple.php +++ b/tests/integration/logging/monolog3/test_monolog_context_simple.php @@ -63,7 +63,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 index 3d8edcc7c..31cf32430 100644 --- a/tests/integration/logging/monolog3/test_monolog_decoration_and_forwarding.php +++ b/tests/integration/logging/monolog3/test_monolog_decoration_and_forwarding.php @@ -117,7 +117,8 @@ [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/LocalDecorating/PHP/enabled"}, [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/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_decoration_basic.php b/tests/integration/logging/monolog3/test_monolog_decoration_basic.php index cd73f05e3..443c5f1ce 100644 --- a/tests/integration/logging/monolog3/test_monolog_decoration_basic.php +++ b/tests/integration/logging/monolog3/test_monolog_decoration_basic.php @@ -115,7 +115,8 @@ [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/LocalDecorating/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_decoration_multiple_handlers.php b/tests/integration/logging/monolog3/test_monolog_decoration_multiple_handlers.php index 881f23b51..c9661addc 100644 --- a/tests/integration/logging/monolog3/test_monolog_decoration_multiple_handlers.php +++ b/tests/integration/logging/monolog3/test_monolog_decoration_multiple_handlers.php @@ -165,7 +165,8 @@ [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/LocalDecorating/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_disable_forwarding.php b/tests/integration/logging/monolog3/test_monolog_disable_forwarding.php index 08a8c0914..dc0e451c9 100644 --- a/tests/integration/logging/monolog3/test_monolog_disable_forwarding.php +++ b/tests/integration/logging/monolog3/test_monolog_disable_forwarding.php @@ -60,7 +60,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_disable_logging.php b/tests/integration/logging/monolog3/test_monolog_disable_logging.php index 949f02102..3aa2781e0 100644 --- a/tests/integration/logging/monolog3/test_monolog_disable_logging.php +++ b/tests/integration/logging/monolog3/test_monolog_disable_logging.php @@ -51,7 +51,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/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 11bad2177..9546cc454 100644 --- a/tests/integration/logging/monolog3/test_monolog_disable_metrics.php +++ b/tests/integration/logging/monolog3/test_monolog_disable_metrics.php @@ -55,7 +55,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/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 6a470653b..563e5e9ef 100644 --- a/tests/integration/logging/monolog3/test_monolog_drop_empty.php +++ b/tests/integration/logging/monolog3/test_monolog_drop_empty.php @@ -61,7 +61,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_escape_chars.php b/tests/integration/logging/monolog3/test_monolog_escape_chars.php index a1c768efd..e40597c9d 100644 --- a/tests/integration/logging/monolog3/test_monolog_escape_chars.php +++ b/tests/integration/logging/monolog3/test_monolog_escape_chars.php @@ -42,7 +42,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 64232c566..40f39a35b 100644 --- a/tests/integration/logging/monolog3/test_monolog_hsm_disable_forwarding.php +++ b/tests/integration/logging/monolog3/test_monolog_hsm_disable_forwarding.php @@ -61,7 +61,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_01.php similarity index 99% rename from tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled.php rename to tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_01.php index 330c2513b..bc144bdc1 100644 --- a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled.php +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_01.php @@ -6,6 +6,7 @@ /*DESCRIPTION Test that Monolog3 instrumentation will NOT forward logs with labels when: + - logging and log forwarding are enabled - label forwarding is disabled - newrelic.labels set to "label1:value1;label2:value2" - default value for label exclusion rule diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_02.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_02.php new file mode 100644 index 000000000..49c113cee --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_02.php @@ -0,0 +1,126 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_03.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_03.php new file mode 100644 index 000000000..b0d4cad79 --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_03.php @@ -0,0 +1,118 @@ +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(); 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 50b2a26a5..0af1e2286 100644 --- a/tests/integration/logging/monolog3/test_monolog_large_message_limit.php +++ b/tests/integration/logging/monolog3/test_monolog_large_message_limit.php @@ -44,7 +44,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 c2913419d..91aeaea64 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 @@ -44,7 +44,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 b5ffaf258..65be7e65a 100644 --- a/tests/integration/logging/monolog3/test_monolog_limit_log_events.php +++ b/tests/integration/logging/monolog3/test_monolog_limit_log_events.php @@ -62,7 +62,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 4b65d64f3..f021b5029 100644 --- a/tests/integration/logging/monolog3/test_monolog_limit_zero_events.php +++ b/tests/integration/logging/monolog3/test_monolog_limit_zero_events.php @@ -62,7 +62,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 f94ea94af..c57aed5c1 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 @@ -46,7 +46,8 @@ [{"name": "Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/PHP/package/monolog/monolog/3/detected"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 5d0363243..7e891359b 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 @@ -46,7 +46,8 @@ [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/PHP/package/monolog/monolog/3/detected"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 8b451bdea..827eaa4d8 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 @@ -46,7 +46,8 @@ [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/PHP/package/monolog/monolog/3/detected"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 fe4185197..f1185ac24 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 @@ -46,7 +46,8 @@ [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/PHP/package/monolog/monolog/3/detected"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 69d482e9b..e5b91554a 100644 --- a/tests/integration/logging/monolog3/test_monolog_log_level_filter.php +++ b/tests/integration/logging/monolog3/test_monolog_log_level_filter.php @@ -61,7 +61,8 @@ [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/PHP/package/monolog/monolog/3/detected"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 649cd5acf..18849c9de 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 @@ -62,7 +62,8 @@ [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/PHP/Monolog/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/PHP/package/monolog/monolog/3/detected"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/library/Monolog/detected"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [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 4c99e09ba..09e2ed91a 100644 --- a/tests/integration/logging/monolog3/test_monolog_truncate_long_msgs.php +++ b/tests/integration/logging/monolog3/test_monolog_truncate_long_msgs.php @@ -47,7 +47,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name": "Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ From 2d0e4ad6c7c49131d1d973027e8c1ec2b7634e3e Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Thu, 20 Feb 2025 16:27:47 -0500 Subject: [PATCH 22/60] chore(docs): Corrects comment for log forwarded labels exclude rule --- agent/scripts/newrelic.ini.template | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/agent/scripts/newrelic.ini.template b/agent/scripts/newrelic.ini.template index c7b36b5db..ed61d78ae 100644 --- a/agent/scripts/newrelic.ini.template +++ b/agent/scripts/newrelic.ini.template @@ -1320,11 +1320,9 @@ newrelic.daemon.logfile = "/var/log/newrelic/newrelic-daemon.log" ; Scope : per-directory ; Default: "" ; Info : A list of labels to NOT add as attributes to logs which are forwarded -; to New Relic. This list can be separated by spaces or commas. +; to New Relic. This list can be separated by commas. ; ; Ex: -; newrelic.application_logging.forwarding.labels.exclude = "label1 label2" -; or ; newrelic.application_logging.forwarding.labels.exclude = "label1, label2" ; ;newrelic.application_logging.forwarding.labels.exclude = "" From 2c53c7aef3b2f00bdb5d04f01362b5e07e30f5f5 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Thu, 20 Feb 2025 16:28:14 -0500 Subject: [PATCH 23/60] chore(docs): Fixes version for when php_packages added to protobuf --- protocol/flatbuffers/protocol.fbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protocol/flatbuffers/protocol.fbs b/protocol/flatbuffers/protocol.fbs index 118e81a61..ec2fb76d9 100644 --- a/protocol/flatbuffers/protocol.fbs +++ b/protocol/flatbuffers/protocol.fbs @@ -118,7 +118,7 @@ table Transaction { sampling_priority: double; // added in the 8.2 PHP agent release span_events: [Event]; log_events: [Event]; // added in the 10.1 PHP agent release - php_packages: Event; // added in the ??? PHP agent release <- fix agent version + php_packages: Event; // added in the 10.17 PHP agent release log_forwarding_labels: Event; // added in the ??? PHP agent release } From c0a76663fbc6205122db99bbb815909148b7c76b Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Thu, 20 Feb 2025 16:28:40 -0500 Subject: [PATCH 24/60] chore: Removes test_segment_message - moving to another PR --- axiom/tests/.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/axiom/tests/.gitignore b/axiom/tests/.gitignore index fa0332187..22ee3b042 100644 --- a/axiom/tests/.gitignore +++ b/axiom/tests/.gitignore @@ -95,7 +95,6 @@ test_segment test_segment_children test_segment_datastore test_segment_external -test_segment_message test_segment_private test_segment_terms test_segment_traces From 5426df7051bfd57451a2db74892dc30b1de929a1 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Thu, 20 Feb 2025 16:44:58 -0500 Subject: [PATCH 25/60] tests(daemon): Tests invalid data passed to SetLogForwardingLabels --- daemon/internal/newrelic/log_events_test.go | 73 +++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/daemon/internal/newrelic/log_events_test.go b/daemon/internal/newrelic/log_events_test.go index 421df9708..83bdbd3cd 100644 --- a/daemon/internal/newrelic/log_events_test.go +++ b/daemon/internal/newrelic/log_events_test.go @@ -83,3 +83,76 @@ func TestSetLogForwardingLabels(t *testing.T) { t.Errorf("expected JSON %s, got %s", expected, string(json)) } } + +func TestSetLogForwardingLabelsInvalidData(t *testing.T) { + events := NewLogEvents(10) + id := AgentRunID(`12345`) + log_data := []byte(`{"message":"test log event"}`) + label_data := []byte(`NOT VALID JSON`) + priority := SamplingPriority(0.5) + + events.AddEventFromData(log_data, priority) + events.SetLogForwardingLabels(label_data) + + if events.analyticsEvents.events.Len() != 1 { + t.Errorf("expected 1 event, got %d", events.analyticsEvents.events.Len()) + } + + es := *events.analyticsEvents.events + event := es[0] + + if string(event.data) != string(log_data) { + t.Errorf("expected event data %s, got %s", string(log_data), string(event.data)) + } + + if event.priority != priority { + t.Errorf("expected event priority %f, got %f", priority, event.priority) + } + + json, err := events.CollectorJSON(id) + if nil != err { + t.Fatal(err) + } + + expected := `[{"common": {"attributes": {}},` + + `"logs": [{"message":"test log event"}]}]` + if string(json) != expected { + t.Errorf("expected JSON %s, got %s", expected, string(json)) + } +} + +func TestSetLogForwardingLabelsNilData(t *testing.T) { + events := NewLogEvents(10) + id := AgentRunID(`12345`) + log_data := []byte(`{"message":"test log event"}`) + priority := SamplingPriority(0.5) + + events.AddEventFromData(log_data, priority) + events.SetLogForwardingLabels(nil) + + if events.analyticsEvents.events.Len() != 1 { + t.Errorf("expected 1 event, got %d", events.analyticsEvents.events.Len()) + } + + es := *events.analyticsEvents.events + event := es[0] + + if string(event.data) != string(log_data) { + t.Errorf("expected event data %s, got %s", string(log_data), string(event.data)) + } + + if event.priority != priority { + t.Errorf("expected event priority %f, got %f", priority, event.priority) + } + + json, err := events.CollectorJSON(id) + if nil != err { + t.Fatal(err) + } + + expected := `[{"common": {"attributes": {}},` + + `"logs": [{"message":"test log event"}]}]` + if string(json) != expected { + t.Errorf("expected JSON %s, got %s", expected, string(json)) + } +} From eb8b575b90b07e2361b4fd24031f2ad399418716 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Thu, 20 Feb 2025 16:49:13 -0500 Subject: [PATCH 26/60] tests(axiom): Adds test if log fowarded labels is NULL --- axiom/tests/test_cmd_txndata.c | 61 ++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/axiom/tests/test_cmd_txndata.c b/axiom/tests/test_cmd_txndata.c index ddd91169b..f1af51979 100644 --- a/axiom/tests/test_cmd_txndata.c +++ b/axiom/tests/test_cmd_txndata.c @@ -1175,6 +1175,66 @@ static void test_encode_log_forwarding_labels(void) { nro_delete(obj); } +static void test_encode_log_forwarding_labels_null(void) { + nrtxn_t txn; + nr_flatbuffers_table_t tbl; + nrobj_t* obj; + nr_flatbuffer_t* fb; + int data_type; + int did_pass; + const char* input = "alpha:beta;gamma:delta"; + + obj = nr_labels_parse(input); + + nr_memset(&txn, 0, sizeof(txn)); + txn.status.recording = 1; + txn.options.log_forwarding_enabled = 1; + txn.options.log_forwarding_labels_enabled = 1; + txn.log_forwarding_labels = NULL; + + fb = nr_txndata_encode(&txn); + + nr_flatbuffers_table_init_root(&tbl, nr_flatbuffers_data(fb), + nr_flatbuffers_len(fb)); + + data_type = nr_flatbuffers_table_read_i8(&tbl, MESSAGE_FIELD_DATA_TYPE, + MESSAGE_BODY_NONE); + did_pass = tlib_pass_if_true(__func__, MESSAGE_BODY_TXN == data_type, + "data_type=%d", data_type); + if (0 != did_pass) { + goto done; + } + + did_pass = tlib_pass_if_true( + __func__, + 0 != nr_flatbuffers_table_read_union(&tbl, &tbl, MESSAGE_FIELD_DATA), + "transaction data missing"); + if (0 != did_pass) { + goto done; + } + + did_pass + = tlib_pass_if_true(__func__, + 0 + != nr_flatbuffers_table_read_union( + &tbl, &tbl, TRANSACTION_FIELD_LOG_LABELS), + "log labels missing"); + if (0 != did_pass) { + goto done; + } + + tlib_pass_if_bytes_equal_f( + __func__, NR_PSTR("[]"), + nr_flatbuffers_table_read_bytes(&tbl, EVENT_FIELD_DATA), + nr_flatbuffers_table_read_vector_len(&tbl, EVENT_FIELD_DATA), __FILE__, + __LINE__); + +done: + nr_flatbuffers_destroy(&fb); + nr_txn_destroy_fields(&txn); + nro_delete(obj); +} + static void test_encode_php_packages(void) { nrtxn_t txn; nr_flatbuffers_table_t tbl; @@ -1343,6 +1403,7 @@ void test_main(void* p NRUNUSED) { test_encode_txn_event(); test_encode_log_events(); test_encode_log_forwarding_labels(); + test_encode_log_forwarding_labels_null(); test_encode_php_packages(); test_bad_daemon_fd(); From ddf40e0b62eee3d7af23dc9170671fc9c3fcf642 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Mon, 24 Feb 2025 15:42:04 -0500 Subject: [PATCH 27/60] tests(agent): Updates integration/api tests to have log labels metric - skipped PHP5 specific tests --- .../test_span_event_parameter_disabled.php | 3 +- .../test_span_event_parameter_duplicate.php | 5 +-- ..._span_event_parameter_duplicate_te_off.php | 5 +-- .../test_span_event_parameter_filter.php | 5 +-- ...pan_event_parameter_filter_logging_off.php | 9 +++--- .../test_span_event_parameter_max_key.php | 5 +-- ...st_span_event_parameter_max_key_te_off.php | 5 +-- ...st_span_event_parameter_max_parameters.php | 5 +-- .../test_span_event_parameter_max_value.php | 5 +-- ..._span_event_parameter_max_value_te_off.php | 5 +-- ...pan_event_parameter_maxplus_parameters.php | 5 +-- ...nt_parameter_maxplus_parameters_te_off.php | 5 +-- ..._maxplus_parameters_te_off_logging_off.php | 5 +-- ...an_event_parameter_maxplus_span_and_te.php | 5 +-- ...t_parameter_maxplus_span_and_te_te_off.php | 5 +-- .../test_span_event_parameter_overwrite.php | 5 +-- .../test_span_event_parameter_te_off.php | 5 +-- .../test_span_event_parameter_types.php | 5 +-- .../api/add_custom_tracer/test_happy.php | 3 +- .../test_not_user_function.php | 3 +- .../add_custom_tracer/test_short_segments.php | 3 +- .../api/custom_metric/test_bad_input.php | 3 +- .../api/custom_metric/test_bad_input.php8.php | 3 +- .../api/custom_metric/test_happy.php | 3 +- .../custom_metric/test_happy_logging_off.php | 3 +- .../test_all_parameters_no_children.php | 3 +- .../datastore/test_all_parameters_nosql.php | 3 +- .../test_all_parameters_sql_no_query.php | 3 +- .../test_all_parameters_sql_obfuscated.php | 3 +- ..._parameters_sql_obfuscated_logging_off.php | 3 +- .../datastore/test_all_parameters_sql_raw.php | 3 +- .../integration/api/datastore/test_basic.php | 3 +- ...test_error_group_callback_bad_callback.php | 3 +- ...error_group_callback_bad_callback.php7.php | 3 +- .../test_error_group_callback_bad_params.php | 3 +- ...t_error_group_callback_bad_return_null.php | 3 +- ...st_error_group_callback_bad_return_num.php | 3 +- .../test_error_group_callback_clobber.php | 3 +- ...st_error_group_callback_empty_callback.php | 3 +- ...est_error_group_callback_error_non_web.php | 3 +- .../test_error_group_callback_error_web.php | 3 +- ...t_error_group_callback_error_web.php84.php | 3 +- ...error_group_callback_exception_non_web.php | 3 +- ...est_error_group_callback_exception_web.php | 3 +- ...st_error_group_callback_max_string_len.php | 3 +- .../api/metadata/test_linking_metadata_dt.php | 3 +- .../test_linking_metadata_dt_logging_off.php | 3 +- .../test_linking_metadata_invalid.php | 3 +- .../test_linking_metadata_invalid.php8.php | 3 +- .../metadata/test_linking_metadata_no_dt.php | 3 +- .../api/metadata/test_trace_metadata_dt.php | 3 +- .../metadata/test_trace_metadata_invalid.php | 3 +- .../test_trace_metadata_invalid.php8.php | 3 +- .../metadata/test_trace_metadata_no_dt.php | 3 +- .../api/other/test_ignore_apdex.php | 3 +- .../other/test_is_sampled_cancelled_txn.php | 3 +- .../api/other/test_is_sampled_dt_disabled.php | 3 +- .../api/other/test_is_sampled_dt_enabled.php | 3 +- .../api/other/test_is_sampled_extra_param.php | 3 +- .../test_is_sampled_extra_param.php8.php | 3 +- .../api/set_appname/test_already_ended.php | 21 +++++++------ .../api/set_appname/test_appname_license.php | 23 +++++++------- .../test_appname_switch_license.php | 31 ++++++++++--------- .../test_appname_switch_license_lasp.php | 23 +++++++------- .../api/set_appname/test_bad_params.php | 3 +- .../api/set_appname/test_bad_params.php8.php | 3 +- .../api/set_appname/test_no_license.php | 21 +++++++------ .../api/set_appname/test_transmit_false.php | 23 +++++++------- .../api/set_appname/test_transmit_int.php | 3 +- .../api/set_appname/test_transmit_true.php | 3 +- .../api/set_user_id/test_set_user_id.php | 3 +- .../test_set_user_id_empty_string.php | 3 +- .../set_user_id/test_set_user_id_error.php | 3 +- .../test_set_user_id_exceeds_maxlen.php | 3 +- .../test_set_user_id_exception.php | 3 +- .../set_user_id/test_set_user_id_noarg.php | 3 +- .../test_set_user_id_non_string.php | 3 +- .../api/set_user_id/test_set_user_id_null.php | 3 +- 78 files changed, 237 insertions(+), 159 deletions(-) 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 8a15fabe7..3e97252e5 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 @@ -89,7 +89,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 9d8f8fc30..1569670a0 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": 157, + "code.lineno": 158, "code.filepath": "__FILE__", "code.function": "a" } @@ -143,7 +143,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 682057acb..6e7188a94 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": 131, + "code.lineno": 132, "code.filepath": "__FILE__", "code.function": "a" } @@ -117,7 +117,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 9e6b356d7..85cdcdb60 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": 118, + "code.lineno": 119, "code.filepath": "__FILE__", "code.function": "a" } @@ -104,7 +104,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 40ca3c916..dec1e817d 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": 121, + "code.lineno": 122, "code.filepath": "__FILE__", "code.function": "a" } @@ -105,9 +105,10 @@ [{"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"}, [4, 0, 0, 0, 0, 0]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 342c3f15e..e63ebd233 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": 118, + "code.lineno": 119, "code.filepath": "__FILE__", "code.function": "a" } @@ -104,7 +104,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 544ff70e7..2130f4b77 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": 123, + "code.lineno": 124, "code.filepath": "__FILE__", "code.function": "a" } @@ -109,7 +109,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 bef117bfd..46e3d5918 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": 240, + "code.lineno": 241, "code.filepath": "__FILE__", "code.function": "a" } @@ -226,7 +226,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 658402980..5b57ca876 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": 118, + "code.lineno": 119, "code.filepath": "__FILE__", "code.function": "a" } @@ -104,7 +104,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 21bfa0911..a2c2589d4 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": 128, + "code.lineno": 129, "code.filepath": "__FILE__", "code.function": "a" } @@ -114,7 +114,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 040bf7d00..8d45c615a 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": 240, + "code.lineno": 241, "code.filepath": "__FILE__", "code.function": "a" } @@ -226,7 +226,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 0aa959429..220568415 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": 246, + "code.lineno": 247, "code.filepath": "__FILE__", "code.function": "a" } @@ -232,7 +232,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 ae622e252..309ecdf49 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": 249, + "code.lineno": 250, "code.filepath": "__FILE__", "code.function": "a" } @@ -235,7 +235,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 8096885ba..cc97dad67 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": 367, + "code.lineno": 368, "code.filepath": "__FILE__", "code.function": "a" } @@ -353,7 +353,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 851350df5..4792e60c8 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": 281, + "code.lineno": 282, "code.filepath": "__FILE__", "code.function": "a" } @@ -267,7 +267,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 605734190..10d64e5c1 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": 119, + "code.lineno": 120, "code.filepath": "__FILE__", "code.function": "a" } @@ -105,7 +105,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 104d198ea..af2923b3b 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": 120, + "code.lineno": 121, "code.filepath": "__FILE__", "code.function": "a" } @@ -106,7 +106,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 dc91ae467..778f22b85 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": 119, + "code.lineno": 120, "code.filepath": "__FILE__", "code.function": "a" } @@ -105,7 +105,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/api/add_custom_tracer/test_happy.php b/tests/integration/api/add_custom_tracer/test_happy.php index ba65a7aed..4ecab82cb 100644 --- a/tests/integration/api/add_custom_tracer/test_happy.php +++ b/tests/integration/api/add_custom_tracer/test_happy.php @@ -37,7 +37,8 @@ [{"name":"Supportability/api/add_custom_tracer"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 aa6d08324..9853477e0 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 @@ -26,7 +26,8 @@ [{"name":"Supportability/api/add_custom_tracer"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 fde7bcee3..d01a8c733 100644 --- a/tests/integration/api/add_custom_tracer/test_short_segments.php +++ b/tests/integration/api/add_custom_tracer/test_short_segments.php @@ -76,7 +76,8 @@ [{"name":"Supportability/api/add_custom_tracer"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/api/custom_metric/test_bad_input.php b/tests/integration/api/custom_metric/test_bad_input.php index 60780c548..40c00c053 100644 --- a/tests/integration/api/custom_metric/test_bad_input.php +++ b/tests/integration/api/custom_metric/test_bad_input.php @@ -44,7 +44,8 @@ [{"name":"Supportability/api/custom_metric"}, [7, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 0fda2de37..839a500bd 100644 --- a/tests/integration/api/custom_metric/test_bad_input.php8.php +++ b/tests/integration/api/custom_metric/test_bad_input.php8.php @@ -44,7 +44,8 @@ [{"name":"Supportability/api/custom_metric"}, [7, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/api/custom_metric/test_happy.php b/tests/integration/api/custom_metric/test_happy.php index 02413bd60..bc7cc0991 100644 --- a/tests/integration/api/custom_metric/test_happy.php +++ b/tests/integration/api/custom_metric/test_happy.php @@ -35,7 +35,8 @@ [{"name":"Supportability/api/custom_metric"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 8b90ccc42..0daf910ca 100644 --- a/tests/integration/api/custom_metric/test_happy_logging_off.php +++ b/tests/integration/api/custom_metric/test_happy_logging_off.php @@ -38,7 +38,8 @@ [{"name":"Supportability/api/custom_metric"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 5dfc19488..c226ce3c0 100644 --- a/tests/integration/api/datastore/test_all_parameters_no_children.php +++ b/tests/integration/api/datastore/test_all_parameters_no_children.php @@ -39,7 +39,8 @@ [{"name":"Supportability/api/record_datastore_segment"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/api/datastore/test_all_parameters_nosql.php b/tests/integration/api/datastore/test_all_parameters_nosql.php index f318b31db..cfccc66d0 100644 --- a/tests/integration/api/datastore/test_all_parameters_nosql.php +++ b/tests/integration/api/datastore/test_all_parameters_nosql.php @@ -38,7 +38,8 @@ [{"name":"Supportability/api/record_datastore_segment"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 897e877e6..a0489995c 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 @@ -39,7 +39,8 @@ [{"name":"Supportability/api/record_datastore_segment"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 735d04364..20e757732 100644 --- a/tests/integration/api/datastore/test_all_parameters_sql_obfuscated.php +++ b/tests/integration/api/datastore/test_all_parameters_sql_obfuscated.php @@ -39,7 +39,8 @@ [{"name":"Supportability/api/record_datastore_segment"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 cd8da7672..42d5e8617 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 @@ -42,7 +42,8 @@ [{"name":"Supportability/api/record_datastore_segment"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 17ead98f8..26de77cd0 100644 --- a/tests/integration/api/datastore/test_all_parameters_sql_raw.php +++ b/tests/integration/api/datastore/test_all_parameters_sql_raw.php @@ -39,7 +39,8 @@ [{"name":"Supportability/api/record_datastore_segment"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/api/datastore/test_basic.php b/tests/integration/api/datastore/test_basic.php index 6cf6eab22..ad458613c 100644 --- a/tests/integration/api/datastore/test_basic.php +++ b/tests/integration/api/datastore/test_basic.php @@ -38,7 +38,8 @@ [{"name":"Supportability/api/record_datastore_segment"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 ef04b1766..5d1b89498 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 @@ -46,7 +46,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 2b46375fd..5e570fec0 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 @@ -43,7 +43,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 c07fc9846..4ac274748 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 @@ -36,7 +36,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 4b8e1cb70..841947633 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 @@ -45,7 +45,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 2245f578a..dd559076e 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 @@ -45,7 +45,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 f6f1100ad..786c8f70d 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 @@ -44,7 +44,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 3fe8ec488..49b6bce01 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 @@ -36,7 +36,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 6e6f8624e..1a99a2b06 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 @@ -42,7 +42,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 3b82e16f9..650df0f7a 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 @@ -59,7 +59,8 @@ [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/api/error_group_callback/test_error_group_callback_error_web.php84.php b/tests/integration/api/error_group_callback/test_error_group_callback_error_web.php84.php index e740c7613..642d94e9e 100644 --- a/tests/integration/api/error_group_callback/test_error_group_callback_error_web.php84.php +++ b/tests/integration/api/error_group_callback/test_error_group_callback_error_web.php84.php @@ -57,7 +57,8 @@ [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 635bfd80c..811b5a43a 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 @@ -43,7 +43,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 21651b710..519b04b35 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 @@ -50,7 +50,8 @@ [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 0a492390d..7c3c25eb5 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 @@ -46,7 +46,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/api/metadata/test_linking_metadata_dt.php b/tests/integration/api/metadata/test_linking_metadata_dt.php index 82e898b09..2eed2afbb 100644 --- a/tests/integration/api/metadata/test_linking_metadata_dt.php +++ b/tests/integration/api/metadata/test_linking_metadata_dt.php @@ -41,7 +41,8 @@ [{"name":"Supportability/api/get_linking_metadata"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 9c0897aeb..2d135f26f 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 @@ -44,7 +44,8 @@ [{"name":"Supportability/api/get_linking_metadata"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/api/metadata/test_linking_metadata_invalid.php b/tests/integration/api/metadata/test_linking_metadata_invalid.php index 66796fef3..d52708233 100644 --- a/tests/integration/api/metadata/test_linking_metadata_invalid.php +++ b/tests/integration/api/metadata/test_linking_metadata_invalid.php @@ -40,7 +40,8 @@ [{"name":"Supportability/api/get_linking_metadata"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 831e5840d..08b6ab936 100644 --- a/tests/integration/api/metadata/test_linking_metadata_invalid.php8.php +++ b/tests/integration/api/metadata/test_linking_metadata_invalid.php8.php @@ -40,7 +40,8 @@ [{"name":"Supportability/api/get_linking_metadata"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 af9c1dcc1..03224e800 100644 --- a/tests/integration/api/metadata/test_linking_metadata_no_dt.php +++ b/tests/integration/api/metadata/test_linking_metadata_no_dt.php @@ -35,7 +35,8 @@ [{"name":"Supportability/api/get_linking_metadata"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/api/metadata/test_trace_metadata_dt.php b/tests/integration/api/metadata/test_trace_metadata_dt.php index 66cc4d43a..f49963af8 100644 --- a/tests/integration/api/metadata/test_trace_metadata_dt.php +++ b/tests/integration/api/metadata/test_trace_metadata_dt.php @@ -37,7 +37,8 @@ [{"name":"Supportability/api/get_trace_metadata"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/api/metadata/test_trace_metadata_invalid.php b/tests/integration/api/metadata/test_trace_metadata_invalid.php index 9d574f0b1..57bac6223 100644 --- a/tests/integration/api/metadata/test_trace_metadata_invalid.php +++ b/tests/integration/api/metadata/test_trace_metadata_invalid.php @@ -43,7 +43,8 @@ [{"name":"Supportability/api/get_trace_metadata"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 20f2bf13d..96c64acf3 100644 --- a/tests/integration/api/metadata/test_trace_metadata_invalid.php8.php +++ b/tests/integration/api/metadata/test_trace_metadata_invalid.php8.php @@ -43,7 +43,8 @@ [{"name":"Supportability/api/get_trace_metadata"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 ddb3c9553..78133d1a9 100644 --- a/tests/integration/api/metadata/test_trace_metadata_no_dt.php +++ b/tests/integration/api/metadata/test_trace_metadata_no_dt.php @@ -31,7 +31,8 @@ [{"name":"Supportability/api/get_trace_metadata"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/api/other/test_ignore_apdex.php b/tests/integration/api/other/test_ignore_apdex.php index 966336baa..018b7c1c5 100644 --- a/tests/integration/api/other/test_ignore_apdex.php +++ b/tests/integration/api/other/test_ignore_apdex.php @@ -28,7 +28,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 509caa29e..e244808a4 100644 --- a/tests/integration/api/other/test_is_sampled_cancelled_txn.php +++ b/tests/integration/api/other/test_is_sampled_cancelled_txn.php @@ -27,7 +27,8 @@ [{"name":"Supportability/api/end_transaction"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 ed035ee1a..e317d9267 100644 --- a/tests/integration/api/other/test_is_sampled_dt_disabled.php +++ b/tests/integration/api/other/test_is_sampled_dt_disabled.php @@ -25,7 +25,8 @@ [{"name":"Supportability/api/is_sampled"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 cee406079..31002193e 100644 --- a/tests/integration/api/other/test_is_sampled_dt_enabled.php +++ b/tests/integration/api/other/test_is_sampled_dt_enabled.php @@ -27,7 +27,8 @@ [{"name":"Supportability/api/is_sampled"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 a6e69c592..044029711 100644 --- a/tests/integration/api/other/test_is_sampled_extra_param.php +++ b/tests/integration/api/other/test_is_sampled_extra_param.php @@ -39,7 +39,8 @@ [{"name":"Supportability/api/is_sampled"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 5aec50923..be9172203 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 @@ -39,7 +39,8 @@ [{"name":"Supportability/api/is_sampled"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/api/set_appname/test_already_ended.php b/tests/integration/api/set_appname/test_already_ended.php index a4cf8824d..af4923ff3 100644 --- a/tests/integration/api/set_appname/test_already_ended.php +++ b/tests/integration/api/set_appname/test_already_ended.php @@ -21,16 +21,17 @@ [ [{"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, "??", "??", "??", "??", "??"]] + [{"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, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/api/set_appname/test_appname_license.php b/tests/integration/api/set_appname/test_appname_license.php index 1e59554f3..5fdd770e1 100644 --- a/tests/integration/api/set_appname/test_appname_license.php +++ b/tests/integration/api/set_appname/test_appname_license.php @@ -20,17 +20,18 @@ [ [{"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, "??", "??", "??", "??", "??"]] + [{"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, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 86a973ef6..cf51aaf93 100644 --- a/tests/integration/api/set_appname/test_appname_switch_license.php +++ b/tests/integration/api/set_appname/test_appname_switch_license.php @@ -18,22 +18,23 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"},[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, "??", "??", "??", "??", "??"]] + [{"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, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [2, "??", "??", "??", "??", "??"]] ] ] */ 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 47c2aa0d2..003abcf9b 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,18 +24,19 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"},[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, "??", "??", "??", "??", "??"]] + [{"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, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/api/set_appname/test_bad_params.php b/tests/integration/api/set_appname/test_bad_params.php index 30d1d5242..65938b4db 100644 --- a/tests/integration/api/set_appname/test_bad_params.php +++ b/tests/integration/api/set_appname/test_bad_params.php @@ -49,7 +49,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 4397b395a..0ee7344a0 100644 --- a/tests/integration/api/set_appname/test_bad_params.php8.php +++ b/tests/integration/api/set_appname/test_bad_params.php8.php @@ -43,7 +43,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/api/set_appname/test_no_license.php b/tests/integration/api/set_appname/test_no_license.php index 0a507cf55..6106cb099 100644 --- a/tests/integration/api/set_appname/test_no_license.php +++ b/tests/integration/api/set_appname/test_no_license.php @@ -20,16 +20,17 @@ [ [{"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, "??", "??", "??", "??", "??"]] + [{"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, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/api/set_appname/test_transmit_false.php b/tests/integration/api/set_appname/test_transmit_false.php index 9bc2b23f7..7c6e8a116 100644 --- a/tests/integration/api/set_appname/test_transmit_false.php +++ b/tests/integration/api/set_appname/test_transmit_false.php @@ -21,17 +21,18 @@ [ [{"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, "??", "??", "??", "??", "??"]] + [{"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, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/api/set_appname/test_transmit_int.php b/tests/integration/api/set_appname/test_transmit_int.php index 340de0855..5eac31a77 100644 --- a/tests/integration/api/set_appname/test_transmit_int.php +++ b/tests/integration/api/set_appname/test_transmit_int.php @@ -33,7 +33,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [3, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [3, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [3, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/api/set_appname/test_transmit_true.php b/tests/integration/api/set_appname/test_transmit_true.php index c6e3fe22b..0bd7be593 100644 --- a/tests/integration/api/set_appname/test_transmit_true.php +++ b/tests/integration/api/set_appname/test_transmit_true.php @@ -34,7 +34,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [3, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [3, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [3, "??", "??", "??", "??", "??"]] ] ] */ 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 38afe8c23..5e663d6c1 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 @@ -33,7 +33,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 a51035d71..72726a8ab 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 @@ -36,7 +36,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 dbf782bdb..ee4caeafe 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 @@ -30,7 +30,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 1a369a76b..f77c3331a 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 @@ -32,7 +32,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 e38ffef8d..4631705b2 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 @@ -31,7 +31,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 09c18914a..fd8aa44cb 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 @@ -32,7 +32,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 b54b24c4f..1ac980a24 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 @@ -32,7 +32,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 beae49a97..28c073080 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 @@ -32,7 +32,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ From c7fdf4a2ad84798e620219cea4de94d53818ccb2 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Mon, 24 Feb 2025 15:42:39 -0500 Subject: [PATCH 28/60] tests(agent): Updates integration/basic tests to have log labels metric --- tests/integration/basic/test_call_user_func_array_0.php | 3 ++- tests/integration/basic/test_dl.php | 3 ++- tests/integration/basic/test_output_buffer.php | 3 ++- tests/integration/basic/test_output_buffer_logging_off.php | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) 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 fda267f67..f9950b8a0 100644 --- a/tests/integration/basic/test_call_user_func_array_0.php +++ b/tests/integration/basic/test_call_user_func_array_0.php @@ -36,7 +36,8 @@ [{"name":"Supportability/framework/CodeIgniter/forced"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/basic/test_dl.php b/tests/integration/basic/test_dl.php index c00632753..ccaeda661 100644 --- a/tests/integration/basic/test_dl.php +++ b/tests/integration/basic/test_dl.php @@ -31,7 +31,8 @@ [{"name":"Supportability/InstrumentedFunction/dl"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/basic/test_output_buffer.php b/tests/integration/basic/test_output_buffer.php index 8b8dbd0c2..73efaddb5 100644 --- a/tests/integration/basic/test_output_buffer.php +++ b/tests/integration/basic/test_output_buffer.php @@ -41,7 +41,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/basic/test_output_buffer_logging_off.php b/tests/integration/basic/test_output_buffer_logging_off.php index d559d4140..33ef55bf8 100644 --- a/tests/integration/basic/test_output_buffer_logging_off.php +++ b/tests/integration/basic/test_output_buffer_logging_off.php @@ -44,7 +44,8 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ From f921ddb1aac73ff0b21be0c5e32fe98311875f0d Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Mon, 24 Feb 2025 15:46:27 -0500 Subject: [PATCH 29/60] tests(agent): Updates integration/distributed_tracing tests to have log labels metric --- .../newrelic/test_inbound_payload_rejects_if_no_tx_or_id.php | 3 ++- .../newrelic/test_supportability_acceptpayload_exception.php | 3 ++- ...supportability_acceptpayload_ignored_createBeforeAccept.php | 3 ++- .../test_supportability_acceptpayload_ignored_majorVersion.php | 3 ++- .../test_supportability_acceptpayload_ignored_multiple.php | 3 ++- ...pportability_acceptpayload_ignored_multiple_logging_off.php | 3 ++- .../test_supportability_acceptpayload_ignored_null.php | 3 ++- ...t_supportability_acceptpayload_ignored_untrustedAccount.php | 3 ++- ...ability_acceptpayload_ignored_untrustedAccount_httpsafe.php | 3 ++- ...lity_acceptpayload_ignored_untrustedAccount_logging_off.php | 3 ++- .../test_supportability_acceptpayload_parseexception.php | 3 ++- .../newrelic/test_supportability_acceptpayload_success.php | 3 ++- .../w3c/test_insert_dt_headers_empty_array.php | 3 ++- .../distributed_tracing/w3c/test_insert_dt_headers_happy.php | 3 ++- .../w3c/test_insert_dt_headers_happy_logging_off.php | 3 ++- .../distributed_tracing/w3c/test_insert_dt_headers_nonref.php | 3 ++- .../w3c/test_insert_dt_headers_wrong_arg_type.php | 3 ++- .../w3c/test_insert_dt_headers_wrong_arg_type.php8.php | 3 ++- .../distributed_tracing/w3c/test_invalid_inbound.php | 3 ++- .../distributed_tracing/w3c/test_valid_inbound_headers.php | 3 ++- .../w3c/test_valid_inbound_headers_logging_off.php | 3 ++- .../w3c/test_valid_inbound_headers_parsed_key.php | 3 ++- .../distributed_tracing/w3c/test_valid_inbound_no_sampled.php | 3 ++- .../w3c/test_valid_inbound_non_newrelic.php | 3 ++- .../distributed_tracing/w3c/test_valid_no_nr_state.php | 3 ++- 25 files changed, 50 insertions(+), 25 deletions(-) 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 9ff046acd..0e361f7b3 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 @@ -39,7 +39,8 @@ [{"name":"Supportability/DistributedTrace/AcceptPayload/ParseException"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 6c28d7158..60c61f6e9 100644 --- a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_exception.php +++ b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_exception.php @@ -34,7 +34,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Exception"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 5b9a4cc83..0b4fffa5d 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 @@ -37,7 +37,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"},[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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 be5197d5a..fdfb5f6fe 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 @@ -40,7 +40,8 @@ [{"name":"Supportability/DistributedTrace/AcceptPayload/Ignored/MajorVersion"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 d567b2e31..a34ff28b1 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 @@ -42,7 +42,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 d5857bde0..a08b0be78 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 @@ -45,7 +45,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 d6a8a3477..bc2f171c8 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 @@ -35,7 +35,8 @@ [{"name":"Supportability/DistributedTrace/AcceptPayload/Ignored/Null"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 a2c2eb33f..bda0809e5 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 @@ -31,7 +31,8 @@ [{"name":"Supportability/DistributedTrace/AcceptPayload/Ignored/UntrustedAccount"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 043bfa0fc..ff7c7f68f 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 @@ -32,7 +32,8 @@ [{"name":"Supportability/DistributedTrace/AcceptPayload/Ignored/UntrustedAccount"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 bf9974f71..af70d495b 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 @@ -34,7 +34,8 @@ [{"name":"Supportability/DistributedTrace/AcceptPayload/Ignored/UntrustedAccount"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 470fcb13a..6a6195e94 100644 --- a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_parseexception.php +++ b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_parseexception.php @@ -31,7 +31,8 @@ [{"name":"Supportability/DistributedTrace/AcceptPayload/ParseException"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 6c8bf8ac2..22c021dc9 100644 --- a/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_success.php +++ b/tests/integration/distributed_tracing/newrelic/test_supportability_acceptpayload_success.php @@ -40,7 +40,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 722db3181..3f8da711f 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 @@ -35,7 +35,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 c4e961fc8..b1f4b7768 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 @@ -35,7 +35,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 fa8e0d92c..f24974e93 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 @@ -38,7 +38,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 275e1544b..05a193202 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 @@ -30,7 +30,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 7da4a6eb4..4e923111f 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 @@ -38,7 +38,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 427f1f121..0a0057ae6 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 @@ -38,7 +38,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/distributed_tracing/w3c/test_invalid_inbound.php b/tests/integration/distributed_tracing/w3c/test_invalid_inbound.php index b6f2ce76e..367d3f250 100644 --- a/tests/integration/distributed_tracing/w3c/test_invalid_inbound.php +++ b/tests/integration/distributed_tracing/w3c/test_invalid_inbound.php @@ -29,7 +29,8 @@ [{"name":"Supportability/TraceContext/TraceParent/Parse/Exception"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 112d6f429..ad7904374 100644 --- a/tests/integration/distributed_tracing/w3c/test_valid_inbound_headers.php +++ b/tests/integration/distributed_tracing/w3c/test_valid_inbound_headers.php @@ -40,7 +40,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 87a75d3fa..1e1d59818 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 @@ -43,7 +43,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 63950f174..6048640e6 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 @@ -40,7 +40,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 06b7a437d..a91dbaf9b 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 @@ -40,7 +40,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 5f4dff7c0..11e1c5056 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 @@ -39,7 +39,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] ] ] */ 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 14767c2c6..96e8ea37e 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 @@ -33,7 +33,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ From f73cfa0eba4fd73724aa654944d2c3d50e9bd9a8 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Mon, 24 Feb 2025 15:48:20 -0500 Subject: [PATCH 30/60] tests(agent): Updates integration/errors tests to have log labels metric --- tests/integration/errors/test_top_level_exception_tracer.php | 3 ++- .../errors/test_top_level_exception_tracer_logging_off.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/integration/errors/test_top_level_exception_tracer.php b/tests/integration/errors/test_top_level_exception_tracer.php index 4b697582d..0fc35f557 100644 --- a/tests/integration/errors/test_top_level_exception_tracer.php +++ b/tests/integration/errors/test_top_level_exception_tracer.php @@ -34,7 +34,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 23139b2a3..3dc2a4983 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 @@ -37,7 +37,8 @@ "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ From b5e712139cb0172b5b38004caf9ae72c95a9e2df Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Mon, 24 Feb 2025 15:54:23 -0500 Subject: [PATCH 31/60] tests(agent): Updates integration/external tests to have log labels metric --- .../test_cat_and_synthetics_disabled.php | 3 ++- .../external/curl_exec/test_cat_disabled.php | 3 ++- .../test_cat_disabled_by_default.php | 3 ++- .../test_cat_request_headers_empty_array.php | 3 ++- .../test_cat_request_headers_present.php | 3 ++- ...test_cat_request_headers_present_array.php | 3 ++- ...t_cat_request_headers_referenced_array.php | 3 ++- .../test_cat_response_header_anonymous.php | 3 ++- .../test_cat_response_header_function.php | 3 ++- .../test_cat_response_header_returned.php | 3 ++- .../test_cat_response_header_to_file.php | 3 ++- .../test_cat_response_header_to_stdout.php | 3 ++- .../external/curl_exec/test_cat_simple.php | 3 ++- .../curl_exec/test_dt_enabled_cat_enabled.php | 3 ++- .../test_dt_newrelic_header_disabled.php | 3 ++- .../test_dt_request_headers_empty_array.php | 3 ++- .../test_dt_request_headers_present.php | 3 ++- .../test_dt_request_headers_present_array.php | 3 ++- ...uest_headers_present_array_logging_off.php | 3 ++- ...st_dt_request_headers_referenced_array.php | 3 ++- .../external/curl_exec/test_dt_simple.php | 3 ++- .../external/curl_exec/test_file_proto.php | 3 ++- .../external/curl_exec/test_http.php | 3 ++- .../external/curl_exec/test_malformed_url.php | 3 ++- .../curl_exec/test_missing_handle.php | 3 ++- .../test_request_headers_referenced_array.php | 3 ++- .../external/curl_exec/test_synthetics.php | 3 ++- .../curl_exec/test_synthetics_disabled.php | 3 ++- .../test_synthetics_with_cat_disabled.php | 3 ++- .../curl_exec/test_synthetics_with_dt.php | 3 ++- .../test_synthetics_with_dt_logging_off.php | 3 ++- .../external/curl_exec/test_type_mismatch.php | 3 ++- .../curl_multi_exec/test_cat_simple.php | 3 ++- .../test_curl_multi_exec_params.php | 3 ++- .../curl_multi_exec/test_custom_header.php | 3 ++- .../curl_multi_exec/test_dt_custom_header.php | 3 ++- .../test_dt_custom_header_logging_off.php | 3 ++- .../test_dt_newrelic_header_disabled.php | 3 ++- .../curl_multi_exec/test_dt_simple.php | 3 ++- .../curl_multi_exec/test_exec_add_handles.php | 3 ++- .../test_exec_remove_handles.php | 3 ++- .../test_exec_remove_handles_logging_off.php | 3 ++- .../external/curl_multi_exec/test_http.php | 3 ++- .../curl_multi_exec/test_malformed_url.php | 3 ++- .../curl_multi_exec/test_missing_arg.php | 3 ++- .../external/curl_multi_exec/test_simple.php | 3 ++- .../curl_multi_exec/test_txn_restart.php | 3 ++- .../curl_multi_exec/test_type_mismatch.php | 3 ++- .../external/drupal6/test_basic.php | 3 ++- .../test_cat_and_synthetics_disabled.php | 3 ++- .../external/drupal6/test_cat_disabled.php | 3 ++- .../test_cross_process_empty_headers.php | 3 ++- .../test_cross_process_existing_header.php | 3 ++- .../drupal6/test_cross_process_no_headers.php | 3 ++- .../drupal6/test_dt_empty_headers.php | 3 ++- .../drupal6/test_dt_existing_headers.php | 3 ++- .../test_dt_newrelic_header_disabled.php | 3 ++- .../external/drupal6/test_dt_no_headers.php | 3 ++- .../external/drupal6/test_multiple_calls.php | 3 ++- .../external/drupal6/test_synthetics.php | 3 ++- .../drupal6/test_synthetics_disabled.php | 3 ++- .../test_synthetics_with_cat_disabled.php | 3 ++- .../drupal6/test_synthetics_with_dt.php | 3 ++- .../test_bad_params_integer_headers.php | 3 ++- .../test_bad_params_integer_headers.php8.php | 23 ++++++++++--------- .../test_bad_params_integer_options.php | 3 ++- .../drupal7/test_bad_params_null_headers.php | 3 ++- .../test_bad_params_null_headers.php8.php | 23 ++++++++++--------- .../drupal7/test_bad_params_null_options.php | 3 ++- .../external/drupal7/test_bad_url.php | 3 ++- .../external/drupal7/test_basic.php | 3 ++- .../test_cat_and_synthetics_disabled.php | 3 ++- .../external/drupal7/test_cat_disabled.php | 3 ++- .../test_cross_process_empty_headers.php | 3 ++- .../test_cross_process_empty_options.php | 3 ++- .../test_cross_process_existing_header.php | 3 ++- .../drupal7/test_cross_process_no_options.php | 3 ++- .../drupal7/test_dt_empty_headers.php | 3 ++- .../drupal7/test_dt_existing_headers.php | 3 ++- .../test_dt_newrelic_header_disabled.php | 3 ++- .../external/drupal7/test_dt_no_headers.php | 3 ++- .../external/drupal7/test_multiple_calls.php | 3 ++- .../external/drupal7/test_synthetics.php | 3 ++- .../drupal7/test_synthetics_disabled.php | 3 ++- .../test_synthetics_with_cat_disabled.php | 3 ++- .../drupal7/test_synthetics_with_dt.php | 3 ++- .../test_cat_and_synthetics_disabled.php | 3 ++- .../test_cat_context_provided.php | 3 ++- .../test_cat_default_context.php | 3 ++- .../file_get_contents/test_cat_disabled.php | 3 ++- .../file_get_contents/test_cat_no_context.php | 3 ++- .../test_dt_context_provided.php | 3 ++- .../test_dt_context_provided_logging_off.php | 3 ++- .../test_dt_default_context.php | 3 ++- .../file_get_contents/test_dt_disabled.php | 3 ++- .../test_dt_disabled_cat_disabled.php | 3 ++- .../test_dt_newrelic_header_disabled.php | 3 ++- .../file_get_contents/test_dt_no_context.php | 3 ++- .../test_http_response_header_cv.php | 3 ++- .../test_synthetics_context_provided.php | 3 ++- .../test_synthetics_default_context.php | 3 ++- .../test_synthetics_disabled.php | 3 ++- .../test_synthetics_no_context.php | 3 ++- .../test_synthetics_with_cat_disabled.php | 3 ++- .../test_synthetics_with_dt.php | 3 ++- .../test_synthetics_with_dt_logging_off.php | 3 ++- .../integration/external/guzzle5/test_cat.php | 3 ++- .../integration/external/guzzle5/test_dt.php | 3 ++- .../test_dt_newrelic_header_disabled.php | 3 ++- .../external/guzzle5/test_dt_synthetics.php | 3 ++- .../test_dt_synthetics_logging_off.php | 3 ++- .../external/guzzle5/test_no_cat_no_dt.php | 3 ++- .../integration/external/guzzle6/test_cat.php | 3 ++- .../integration/external/guzzle6/test_dt.php | 3 ++- .../test_dt_newrelic_header_disabled.php | 3 ++- .../external/guzzle6/test_dt_synthetics.php | 3 ++- .../test_dt_synthetics_logging_off.php | 3 ++- .../external/guzzle6/test_no_cat_no_dt.php | 3 ++- .../integration/external/guzzle7/test_cat.php | 3 ++- .../integration/external/guzzle7/test_dt.php | 3 ++- .../test_dt_newrelic_header_disabled.php | 3 ++- .../external/guzzle7/test_dt_synthetics.php | 3 ++- .../external/guzzle7/test_no_cat_no_dt.php | 3 ++- .../integration/external/http/test_v1_cat.php | 3 ++- .../test_v1_cat_and_synthetics_disabled.php | 3 ++- .../external/http/test_v1_cat_disabled.php | 3 ++- .../external/http/test_v1_synthetics.php | 3 ++- .../http/test_v1_synthetics_disabled.php | 3 ++- .../test_v1_synthetics_with_cat_disabled.php | 3 ++- .../integration/external/http/test_v2_cat.php | 3 ++- .../test_curl_multi_add_remove_handles.php | 3 ++- 131 files changed, 282 insertions(+), 151 deletions(-) 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 6e60d4b95..61131f013 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 @@ -68,7 +68,8 @@ [{"name":"WebTransactionTotalTime/Uri__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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/curl_exec/test_cat_disabled.php b/tests/integration/external/curl_exec/test_cat_disabled.php index 3b874ad5b..5b17421b5 100644 --- a/tests/integration/external/curl_exec/test_cat_disabled.php +++ b/tests/integration/external/curl_exec/test_cat_disabled.php @@ -39,7 +39,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 bdd21d61f..4d4f657fa 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 @@ -39,7 +39,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 6fb3177ad..87499f03d 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 @@ -57,7 +57,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 cdf0aa712..cd0a6761c 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 @@ -57,7 +57,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 d1d873414..dd1d232fc 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 @@ -57,7 +57,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 28a19930d..e691b9136 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 @@ -57,7 +57,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 5457f11e8..9dbbcab79 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 @@ -52,7 +52,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 79fc67f6a..0f1a8c75e 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 @@ -57,7 +57,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 8a27c4371..18d069496 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 @@ -55,7 +55,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 c0d0da723..8c0c55057 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 @@ -52,7 +52,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 44aeb1aac..e750392da 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 @@ -55,7 +55,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/curl_exec/test_cat_simple.php b/tests/integration/external/curl_exec/test_cat_simple.php index 5edb87f68..5b133ad8c 100644 --- a/tests/integration/external/curl_exec/test_cat_simple.php +++ b/tests/integration/external/curl_exec/test_cat_simple.php @@ -56,7 +56,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 8f9cd8880..4acdfd815 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 @@ -55,7 +55,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 6ee09ead9..241e27ff9 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 @@ -53,7 +53,8 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 dcfd62c5a..1df90a6ad 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 @@ -54,7 +54,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 d2affbff3..b7042621c 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 @@ -54,7 +54,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 adeb4c633..dbfd06806 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 @@ -54,7 +54,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 5ccce861f..1b6964c46 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 @@ -57,7 +57,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 1e7a2a4be..436acaa6a 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 @@ -55,7 +55,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/curl_exec/test_dt_simple.php b/tests/integration/external/curl_exec/test_dt_simple.php index b7009267a..da78515c0 100644 --- a/tests/integration/external/curl_exec/test_dt_simple.php +++ b/tests/integration/external/curl_exec/test_dt_simple.php @@ -83,7 +83,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/curl_exec/test_file_proto.php b/tests/integration/external/curl_exec/test_file_proto.php index 3cebd2e6a..3459dfaa2 100644 --- a/tests/integration/external/curl_exec/test_file_proto.php +++ b/tests/integration/external/curl_exec/test_file_proto.php @@ -36,7 +36,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/curl_exec/test_http.php b/tests/integration/external/curl_exec/test_http.php index b626b2f7a..5d55f2975 100644 --- a/tests/integration/external/curl_exec/test_http.php +++ b/tests/integration/external/curl_exec/test_http.php @@ -47,7 +47,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/curl_exec/test_malformed_url.php b/tests/integration/external/curl_exec/test_malformed_url.php index 4131f55e9..9f12085f6 100644 --- a/tests/integration/external/curl_exec/test_malformed_url.php +++ b/tests/integration/external/curl_exec/test_malformed_url.php @@ -44,7 +44,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/curl_exec/test_missing_handle.php b/tests/integration/external/curl_exec/test_missing_handle.php index 3d270a4dd..71d8c8bbb 100644 --- a/tests/integration/external/curl_exec/test_missing_handle.php +++ b/tests/integration/external/curl_exec/test_missing_handle.php @@ -38,7 +38,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 cf90cc31d..7d3f66ac2 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 @@ -43,7 +43,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/curl_exec/test_synthetics.php b/tests/integration/external/curl_exec/test_synthetics.php index 9a78fab80..81a8bd6d7 100644 --- a/tests/integration/external/curl_exec/test_synthetics.php +++ b/tests/integration/external/curl_exec/test_synthetics.php @@ -67,7 +67,8 @@ [{"name":"WebTransactionTotalTime/Uri__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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/curl_exec/test_synthetics_disabled.php b/tests/integration/external/curl_exec/test_synthetics_disabled.php index 0ce24aa42..5e5369982 100644 --- a/tests/integration/external/curl_exec/test_synthetics_disabled.php +++ b/tests/integration/external/curl_exec/test_synthetics_disabled.php @@ -68,7 +68,8 @@ [{"name":"WebTransactionTotalTime/Uri__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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 743d463b6..92eca7b45 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 @@ -66,7 +66,8 @@ [{"name":"WebTransactionTotalTime/Uri__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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 2bc43a7f5..e5da0cd0e 100644 --- a/tests/integration/external/curl_exec/test_synthetics_with_dt.php +++ b/tests/integration/external/curl_exec/test_synthetics_with_dt.php @@ -67,7 +67,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 93890d009..040ac383f 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 @@ -70,7 +70,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/curl_exec/test_type_mismatch.php b/tests/integration/external/curl_exec/test_type_mismatch.php index 558e86d80..ea6c99598 100644 --- a/tests/integration/external/curl_exec/test_type_mismatch.php +++ b/tests/integration/external/curl_exec/test_type_mismatch.php @@ -37,7 +37,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 ff56296e1..db719d477 100644 --- a/tests/integration/external/curl_multi_exec/test_cat_simple.php +++ b/tests/integration/external/curl_multi_exec/test_cat_simple.php @@ -59,7 +59,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 edf70a708..6ac62ec7c 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 @@ -41,7 +41,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 90c8a5a0e..58e148175 100644 --- a/tests/integration/external/curl_multi_exec/test_custom_header.php +++ b/tests/integration/external/curl_multi_exec/test_custom_header.php @@ -43,7 +43,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 e6e31a2ca..92b916e94 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 @@ -53,7 +53,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 033b9b53d..fb03b507e 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 @@ -56,7 +56,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 23b262a9a..e12938e70 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 @@ -55,7 +55,8 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 d079b0c39..477014a16 100644 --- a/tests/integration/external/curl_multi_exec/test_dt_simple.php +++ b/tests/integration/external/curl_multi_exec/test_dt_simple.php @@ -55,7 +55,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 92c327975..8a34a05db 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 @@ -135,7 +135,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 995a1eb27..32ada2c87 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 @@ -134,7 +134,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [6, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 7573811a1..dd4b8bb4a 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 @@ -137,7 +137,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [6, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/curl_multi_exec/test_http.php b/tests/integration/external/curl_multi_exec/test_http.php index 76f44e184..2b2e9f6ab 100644 --- a/tests/integration/external/curl_multi_exec/test_http.php +++ b/tests/integration/external/curl_multi_exec/test_http.php @@ -47,7 +47,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 4250faeef..69bf0981a 100644 --- a/tests/integration/external/curl_multi_exec/test_malformed_url.php +++ b/tests/integration/external/curl_multi_exec/test_malformed_url.php @@ -45,7 +45,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 62012d28e..2e9a494ce 100644 --- a/tests/integration/external/curl_multi_exec/test_missing_arg.php +++ b/tests/integration/external/curl_multi_exec/test_missing_arg.php @@ -38,7 +38,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/curl_multi_exec/test_simple.php b/tests/integration/external/curl_multi_exec/test_simple.php index 19e1258af..3c8c5aae4 100644 --- a/tests/integration/external/curl_multi_exec/test_simple.php +++ b/tests/integration/external/curl_multi_exec/test_simple.php @@ -135,7 +135,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 23de9b40d..4e4e6040f 100644 --- a/tests/integration/external/curl_multi_exec/test_txn_restart.php +++ b/tests/integration/external/curl_multi_exec/test_txn_restart.php @@ -54,7 +54,8 @@ [{"name":"Supportability/api/start_transaction"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 ccc8567a6..360be44ac 100644 --- a/tests/integration/external/curl_multi_exec/test_type_mismatch.php +++ b/tests/integration/external/curl_multi_exec/test_type_mismatch.php @@ -37,7 +37,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/drupal6/test_basic.php b/tests/integration/external/drupal6/test_basic.php index 66f36a717..647e91a9b 100644 --- a/tests/integration/external/drupal6/test_basic.php +++ b/tests/integration/external/drupal6/test_basic.php @@ -37,7 +37,8 @@ [{"name":"External/127.0.0.1/all", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 c21f306f7..28fdaefe0 100644 --- a/tests/integration/external/drupal6/test_cat_and_synthetics_disabled.php +++ b/tests/integration/external/drupal6/test_cat_and_synthetics_disabled.php @@ -63,7 +63,8 @@ [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/drupal6/test_cat_disabled.php b/tests/integration/external/drupal6/test_cat_disabled.php index fc6fef0be..286038536 100644 --- a/tests/integration/external/drupal6/test_cat_disabled.php +++ b/tests/integration/external/drupal6/test_cat_disabled.php @@ -42,7 +42,8 @@ [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 f7500fd6b..16454e81f 100644 --- a/tests/integration/external/drupal6/test_cross_process_empty_headers.php +++ b/tests/integration/external/drupal6/test_cross_process_empty_headers.php @@ -45,7 +45,8 @@ [{"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]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 b5fe8ce79..f980edc23 100644 --- a/tests/integration/external/drupal6/test_cross_process_existing_header.php +++ b/tests/integration/external/drupal6/test_cross_process_existing_header.php @@ -45,7 +45,8 @@ [{"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]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 9025c5eec..045dc9b40 100644 --- a/tests/integration/external/drupal6/test_cross_process_no_headers.php +++ b/tests/integration/external/drupal6/test_cross_process_no_headers.php @@ -45,7 +45,8 @@ [{"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]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/drupal6/test_dt_empty_headers.php b/tests/integration/external/drupal6/test_dt_empty_headers.php index 964347339..aaffe43d9 100644 --- a/tests/integration/external/drupal6/test_dt_empty_headers.php +++ b/tests/integration/external/drupal6/test_dt_empty_headers.php @@ -46,7 +46,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/drupal6/test_dt_existing_headers.php b/tests/integration/external/drupal6/test_dt_existing_headers.php index c2f9f7d0f..9d98d4415 100644 --- a/tests/integration/external/drupal6/test_dt_existing_headers.php +++ b/tests/integration/external/drupal6/test_dt_existing_headers.php @@ -46,7 +46,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 bf593565b..cde5ba877 100644 --- a/tests/integration/external/drupal6/test_dt_newrelic_header_disabled.php +++ b/tests/integration/external/drupal6/test_dt_newrelic_header_disabled.php @@ -45,7 +45,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/drupal6/test_dt_no_headers.php b/tests/integration/external/drupal6/test_dt_no_headers.php index 8060c353e..2c6460684 100644 --- a/tests/integration/external/drupal6/test_dt_no_headers.php +++ b/tests/integration/external/drupal6/test_dt_no_headers.php @@ -45,7 +45,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/drupal6/test_multiple_calls.php b/tests/integration/external/drupal6/test_multiple_calls.php index a983a0ab7..6650e71e7 100644 --- a/tests/integration/external/drupal6/test_multiple_calls.php +++ b/tests/integration/external/drupal6/test_multiple_calls.php @@ -39,7 +39,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/drupal6/test_synthetics.php b/tests/integration/external/drupal6/test_synthetics.php index 2203dbbb1..e03ce3734 100644 --- a/tests/integration/external/drupal6/test_synthetics.php +++ b/tests/integration/external/drupal6/test_synthetics.php @@ -67,7 +67,8 @@ [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/drupal6/test_synthetics_disabled.php b/tests/integration/external/drupal6/test_synthetics_disabled.php index 45f99a634..ca2a4b64d 100644 --- a/tests/integration/external/drupal6/test_synthetics_disabled.php +++ b/tests/integration/external/drupal6/test_synthetics_disabled.php @@ -64,7 +64,8 @@ [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 6211d4479..26e00116c 100644 --- a/tests/integration/external/drupal6/test_synthetics_with_cat_disabled.php +++ b/tests/integration/external/drupal6/test_synthetics_with_cat_disabled.php @@ -65,7 +65,8 @@ [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/drupal6/test_synthetics_with_dt.php b/tests/integration/external/drupal6/test_synthetics_with_dt.php index d42dbd5c0..031160499 100644 --- a/tests/integration/external/drupal6/test_synthetics_with_dt.php +++ b/tests/integration/external/drupal6/test_synthetics_with_dt.php @@ -67,7 +67,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 1f0aec4c8..d187e5945 100644 --- a/tests/integration/external/drupal7/test_bad_params_integer_headers.php +++ b/tests/integration/external/drupal7/test_bad_params_integer_headers.php @@ -40,7 +40,8 @@ [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"External/127.0.0.1/all", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/drupal7/test_bad_params_integer_headers.php8.php b/tests/integration/external/drupal7/test_bad_params_integer_headers.php8.php index 36cf6b0f1..4487a999b 100644 --- a/tests/integration/external/drupal7/test_bad_params_integer_headers.php8.php +++ b/tests/integration/external/drupal7/test_bad_params_integer_headers.php8.php @@ -25,17 +25,18 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [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":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [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/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 20be1df50..0e7fb28d0 100644 --- a/tests/integration/external/drupal7/test_bad_params_integer_options.php +++ b/tests/integration/external/drupal7/test_bad_params_integer_options.php @@ -32,7 +32,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 fe9463431..f7dd6c2ce 100644 --- a/tests/integration/external/drupal7/test_bad_params_null_headers.php +++ b/tests/integration/external/drupal7/test_bad_params_null_headers.php @@ -40,7 +40,8 @@ [{"name":"External/allOther"}, [1, "??", "??", "??", "??", "??"]], [{"name":"External/127.0.0.1/all", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/drupal7/test_bad_params_null_headers.php8.php b/tests/integration/external/drupal7/test_bad_params_null_headers.php8.php index 1189821b1..e3378de9b 100644 --- a/tests/integration/external/drupal7/test_bad_params_null_headers.php8.php +++ b/tests/integration/external/drupal7/test_bad_params_null_headers.php8.php @@ -25,17 +25,18 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name": "Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [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":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [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/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 1db7121b5..946b04876 100644 --- a/tests/integration/external/drupal7/test_bad_params_null_options.php +++ b/tests/integration/external/drupal7/test_bad_params_null_options.php @@ -36,7 +36,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/drupal7/test_bad_url.php b/tests/integration/external/drupal7/test_bad_url.php index 8729feae8..294404326 100644 --- a/tests/integration/external/drupal7/test_bad_url.php +++ b/tests/integration/external/drupal7/test_bad_url.php @@ -34,7 +34,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/drupal7/test_basic.php b/tests/integration/external/drupal7/test_basic.php index ee8db6724..5efdf2488 100644 --- a/tests/integration/external/drupal7/test_basic.php +++ b/tests/integration/external/drupal7/test_basic.php @@ -37,7 +37,8 @@ [{"name":"External/127.0.0.1/all", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 58d6fdfb0..e9c1a99a9 100644 --- a/tests/integration/external/drupal7/test_cat_and_synthetics_disabled.php +++ b/tests/integration/external/drupal7/test_cat_and_synthetics_disabled.php @@ -63,7 +63,8 @@ [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/drupal7/test_cat_disabled.php b/tests/integration/external/drupal7/test_cat_disabled.php index 98c7cbde8..57d909142 100644 --- a/tests/integration/external/drupal7/test_cat_disabled.php +++ b/tests/integration/external/drupal7/test_cat_disabled.php @@ -46,7 +46,8 @@ [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 b9aa2d73b..607a90382 100644 --- a/tests/integration/external/drupal7/test_cross_process_empty_headers.php +++ b/tests/integration/external/drupal7/test_cross_process_empty_headers.php @@ -45,7 +45,8 @@ [{"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]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 a583181c9..2b2babb31 100644 --- a/tests/integration/external/drupal7/test_cross_process_empty_options.php +++ b/tests/integration/external/drupal7/test_cross_process_empty_options.php @@ -45,7 +45,8 @@ [{"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]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 2c8ff316b..9429f974f 100644 --- a/tests/integration/external/drupal7/test_cross_process_existing_header.php +++ b/tests/integration/external/drupal7/test_cross_process_existing_header.php @@ -49,7 +49,8 @@ [{"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]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 e873a7a50..2c60d4fee 100644 --- a/tests/integration/external/drupal7/test_cross_process_no_options.php +++ b/tests/integration/external/drupal7/test_cross_process_no_options.php @@ -45,7 +45,8 @@ [{"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]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/drupal7/test_dt_empty_headers.php b/tests/integration/external/drupal7/test_dt_empty_headers.php index a228bc11b..9a6a08249 100644 --- a/tests/integration/external/drupal7/test_dt_empty_headers.php +++ b/tests/integration/external/drupal7/test_dt_empty_headers.php @@ -46,7 +46,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/drupal7/test_dt_existing_headers.php b/tests/integration/external/drupal7/test_dt_existing_headers.php index 31c0a4f18..a701bd0f6 100644 --- a/tests/integration/external/drupal7/test_dt_existing_headers.php +++ b/tests/integration/external/drupal7/test_dt_existing_headers.php @@ -45,7 +45,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 3651f7fce..73f4fba9f 100644 --- a/tests/integration/external/drupal7/test_dt_newrelic_header_disabled.php +++ b/tests/integration/external/drupal7/test_dt_newrelic_header_disabled.php @@ -45,7 +45,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/drupal7/test_dt_no_headers.php b/tests/integration/external/drupal7/test_dt_no_headers.php index 84e4dd1df..ee6853135 100644 --- a/tests/integration/external/drupal7/test_dt_no_headers.php +++ b/tests/integration/external/drupal7/test_dt_no_headers.php @@ -45,7 +45,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/drupal7/test_multiple_calls.php b/tests/integration/external/drupal7/test_multiple_calls.php index 982b1a6e8..bbacaa2b4 100644 --- a/tests/integration/external/drupal7/test_multiple_calls.php +++ b/tests/integration/external/drupal7/test_multiple_calls.php @@ -38,7 +38,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/drupal7/test_synthetics.php b/tests/integration/external/drupal7/test_synthetics.php index 9a7d6782f..e5a62b696 100644 --- a/tests/integration/external/drupal7/test_synthetics.php +++ b/tests/integration/external/drupal7/test_synthetics.php @@ -63,7 +63,8 @@ [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/drupal7/test_synthetics_disabled.php b/tests/integration/external/drupal7/test_synthetics_disabled.php index 89590c71d..2fb59f4f1 100644 --- a/tests/integration/external/drupal7/test_synthetics_disabled.php +++ b/tests/integration/external/drupal7/test_synthetics_disabled.php @@ -68,7 +68,8 @@ [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 68065bca3..78850fe8b 100644 --- a/tests/integration/external/drupal7/test_synthetics_with_cat_disabled.php +++ b/tests/integration/external/drupal7/test_synthetics_with_cat_disabled.php @@ -64,7 +64,8 @@ [{"name":"WebTransaction/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/drupal7/test_synthetics_with_dt.php b/tests/integration/external/drupal7/test_synthetics_with_dt.php index 386ebef10..19bf6e17b 100644 --- a/tests/integration/external/drupal7/test_synthetics_with_dt.php +++ b/tests/integration/external/drupal7/test_synthetics_with_dt.php @@ -63,7 +63,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 4ed8a7e3b..d0270ea9a 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 @@ -66,7 +66,8 @@ [{"name":"WebTransactionTotalTime/Uri__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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 64f4d5c70..9320fa5b1 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 @@ -70,7 +70,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 1ce724a67..4e71cf19c 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 @@ -52,7 +52,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 d27a0db6a..623f1f2c7 100644 --- a/tests/integration/external/file_get_contents/test_cat_disabled.php +++ b/tests/integration/external/file_get_contents/test_cat_disabled.php @@ -38,7 +38,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 5785fd06c..b4a27eec6 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 @@ -55,7 +55,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 fd184ba69..1824b404a 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 @@ -55,7 +55,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [13, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 a745bbaa7..5d8cfd395 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 @@ -58,7 +58,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [13, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 ba7b5e3e8..255465a91 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 @@ -44,7 +44,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 1eec54186..1ead82632 100644 --- a/tests/integration/external/file_get_contents/test_dt_disabled.php +++ b/tests/integration/external/file_get_contents/test_dt_disabled.php @@ -48,7 +48,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 a009c685e..61a241420 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 @@ -39,7 +39,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 46d5b2446..6a942de0e 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 @@ -44,7 +44,8 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 f6674b95c..f76a9f037 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 @@ -44,7 +44,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 c0120cc4c..a65bc6f5f 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 @@ -61,7 +61,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 183a838ee..1e5df3ed2 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 @@ -88,7 +88,8 @@ [{"name":"WebTransactionTotalTime/Uri__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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 b6ef4ffce..752a92c15 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 @@ -70,7 +70,8 @@ [{"name":"WebTransactionTotalTime/Uri__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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 17835608c..4650c383a 100644 --- a/tests/integration/external/file_get_contents/test_synthetics_disabled.php +++ b/tests/integration/external/file_get_contents/test_synthetics_disabled.php @@ -67,7 +67,8 @@ [{"name":"WebTransactionTotalTime/Uri__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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 cb6adf4b8..768a20a9c 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 @@ -74,7 +74,8 @@ [{"name":"WebTransactionTotalTime/Uri__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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 8ad02a415..581e805c4 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 @@ -68,7 +68,8 @@ [{"name":"WebTransactionTotalTime/Uri__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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 72b816cd0..e4517d8a9 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 @@ -69,7 +69,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 f6a829dd4..cf35c1c6b 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 @@ -72,7 +72,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/guzzle5/test_cat.php b/tests/integration/external/guzzle5/test_cat.php index 2b74411ff..9e01532df 100644 --- a/tests/integration/external/guzzle5/test_cat.php +++ b/tests/integration/external/guzzle5/test_cat.php @@ -55,7 +55,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/guzzle5/test_dt.php b/tests/integration/external/guzzle5/test_dt.php index f5f8d1aee..4992d91f4 100644 --- a/tests/integration/external/guzzle5/test_dt.php +++ b/tests/integration/external/guzzle5/test_dt.php @@ -48,7 +48,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/guzzle5/test_dt_newrelic_header_disabled.php b/tests/integration/external/guzzle5/test_dt_newrelic_header_disabled.php index 2c85df9e8..0a3352ba6 100644 --- a/tests/integration/external/guzzle5/test_dt_newrelic_header_disabled.php +++ b/tests/integration/external/guzzle5/test_dt_newrelic_header_disabled.php @@ -48,7 +48,8 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/guzzle5/test_dt_synthetics.php b/tests/integration/external/guzzle5/test_dt_synthetics.php index 4786ea923..042f9f3eb 100644 --- a/tests/integration/external/guzzle5/test_dt_synthetics.php +++ b/tests/integration/external/guzzle5/test_dt_synthetics.php @@ -79,7 +79,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, ["??", "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/guzzle5/test_dt_synthetics_logging_off.php b/tests/integration/external/guzzle5/test_dt_synthetics_logging_off.php index ac2b9f200..559517104 100644 --- a/tests/integration/external/guzzle5/test_dt_synthetics_logging_off.php +++ b/tests/integration/external/guzzle5/test_dt_synthetics_logging_off.php @@ -82,7 +82,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, ["??", "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/guzzle5/test_no_cat_no_dt.php b/tests/integration/external/guzzle5/test_no_cat_no_dt.php index 35a34feb5..241a01fa9 100644 --- a/tests/integration/external/guzzle5/test_no_cat_no_dt.php +++ b/tests/integration/external/guzzle5/test_no_cat_no_dt.php @@ -45,7 +45,8 @@ [{"name":"Supportability/library/Guzzle 4-5/detected"}, [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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/guzzle6/test_cat.php b/tests/integration/external/guzzle6/test_cat.php index 9f4b40f2c..834185ad4 100644 --- a/tests/integration/external/guzzle6/test_cat.php +++ b/tests/integration/external/guzzle6/test_cat.php @@ -56,7 +56,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/guzzle6/test_dt.php b/tests/integration/external/guzzle6/test_dt.php index da4d6584c..d405abdfa 100644 --- a/tests/integration/external/guzzle6/test_dt.php +++ b/tests/integration/external/guzzle6/test_dt.php @@ -51,7 +51,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/guzzle6/test_dt_newrelic_header_disabled.php b/tests/integration/external/guzzle6/test_dt_newrelic_header_disabled.php index ad87177dd..290ca52e7 100644 --- a/tests/integration/external/guzzle6/test_dt_newrelic_header_disabled.php +++ b/tests/integration/external/guzzle6/test_dt_newrelic_header_disabled.php @@ -51,7 +51,8 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/guzzle6/test_dt_synthetics.php b/tests/integration/external/guzzle6/test_dt_synthetics.php index ce80463ad..ccfc8ac31 100644 --- a/tests/integration/external/guzzle6/test_dt_synthetics.php +++ b/tests/integration/external/guzzle6/test_dt_synthetics.php @@ -74,7 +74,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/guzzle6/test_dt_synthetics_logging_off.php b/tests/integration/external/guzzle6/test_dt_synthetics_logging_off.php index c843f9571..3981082e5 100644 --- a/tests/integration/external/guzzle6/test_dt_synthetics_logging_off.php +++ b/tests/integration/external/guzzle6/test_dt_synthetics_logging_off.php @@ -77,7 +77,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/guzzle6/test_no_cat_no_dt.php b/tests/integration/external/guzzle6/test_no_cat_no_dt.php index eb60de85c..8d42dff85 100644 --- a/tests/integration/external/guzzle6/test_no_cat_no_dt.php +++ b/tests/integration/external/guzzle6/test_no_cat_no_dt.php @@ -46,7 +46,8 @@ [{"name":"Supportability/library/Guzzle 6/detected"}, [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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/guzzle7/test_cat.php b/tests/integration/external/guzzle7/test_cat.php index 23686fa53..c865cc94f 100644 --- a/tests/integration/external/guzzle7/test_cat.php +++ b/tests/integration/external/guzzle7/test_cat.php @@ -56,7 +56,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/guzzle7/test_dt.php b/tests/integration/external/guzzle7/test_dt.php index 0b82d6efb..3b4375c5d 100644 --- a/tests/integration/external/guzzle7/test_dt.php +++ b/tests/integration/external/guzzle7/test_dt.php @@ -51,7 +51,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/guzzle7/test_dt_newrelic_header_disabled.php b/tests/integration/external/guzzle7/test_dt_newrelic_header_disabled.php index 6587c3e4c..3f98fd74d 100644 --- a/tests/integration/external/guzzle7/test_dt_newrelic_header_disabled.php +++ b/tests/integration/external/guzzle7/test_dt_newrelic_header_disabled.php @@ -51,7 +51,8 @@ [{"name":"Supportability/TraceContext/Create/Success"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/guzzle7/test_dt_synthetics.php b/tests/integration/external/guzzle7/test_dt_synthetics.php index dd293905b..18541bfad 100644 --- a/tests/integration/external/guzzle7/test_dt_synthetics.php +++ b/tests/integration/external/guzzle7/test_dt_synthetics.php @@ -74,7 +74,8 @@ [{"name":"Supportability/DistributedTrace/CreatePayload/Success"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/guzzle7/test_no_cat_no_dt.php b/tests/integration/external/guzzle7/test_no_cat_no_dt.php index ad1996e3a..5d6413715 100644 --- a/tests/integration/external/guzzle7/test_no_cat_no_dt.php +++ b/tests/integration/external/guzzle7/test_no_cat_no_dt.php @@ -46,7 +46,8 @@ [{"name":"Supportability/library/Guzzle 6/detected"}, [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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/http/test_v1_cat.php b/tests/integration/external/http/test_v1_cat.php index 82fb7dc48..87f71f68f 100644 --- a/tests/integration/external/http/test_v1_cat.php +++ b/tests/integration/external/http/test_v1_cat.php @@ -57,7 +57,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/http/test_v1_cat_and_synthetics_disabled.php b/tests/integration/external/http/test_v1_cat_and_synthetics_disabled.php index f3b1cb540..7392577df 100644 --- a/tests/integration/external/http/test_v1_cat_and_synthetics_disabled.php +++ b/tests/integration/external/http/test_v1_cat_and_synthetics_disabled.php @@ -75,7 +75,8 @@ [{"name":"WebTransactionTotalTime/Uri__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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/http/test_v1_cat_disabled.php b/tests/integration/external/http/test_v1_cat_disabled.php index f702d5334..5ab092bda 100644 --- a/tests/integration/external/http/test_v1_cat_disabled.php +++ b/tests/integration/external/http/test_v1_cat_disabled.php @@ -46,7 +46,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/http/test_v1_synthetics.php b/tests/integration/external/http/test_v1_synthetics.php index 29644e791..5b85fe973 100644 --- a/tests/integration/external/http/test_v1_synthetics.php +++ b/tests/integration/external/http/test_v1_synthetics.php @@ -75,7 +75,8 @@ [{"name":"WebTransactionTotalTime/Uri__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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/http/test_v1_synthetics_disabled.php b/tests/integration/external/http/test_v1_synthetics_disabled.php index f5c700dad..e40416334 100644 --- a/tests/integration/external/http/test_v1_synthetics_disabled.php +++ b/tests/integration/external/http/test_v1_synthetics_disabled.php @@ -78,7 +78,8 @@ [{"name":"WebTransactionTotalTime/Uri__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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/http/test_v1_synthetics_with_cat_disabled.php b/tests/integration/external/http/test_v1_synthetics_with_cat_disabled.php index f7fcf1c46..fcf9c1556 100644 --- a/tests/integration/external/http/test_v1_synthetics_with_cat_disabled.php +++ b/tests/integration/external/http/test_v1_synthetics_with_cat_disabled.php @@ -77,7 +77,8 @@ [{"name":"WebTransactionTotalTime/Uri__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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/http/test_v2_cat.php b/tests/integration/external/http/test_v2_cat.php index 742e92a4c..2d7c759a6 100644 --- a/tests/integration/external/http/test_v2_cat.php +++ b/tests/integration/external/http/test_v2_cat.php @@ -44,7 +44,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/external/test_curl_multi_add_remove_handles.php b/tests/integration/external/test_curl_multi_add_remove_handles.php index bb1e2bfa6..fb913ee32 100644 --- a/tests/integration/external/test_curl_multi_add_remove_handles.php +++ b/tests/integration/external/test_curl_multi_add_remove_handles.php @@ -38,7 +38,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ From 83b2cbfe91c90f0f1c04724c5483c760bc0dda20 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Mon, 24 Feb 2025 15:56:53 -0500 Subject: [PATCH 32/60] tests(agent): Updates integration/api tests to have log labels metric - added PHP5 tests - these are not for PHP 5 but are intended to run on PHP5+! --- .../test_span_event_parameter_duplicate.php5.php | 3 ++- .../test_span_event_parameter_duplicate_te_off.php5.php | 3 ++- .../test_span_event_parameter_filter.php5.php | 3 ++- .../test_span_event_parameter_filter_logging_off.php5.php | 7 ++++--- .../test_span_event_parameter_max_key.php5.php | 3 ++- .../test_span_event_parameter_max_key_te_off.php5.php | 3 ++- .../test_span_event_parameter_max_parameters.php5.php | 3 ++- .../test_span_event_parameter_max_value.php5.php | 3 ++- .../test_span_event_parameter_max_value_te_off.php5.php | 3 ++- .../test_span_event_parameter_maxplus_parameters.php5.php | 3 ++- ...span_event_parameter_maxplus_parameters_te_off.php5.php | 3 ++- ...arameter_maxplus_parameters_te_off_logging_off.php5.php | 3 ++- .../test_span_event_parameter_maxplus_span_and_te.php5.php | 3 ++- ...pan_event_parameter_maxplus_span_and_te_te_off.php5.php | 3 ++- .../test_span_event_parameter_overwrite.php5.php | 3 ++- .../test_span_event_parameter_te_off.php5.php | 3 ++- .../test_span_event_parameter_types.php5.php | 3 ++- 17 files changed, 36 insertions(+), 19 deletions(-) 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 2ced24f1d..bc69c7127 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 @@ -133,7 +133,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 6726eda98..264c78480 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 @@ -107,7 +107,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 2e97dc5f2..9df95dc9a 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 @@ -94,7 +94,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 0f4804782..50ec0d519 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 @@ -95,9 +95,10 @@ [{"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"}, [4, 0, 0, 0, 0, 0]], - [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 d181a4691..89b899f62 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 @@ -94,7 +94,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 c3060a4dd..773d82280 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 @@ -99,7 +99,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 71d1cca08..bfa4ad71d 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 @@ -216,7 +216,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 f1896cd76..3fa6a5756 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 @@ -94,7 +94,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 fe1b596fc..c4b08d4d1 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 @@ -104,7 +104,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 0e2cf9f14..198a51736 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 @@ -216,7 +216,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 a9837b59c..33323e4b7 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 @@ -222,7 +222,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 4489ff0fa..fe88c8585 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 @@ -225,7 +225,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 15625a351..282cb1a27 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 @@ -343,7 +343,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 ed843a542..4fcce5000 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 @@ -257,7 +257,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 2603a0908..f51aef043 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 @@ -95,7 +95,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 95fc61f19..ea0d40f65 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 @@ -96,7 +96,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 e26ea6bc3..f85038a34 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 @@ -95,7 +95,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ From 1ed7d0327a345cc837ab455be9d19fea6bcc7f80 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Mon, 24 Feb 2025 16:00:37 -0500 Subject: [PATCH 33/60] tests(agent): Updates integration/frameworks tests to have log labels metric --- .../drupal/test_invoke_all_with.php | 3 +- .../drupal/test_module_invoke_all.php | 33 +++++++++---------- .../drupal/test_module_invoke_all.php8.php | 31 +++++++++-------- .../frameworks/laravel/test_artisan_name.php | 3 +- .../laravel/test_artisan_name_logging_off.php | 3 +- .../laravel/test_artisan_name_non_input.php | 3 +- .../laravel/test_artisan_name_non_string.php | 3 +- .../frameworks/magento/test_temp_tables.php | 9 ++--- .../magento/test_temp_tables_logging_off.php | 9 ++--- .../frameworks/silex/test_basic.php | 3 +- .../silex/test_basic_logging_off.php | 3 +- .../silex/test_invalid_attributes.php | 3 +- .../frameworks/silex/test_invalid_request.php | 3 +- .../wordpress/test_site_specific_tables.php | 3 +- .../test_site_specific_tables_logging_off.php | 3 +- .../test_wordpress_apply_filters.php | 27 +++++++-------- .../wordpress/test_wordpress_do_action.php | 27 +++++++-------- 17 files changed, 91 insertions(+), 78 deletions(-) diff --git a/tests/integration/frameworks/drupal/test_invoke_all_with.php b/tests/integration/frameworks/drupal/test_invoke_all_with.php index 289d4e69a..7380e4562 100644 --- a/tests/integration/frameworks/drupal/test_invoke_all_with.php +++ b/tests/integration/frameworks/drupal/test_invoke_all_with.php @@ -57,7 +57,8 @@ "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Custom/invoke_callback", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/frameworks/drupal/test_module_invoke_all.php b/tests/integration/frameworks/drupal/test_module_invoke_all.php index c9b70e1cf..0d5b235e2 100644 --- a/tests/integration/frameworks/drupal/test_module_invoke_all.php +++ b/tests/integration/frameworks/drupal/test_module_invoke_all.php @@ -35,23 +35,22 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, - [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Framework/Drupal/Hook/hook_with_arg"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Framework/Drupal/Hook/f"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Framework/Drupal/Hook/g"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Framework/Drupal/Hook/h"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Framework/Drupal/Module/module"}, [5, "??", "??", "??", "??", "??"]], - [{"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/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Framework/Drupal/Hook/hook_with_arg"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Framework/Drupal/Hook/f"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Framework/Drupal/Hook/g"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Framework/Drupal/Hook/h"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Framework/Drupal/Module/module"}, [5, "??", "??", "??", "??", "??"]], + [{"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/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/frameworks/drupal/test_module_invoke_all.php8.php b/tests/integration/frameworks/drupal/test_module_invoke_all.php8.php index fc694e039..ef94baedc 100644 --- a/tests/integration/frameworks/drupal/test_module_invoke_all.php8.php +++ b/tests/integration/frameworks/drupal/test_module_invoke_all.php8.php @@ -36,22 +36,21 @@ "?? timeframe start", "?? timeframe stop", [ - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, - [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Framework/Drupal/Hook/hook_with_arg"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Framework/Drupal/Hook/f"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Framework/Drupal/Hook/g"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Framework/Drupal/Module/module"}, [3, "??", "??", "??", "??", "??"]], - [{"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/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Framework/Drupal/Hook/hook_with_arg"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Framework/Drupal/Hook/f"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Framework/Drupal/Hook/g"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Framework/Drupal/Module/module"}, [3, "??", "??", "??", "??", "??"]], + [{"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/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/frameworks/laravel/test_artisan_name.php b/tests/integration/frameworks/laravel/test_artisan_name.php index 782620d8f..c9a887e1a 100644 --- a/tests/integration/frameworks/laravel/test_artisan_name.php +++ b/tests/integration/frameworks/laravel/test_artisan_name.php @@ -28,7 +28,8 @@ [{"name":"Supportability/framework/Laravel/forced"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/frameworks/laravel/test_artisan_name_logging_off.php b/tests/integration/frameworks/laravel/test_artisan_name_logging_off.php index 92f012815..e5105665a 100644 --- a/tests/integration/frameworks/laravel/test_artisan_name_logging_off.php +++ b/tests/integration/frameworks/laravel/test_artisan_name_logging_off.php @@ -31,7 +31,8 @@ [{"name":"Supportability/framework/Laravel/forced"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/frameworks/laravel/test_artisan_name_non_input.php b/tests/integration/frameworks/laravel/test_artisan_name_non_input.php index c403da89d..8e0dcb166 100644 --- a/tests/integration/frameworks/laravel/test_artisan_name_non_input.php +++ b/tests/integration/frameworks/laravel/test_artisan_name_non_input.php @@ -28,7 +28,8 @@ [{"name":"Supportability/framework/Laravel/forced"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/frameworks/laravel/test_artisan_name_non_string.php b/tests/integration/frameworks/laravel/test_artisan_name_non_string.php index d255f3b10..d2d1855b6 100644 --- a/tests/integration/frameworks/laravel/test_artisan_name_non_string.php +++ b/tests/integration/frameworks/laravel/test_artisan_name_non_string.php @@ -28,7 +28,8 @@ [{"name":"Supportability/framework/Laravel/forced"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/frameworks/magento/test_temp_tables.php b/tests/integration/frameworks/magento/test_temp_tables.php index 8fb8b0550..3328f6a8f 100644 --- a/tests/integration/frameworks/magento/test_temp_tables.php +++ b/tests/integration/frameworks/magento/test_temp_tables.php @@ -39,9 +39,9 @@ [{"name":"Datastore/statement/SQLite/search_/create"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/SQLite/search_/drop"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/SQLite/search_/insert"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/statement/SQLite/search_tmp_*\/create"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/statement/SQLite/search_tmp_*\/drop"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/statement/SQLite/search_tmp_*\/insert"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/statement/SQLite/search_tmp_*\/create"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/statement/SQLite/search_tmp_*\/drop"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/statement/SQLite/search_tmp_*\/insert"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/SQLite/search_tmp_/create"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/SQLite/search_tmp_/drop"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/SQLite/search_tmp_/insert"}, [1, "??", "??", "??", "??", "??"]], @@ -70,7 +70,8 @@ "scope":"OtherTransaction/Action/unknown"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/frameworks/magento/test_temp_tables_logging_off.php b/tests/integration/frameworks/magento/test_temp_tables_logging_off.php index 52568e735..74de05a78 100644 --- a/tests/integration/frameworks/magento/test_temp_tables_logging_off.php +++ b/tests/integration/frameworks/magento/test_temp_tables_logging_off.php @@ -42,9 +42,9 @@ [{"name":"Datastore/statement/SQLite/search_/create"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/SQLite/search_/drop"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/SQLite/search_/insert"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/statement/SQLite/search_tmp_*\/create"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/statement/SQLite/search_tmp_*\/drop"}, [2, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/statement/SQLite/search_tmp_*\/insert"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/statement/SQLite/search_tmp_*\/create"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/statement/SQLite/search_tmp_*\/drop"}, [2, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/statement/SQLite/search_tmp_*\/insert"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/SQLite/search_tmp_/create"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/SQLite/search_tmp_/drop"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/statement/SQLite/search_tmp_/insert"}, [1, "??", "??", "??", "??", "??"]], @@ -73,7 +73,8 @@ "scope":"OtherTransaction/Action/unknown"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/frameworks/silex/test_basic.php b/tests/integration/frameworks/silex/test_basic.php index 945b198ec..5bf4a170c 100644 --- a/tests/integration/frameworks/silex/test_basic.php +++ b/tests/integration/frameworks/silex/test_basic.php @@ -28,7 +28,8 @@ [{"name":"Supportability/framework/Silex/detected"}, [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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/frameworks/silex/test_basic_logging_off.php b/tests/integration/frameworks/silex/test_basic_logging_off.php index cb8f849bc..240450840 100644 --- a/tests/integration/frameworks/silex/test_basic_logging_off.php +++ b/tests/integration/frameworks/silex/test_basic_logging_off.php @@ -31,7 +31,8 @@ [{"name":"Supportability/framework/Silex/detected"}, [1, 0, 0, 0, 0, 0]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/frameworks/silex/test_invalid_attributes.php b/tests/integration/frameworks/silex/test_invalid_attributes.php index dc0cdd5a0..cb4fcc153 100644 --- a/tests/integration/frameworks/silex/test_invalid_attributes.php +++ b/tests/integration/frameworks/silex/test_invalid_attributes.php @@ -28,7 +28,8 @@ [{"name":"Supportability/framework/Silex/detected"}, [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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/frameworks/silex/test_invalid_request.php b/tests/integration/frameworks/silex/test_invalid_request.php index 090f8db38..3a428ae71 100644 --- a/tests/integration/frameworks/silex/test_invalid_request.php +++ b/tests/integration/frameworks/silex/test_invalid_request.php @@ -27,7 +27,8 @@ [{"name":"Supportability/framework/Silex/detected"}, [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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/frameworks/wordpress/test_site_specific_tables.php b/tests/integration/frameworks/wordpress/test_site_specific_tables.php index 941fabcf6..c2d054067 100644 --- a/tests/integration/frameworks/wordpress/test_site_specific_tables.php +++ b/tests/integration/frameworks/wordpress/test_site_specific_tables.php @@ -70,7 +70,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/frameworks/wordpress/test_site_specific_tables_logging_off.php b/tests/integration/frameworks/wordpress/test_site_specific_tables_logging_off.php index c1ea98d20..96ebd32c9 100644 --- a/tests/integration/frameworks/wordpress/test_site_specific_tables_logging_off.php +++ b/tests/integration/frameworks/wordpress/test_site_specific_tables_logging_off.php @@ -73,7 +73,8 @@ "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/frameworks/wordpress/test_wordpress_apply_filters.php b/tests/integration/frameworks/wordpress/test_wordpress_apply_filters.php index 062f6d4e6..7893fa4da 100644 --- a/tests/integration/frameworks/wordpress/test_wordpress_apply_filters.php +++ b/tests/integration/frameworks/wordpress/test_wordpress_apply_filters.php @@ -37,19 +37,20 @@ "?? start time", "?? stop time", [ - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Framework/WordPress/Hook/f"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Framework/WordPress/Hook/g"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Framework/WordPress/Hook/h"}, [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, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/framework/WordPress/forced"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Framework/WordPress/Hook/f"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Framework/WordPress/Hook/g"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Framework/WordPress/Hook/h"}, [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, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/WordPress/forced"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/frameworks/wordpress/test_wordpress_do_action.php b/tests/integration/frameworks/wordpress/test_wordpress_do_action.php index cad1bf607..2f208cc39 100644 --- a/tests/integration/frameworks/wordpress/test_wordpress_do_action.php +++ b/tests/integration/frameworks/wordpress/test_wordpress_do_action.php @@ -36,19 +36,20 @@ "?? start time", "?? stop time", [ - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Framework/WordPress/Hook/f"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Framework/WordPress/Hook/g"}, [1, "??", "??", "??", "??", "??"]], - [{"name": "Framework/WordPress/Hook/h"}, [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, "??", "??", "??", "??", "??"]], - [{"name": "Supportability/framework/WordPress/forced"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Framework/WordPress/Hook/f"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Framework/WordPress/Hook/g"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Framework/WordPress/Hook/h"}, [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, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/framework/WordPress/forced"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ From c6faa75bd75fa235dffb8fb366594ab0a84df580 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Mon, 24 Feb 2025 16:04:19 -0500 Subject: [PATCH 34/60] tests(agent): Updates integration/ini tests to have log labels metric --- .../ini/test_force_framework_0.php | 3 ++- .../ini/test_force_framework_1.php | 3 ++- .../ini/test_force_framework_2.php | 3 ++- .../ini/test_force_framework_3.php | 3 ++- .../ini/test_force_framework_5.php | 3 ++- .../ini/test_force_framework_6.php | 3 ++- tests/integration/ini/test_ini_001.php | 3 ++- tests/integration/ini/test_ini_002.php | 3 ++- tests/integration/ini/test_ini_003.php | 3 ++- .../ini/test_ini_003_logging_off.php | 3 ++- tests/integration/ini/test_ini_004.php | 3 ++- .../test_transaction_tracer_max_segments.php | 3 ++- ...transaction_tracer_max_segments_nested.php | 21 ++++++++++--------- ...action_tracer_max_segments_nested.php5.php | 3 ++- ...transaction_tracer_max_segments_no_cap.php | 3 ++- ...ion_tracer_max_segments_with_datastore.php | 5 +++-- ...racer_max_segments_with_datastore.php5.php | 3 ++- 17 files changed, 44 insertions(+), 27 deletions(-) diff --git a/tests/integration/ini/test_force_framework_0.php b/tests/integration/ini/test_force_framework_0.php index c50bf7987..0cedbb2af 100644 --- a/tests/integration/ini/test_force_framework_0.php +++ b/tests/integration/ini/test_force_framework_0.php @@ -27,7 +27,8 @@ [{"name":"Supportability/framework/None/forced"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/ini/test_force_framework_1.php b/tests/integration/ini/test_force_framework_1.php index 09a681ddc..09d4bb496 100644 --- a/tests/integration/ini/test_force_framework_1.php +++ b/tests/integration/ini/test_force_framework_1.php @@ -27,7 +27,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/ini/test_force_framework_2.php b/tests/integration/ini/test_force_framework_2.php index 1da2288a0..96c87d21e 100644 --- a/tests/integration/ini/test_force_framework_2.php +++ b/tests/integration/ini/test_force_framework_2.php @@ -28,7 +28,8 @@ [{"name":"Supportability/framework/Drupal8/forced"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/ini/test_force_framework_3.php b/tests/integration/ini/test_force_framework_3.php index 5e9832f9b..e2e8f8e51 100644 --- a/tests/integration/ini/test_force_framework_3.php +++ b/tests/integration/ini/test_force_framework_3.php @@ -33,7 +33,8 @@ [{"name":"Supportability/framework/CakePHP/forced"}, [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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/ini/test_force_framework_5.php b/tests/integration/ini/test_force_framework_5.php index 8ed595866..e8df9eaa2 100644 --- a/tests/integration/ini/test_force_framework_5.php +++ b/tests/integration/ini/test_force_framework_5.php @@ -31,7 +31,8 @@ [{"name":"Supportability/framework/Drupal/forced"}, [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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/ini/test_force_framework_6.php b/tests/integration/ini/test_force_framework_6.php index 9e18e6856..40af734a1 100644 --- a/tests/integration/ini/test_force_framework_6.php +++ b/tests/integration/ini/test_force_framework_6.php @@ -29,7 +29,8 @@ [{"name":"Supportability/execute/user/call_count"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/ini/test_ini_001.php b/tests/integration/ini/test_ini_001.php index dc7617dca..a0e96593f 100644 --- a/tests/integration/ini/test_ini_001.php +++ b/tests/integration/ini/test_ini_001.php @@ -26,7 +26,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/ini/test_ini_002.php b/tests/integration/ini/test_ini_002.php index 0f7830d9c..aeadd6250 100644 --- a/tests/integration/ini/test_ini_002.php +++ b/tests/integration/ini/test_ini_002.php @@ -26,7 +26,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/ini/test_ini_003.php b/tests/integration/ini/test_ini_003.php index d4a61d265..ae1d18936 100644 --- a/tests/integration/ini/test_ini_003.php +++ b/tests/integration/ini/test_ini_003.php @@ -48,7 +48,8 @@ [{"name":"OtherTransaction/Function/f_0"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/ini/test_ini_003_logging_off.php b/tests/integration/ini/test_ini_003_logging_off.php index 8d022758e..87a146e37 100644 --- a/tests/integration/ini/test_ini_003_logging_off.php +++ b/tests/integration/ini/test_ini_003_logging_off.php @@ -51,7 +51,8 @@ [{"name":"OtherTransaction/Function/f_0"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/ini/test_ini_004.php b/tests/integration/ini/test_ini_004.php index 9eb3350b9..298d6a85b 100644 --- a/tests/integration/ini/test_ini_004.php +++ b/tests/integration/ini/test_ini_004.php @@ -38,7 +38,8 @@ [{"name":"Supportability/InstrumentedFunction/Foobar::interesting_method"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/ini/test_transaction_tracer_max_segments.php b/tests/integration/ini/test_transaction_tracer_max_segments.php index 758b570e1..3598ff3d4 100644 --- a/tests/integration/ini/test_transaction_tracer_max_segments.php +++ b/tests/integration/ini/test_transaction_tracer_max_segments.php @@ -73,7 +73,8 @@ [{"name":"Supportability/api/add_custom_tracer"}, [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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/ini/test_transaction_tracer_max_segments_nested.php b/tests/integration/ini/test_transaction_tracer_max_segments_nested.php index 7a97a6448..f00ba78ff 100644 --- a/tests/integration/ini/test_transaction_tracer_max_segments_nested.php +++ b/tests/integration/ini/test_transaction_tracer_max_segments_nested.php @@ -43,7 +43,7 @@ [ "?? start time", "?? end time", "`1", { - "code.lineno": 187, + "code.lineno": 188, "code.filepath": "__FILE__", "code.function": "great_grandmother" }, @@ -51,7 +51,7 @@ [ "?? start time", "?? end time", "`2", { - "code.lineno": 182, + "code.lineno": 183, "code.filepath": "__FILE__", "code.function": "grandmother" }, @@ -59,7 +59,7 @@ [ "?? start time", "?? end time", "`3", { - "code.lineno": 179, + "code.lineno": 180, "code.filepath": "__FILE__", "code.function": "my_function" }, [] @@ -67,7 +67,7 @@ [ "?? start time", "?? end time", "`3", { - "code.lineno": 179, + "code.lineno": 180, "code.filepath": "__FILE__", "code.function": "my_function" }, [] @@ -75,7 +75,7 @@ [ "?? start time", "?? end time", "`3", { - "code.lineno": 179, + "code.lineno": 180, "code.filepath": "__FILE__", "code.function": "my_function" }, [] @@ -83,7 +83,7 @@ [ "?? start time", "?? end time", "`3", { - "code.lineno": 179, + "code.lineno": 180, "code.filepath": "__FILE__", "code.function": "my_function" }, [] @@ -91,7 +91,7 @@ [ "?? start time", "?? end time", "`3", { - "code.lineno": 179, + "code.lineno": 180, "code.filepath": "__FILE__", "code.function": "my_function" }, [] @@ -99,7 +99,7 @@ [ "?? start time", "?? end time", "`3", { - "code.lineno": 179, + "code.lineno": 180, "code.filepath": "__FILE__", "code.function": "my_function" }, [] @@ -107,7 +107,7 @@ [ "?? start time", "?? end time", "`3", { - "code.lineno": 179, + "code.lineno": 180, "code.filepath": "__FILE__", "code.function": "my_function" }, [] @@ -168,7 +168,8 @@ [{"name":"Supportability/api/add_custom_tracer"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/ini/test_transaction_tracer_max_segments_nested.php5.php b/tests/integration/ini/test_transaction_tracer_max_segments_nested.php5.php index f5fb391c9..d4fc8557c 100644 --- a/tests/integration/ini/test_transaction_tracer_max_segments_nested.php5.php +++ b/tests/integration/ini/test_transaction_tracer_max_segments_nested.php5.php @@ -117,7 +117,8 @@ [{"name":"Supportability/api/add_custom_tracer"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/ini/test_transaction_tracer_max_segments_no_cap.php b/tests/integration/ini/test_transaction_tracer_max_segments_no_cap.php index fe3f05356..fa9b6de80 100644 --- a/tests/integration/ini/test_transaction_tracer_max_segments_no_cap.php +++ b/tests/integration/ini/test_transaction_tracer_max_segments_no_cap.php @@ -73,7 +73,8 @@ [{"name":"Supportability/api/add_custom_tracer"}, [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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/ini/test_transaction_tracer_max_segments_with_datastore.php b/tests/integration/ini/test_transaction_tracer_max_segments_with_datastore.php index cd233aa81..98f4a2cd2 100644 --- a/tests/integration/ini/test_transaction_tracer_max_segments_with_datastore.php +++ b/tests/integration/ini/test_transaction_tracer_max_segments_with_datastore.php @@ -43,7 +43,7 @@ [ "?? start time", "?? end time", "`1", { - "code.lineno": 139, + "code.lineno": 140, "code.filepath": "__FILE__", "code.function": "my_function_3" }, [] @@ -120,7 +120,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/ini/test_transaction_tracer_max_segments_with_datastore.php5.php b/tests/integration/ini/test_transaction_tracer_max_segments_with_datastore.php5.php index 496b522e8..9e6ed5218 100644 --- a/tests/integration/ini/test_transaction_tracer_max_segments_with_datastore.php5.php +++ b/tests/integration/ini/test_transaction_tracer_max_segments_with_datastore.php5.php @@ -109,7 +109,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ From 5ef7858d22584dcf6e5c0f8cdbe76e11b36a92c5 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Mon, 24 Feb 2025 16:05:52 -0500 Subject: [PATCH 35/60] tests(agent): Updates integration/lang tests to have log labels metric --- .../lang/test_generator_5.6-7.0.php | 3 +- .../lang/test_generator_7.1-7.4.php | 3 +- tests/integration/lang/test_generator_8.0.php | 31 +++++++++---------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/tests/integration/lang/test_generator_5.6-7.0.php b/tests/integration/lang/test_generator_5.6-7.0.php index 21c99c787..d709aba96 100644 --- a/tests/integration/lang/test_generator_5.6-7.0.php +++ b/tests/integration/lang/test_generator_5.6-7.0.php @@ -46,7 +46,8 @@ [{"name":"Supportability/api/add_custom_tracer"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/lang/test_generator_7.1-7.4.php b/tests/integration/lang/test_generator_7.1-7.4.php index 757cd22d4..9c145c086 100644 --- a/tests/integration/lang/test_generator_7.1-7.4.php +++ b/tests/integration/lang/test_generator_7.1-7.4.php @@ -42,7 +42,8 @@ [{"name":"Supportability/api/add_custom_tracer"}, [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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/lang/test_generator_8.0.php b/tests/integration/lang/test_generator_8.0.php index 62139de98..e7a64cf73 100644 --- a/tests/integration/lang/test_generator_8.0.php +++ b/tests/integration/lang/test_generator_8.0.php @@ -32,22 +32,21 @@ "?? timeframe start", "?? timeframe stop", [ - [{"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"}, - [1, "??", "??", "??", "??", "??"]], - [{"name":"Custom/xrange"}, [11, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Custom/xrange","scope":"OtherTransaction/php__FILE__"}, - [11, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/InstrumentedFunction/xrange"}, [11, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/api/add_custom_tracer"}, [1, "??", "??", "??", "??", "??"]] + [{"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"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Custom/xrange"}, [11, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Custom/xrange", + "scope":"OtherTransaction/php__FILE__"}, [11, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/InstrumentedFunction/xrange"}, [11, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/api/add_custom_tracer"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ From a7595b0c06b458eeeb35dc5fe129c2b0b406a3be Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Mon, 24 Feb 2025 16:07:21 -0500 Subject: [PATCH 36/60] tests(agent): Updates integration/memcache tests to have log labels metric --- tests/integration/memcache/test_add.php | 3 ++- tests/integration/memcache/test_add.php82.php | 3 ++- tests/integration/memcache/test_incr_decr.php | 3 ++- tests/integration/memcache/test_incr_decr.php82.php | 3 ++- tests/integration/memcache/test_memcache_add.php | 3 ++- tests/integration/memcache/test_memcache_add.php82.php | 3 ++- tests/integration/memcache/test_memcache_add_logging_off.php | 3 ++- .../memcache/test_memcache_add_logging_off.php82.php | 3 ++- tests/integration/memcache/test_memcache_incr_decr.php | 3 ++- tests/integration/memcache/test_memcache_incr_decr.php82.php | 3 ++- tests/integration/memcache/test_memcache_replace.php | 3 ++- tests/integration/memcache/test_memcache_replace.php82.php | 3 ++- tests/integration/memcache/test_memcache_set.php | 3 ++- tests/integration/memcache/test_memcache_set.php82.php | 3 ++- tests/integration/memcache/test_replace.php | 3 ++- tests/integration/memcache/test_replace.php82.php | 3 ++- tests/integration/memcache/test_set.php | 3 ++- tests/integration/memcache/test_set.php82.php | 3 ++- 18 files changed, 36 insertions(+), 18 deletions(-) diff --git a/tests/integration/memcache/test_add.php b/tests/integration/memcache/test_add.php index a144c1386..b4f3c6b70 100644 --- a/tests/integration/memcache/test_add.php +++ b/tests/integration/memcache/test_add.php @@ -61,7 +61,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcache/test_add.php82.php b/tests/integration/memcache/test_add.php82.php index fe1223d17..25467baa0 100644 --- a/tests/integration/memcache/test_add.php82.php +++ b/tests/integration/memcache/test_add.php82.php @@ -61,7 +61,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcache/test_incr_decr.php b/tests/integration/memcache/test_incr_decr.php index 859b53f99..ad3dcdace 100644 --- a/tests/integration/memcache/test_incr_decr.php +++ b/tests/integration/memcache/test_incr_decr.php @@ -65,7 +65,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcache/test_incr_decr.php82.php b/tests/integration/memcache/test_incr_decr.php82.php index a7d5bc224..2d52f9c70 100644 --- a/tests/integration/memcache/test_incr_decr.php82.php +++ b/tests/integration/memcache/test_incr_decr.php82.php @@ -65,7 +65,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcache/test_memcache_add.php b/tests/integration/memcache/test_memcache_add.php index 3d6f6e3cb..23a6b94e4 100644 --- a/tests/integration/memcache/test_memcache_add.php +++ b/tests/integration/memcache/test_memcache_add.php @@ -62,7 +62,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcache/test_memcache_add.php82.php b/tests/integration/memcache/test_memcache_add.php82.php index 9c3efc63d..422dfeb99 100644 --- a/tests/integration/memcache/test_memcache_add.php82.php +++ b/tests/integration/memcache/test_memcache_add.php82.php @@ -62,7 +62,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcache/test_memcache_add_logging_off.php b/tests/integration/memcache/test_memcache_add_logging_off.php index 9d63ac00e..fcd3de3ed 100644 --- a/tests/integration/memcache/test_memcache_add_logging_off.php +++ b/tests/integration/memcache/test_memcache_add_logging_off.php @@ -65,7 +65,8 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 28fac43ce..e99b59e7f 100644 --- a/tests/integration/memcache/test_memcache_add_logging_off.php82.php +++ b/tests/integration/memcache/test_memcache_add_logging_off.php82.php @@ -65,7 +65,8 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcache/test_memcache_incr_decr.php b/tests/integration/memcache/test_memcache_incr_decr.php index 91188b071..1a3c180f4 100644 --- a/tests/integration/memcache/test_memcache_incr_decr.php +++ b/tests/integration/memcache/test_memcache_incr_decr.php @@ -65,7 +65,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcache/test_memcache_incr_decr.php82.php b/tests/integration/memcache/test_memcache_incr_decr.php82.php index 59be46d06..142b59273 100644 --- a/tests/integration/memcache/test_memcache_incr_decr.php82.php +++ b/tests/integration/memcache/test_memcache_incr_decr.php82.php @@ -65,7 +65,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcache/test_memcache_replace.php b/tests/integration/memcache/test_memcache_replace.php index 99734e5bc..418315d55 100644 --- a/tests/integration/memcache/test_memcache_replace.php +++ b/tests/integration/memcache/test_memcache_replace.php @@ -67,7 +67,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcache/test_memcache_replace.php82.php b/tests/integration/memcache/test_memcache_replace.php82.php index f52a39fde..4634d326f 100644 --- a/tests/integration/memcache/test_memcache_replace.php82.php +++ b/tests/integration/memcache/test_memcache_replace.php82.php @@ -67,7 +67,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcache/test_memcache_set.php b/tests/integration/memcache/test_memcache_set.php index 78b1f01b9..b9dad0d45 100644 --- a/tests/integration/memcache/test_memcache_set.php +++ b/tests/integration/memcache/test_memcache_set.php @@ -64,7 +64,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcache/test_memcache_set.php82.php b/tests/integration/memcache/test_memcache_set.php82.php index 329cb3c5f..a16ecc5a4 100644 --- a/tests/integration/memcache/test_memcache_set.php82.php +++ b/tests/integration/memcache/test_memcache_set.php82.php @@ -64,7 +64,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcache/test_replace.php b/tests/integration/memcache/test_replace.php index 9efac30cc..e38770210 100644 --- a/tests/integration/memcache/test_replace.php +++ b/tests/integration/memcache/test_replace.php @@ -66,7 +66,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcache/test_replace.php82.php b/tests/integration/memcache/test_replace.php82.php index 0b5124782..82253b8e8 100644 --- a/tests/integration/memcache/test_replace.php82.php +++ b/tests/integration/memcache/test_replace.php82.php @@ -66,7 +66,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcache/test_set.php b/tests/integration/memcache/test_set.php index eb0bcdd42..6a7b89994 100644 --- a/tests/integration/memcache/test_set.php +++ b/tests/integration/memcache/test_set.php @@ -63,7 +63,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcache/test_set.php82.php b/tests/integration/memcache/test_set.php82.php index 8e4df3b52..8b9cad8e5 100644 --- a/tests/integration/memcache/test_set.php82.php +++ b/tests/integration/memcache/test_set.php82.php @@ -63,7 +63,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ From da69a7c2e38ef5d08cd7e6e8d3cc8fb2149f0c5d Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Mon, 24 Feb 2025 16:08:34 -0500 Subject: [PATCH 37/60] tests(agent): Updates integration/memcached tests to have log labels metric --- tests/integration/memcached/test_basic.php | 5 +++-- tests/integration/memcached/test_basic_logging_off.php | 5 +++-- tests/integration/memcached/test_by_key.php | 5 +++-- tests/integration/memcached/test_cas.php5.php | 3 ++- tests/integration/memcached/test_cas.php7.php | 5 +++-- tests/integration/memcached/test_cas_by_key.php5.php | 3 ++- tests/integration/memcached/test_cas_by_key.php7.php | 5 +++-- tests/integration/memcached/test_concat.php | 5 +++-- tests/integration/memcached/test_concat_by_key.php | 5 +++-- .../integration/memcached/test_concat_by_key_logging_off.php | 5 +++-- tests/integration/memcached/test_multi.php | 5 +++-- tests/integration/memcached/test_multi_by_key.php | 5 +++-- 12 files changed, 34 insertions(+), 22 deletions(-) diff --git a/tests/integration/memcached/test_basic.php b/tests/integration/memcached/test_basic.php index 1e24bfd7e..cf91b8c5c 100644 --- a/tests/integration/memcached/test_basic.php +++ b/tests/integration/memcached/test_basic.php @@ -46,7 +46,7 @@ [{"name":"Datastore/allOther"}, [15, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Memcached/all"}, [15, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Memcached/allOther"}, [15, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"},[1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Memcached/add"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Memcached/add", "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], @@ -74,7 +74,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcached/test_basic_logging_off.php b/tests/integration/memcached/test_basic_logging_off.php index 05e87a4c1..f05e19cf2 100644 --- a/tests/integration/memcached/test_basic_logging_off.php +++ b/tests/integration/memcached/test_basic_logging_off.php @@ -49,7 +49,7 @@ [{"name":"Datastore/allOther"}, [15, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Memcached/all"}, [15, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Memcached/allOther"}, [15, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"},[1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Memcached/add"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Memcached/add", "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], @@ -77,7 +77,8 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcached/test_by_key.php b/tests/integration/memcached/test_by_key.php index ceb2758d8..896653e2e 100644 --- a/tests/integration/memcached/test_by_key.php +++ b/tests/integration/memcached/test_by_key.php @@ -48,7 +48,7 @@ [{"name":"Datastore/allOther"}, [11, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Memcached/all"}, [11, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Memcached/allOther"}, [11, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"},[1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Memcached/add"}, [2, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Memcached/add", "scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]], @@ -70,7 +70,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcached/test_cas.php5.php b/tests/integration/memcached/test_cas.php5.php index c96dd94b3..144cf6b82 100644 --- a/tests/integration/memcached/test_cas.php5.php +++ b/tests/integration/memcached/test_cas.php5.php @@ -58,7 +58,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcached/test_cas.php7.php b/tests/integration/memcached/test_cas.php7.php index 650bb22ec..924d7d8b9 100644 --- a/tests/integration/memcached/test_cas.php7.php +++ b/tests/integration/memcached/test_cas.php7.php @@ -42,7 +42,7 @@ [{"name":"Datastore/allOther"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Memcached/all"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Memcached/allOther"}, [5, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"},[1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Memcached/delete"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Memcached/delete", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], @@ -61,7 +61,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcached/test_cas_by_key.php5.php b/tests/integration/memcached/test_cas_by_key.php5.php index 7dda968dc..c4daae66c 100644 --- a/tests/integration/memcached/test_cas_by_key.php5.php +++ b/tests/integration/memcached/test_cas_by_key.php5.php @@ -58,7 +58,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcached/test_cas_by_key.php7.php b/tests/integration/memcached/test_cas_by_key.php7.php index 10b073016..d9c7ddf14 100644 --- a/tests/integration/memcached/test_cas_by_key.php7.php +++ b/tests/integration/memcached/test_cas_by_key.php7.php @@ -42,7 +42,7 @@ [{"name":"Datastore/allOther"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Memcached/all"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Memcached/allOther"}, [5, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"},[1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Memcached/delete"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Memcached/delete", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], @@ -61,7 +61,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcached/test_concat.php b/tests/integration/memcached/test_concat.php index 0a526adcd..774ac6c06 100644 --- a/tests/integration/memcached/test_concat.php +++ b/tests/integration/memcached/test_concat.php @@ -35,7 +35,7 @@ [{"name":"Datastore/allOther"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Memcached/all"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Memcached/allOther"}, [5, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"},[1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Memcached/delete"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Memcached/delete", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], @@ -54,7 +54,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcached/test_concat_by_key.php b/tests/integration/memcached/test_concat_by_key.php index 2cb041974..8920b62ef 100644 --- a/tests/integration/memcached/test_concat_by_key.php +++ b/tests/integration/memcached/test_concat_by_key.php @@ -35,7 +35,7 @@ [{"name":"Datastore/allOther"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Memcached/all"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Memcached/allOther"}, [5, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"},[1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Memcached/delete"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Memcached/delete", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], @@ -54,7 +54,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 4d644a74d..14c35800d 100644 --- a/tests/integration/memcached/test_concat_by_key_logging_off.php +++ b/tests/integration/memcached/test_concat_by_key_logging_off.php @@ -38,7 +38,7 @@ [{"name":"Datastore/allOther"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Memcached/all"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Memcached/allOther"}, [5, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"},[1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Memcached/delete"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Memcached/delete", "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], @@ -57,7 +57,8 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcached/test_multi.php b/tests/integration/memcached/test_multi.php index 78dbd2fa3..a2b55b65e 100644 --- a/tests/integration/memcached/test_multi.php +++ b/tests/integration/memcached/test_multi.php @@ -42,7 +42,7 @@ [{"name":"Datastore/allOther"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Memcached/all"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Memcached/allOther"}, [5, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"},[1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Memcached/get"}, [4, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Memcached/get", "scope":"OtherTransaction/php__FILE__"}, [4, "??", "??", "??", "??", "??"]], @@ -55,7 +55,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/memcached/test_multi_by_key.php b/tests/integration/memcached/test_multi_by_key.php index 5d4c2e9d3..36e8f2764 100644 --- a/tests/integration/memcached/test_multi_by_key.php +++ b/tests/integration/memcached/test_multi_by_key.php @@ -42,7 +42,7 @@ [{"name":"Datastore/allOther"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Memcached/all"}, [5, "??", "??", "??", "??", "??"]], [{"name":"Datastore/Memcached/allOther"}, [5, "??", "??", "??", "??", "??"]], - [{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"},[1, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Memcached/get"}, [4, "??", "??", "??", "??", "??"]], [{"name":"Datastore/operation/Memcached/get", "scope":"OtherTransaction/php__FILE__"}, [4, "??", "??", "??", "??", "??"]], @@ -55,7 +55,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ From f02d0dae086e74d2a7be36b42d09389f1a9aad22 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Mon, 24 Feb 2025 16:14:49 -0500 Subject: [PATCH 38/60] tests(agent): Updates integration/mysql tests to have log labels metric --- tests/integration/mysql/test_db_query.php | 3 ++- tests/integration/mysql/test_db_query_error.php | 3 ++- tests/integration/mysql/test_db_query_logging_off.php | 4 +++- tests/integration/mysql/test_query.php | 3 ++- tests/integration/mysql/test_query_error.php | 3 ++- tests/integration/mysql/test_unbuffered_query.php | 3 ++- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/tests/integration/mysql/test_db_query.php b/tests/integration/mysql/test_db_query.php index d57281ddd..96f054bb4 100644 --- a/tests/integration/mysql/test_db_query.php +++ b/tests/integration/mysql/test_db_query.php @@ -51,7 +51,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysql/test_db_query_error.php b/tests/integration/mysql/test_db_query_error.php index 61c145b34..2994ecc7a 100644 --- a/tests/integration/mysql/test_db_query_error.php +++ b/tests/integration/mysql/test_db_query_error.php @@ -45,7 +45,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysql/test_db_query_logging_off.php b/tests/integration/mysql/test_db_query_logging_off.php index 751d62fc7..f1c23fa01 100644 --- a/tests/integration/mysql/test_db_query_logging_off.php +++ b/tests/integration/mysql/test_db_query_logging_off.php @@ -54,7 +54,9 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysql/test_query.php b/tests/integration/mysql/test_query.php index a0b7c4c33..b5853c00d 100644 --- a/tests/integration/mysql/test_query.php +++ b/tests/integration/mysql/test_query.php @@ -51,7 +51,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysql/test_query_error.php b/tests/integration/mysql/test_query_error.php index f8dcb6021..26c8a5d9a 100644 --- a/tests/integration/mysql/test_query_error.php +++ b/tests/integration/mysql/test_query_error.php @@ -45,7 +45,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysql/test_unbuffered_query.php b/tests/integration/mysql/test_unbuffered_query.php index f4d95edb4..3387f12d7 100644 --- a/tests/integration/mysql/test_unbuffered_query.php +++ b/tests/integration/mysql/test_unbuffered_query.php @@ -51,7 +51,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ From a3bad9b2bdc91e6caaaf970f0a53c2cc07635778 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Mon, 24 Feb 2025 16:15:35 -0500 Subject: [PATCH 39/60] tests(agent): Updates integration/mysqli tests to have log labels metric --- tests/integration/mysqli/test_bind_param_object_oo.php | 3 ++- .../mysqli/test_bind_param_object_oo_logging_off.php | 3 ++- tests/integration/mysqli/test_bind_param_oo.php | 3 ++- tests/integration/mysqli/test_bind_param_proc.php | 3 ++- tests/integration/mysqli/test_explain_connect.php | 3 ++- tests/integration/mysqli/test_explain_connect_socket.php | 3 ++- tests/integration/mysqli/test_explain_construct.php | 3 ++- tests/integration/mysqli/test_explain_construct_socket.php | 3 ++- tests/integration/mysqli/test_explain_database_no_user.php | 3 ++- .../mysqli/test_explain_database_no_user_logging_off.php | 1 + tests/integration/mysqli/test_explain_init_oo.php | 3 ++- tests/integration/mysqli/test_explain_init_oo_persistent.php | 3 ++- tests/integration/mysqli/test_explain_init_proc.php | 3 ++- tests/integration/mysqli/test_explain_leading_whitespace.php | 3 ++- tests/integration/mysqli/test_explain_options_garbage.php | 3 ++- tests/integration/mysqli/test_explain_real_connect_garbage.php | 3 ++- .../mysqli/test_explain_real_connect_garbage_logging_off.php | 1 + tests/integration/mysqli/test_explain_reused_id.php | 3 ++- tests/integration/mysqli/test_explain_select_db_oo.php | 3 ++- tests/integration/mysqli/test_explain_select_db_proc.php | 3 ++- tests/integration/mysqli/test_multi_query_oo.php | 3 ++- tests/integration/mysqli/test_multi_query_proc.php | 3 ++- tests/integration/mysqli/test_multi_query_proc_logging_off.php | 3 ++- tests/integration/mysqli/test_mysqli_query_1.php | 3 ++- tests/integration/mysqli/test_prepare_oo.php | 3 ++- tests/integration/mysqli/test_prepare_proc.php | 3 ++- tests/integration/mysqli/test_query_oo.php | 3 ++- tests/integration/mysqli/test_query_proc.php | 3 ++- tests/integration/mysqli/test_real_query_oo.php | 3 ++- tests/integration/mysqli/test_real_query_oo_logging_off.php | 3 ++- tests/integration/mysqli/test_real_query_proc.php | 3 ++- tests/integration/mysqli/test_stmt_prepare_oo.php | 3 ++- tests/integration/mysqli/test_stmt_prepare_proc.php | 3 ++- tests/integration/mysqli/test_subclassing.php | 3 ++- tests/integration/mysqli/test_subclassing.php81.php | 3 ++- 35 files changed, 68 insertions(+), 33 deletions(-) diff --git a/tests/integration/mysqli/test_bind_param_object_oo.php b/tests/integration/mysqli/test_bind_param_object_oo.php index bd000429a..011b7459b 100644 --- a/tests/integration/mysqli/test_bind_param_object_oo.php +++ b/tests/integration/mysqli/test_bind_param_object_oo.php @@ -55,7 +55,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 941e89555..8245b1fa2 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 @@ -58,7 +58,8 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_bind_param_oo.php b/tests/integration/mysqli/test_bind_param_oo.php index 2b7dc5d0a..f6e5970a5 100644 --- a/tests/integration/mysqli/test_bind_param_oo.php +++ b/tests/integration/mysqli/test_bind_param_oo.php @@ -47,7 +47,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_bind_param_proc.php b/tests/integration/mysqli/test_bind_param_proc.php index 6efc982a9..881fc2e25 100644 --- a/tests/integration/mysqli/test_bind_param_proc.php +++ b/tests/integration/mysqli/test_bind_param_proc.php @@ -46,7 +46,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_explain_connect.php b/tests/integration/mysqli/test_explain_connect.php index 7ee1f130b..0a1cb7449 100644 --- a/tests/integration/mysqli/test_explain_connect.php +++ b/tests/integration/mysqli/test_explain_connect.php @@ -46,7 +46,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_explain_connect_socket.php b/tests/integration/mysqli/test_explain_connect_socket.php index 0c56e3bc9..ebdf6eca2 100644 --- a/tests/integration/mysqli/test_explain_connect_socket.php +++ b/tests/integration/mysqli/test_explain_connect_socket.php @@ -46,7 +46,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_explain_construct.php b/tests/integration/mysqli/test_explain_construct.php index ce7357bc4..e1491b842 100644 --- a/tests/integration/mysqli/test_explain_construct.php +++ b/tests/integration/mysqli/test_explain_construct.php @@ -47,7 +47,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_explain_construct_socket.php b/tests/integration/mysqli/test_explain_construct_socket.php index 20c6e1481..2c2223ba4 100644 --- a/tests/integration/mysqli/test_explain_construct_socket.php +++ b/tests/integration/mysqli/test_explain_construct_socket.php @@ -47,7 +47,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_explain_database_no_user.php b/tests/integration/mysqli/test_explain_database_no_user.php index 07836dbb1..e77ecce4d 100644 --- a/tests/integration/mysqli/test_explain_database_no_user.php +++ b/tests/integration/mysqli/test_explain_database_no_user.php @@ -46,7 +46,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 1ea8a0741..0b3b4200b 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 @@ -36,6 +36,7 @@ [{"name": "Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/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 4b0395788..630586ffa 100644 --- a/tests/integration/mysqli/test_explain_init_oo.php +++ b/tests/integration/mysqli/test_explain_init_oo.php @@ -46,7 +46,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_explain_init_oo_persistent.php b/tests/integration/mysqli/test_explain_init_oo_persistent.php index c3ff9268f..90ca9191c 100644 --- a/tests/integration/mysqli/test_explain_init_oo_persistent.php +++ b/tests/integration/mysqli/test_explain_init_oo_persistent.php @@ -46,7 +46,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_explain_init_proc.php b/tests/integration/mysqli/test_explain_init_proc.php index 05ce43f39..b390d28e1 100644 --- a/tests/integration/mysqli/test_explain_init_proc.php +++ b/tests/integration/mysqli/test_explain_init_proc.php @@ -46,7 +46,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_explain_leading_whitespace.php b/tests/integration/mysqli/test_explain_leading_whitespace.php index d0b165ea6..d508a7b67 100644 --- a/tests/integration/mysqli/test_explain_leading_whitespace.php +++ b/tests/integration/mysqli/test_explain_leading_whitespace.php @@ -45,7 +45,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_explain_options_garbage.php b/tests/integration/mysqli/test_explain_options_garbage.php index 420a489af..2690c578a 100644 --- a/tests/integration/mysqli/test_explain_options_garbage.php +++ b/tests/integration/mysqli/test_explain_options_garbage.php @@ -38,7 +38,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_explain_real_connect_garbage.php b/tests/integration/mysqli/test_explain_real_connect_garbage.php index c12a3d07b..b767cfac7 100644 --- a/tests/integration/mysqli/test_explain_real_connect_garbage.php +++ b/tests/integration/mysqli/test_explain_real_connect_garbage.php @@ -38,7 +38,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 511f1b1c9..cb903383a 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 @@ -31,6 +31,7 @@ [{"name": "Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name": "Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/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 21382def1..71fdf1fa3 100644 --- a/tests/integration/mysqli/test_explain_reused_id.php +++ b/tests/integration/mysqli/test_explain_reused_id.php @@ -47,7 +47,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_explain_select_db_oo.php b/tests/integration/mysqli/test_explain_select_db_oo.php index f03d91a6a..c39a3e17b 100644 --- a/tests/integration/mysqli/test_explain_select_db_oo.php +++ b/tests/integration/mysqli/test_explain_select_db_oo.php @@ -46,7 +46,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_explain_select_db_proc.php b/tests/integration/mysqli/test_explain_select_db_proc.php index 21c326ce9..a1d34a443 100644 --- a/tests/integration/mysqli/test_explain_select_db_proc.php +++ b/tests/integration/mysqli/test_explain_select_db_proc.php @@ -46,7 +46,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_multi_query_oo.php b/tests/integration/mysqli/test_multi_query_oo.php index 1d1e3006a..0152850d5 100644 --- a/tests/integration/mysqli/test_multi_query_oo.php +++ b/tests/integration/mysqli/test_multi_query_oo.php @@ -51,7 +51,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_multi_query_proc.php b/tests/integration/mysqli/test_multi_query_proc.php index 3f3014b0d..0d643c1b2 100644 --- a/tests/integration/mysqli/test_multi_query_proc.php +++ b/tests/integration/mysqli/test_multi_query_proc.php @@ -51,7 +51,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 3f3014b0d..0d643c1b2 100644 --- a/tests/integration/mysqli/test_multi_query_proc_logging_off.php +++ b/tests/integration/mysqli/test_multi_query_proc_logging_off.php @@ -51,7 +51,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_mysqli_query_1.php b/tests/integration/mysqli/test_mysqli_query_1.php index dc44166af..ab46557b6 100644 --- a/tests/integration/mysqli/test_mysqli_query_1.php +++ b/tests/integration/mysqli/test_mysqli_query_1.php @@ -48,7 +48,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_prepare_oo.php b/tests/integration/mysqli/test_prepare_oo.php index 791b36a07..64558676e 100644 --- a/tests/integration/mysqli/test_prepare_oo.php +++ b/tests/integration/mysqli/test_prepare_oo.php @@ -120,7 +120,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_prepare_proc.php b/tests/integration/mysqli/test_prepare_proc.php index d18ad19bc..0d327788c 100644 --- a/tests/integration/mysqli/test_prepare_proc.php +++ b/tests/integration/mysqli/test_prepare_proc.php @@ -45,7 +45,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_query_oo.php b/tests/integration/mysqli/test_query_oo.php index 770692bda..3c579f2c5 100644 --- a/tests/integration/mysqli/test_query_oo.php +++ b/tests/integration/mysqli/test_query_oo.php @@ -47,7 +47,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_query_proc.php b/tests/integration/mysqli/test_query_proc.php index c9dbc6f4e..3dae4816b 100644 --- a/tests/integration/mysqli/test_query_proc.php +++ b/tests/integration/mysqli/test_query_proc.php @@ -47,7 +47,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_real_query_oo.php b/tests/integration/mysqli/test_real_query_oo.php index 0bc63707c..194afd730 100644 --- a/tests/integration/mysqli/test_real_query_oo.php +++ b/tests/integration/mysqli/test_real_query_oo.php @@ -51,7 +51,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 0bc63707c..194afd730 100644 --- a/tests/integration/mysqli/test_real_query_oo_logging_off.php +++ b/tests/integration/mysqli/test_real_query_oo_logging_off.php @@ -51,7 +51,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_real_query_proc.php b/tests/integration/mysqli/test_real_query_proc.php index 33e04bc4f..3454b4058 100644 --- a/tests/integration/mysqli/test_real_query_proc.php +++ b/tests/integration/mysqli/test_real_query_proc.php @@ -53,7 +53,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_stmt_prepare_oo.php b/tests/integration/mysqli/test_stmt_prepare_oo.php index a75325b94..8a095f79d 100644 --- a/tests/integration/mysqli/test_stmt_prepare_oo.php +++ b/tests/integration/mysqli/test_stmt_prepare_oo.php @@ -46,7 +46,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_stmt_prepare_proc.php b/tests/integration/mysqli/test_stmt_prepare_proc.php index 7a70943e4..ec3c3a471 100644 --- a/tests/integration/mysqli/test_stmt_prepare_proc.php +++ b/tests/integration/mysqli/test_stmt_prepare_proc.php @@ -46,7 +46,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_subclassing.php b/tests/integration/mysqli/test_subclassing.php index c19b763fd..ab11f5a59 100644 --- a/tests/integration/mysqli/test_subclassing.php +++ b/tests/integration/mysqli/test_subclassing.php @@ -47,7 +47,8 @@ classes. [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/mysqli/test_subclassing.php81.php b/tests/integration/mysqli/test_subclassing.php81.php index 220962fa6..6ca0aba5f 100644 --- a/tests/integration/mysqli/test_subclassing.php81.php +++ b/tests/integration/mysqli/test_subclassing.php81.php @@ -47,7 +47,8 @@ classes. [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ From b97fa4264ffbc5716762113947dc79268329c658 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Mon, 24 Feb 2025 16:19:43 -0500 Subject: [PATCH 40/60] tests(agent): Updates integration/pdo tests to have log labels metric --- tests/integration/pdo/sqlite/base-class/test_query_1_arg.php | 3 ++- .../pdo/sqlite/base-class/test_query_fetch_class.php | 3 ++- .../pdo/sqlite/base-class/test_query_fetch_column.php | 3 ++- .../sqlite/base-class/test_query_fetch_column_logging_off.php | 3 ++- .../pdo/sqlite/base-class/test_query_fetch_into.php | 3 ++- tests/integration/pdo/sqlite/constructor/test_query_1_arg.php | 3 ++- .../pdo/sqlite/constructor/test_query_fetch_class.php | 3 ++- .../pdo/sqlite/constructor/test_query_fetch_column.php | 3 ++- .../sqlite/constructor/test_query_fetch_column_logging_off.php | 3 ++- .../pdo/sqlite/constructor/test_query_fetch_into.php | 3 ++- .../pdo/sqlite/extending-class/test_query_1_arg.php | 3 ++- tests/integration/pdo/sqlite/factory/test_query_1_arg.php | 3 ++- .../integration/pdo/sqlite/factory/test_query_fetch_class.php | 3 ++- .../integration/pdo/sqlite/factory/test_query_fetch_column.php | 3 ++- .../pdo/sqlite/factory/test_query_fetch_column_logging_off.php | 3 ++- tests/integration/pdo/sqlite/factory/test_query_fetch_into.php | 3 ++- tests/integration/pdo/test_bad_input_1.php | 3 ++- tests/integration/pdo/test_bad_input_1_logging_off.php | 3 ++- 18 files changed, 36 insertions(+), 18 deletions(-) diff --git a/tests/integration/pdo/sqlite/base-class/test_query_1_arg.php b/tests/integration/pdo/sqlite/base-class/test_query_1_arg.php index df16dc8a3..9e7c65306 100644 --- a/tests/integration/pdo/sqlite/base-class/test_query_1_arg.php +++ b/tests/integration/pdo/sqlite/base-class/test_query_1_arg.php @@ -64,7 +64,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pdo/sqlite/base-class/test_query_fetch_class.php b/tests/integration/pdo/sqlite/base-class/test_query_fetch_class.php index e84fb4027..27ec0f80f 100644 --- a/tests/integration/pdo/sqlite/base-class/test_query_fetch_class.php +++ b/tests/integration/pdo/sqlite/base-class/test_query_fetch_class.php @@ -62,7 +62,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pdo/sqlite/base-class/test_query_fetch_column.php b/tests/integration/pdo/sqlite/base-class/test_query_fetch_column.php index 37989527d..dbc077a68 100644 --- a/tests/integration/pdo/sqlite/base-class/test_query_fetch_column.php +++ b/tests/integration/pdo/sqlite/base-class/test_query_fetch_column.php @@ -64,7 +64,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pdo/sqlite/base-class/test_query_fetch_column_logging_off.php b/tests/integration/pdo/sqlite/base-class/test_query_fetch_column_logging_off.php index 76a35f1fc..23eb9655b 100644 --- a/tests/integration/pdo/sqlite/base-class/test_query_fetch_column_logging_off.php +++ b/tests/integration/pdo/sqlite/base-class/test_query_fetch_column_logging_off.php @@ -67,7 +67,8 @@ "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pdo/sqlite/base-class/test_query_fetch_into.php b/tests/integration/pdo/sqlite/base-class/test_query_fetch_into.php index 63c132317..8389707af 100644 --- a/tests/integration/pdo/sqlite/base-class/test_query_fetch_into.php +++ b/tests/integration/pdo/sqlite/base-class/test_query_fetch_into.php @@ -62,7 +62,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pdo/sqlite/constructor/test_query_1_arg.php b/tests/integration/pdo/sqlite/constructor/test_query_1_arg.php index d0dc104cf..59a94ea4d 100644 --- a/tests/integration/pdo/sqlite/constructor/test_query_1_arg.php +++ b/tests/integration/pdo/sqlite/constructor/test_query_1_arg.php @@ -65,7 +65,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pdo/sqlite/constructor/test_query_fetch_class.php b/tests/integration/pdo/sqlite/constructor/test_query_fetch_class.php index d8cc5fa42..98f760930 100644 --- a/tests/integration/pdo/sqlite/constructor/test_query_fetch_class.php +++ b/tests/integration/pdo/sqlite/constructor/test_query_fetch_class.php @@ -63,7 +63,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pdo/sqlite/constructor/test_query_fetch_column.php b/tests/integration/pdo/sqlite/constructor/test_query_fetch_column.php index a7c70929c..50b395ee2 100644 --- a/tests/integration/pdo/sqlite/constructor/test_query_fetch_column.php +++ b/tests/integration/pdo/sqlite/constructor/test_query_fetch_column.php @@ -65,7 +65,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pdo/sqlite/constructor/test_query_fetch_column_logging_off.php b/tests/integration/pdo/sqlite/constructor/test_query_fetch_column_logging_off.php index be19c728c..9702d3aa5 100644 --- a/tests/integration/pdo/sqlite/constructor/test_query_fetch_column_logging_off.php +++ b/tests/integration/pdo/sqlite/constructor/test_query_fetch_column_logging_off.php @@ -68,7 +68,8 @@ "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pdo/sqlite/constructor/test_query_fetch_into.php b/tests/integration/pdo/sqlite/constructor/test_query_fetch_into.php index 7d2b0f4cc..79e525519 100644 --- a/tests/integration/pdo/sqlite/constructor/test_query_fetch_into.php +++ b/tests/integration/pdo/sqlite/constructor/test_query_fetch_into.php @@ -63,7 +63,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pdo/sqlite/extending-class/test_query_1_arg.php b/tests/integration/pdo/sqlite/extending-class/test_query_1_arg.php index 07e199db0..c040ea065 100644 --- a/tests/integration/pdo/sqlite/extending-class/test_query_1_arg.php +++ b/tests/integration/pdo/sqlite/extending-class/test_query_1_arg.php @@ -63,7 +63,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pdo/sqlite/factory/test_query_1_arg.php b/tests/integration/pdo/sqlite/factory/test_query_1_arg.php index edab45185..dd5e9eedf 100644 --- a/tests/integration/pdo/sqlite/factory/test_query_1_arg.php +++ b/tests/integration/pdo/sqlite/factory/test_query_1_arg.php @@ -65,7 +65,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pdo/sqlite/factory/test_query_fetch_class.php b/tests/integration/pdo/sqlite/factory/test_query_fetch_class.php index f9599e637..aee08b401 100644 --- a/tests/integration/pdo/sqlite/factory/test_query_fetch_class.php +++ b/tests/integration/pdo/sqlite/factory/test_query_fetch_class.php @@ -63,7 +63,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pdo/sqlite/factory/test_query_fetch_column.php b/tests/integration/pdo/sqlite/factory/test_query_fetch_column.php index e86edc3c9..cfc01a6d0 100644 --- a/tests/integration/pdo/sqlite/factory/test_query_fetch_column.php +++ b/tests/integration/pdo/sqlite/factory/test_query_fetch_column.php @@ -65,7 +65,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pdo/sqlite/factory/test_query_fetch_column_logging_off.php b/tests/integration/pdo/sqlite/factory/test_query_fetch_column_logging_off.php index 6177ba8a1..3c03b895c 100644 --- a/tests/integration/pdo/sqlite/factory/test_query_fetch_column_logging_off.php +++ b/tests/integration/pdo/sqlite/factory/test_query_fetch_column_logging_off.php @@ -68,7 +68,8 @@ "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pdo/sqlite/factory/test_query_fetch_into.php b/tests/integration/pdo/sqlite/factory/test_query_fetch_into.php index b514f4c50..f911d4f54 100644 --- a/tests/integration/pdo/sqlite/factory/test_query_fetch_into.php +++ b/tests/integration/pdo/sqlite/factory/test_query_fetch_into.php @@ -63,7 +63,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pdo/test_bad_input_1.php b/tests/integration/pdo/test_bad_input_1.php index a0e6989b0..d0dc57e8c 100644 --- a/tests/integration/pdo/test_bad_input_1.php +++ b/tests/integration/pdo/test_bad_input_1.php @@ -42,7 +42,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 84324160d..eb64d9ccf 100644 --- a/tests/integration/pdo/test_bad_input_1_logging_off.php +++ b/tests/integration/pdo/test_bad_input_1_logging_off.php @@ -45,7 +45,8 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ From 95f0d6c805ef63b3e8bdd9e3e5d160d0f7346d10 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Mon, 24 Feb 2025 16:20:41 -0500 Subject: [PATCH 41/60] tests(agent): Updates integration/pgsql tests to have log labels metric --- tests/integration/pgsql/test_pg_execute_mixed_use.php | 3 ++- .../pgsql/test_pg_execute_mixed_use_logging_off.php | 3 ++- tests/integration/pgsql/test_pg_execute_with_resource.php | 3 ++- tests/integration/pgsql/test_pg_execute_without_resource.php | 3 ++- tests/integration/pgsql/test_pg_query_error.php | 3 ++- tests/integration/pgsql/test_pg_query_params_error.php | 3 ++- .../pgsql/test_pg_query_params_error_logging_off.php | 3 ++- tests/integration/pgsql/test_pg_query_params_with_resource.php | 3 ++- .../pgsql/test_pg_query_params_without_resource.php | 3 ++- tests/integration/pgsql/test_pg_query_with_resource.php | 3 ++- .../pgsql/test_pg_query_with_resource_logging_off.php | 3 ++- tests/integration/pgsql/test_pg_query_without_resource.php | 3 ++- 12 files changed, 24 insertions(+), 12 deletions(-) diff --git a/tests/integration/pgsql/test_pg_execute_mixed_use.php b/tests/integration/pgsql/test_pg_execute_mixed_use.php index ab6e0903b..fa79914c4 100644 --- a/tests/integration/pgsql/test_pg_execute_mixed_use.php +++ b/tests/integration/pgsql/test_pg_execute_mixed_use.php @@ -54,7 +54,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 72e451039..ebbb027c2 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 @@ -57,7 +57,8 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pgsql/test_pg_execute_with_resource.php b/tests/integration/pgsql/test_pg_execute_with_resource.php index c4f83c929..a34511de6 100644 --- a/tests/integration/pgsql/test_pg_execute_with_resource.php +++ b/tests/integration/pgsql/test_pg_execute_with_resource.php @@ -49,7 +49,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pgsql/test_pg_execute_without_resource.php b/tests/integration/pgsql/test_pg_execute_without_resource.php index 77e4bfa6b..f696baa0c 100644 --- a/tests/integration/pgsql/test_pg_execute_without_resource.php +++ b/tests/integration/pgsql/test_pg_execute_without_resource.php @@ -51,7 +51,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pgsql/test_pg_query_error.php b/tests/integration/pgsql/test_pg_query_error.php index 7aff7ea25..cd6ed83be 100644 --- a/tests/integration/pgsql/test_pg_query_error.php +++ b/tests/integration/pgsql/test_pg_query_error.php @@ -48,7 +48,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pgsql/test_pg_query_params_error.php b/tests/integration/pgsql/test_pg_query_params_error.php index 5151a9896..a79c7efc6 100644 --- a/tests/integration/pgsql/test_pg_query_params_error.php +++ b/tests/integration/pgsql/test_pg_query_params_error.php @@ -48,7 +48,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 23d688c7e..7bebd557c 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 @@ -51,7 +51,8 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 12f064520..04ac504b8 100644 --- a/tests/integration/pgsql/test_pg_query_params_with_resource.php +++ b/tests/integration/pgsql/test_pg_query_params_with_resource.php @@ -46,7 +46,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 d8fc4e0fc..81a01b9e8 100644 --- a/tests/integration/pgsql/test_pg_query_params_without_resource.php +++ b/tests/integration/pgsql/test_pg_query_params_without_resource.php @@ -48,7 +48,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pgsql/test_pg_query_with_resource.php b/tests/integration/pgsql/test_pg_query_with_resource.php index 45d17ecf2..8cbd1dba3 100644 --- a/tests/integration/pgsql/test_pg_query_with_resource.php +++ b/tests/integration/pgsql/test_pg_query_with_resource.php @@ -46,7 +46,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 1828881a5..13a986360 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 @@ -49,7 +49,8 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/pgsql/test_pg_query_without_resource.php b/tests/integration/pgsql/test_pg_query_without_resource.php index b6f17acec..28353b47b 100644 --- a/tests/integration/pgsql/test_pg_query_without_resource.php +++ b/tests/integration/pgsql/test_pg_query_without_resource.php @@ -48,7 +48,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ From 1e8c3269bff856adbcfc27127aaa8b3437cdd2ac Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Mon, 24 Feb 2025 16:21:21 -0500 Subject: [PATCH 42/60] tests(agent): Updates integration/predis tests to have log labels metric --- tests/integration/predis/test_basic.php | 3 ++- tests/integration/predis/test_basic_logging_off.php | 3 ++- tests/integration/predis/test_basic_reporting_disabled.php | 3 ++- tests/integration/predis/test_cross_transaction.php | 3 ++- tests/integration/predis/test_pipeline.php | 3 ++- tests/integration/predis/test_pipeline_atomic.php | 3 ++- tests/integration/predis/test_pipeline_fire_and_forget.php | 3 ++- .../predis/test_pipeline_fire_and_forget_logging_off.php | 3 ++- tests/integration/predis/test_txn_restarted.php | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/tests/integration/predis/test_basic.php b/tests/integration/predis/test_basic.php index 68abdf928..800e3c547 100644 --- a/tests/integration/predis/test_basic.php +++ b/tests/integration/predis/test_basic.php @@ -58,7 +58,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/predis/test_basic_logging_off.php b/tests/integration/predis/test_basic_logging_off.php index 03c84c3bb..075572cbd 100644 --- a/tests/integration/predis/test_basic_logging_off.php +++ b/tests/integration/predis/test_basic_logging_off.php @@ -61,7 +61,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/predis/test_basic_reporting_disabled.php b/tests/integration/predis/test_basic_reporting_disabled.php index 73d262965..9b8b66932 100644 --- a/tests/integration/predis/test_basic_reporting_disabled.php +++ b/tests/integration/predis/test_basic_reporting_disabled.php @@ -63,7 +63,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/predis/test_cross_transaction.php b/tests/integration/predis/test_cross_transaction.php index 005364920..840aeecad 100644 --- a/tests/integration/predis/test_cross_transaction.php +++ b/tests/integration/predis/test_cross_transaction.php @@ -50,7 +50,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/predis/test_pipeline.php b/tests/integration/predis/test_pipeline.php index 32312aab4..ce48351ca 100644 --- a/tests/integration/predis/test_pipeline.php +++ b/tests/integration/predis/test_pipeline.php @@ -51,7 +51,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/predis/test_pipeline_atomic.php b/tests/integration/predis/test_pipeline_atomic.php index fd695e5ed..1831ab2ef 100644 --- a/tests/integration/predis/test_pipeline_atomic.php +++ b/tests/integration/predis/test_pipeline_atomic.php @@ -51,7 +51,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/predis/test_pipeline_fire_and_forget.php b/tests/integration/predis/test_pipeline_fire_and_forget.php index 4f7225884..7cc32d638 100644 --- a/tests/integration/predis/test_pipeline_fire_and_forget.php +++ b/tests/integration/predis/test_pipeline_fire_and_forget.php @@ -51,7 +51,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 82a76903e..229e59555 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 @@ -54,7 +54,8 @@ [{"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, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/predis/test_txn_restarted.php b/tests/integration/predis/test_txn_restarted.php index f6276883d..a951ca166 100644 --- a/tests/integration/predis/test_txn_restarted.php +++ b/tests/integration/predis/test_txn_restarted.php @@ -64,7 +64,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ From 3b404819210735358bc3a3ede2e09e52fbc4118f Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Mon, 24 Feb 2025 16:22:02 -0500 Subject: [PATCH 43/60] tests(agent): Updates integration/queue tests to have log labels metric --- tests/integration/queue/test_basic.php | 3 ++- tests/integration/queue/test_basic_logging_off.php | 3 ++- tests/integration/queue/test_capitalized.php | 3 ++- tests/integration/queue/test_malformed.php | 3 ++- tests/integration/queue/test_with_prefix.php | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/integration/queue/test_basic.php b/tests/integration/queue/test_basic.php index 888938f50..9705a51a2 100644 --- a/tests/integration/queue/test_basic.php +++ b/tests/integration/queue/test_basic.php @@ -33,7 +33,8 @@ [{"name":"WebTransactionTotalTime/Uri__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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/queue/test_basic_logging_off.php b/tests/integration/queue/test_basic_logging_off.php index 0170289bc..d9f0ca2ea 100644 --- a/tests/integration/queue/test_basic_logging_off.php +++ b/tests/integration/queue/test_basic_logging_off.php @@ -36,7 +36,8 @@ [{"name":"WebTransactionTotalTime/Uri__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/queue/test_capitalized.php b/tests/integration/queue/test_capitalized.php index 888938f50..9705a51a2 100644 --- a/tests/integration/queue/test_capitalized.php +++ b/tests/integration/queue/test_capitalized.php @@ -33,7 +33,8 @@ [{"name":"WebTransactionTotalTime/Uri__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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/queue/test_malformed.php b/tests/integration/queue/test_malformed.php index 981333eb9..2513c32b8 100644 --- a/tests/integration/queue/test_malformed.php +++ b/tests/integration/queue/test_malformed.php @@ -32,7 +32,8 @@ [{"name":"WebTransactionTotalTime/Uri__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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/queue/test_with_prefix.php b/tests/integration/queue/test_with_prefix.php index ce2b55511..7f006600a 100644 --- a/tests/integration/queue/test_with_prefix.php +++ b/tests/integration/queue/test_with_prefix.php @@ -33,7 +33,8 @@ [{"name":"WebTransactionTotalTime/Uri__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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ From 3167869258a9b00f4f049c0dfd144987ac71f47b Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Mon, 24 Feb 2025 16:23:02 -0500 Subject: [PATCH 44/60] tests(agent): Updates integration/redis tests to have log labels metric --- tests/integration/redis/test_basic.php | 3 ++- tests/integration/redis/test_basic_logging_off.php | 3 ++- tests/integration/redis/test_bitops.php | 3 ++- tests/integration/redis/test_decr.php | 3 ++- tests/integration/redis/test_geo.php | 3 ++- tests/integration/redis/test_hash.php | 3 ++- tests/integration/redis/test_incr.php | 3 ++- tests/integration/redis/test_list.php | 3 ++- tests/integration/redis/test_list_logging_off.php | 3 ++- tests/integration/redis/test_set.php | 3 ++- tests/integration/redis/test_set.redis6.php | 3 ++- tests/integration/redis/test_setex.php | 3 ++- tests/integration/redis/test_stream.redis5.php | 3 ++- tests/integration/redis/test_zset.php | 3 ++- tests/integration/redis/test_zset.redis5.php | 3 ++- 15 files changed, 30 insertions(+), 15 deletions(-) diff --git a/tests/integration/redis/test_basic.php b/tests/integration/redis/test_basic.php index 65f8a7e07..5f46209b3 100644 --- a/tests/integration/redis/test_basic.php +++ b/tests/integration/redis/test_basic.php @@ -180,7 +180,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/redis/test_basic_logging_off.php b/tests/integration/redis/test_basic_logging_off.php index d62670605..afad2a6dd 100644 --- a/tests/integration/redis/test_basic_logging_off.php +++ b/tests/integration/redis/test_basic_logging_off.php @@ -183,7 +183,8 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/redis/test_bitops.php b/tests/integration/redis/test_bitops.php index 54a23e98d..24383b8a8 100644 --- a/tests/integration/redis/test_bitops.php +++ b/tests/integration/redis/test_bitops.php @@ -85,7 +85,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/redis/test_decr.php b/tests/integration/redis/test_decr.php index b49fa0525..9b92fdf68 100644 --- a/tests/integration/redis/test_decr.php +++ b/tests/integration/redis/test_decr.php @@ -69,7 +69,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/redis/test_geo.php b/tests/integration/redis/test_geo.php index a64989bd6..716c5350e 100644 --- a/tests/integration/redis/test_geo.php +++ b/tests/integration/redis/test_geo.php @@ -82,7 +82,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/redis/test_hash.php b/tests/integration/redis/test_hash.php index 1926c12b3..c9f9abcdc 100644 --- a/tests/integration/redis/test_hash.php +++ b/tests/integration/redis/test_hash.php @@ -110,7 +110,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/redis/test_incr.php b/tests/integration/redis/test_incr.php index 6492c78f9..d41f4b71a 100644 --- a/tests/integration/redis/test_incr.php +++ b/tests/integration/redis/test_incr.php @@ -69,7 +69,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/redis/test_list.php b/tests/integration/redis/test_list.php index 185e7cea0..cb3e8abee 100644 --- a/tests/integration/redis/test_list.php +++ b/tests/integration/redis/test_list.php @@ -130,7 +130,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/redis/test_list_logging_off.php b/tests/integration/redis/test_list_logging_off.php index e1a9aeb35..ca32e3f2f 100644 --- a/tests/integration/redis/test_list_logging_off.php +++ b/tests/integration/redis/test_list_logging_off.php @@ -133,7 +133,8 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/redis/test_set.php b/tests/integration/redis/test_set.php index 29c9db1ab..a10b24736 100644 --- a/tests/integration/redis/test_set.php +++ b/tests/integration/redis/test_set.php @@ -116,7 +116,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/redis/test_set.redis6.php b/tests/integration/redis/test_set.redis6.php index a1c7b9814..a69b9d4e9 100644 --- a/tests/integration/redis/test_set.redis6.php +++ b/tests/integration/redis/test_set.redis6.php @@ -57,7 +57,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/redis/test_setex.php b/tests/integration/redis/test_setex.php index 0c593d25f..fffdf123e 100644 --- a/tests/integration/redis/test_setex.php +++ b/tests/integration/redis/test_setex.php @@ -91,7 +91,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/redis/test_stream.redis5.php b/tests/integration/redis/test_stream.redis5.php index a6c2290ec..8a6be3099 100644 --- a/tests/integration/redis/test_stream.redis5.php +++ b/tests/integration/redis/test_stream.redis5.php @@ -114,7 +114,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/redis/test_zset.php b/tests/integration/redis/test_zset.php index dabeb9f7d..ac3201a6d 100644 --- a/tests/integration/redis/test_zset.php +++ b/tests/integration/redis/test_zset.php @@ -135,7 +135,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/redis/test_zset.redis5.php b/tests/integration/redis/test_zset.redis5.php index da2b9a266..3d3c431b9 100644 --- a/tests/integration/redis/test_zset.redis5.php +++ b/tests/integration/redis/test_zset.redis5.php @@ -65,7 +65,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ From 2822bab4a3ba03157596b014e8f95180c4bda060 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Mon, 24 Feb 2025 16:27:29 -0500 Subject: [PATCH 45/60] tests(agent): Updates integration/sqlite* tests to have log labels metric --- tests/integration/sqlite/test_bad_input_1.php | 3 ++- tests/integration/sqlite/test_bad_input_2.php | 3 ++- tests/integration/sqlite/test_bad_input_3.php | 3 ++- tests/integration/sqlite/test_bad_input_4.php | 3 ++- tests/integration/sqlite/test_bad_input_5.php | 3 ++- tests/integration/sqlite/test_exec.php | 3 ++- tests/integration/sqlite/test_exec_logging_off.php | 3 ++- tests/integration/sqlite/test_query_1.php | 3 ++- tests/integration/sqlite/test_query_2.php | 3 ++- tests/integration/sqlite/test_unbuffered_1.php | 3 ++- tests/integration/sqlite/test_unbuffered_2.php | 3 ++- tests/integration/sqlite/test_unbuffered_2_logging_off.php | 3 ++- tests/integration/sqlite3/test_bad_input_1.php | 3 ++- tests/integration/sqlite3/test_bad_input_2.php | 3 ++- tests/integration/sqlite3/test_bad_input_3.php | 3 ++- tests/integration/sqlite3/test_bad_input_3_logging_off.php | 3 ++- tests/integration/sqlite3/test_bad_input_4.php | 3 ++- tests/integration/sqlite3/test_bad_input_5.php | 3 ++- tests/integration/sqlite3/test_bad_sql_1.php | 3 ++- tests/integration/sqlite3/test_bad_sql_2.php | 3 ++- tests/integration/sqlite3/test_query.php | 3 ++- tests/integration/sqlite3/test_query_logging_off.php | 3 ++- tests/integration/sqlite3/test_querysingle_1.php | 3 ++- tests/integration/sqlite3/test_querysingle_2.php | 3 ++- tests/integration/sqlitedatabase/test_bad_input_1.php | 3 ++- tests/integration/sqlitedatabase/test_bad_input_2.php | 3 ++- tests/integration/sqlitedatabase/test_bad_input_3.php | 3 ++- tests/integration/sqlitedatabase/test_query.php | 3 ++- tests/integration/sqlitedatabase/test_query_logging_off.php | 3 ++- tests/integration/sqlitedatabase/test_unbuffered.php | 3 ++- 30 files changed, 60 insertions(+), 30 deletions(-) diff --git a/tests/integration/sqlite/test_bad_input_1.php b/tests/integration/sqlite/test_bad_input_1.php index 87c158600..56cbd9d7d 100644 --- a/tests/integration/sqlite/test_bad_input_1.php +++ b/tests/integration/sqlite/test_bad_input_1.php @@ -38,7 +38,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite/test_bad_input_2.php b/tests/integration/sqlite/test_bad_input_2.php index 1371bb208..10930cbed 100644 --- a/tests/integration/sqlite/test_bad_input_2.php +++ b/tests/integration/sqlite/test_bad_input_2.php @@ -38,7 +38,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite/test_bad_input_3.php b/tests/integration/sqlite/test_bad_input_3.php index 2457fc77a..a693c619f 100644 --- a/tests/integration/sqlite/test_bad_input_3.php +++ b/tests/integration/sqlite/test_bad_input_3.php @@ -38,7 +38,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite/test_bad_input_4.php b/tests/integration/sqlite/test_bad_input_4.php index f45e3129a..4d0f2cfb5 100644 --- a/tests/integration/sqlite/test_bad_input_4.php +++ b/tests/integration/sqlite/test_bad_input_4.php @@ -38,7 +38,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite/test_bad_input_5.php b/tests/integration/sqlite/test_bad_input_5.php index 73dedbd65..13f6ef8e9 100644 --- a/tests/integration/sqlite/test_bad_input_5.php +++ b/tests/integration/sqlite/test_bad_input_5.php @@ -38,7 +38,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite/test_exec.php b/tests/integration/sqlite/test_exec.php index c131e1437..78c870e81 100644 --- a/tests/integration/sqlite/test_exec.php +++ b/tests/integration/sqlite/test_exec.php @@ -44,7 +44,8 @@ "scope":"OtherTransaction/php__FILE__"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite/test_exec_logging_off.php b/tests/integration/sqlite/test_exec_logging_off.php index 44aaecb81..556ceb2f5 100644 --- a/tests/integration/sqlite/test_exec_logging_off.php +++ b/tests/integration/sqlite/test_exec_logging_off.php @@ -47,7 +47,8 @@ "scope":"OtherTransaction/php__FILE__"}, [3, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite/test_query_1.php b/tests/integration/sqlite/test_query_1.php index c076372fd..f2bd36602 100644 --- a/tests/integration/sqlite/test_query_1.php +++ b/tests/integration/sqlite/test_query_1.php @@ -71,7 +71,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite/test_query_2.php b/tests/integration/sqlite/test_query_2.php index d66ef49a8..ab099f0f9 100644 --- a/tests/integration/sqlite/test_query_2.php +++ b/tests/integration/sqlite/test_query_2.php @@ -71,7 +71,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite/test_unbuffered_1.php b/tests/integration/sqlite/test_unbuffered_1.php index 0d7928ddb..d4ce3c601 100644 --- a/tests/integration/sqlite/test_unbuffered_1.php +++ b/tests/integration/sqlite/test_unbuffered_1.php @@ -71,7 +71,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite/test_unbuffered_2.php b/tests/integration/sqlite/test_unbuffered_2.php index 1029d3355..dc37822a0 100644 --- a/tests/integration/sqlite/test_unbuffered_2.php +++ b/tests/integration/sqlite/test_unbuffered_2.php @@ -71,7 +71,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite/test_unbuffered_2_logging_off.php b/tests/integration/sqlite/test_unbuffered_2_logging_off.php index 0ffeecaa7..4f5225a1e 100644 --- a/tests/integration/sqlite/test_unbuffered_2_logging_off.php +++ b/tests/integration/sqlite/test_unbuffered_2_logging_off.php @@ -74,7 +74,8 @@ "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite3/test_bad_input_1.php b/tests/integration/sqlite3/test_bad_input_1.php index aac133a7a..4189be5fb 100644 --- a/tests/integration/sqlite3/test_bad_input_1.php +++ b/tests/integration/sqlite3/test_bad_input_1.php @@ -42,7 +42,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite3/test_bad_input_2.php b/tests/integration/sqlite3/test_bad_input_2.php index 110d9df49..cd4574876 100644 --- a/tests/integration/sqlite3/test_bad_input_2.php +++ b/tests/integration/sqlite3/test_bad_input_2.php @@ -42,7 +42,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite3/test_bad_input_3.php b/tests/integration/sqlite3/test_bad_input_3.php index 48c58c4ff..0a32a3b43 100644 --- a/tests/integration/sqlite3/test_bad_input_3.php +++ b/tests/integration/sqlite3/test_bad_input_3.php @@ -42,7 +42,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ 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 4059f3922..bf16de696 100644 --- a/tests/integration/sqlite3/test_bad_input_3_logging_off.php +++ b/tests/integration/sqlite3/test_bad_input_3_logging_off.php @@ -45,7 +45,8 @@ [{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite3/test_bad_input_4.php b/tests/integration/sqlite3/test_bad_input_4.php index 721573eaa..2c498a269 100644 --- a/tests/integration/sqlite3/test_bad_input_4.php +++ b/tests/integration/sqlite3/test_bad_input_4.php @@ -42,7 +42,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite3/test_bad_input_5.php b/tests/integration/sqlite3/test_bad_input_5.php index 1ce75b6f1..e3613be6b 100644 --- a/tests/integration/sqlite3/test_bad_input_5.php +++ b/tests/integration/sqlite3/test_bad_input_5.php @@ -42,7 +42,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite3/test_bad_sql_1.php b/tests/integration/sqlite3/test_bad_sql_1.php index 31cb44a78..306cd1636 100644 --- a/tests/integration/sqlite3/test_bad_sql_1.php +++ b/tests/integration/sqlite3/test_bad_sql_1.php @@ -42,7 +42,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite3/test_bad_sql_2.php b/tests/integration/sqlite3/test_bad_sql_2.php index 0ecc686c0..5e9938d46 100644 --- a/tests/integration/sqlite3/test_bad_sql_2.php +++ b/tests/integration/sqlite3/test_bad_sql_2.php @@ -42,7 +42,8 @@ [{"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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite3/test_query.php b/tests/integration/sqlite3/test_query.php index 6f1ee56c1..65db1741e 100644 --- a/tests/integration/sqlite3/test_query.php +++ b/tests/integration/sqlite3/test_query.php @@ -67,7 +67,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite3/test_query_logging_off.php b/tests/integration/sqlite3/test_query_logging_off.php index 2993110af..ae637b324 100644 --- a/tests/integration/sqlite3/test_query_logging_off.php +++ b/tests/integration/sqlite3/test_query_logging_off.php @@ -70,7 +70,8 @@ "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite3/test_querysingle_1.php b/tests/integration/sqlite3/test_querysingle_1.php index d78af0d02..26ac11a63 100644 --- a/tests/integration/sqlite3/test_querysingle_1.php +++ b/tests/integration/sqlite3/test_querysingle_1.php @@ -53,7 +53,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlite3/test_querysingle_2.php b/tests/integration/sqlite3/test_querysingle_2.php index 542161a63..c830e728e 100644 --- a/tests/integration/sqlite3/test_querysingle_2.php +++ b/tests/integration/sqlite3/test_querysingle_2.php @@ -57,7 +57,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlitedatabase/test_bad_input_1.php b/tests/integration/sqlitedatabase/test_bad_input_1.php index a7c3c28e1..c175c5493 100644 --- a/tests/integration/sqlitedatabase/test_bad_input_1.php +++ b/tests/integration/sqlitedatabase/test_bad_input_1.php @@ -38,7 +38,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlitedatabase/test_bad_input_2.php b/tests/integration/sqlitedatabase/test_bad_input_2.php index 423cbc54a..80563bd95 100644 --- a/tests/integration/sqlitedatabase/test_bad_input_2.php +++ b/tests/integration/sqlitedatabase/test_bad_input_2.php @@ -38,7 +38,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlitedatabase/test_bad_input_3.php b/tests/integration/sqlitedatabase/test_bad_input_3.php index 7453c70a4..f3e0d5e1c 100644 --- a/tests/integration/sqlitedatabase/test_bad_input_3.php +++ b/tests/integration/sqlitedatabase/test_bad_input_3.php @@ -38,7 +38,8 @@ [{"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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlitedatabase/test_query.php b/tests/integration/sqlitedatabase/test_query.php index 90bd49a5c..f1aa3dee3 100644 --- a/tests/integration/sqlitedatabase/test_query.php +++ b/tests/integration/sqlitedatabase/test_query.php @@ -72,7 +72,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlitedatabase/test_query_logging_off.php b/tests/integration/sqlitedatabase/test_query_logging_off.php index 4aed4020e..5375d6168 100644 --- a/tests/integration/sqlitedatabase/test_query_logging_off.php +++ b/tests/integration/sqlitedatabase/test_query_logging_off.php @@ -75,7 +75,8 @@ "scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], [{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]], - [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]] + [{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ diff --git a/tests/integration/sqlitedatabase/test_unbuffered.php b/tests/integration/sqlitedatabase/test_unbuffered.php index a22824010..5558baaf2 100644 --- a/tests/integration/sqlitedatabase/test_unbuffered.php +++ b/tests/integration/sqlitedatabase/test_unbuffered.php @@ -71,7 +71,8 @@ "scope":"OtherTransaction/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/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]], + [{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]] ] ] */ From ee160600321efce596f83c32ee9219abb3a0c31b Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Tue, 25 Feb 2025 10:46:20 -0500 Subject: [PATCH 46/60] tests(agent): Adds another test for log forwarded labels using defaults --- ..._monolog_labels_forwarding_disabled_04.php | 208 ++++++++++++++++++ 1 file changed, 208 insertions(+) create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_04.php diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_04.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_04.php new file mode 100644 index 000000000..62bd502b1 --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_04.php @@ -0,0 +1,208 @@ +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(); From c9bea37726aa3a0e978ac716f65ba0d576e1d9d2 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Thu, 27 Feb 2025 14:25:55 -0500 Subject: [PATCH 47/60] fix(agent): Restores gitignore line for test_segment_message --- axiom/tests/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/axiom/tests/.gitignore b/axiom/tests/.gitignore index 22ee3b042..fa0332187 100644 --- a/axiom/tests/.gitignore +++ b/axiom/tests/.gitignore @@ -95,6 +95,7 @@ test_segment test_segment_children test_segment_datastore test_segment_external +test_segment_message test_segment_private test_segment_terms test_segment_traces From 192e04ed30e488d4d9ac668fc362e726501ff0b2 Mon Sep 17 00:00:00 2001 From: Michael Fulbright <89205663+mfulb@users.noreply.github.com> Date: Thu, 27 Feb 2025 14:32:04 -0500 Subject: [PATCH 48/60] Update agent/scripts/newrelic.ini.template Co-authored-by: Michal Nowacki --- agent/scripts/newrelic.ini.template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/agent/scripts/newrelic.ini.template b/agent/scripts/newrelic.ini.template index ed61d78ae..c37caf512 100644 --- a/agent/scripts/newrelic.ini.template +++ b/agent/scripts/newrelic.ini.template @@ -1308,10 +1308,10 @@ newrelic.daemon.logfile = "/var/log/newrelic/newrelic-daemon.log" ; Type : boolean ; Scope : per-directory ; Default: false -; Info : Toggles whether the agent adds labels as attributes to log records for -; sending to New Relic. The labels can be defined by the newrelic.labels -; configuration value, and filtered using the -; newrelic.application_logging.forwawrding.labels.exclude configuration value. +; Info : Toggles whether the agent adds labels as attributes to log records which +; are sent to New Relic. The labels can be defined by the newrelic.labels +; configuration value, and filtered using the +; newrelic.application_logging.forwarding.labels.exclude configuration value. ; ;newrelic.application_logging.forwarding.labels.enabled = false From 277d03449135311cb9dd9d0661d8eaa0982f69e4 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Thu, 27 Feb 2025 14:40:39 -0500 Subject: [PATCH 49/60] chore(agent): Improves INI description for log labels exclude directive --- agent/scripts/newrelic.ini.template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/agent/scripts/newrelic.ini.template b/agent/scripts/newrelic.ini.template index c37caf512..3b6feed7c 100644 --- a/agent/scripts/newrelic.ini.template +++ b/agent/scripts/newrelic.ini.template @@ -1320,7 +1320,12 @@ newrelic.daemon.logfile = "/var/log/newrelic/newrelic-daemon.log" ; Scope : per-directory ; Default: "" ; Info : A list of labels to NOT add as attributes to logs which are forwarded -; to New Relic. This list can be separated by commas. +; to New Relic. The values in the list must be separated by commas. +; +; NOTE: The values in this list are compared to label key names in a case +; insensitive fashion. So if an exclude rule for "server" is specified +; here then it would exclude keys like "server", "Server", "SERVER", and +; any other combination of lower and upper case letters that spell out "server". ; ; Ex: ; newrelic.application_logging.forwarding.labels.exclude = "label1, label2" From 467c8a2f1bde998311d2633ba374edc5cddf58a8 Mon Sep 17 00:00:00 2001 From: Michael Fulbright <89205663+mfulb@users.noreply.github.com> Date: Thu, 6 Mar 2025 10:12:11 -0500 Subject: [PATCH 50/60] Update protocol/flatbuffers/protocol.fbs --- protocol/flatbuffers/protocol.fbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protocol/flatbuffers/protocol.fbs b/protocol/flatbuffers/protocol.fbs index ec2fb76d9..db81f2e70 100644 --- a/protocol/flatbuffers/protocol.fbs +++ b/protocol/flatbuffers/protocol.fbs @@ -119,7 +119,7 @@ table Transaction { span_events: [Event]; log_events: [Event]; // added in the 10.1 PHP agent release php_packages: Event; // added in the 10.17 PHP agent release - log_forwarding_labels: Event; // added in the ??? PHP agent release + log_forwarding_labels: Event; // added in the 11.7 PHP agent release } union MessageBody { App, AppReply, Transaction, SpanBatch } From ee9a5a4f964062e27e41b5dc96be9b557e4008cf Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Thu, 6 Mar 2025 12:23:24 -0500 Subject: [PATCH 51/60] tests(daemon): Improves log labels ingest unit tests --- daemon/internal/newrelic/log_events_test.go | 115 ++++++++------------ 1 file changed, 46 insertions(+), 69 deletions(-) diff --git a/daemon/internal/newrelic/log_events_test.go b/daemon/internal/newrelic/log_events_test.go index 83bdbd3cd..c0fb3d7d6 100644 --- a/daemon/internal/newrelic/log_events_test.go +++ b/daemon/internal/newrelic/log_events_test.go @@ -9,6 +9,27 @@ import ( "testing" ) +type LogForwardingLabelsTestCase struct { + name string + labels string + expected string +} + +var ( + logForwardingLabelsTestCases = []LogForwardingLabelsTestCase{ + LogForwardingLabelsTestCase{name: "Valid JSON", + labels: `[{"label_type":"type1","label_value":"value1"},{"label_type":"type2","label_value":"value2"}]`, + expected: `{"tags.type1":"value1","tags.type2":"value2"}`}, + LogForwardingLabelsTestCase{name: "Invalid JSON", labels: `NOT VALID JSON`, expected: `{}`}, + LogForwardingLabelsTestCase{name: "Empty labels 1", labels: ``, expected: `{}`}, + LogForwardingLabelsTestCase{name: "Empty labels 2", labels: `[]`, expected: `{}`}, + LogForwardingLabelsTestCase{name: "Empty labels 3", labels: `[{}]`, expected: `{}`}, + LogForwardingLabelsTestCase{name: "Invalid keys", labels: `[{"label_tipe":"type1","label_valyue":"value1"}]`, expected: `{}`}, + LogForwardingLabelsTestCase{name: "Space in value", labels: `[{"label_type":"type1","label_value":"value 1"}]`, expected: `{"tags.type1":"value 1"}`}, + LogForwardingLabelsTestCase{name: "Space in key", labels: `[{"label_type":"type 1","label_value":"value1"}]`, expected: `{"tags.type 1":"value1"}`}, + } +) + // LogEvents is a wrapper over AnalyticsEvents created for additional type // There are already unit tests for AnalyticsEvents in analytics_events_test.go // These tests will focus on the methods specific to LogEvents @@ -48,76 +69,32 @@ func TestAddEventFromData(t *testing.T) { } func TestSetLogForwardingLabels(t *testing.T) { - events := NewLogEvents(10) - id := AgentRunID(`12345`) - log_data := []byte(`{"message":"test log event"}`) - label_data := []byte(`[{"label_type":"type1","label_value":"value1"},{"label_type":"type2","label_value":"value2"}]`) - priority := SamplingPriority(0.5) - - events.AddEventFromData(log_data, priority) - events.SetLogForwardingLabels(label_data) - - if events.analyticsEvents.events.Len() != 1 { - t.Errorf("expected 1 event, got %d", events.analyticsEvents.events.Len()) - } - - es := *events.analyticsEvents.events - event := es[0] - - if string(event.data) != string(log_data) { - t.Errorf("expected event data %s, got %s", string(log_data), string(event.data)) - } - - if event.priority != priority { - t.Errorf("expected event priority %f, got %f", priority, event.priority) - } - - json, err := events.CollectorJSON(id) - if nil != err { - t.Fatal(err) - } - - expected := `[{"common": {"attributes": {"tags.type1":"value1","tags.type2":"value2"}},` + - `"logs": [{"message":"test log event"}]}]` - if string(json) != expected { - t.Errorf("expected JSON %s, got %s", expected, string(json)) - } -} - -func TestSetLogForwardingLabelsInvalidData(t *testing.T) { - events := NewLogEvents(10) - id := AgentRunID(`12345`) - log_data := []byte(`{"message":"test log event"}`) - label_data := []byte(`NOT VALID JSON`) - priority := SamplingPriority(0.5) - - events.AddEventFromData(log_data, priority) - events.SetLogForwardingLabels(label_data) - - if events.analyticsEvents.events.Len() != 1 { - t.Errorf("expected 1 event, got %d", events.analyticsEvents.events.Len()) - } - - es := *events.analyticsEvents.events - event := es[0] - if string(event.data) != string(log_data) { - t.Errorf("expected event data %s, got %s", string(log_data), string(event.data)) - } - - if event.priority != priority { - t.Errorf("expected event priority %f, got %f", priority, event.priority) - } - - json, err := events.CollectorJSON(id) - if nil != err { - t.Fatal(err) - } - - expected := `[{"common": {"attributes": {}},` + - `"logs": [{"message":"test log event"}]}]` - if string(json) != expected { - t.Errorf("expected JSON %s, got %s", expected, string(json)) + for idx := range logForwardingLabelsTestCases { + testcase := logForwardingLabelsTestCases[idx] + events := NewLogEvents(10) + id := AgentRunID(`12345`) + log_data := []byte(`{"message":"test log event"}`) + label_data := []byte(testcase.labels) + priority := SamplingPriority(0.5) + + events.AddEventFromData(log_data, priority) + events.SetLogForwardingLabels(label_data) + + if events.analyticsEvents.events.Len() != 1 { + t.Errorf("%s: expected 1 event, got %d", testcase.name, events.analyticsEvents.events.Len()) + } + + json, err := events.CollectorJSON(id) + if nil != err { + t.Fatal(err) + } + + expected := `[{"common": {"attributes": ` + testcase.expected + `},` + + `"logs": [{"message":"test log event"}]}]` + if string(json) != expected { + t.Errorf("%s: expected JSON %s, got %s", testcase.name, expected, string(json)) + } } } From 8d46a55b2b98a79fc9cb922e8b74c3ce2a611b3f Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Thu, 6 Mar 2025 12:24:29 -0500 Subject: [PATCH 52/60] fix(daemon): Verify log labels are correct format --- daemon/internal/newrelic/log_events.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/daemon/internal/newrelic/log_events.go b/daemon/internal/newrelic/log_events.go index 3d996310d..d927b4418 100644 --- a/daemon/internal/newrelic/log_events.go +++ b/daemon/internal/newrelic/log_events.go @@ -8,8 +8,9 @@ package newrelic import ( "bytes" "encoding/json" - "github.com/newrelic/newrelic-php-agent/daemon/internal/newrelic/log" "time" + + "github.com/newrelic/newrelic-php-agent/daemon/internal/newrelic/log" ) // LogEvents is a wrapper over AnalyticsEvents created for additional type @@ -46,6 +47,15 @@ func (events *LogEvents) SetLogForwardingLabels(data []byte) { if nil != err { log.Errorf("failed to unmarshal log labels json", err) } + + // verify valid labels + for idx := range events.LogForwardingLabels { + if len(events.LogForwardingLabels[idx].LabelType) == 0 || len(events.LogForwardingLabels[idx].LabelValue) == 0 { + log.Errorf("invalid log label: %s log value: %s", events.LogForwardingLabels[idx].LabelType, events.LogForwardingLabels[idx].LabelValue) + events.LogForwardingLabels = nil + break + } + } } // FailedHarvest is a callback invoked by the processor when an From 7a02270164facfc55fcdff042cd96e8d6bb5e164 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Thu, 6 Mar 2025 12:35:37 -0500 Subject: [PATCH 53/60] chore(docs): Improves api doc for nr_txn_begin() --- axiom/nr_txn.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/axiom/nr_txn.h b/axiom/nr_txn.h index 2134c8f51..02d45f65f 100644 --- a/axiom/nr_txn.h +++ b/axiom/nr_txn.h @@ -387,6 +387,11 @@ void nr_txn_enforce_security_settings(nrtxnopt_t* opts, * Params : 1. The relevant application. This application is assumed * to be locked and is not unlocked by this function. * 2. Pointer to the starting options for the transaction. + * 3. Attributes configuration, usually generated by + * nr_php_create_attribute_config() + * 4. A hash containing log forwarding labels to be added to log + * events, usually genereated with + * nr_php_txn_get_log_forwarding_labels() * * Returns : A newly created transaction pointer or NULL if the request could * not be completed. From c13d6c02f56cab1a6e3c0a011ab2966220771fde Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Thu, 6 Mar 2025 12:42:46 -0500 Subject: [PATCH 54/60] fix(agent): Do not all log labels with a NULL key --- agent/php_txn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent/php_txn.c b/agent/php_txn.c index 3f55b2798..dfb488c7d 100644 --- a/agent/php_txn.c +++ b/agent/php_txn.c @@ -543,7 +543,7 @@ static nr_status_t nr_php_txn_collect_label_keys_iter(const char* key, (void)value; - if (NULL == user_data) { + if (NULL == key || NULL == user_data) { return NR_FAILURE; } From a238c676c9e40e1361284eec0f890d2b8a6fe0e6 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Thu, 6 Mar 2025 12:47:26 -0500 Subject: [PATCH 55/60] fix(agent): Protects against possiblity key is NULL --- agent/php_txn.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agent/php_txn.c b/agent/php_txn.c index dfb488c7d..003de8223 100644 --- a/agent/php_txn.c +++ b/agent/php_txn.c @@ -629,7 +629,8 @@ static nrobj_t* nr_php_txn_get_log_forwarding_labels(nrobj_t* labels) { if (!exclude) { nro_set_hash_string(log_labels, key, value); } else { - nrl_verbosedebug(NRL_TXN, "%s: Excluding label %s", __FUNCTION__, key); + nrl_verbosedebug(NRL_TXN, "%s: Excluding label %s", __FUNCTION__, + NRSAFESTR(key)); } nr_free(lower_key); From 90955f063775140a7d031c1db2a118965d0ddc9b Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Thu, 6 Mar 2025 13:13:35 -0500 Subject: [PATCH 56/60] chore(agent): Refactors log label exclusion logic Takes advantage of return value from nrp_get_hash_boolean() being -1 if the key lookup did not suceed to simplify this section of code. Also is smarter about retrieving data until it is known it is needed. --- agent/php_txn.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/agent/php_txn.c b/agent/php_txn.c index 003de8223..6eecb63ea 100644 --- a/agent/php_txn.c +++ b/agent/php_txn.c @@ -616,23 +616,24 @@ static nrobj_t* nr_php_txn_get_log_forwarding_labels(nrobj_t* labels) { */ log_labels = nro_new(NR_OBJECT_HASH); for (int i = 0; i < nro_getsize(label_keys); i++) { - const char* key = nro_get_array_string(label_keys, i + 1, NULL); - const char* value = nro_get_hash_string(labels, key, NULL); - char* lower_key = nr_string_to_lowercase(key); - bool exclude = false; - nr_status_t rv; - - exclude = nro_get_hash_boolean(exclude_labels_hash, lower_key, &rv); - if (NR_SUCCESS != rv) { - exclude = false; + const char* key = NULL; + char* lower_key = NULL; + int exclude = false; + + key = nro_get_array_string(label_keys, i + 1, NULL); + if (NULL == key) { + continue; } - if (!exclude) { - nro_set_hash_string(log_labels, key, value); + + lower_key = nr_string_to_lowercase(key); + + if (1 != nro_get_hash_boolean(exclude_labels_hash, lower_key, NULL)) { + nro_set_hash_string(log_labels, key, + nro_get_hash_string(labels, key, NULL)); } else { nrl_verbosedebug(NRL_TXN, "%s: Excluding label %s", __FUNCTION__, NRSAFESTR(key)); } - nr_free(lower_key); } From 67c53487b60b0b2388fed0cfca1a0d7405b73463 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Thu, 6 Mar 2025 13:14:37 -0500 Subject: [PATCH 57/60] tests(agent): Adds check for log forwarding labels config Checks if log forwarding is disabled then log forwarding labels is also disabled, even if the log forwarding labels config is set to true. --- axiom/tests/test_txn.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/axiom/tests/test_txn.c b/axiom/tests/test_txn.c index 4cab1ff93..adac091d2 100644 --- a/axiom/tests/test_txn.c +++ b/axiom/tests/test_txn.c @@ -8613,6 +8613,11 @@ static void test_txn_log_configuration(void) { 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"); + + // if log forwarding is disabled then log label forwarding should be disabled + txn->options.log_forwarding_enabled = false; + txn->options.log_forwarding_labels_enabled = true; + tlib_pass_if_false(__func__, nr_txn_log_forwarding_labels_enabled(txn), "forwarding=0, labels=1 -> off"); // clang-format on } From a3aaad01adbe2501f4ba5ff7859cb84470701744 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Thu, 6 Mar 2025 14:26:08 -0500 Subject: [PATCH 58/60] tests(agent): Adds unit tests for log label creation --- agent/php_txn.c | 2 +- agent/php_txn_private.h | 13 ++++++++ agent/tests/test_txn.c | 67 ++++++++++++++++++++++++++++++++++++++++- 3 files changed, 80 insertions(+), 2 deletions(-) diff --git a/agent/php_txn.c b/agent/php_txn.c index 6eecb63ea..32fd8c90e 100644 --- a/agent/php_txn.c +++ b/agent/php_txn.c @@ -563,7 +563,7 @@ static nr_status_t nr_php_txn_collect_label_keys_iter(const char* key, * */ -static nrobj_t* nr_php_txn_get_log_forwarding_labels(nrobj_t* labels) { +nrobj_t* nr_php_txn_get_log_forwarding_labels(nrobj_t* labels) { nrobj_t* label_keys = NULL; nrobj_t* exclude_labels_list = NULL; nrobj_t* exclude_labels_hash = NULL; diff --git a/agent/php_txn_private.h b/agent/php_txn_private.h index 6788877ad..ab7d5d7b4 100644 --- a/agent/php_txn_private.h +++ b/agent/php_txn_private.h @@ -86,3 +86,16 @@ extern void nr_php_txn_php_package_create_major_metric(void* value, * Params : 1. The current transaction. */ extern void nr_php_txn_create_packages_major_metrics(nrtxn_t* txn); + +/* + * Purpose : Filter the labels hash to exclude any labels that are in the + * newrelic.application_logging.forwarding.labels.exclude list. + * + * Params : 1. The labels hash to filter. + * + * Returns : A new hash containing the filtered labels. + * If no labels exist or all labels are excluded, then return NULL. + * + */ + +extern nrobj_t* nr_php_txn_get_log_forwarding_labels(nrobj_t* labels); \ No newline at end of file diff --git a/agent/tests/test_txn.c b/agent/tests/test_txn.c index 50c4ff8bc..f158ef814 100644 --- a/agent/tests/test_txn.c +++ b/agent/tests/test_txn.c @@ -288,6 +288,69 @@ static void test_create_agent_php_version_metrics() { #undef PHP_VERSION_METRIC_BASE #undef AGENT_VERSION_METRIC_BASE +static void test_create_log_forwarding_labels(TSRMLS_D) { + nrobj_t* labels = NULL; + nrobj_t* log_labels = NULL; + char* json = NULL; + + /* Test : Create log forwarding labels with valid key/value pairs */ + labels = nro_new_hash(); + nro_set_hash_string(labels, "key1", "value1"); + nro_set_hash_string(labels, "key2", "value2"); + nro_set_hash_string(labels, "key3", "value3"); + + log_labels = nr_php_txn_get_log_forwarding_labels(labels); + + json = nro_to_json(labels); + tlib_pass_if_str_equal( + "valid log label creation test", + "{\"key1\":\"value1\",\"key2\":\"value2\",\"key3\":\"value3\"}", json); + + nr_free(json); + nro_delete(labels); + nro_delete(log_labels); + + /* Test : Create log forwarding labels with empty key/value pairs */ + labels = nro_new_hash(); + nro_set_hash_string(labels, "", ""); + nro_set_hash_string(labels, "key", ""); + nro_set_hash_string(labels, "", "value"); + + log_labels = nr_php_txn_get_log_forwarding_labels(labels); + + json = nro_to_json(labels); + tlib_pass_if_str_equal("empty string log label creation test", + "{\"key\":\"\"}", json); + + nr_free(json); + nro_delete(labels); + nro_delete(log_labels); + + /* Test : Create log forwarding labels with NULL key/value pairs */ + labels = nro_new_hash(); + nro_set_hash_string(labels, NULL, NULL); + nro_set_hash_string(labels, "key", NULL); + nro_set_hash_string(labels, NULL, "value"); + + log_labels = nr_php_txn_get_log_forwarding_labels(labels); + + json = nro_to_json(labels); + tlib_pass_if_str_equal("NULL value log label creation test", "{\"key\":\"\"}", + json); + + nr_free(json); + nro_delete(labels); + nro_delete(log_labels); + + /* Test : Create log forwarding labels NULL labels object */ + log_labels = nr_php_txn_get_log_forwarding_labels(NULL); + json = nro_to_json(labels); + tlib_pass_if_str_equal("NULL object log label creation test", "null", json); + + nr_free(json); + nro_delete(log_labels); +} + tlib_parallel_info_t parallel_info = {.suggested_nthreads = 1, .state_size = 0}; void test_main(void* p NRUNUSED) { @@ -300,13 +363,15 @@ void test_main(void* p NRUNUSED) { * attribute configuration. */ tlib_php_engine_create( - "newrelic.transaction_events.attributes.include=request.uri" PTSRMLS_CC); + "newrelic.transaction_events.attributes.include=request." + "uri" PTSRMLS_CC); test_handle_fpm_error(); test_max_segments_config_values(); test_create_php_version_metric(); test_create_agent_version_metric(); test_create_agent_php_version_metrics(); + test_create_log_forwarding_labels(); tlib_php_engine_destroy(); } From 47df6f2344e0125864b97aaab122f42b99186d6f Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Thu, 6 Mar 2025 14:33:29 -0500 Subject: [PATCH 59/60] chore: Fix formatting --- agent/tests/test_txn.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/agent/tests/test_txn.c b/agent/tests/test_txn.c index f158ef814..c641fa8e7 100644 --- a/agent/tests/test_txn.c +++ b/agent/tests/test_txn.c @@ -362,9 +362,9 @@ void test_main(void* p NRUNUSED) { * We're setting up our own engine instance because we need to control the * attribute configuration. */ - tlib_php_engine_create( - "newrelic.transaction_events.attributes.include=request." - "uri" PTSRMLS_CC); + // clang-format off + tlib_php_engine_create("newrelic.transaction_events.attributes.include=request.uri" PTSRMLS_CC); + // clang-format on test_handle_fpm_error(); test_max_segments_config_values(); From 65f9ba2949816c25dcda4b78163d2dc4e1ae0b21 Mon Sep 17 00:00:00 2001 From: Michael Fulbright Date: Thu, 6 Mar 2025 15:09:31 -0500 Subject: [PATCH 60/60] tests(agent): Adds some more test cases for log labels --- ..._monolog_labels_forwarding_basic_comma.php | 215 +++++++++++++++++ ..._monolog_labels_forwarding_disabled_04.php | 209 +++++++++++++++++ ..._monolog_labels_forwarding_disabled_05.php | 118 ++++++++++ ...t_monolog_labels_forwarding_exclude_12.php | 215 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_13.php | 217 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_14.php | 221 ++++++++++++++++++ ...t_monolog_labels_forwarding_exclude_15.php | 219 +++++++++++++++++ ..._monolog_labels_forwarding_basic_comma.php | 215 +++++++++++++++++ ..._monolog_labels_forwarding_disabled_04.php | 1 + ..._monolog_labels_forwarding_disabled_05.php | 118 ++++++++++ ...t_monolog_labels_forwarding_exclude_12.php | 215 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_13.php | 217 +++++++++++++++++ ...t_monolog_labels_forwarding_exclude_14.php | 221 ++++++++++++++++++ ...t_monolog_labels_forwarding_exclude_15.php | 219 +++++++++++++++++ 14 files changed, 2620 insertions(+) create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_basic_comma.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled_04.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled_05.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_12.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_13.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_14.php create mode 100644 tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_15.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic_comma.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_05.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_12.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_13.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_14.php create mode 100644 tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_15.php diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_basic_comma.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_basic_comma.php new file mode 100644 index 000000000..c34a97ebc --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_basic_comma.php @@ -0,0 +1,215 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled_04.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled_04.php new file mode 100644 index 000000000..e9abceeab --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled_04.php @@ -0,0 +1,209 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled_05.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled_05.php new file mode 100644 index 000000000..fbec1ce44 --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_disabled_05.php @@ -0,0 +1,118 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_12.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_12.php new file mode 100644 index 000000000..959443b2a --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_12.php @@ -0,0 +1,215 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_13.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_13.php new file mode 100644 index 000000000..de5c2b882 --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_13.php @@ -0,0 +1,217 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_14.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_14.php new file mode 100644 index 000000000..baef46cba --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_14.php @@ -0,0 +1,221 @@ +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(); diff --git a/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_15.php b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_15.php new file mode 100644 index 000000000..b3ff5150b --- /dev/null +++ b/tests/integration/logging/monolog2/test_monolog_labels_forwarding_exclude_15.php @@ -0,0 +1,219 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic_comma.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic_comma.php new file mode 100644 index 000000000..74d2fc01c --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_basic_comma.php @@ -0,0 +1,215 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_04.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_04.php index 62bd502b1..7efe003a7 100644 --- a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_04.php +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_04.php @@ -11,6 +11,7 @@ Expect: - NO labels to be forwarded with the log events in the "common" attribute + since log forwarding is disabled by default - "Supportability/Logging/Labels/PHP/disabled" to exist and have a value of 1 */ diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_05.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_05.php new file mode 100644 index 000000000..ccb13b0e0 --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_disabled_05.php @@ -0,0 +1,118 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_12.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_12.php new file mode 100644 index 000000000..8801c47d0 --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_12.php @@ -0,0 +1,215 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_13.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_13.php new file mode 100644 index 000000000..4453099ba --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_13.php @@ -0,0 +1,217 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_14.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_14.php new file mode 100644 index 000000000..3a5714eac --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_14.php @@ -0,0 +1,221 @@ +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(); diff --git a/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_15.php b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_15.php new file mode 100644 index 000000000..64bcb6697 --- /dev/null +++ b/tests/integration/logging/monolog3/test_monolog_labels_forwarding_exclude_15.php @@ -0,0 +1,219 @@ +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();