diff --git a/axiom/nr_span_event.c b/axiom/nr_span_event.c index 7c8c2dbe0..8c5191bb4 100644 --- a/axiom/nr_span_event.c +++ b/axiom/nr_span_event.c @@ -322,7 +322,13 @@ void nr_span_event_set_datastore(nr_span_event_t* event, nro_set_hash_string(event->agent_attributes, "peer.address", new_value); break; case NR_SPAN_DATASTORE_PEER_HOSTNAME: + /* + * Both peer.hostname and server.address are expected to have the same + * value. server.address is used to create the entity relationship map + * and peer.hostname is maintained for backwards consistency. + */ nro_set_hash_string(event->agent_attributes, "peer.hostname", new_value); + nro_set_hash_string(event->agent_attributes, "server.address", new_value); break; } return; diff --git a/tests/integration/jit/function/test_span_events_are_created_from_segments.php b/tests/integration/jit/function/test_span_events_are_created_from_segments.php index b543794bd..c7a2a187c 100644 --- a/tests/integration/jit/function/test_span_events_are_created_from_segments.php +++ b/tests/integration/jit/function/test_span_events_are_created_from_segments.php @@ -99,6 +99,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ] diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_caught_error.php b/tests/integration/jit/function/test_span_events_are_created_upon_caught_error.php index 0c113528a..439a1fb9d 100644 --- a/tests/integration/jit/function/test_span_events_are_created_upon_caught_error.php +++ b/tests/integration/jit/function/test_span_events_are_created_upon_caught_error.php @@ -117,6 +117,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_caught_error.php84.php b/tests/integration/jit/function/test_span_events_are_created_upon_caught_error.php84.php index f5ef9e41e..5d99fefb1 100644 --- a/tests/integration/jit/function/test_span_events_are_created_upon_caught_error.php84.php +++ b/tests/integration/jit/function/test_span_events_are_created_upon_caught_error.php84.php @@ -118,6 +118,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_exit.php b/tests/integration/jit/function/test_span_events_are_created_upon_exit.php index 3274bf154..3d7c4e0d5 100644 --- a/tests/integration/jit/function/test_span_events_are_created_upon_exit.php +++ b/tests/integration/jit/function/test_span_events_are_created_upon_exit.php @@ -79,6 +79,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_error.php b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_error.php index cc1fc14b3..3a8fbeee3 100644 --- a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_error.php +++ b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_error.php @@ -84,6 +84,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_error.php84.php b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_error.php84.php index dfb8e1de2..d3c960eba 100644 --- a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_error.php84.php +++ b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_error.php84.php @@ -85,6 +85,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception.php b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception.php index 7624a2a4b..8a8bd5fd1 100644 --- a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception.php +++ b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception.php @@ -120,6 +120,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception.php84.php b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception.php84.php index 28099b17c..3d79d767d 100644 --- a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception.php84.php +++ b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception.php84.php @@ -121,6 +121,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception_invalid_handler.php b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception_invalid_handler.php index fd00e971c..a2822285b 100644 --- a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception_invalid_handler.php +++ b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception_invalid_handler.php @@ -131,6 +131,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_unhandled_exception.php b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_unhandled_exception.php index f619cab45..7c4349681 100644 --- a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_unhandled_exception.php +++ b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_unhandled_exception.php @@ -118,6 +118,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/jit/function/test_span_events_error_collector_disabled.php b/tests/integration/jit/function/test_span_events_error_collector_disabled.php index 09a26cd9c..613fa7d98 100644 --- a/tests/integration/jit/function/test_span_events_error_collector_disabled.php +++ b/tests/integration/jit/function/test_span_events_error_collector_disabled.php @@ -84,6 +84,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/jit/function/test_span_events_exception_uncaught_nested.php b/tests/integration/jit/function/test_span_events_exception_uncaught_nested.php index d3c317994..28be88df6 100644 --- a/tests/integration/jit/function/test_span_events_exception_uncaught_nested.php +++ b/tests/integration/jit/function/test_span_events_exception_uncaught_nested.php @@ -114,6 +114,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/jit/tracing/test_span_events_are_created_from_segments.php b/tests/integration/jit/tracing/test_span_events_are_created_from_segments.php index cc2a52753..d1580672c 100644 --- a/tests/integration/jit/tracing/test_span_events_are_created_from_segments.php +++ b/tests/integration/jit/tracing/test_span_events_are_created_from_segments.php @@ -99,6 +99,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ] diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_caught_error.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_caught_error.php index 74e03bf46..2bdbcabe9 100644 --- a/tests/integration/jit/tracing/test_span_events_are_created_upon_caught_error.php +++ b/tests/integration/jit/tracing/test_span_events_are_created_upon_caught_error.php @@ -116,6 +116,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_caught_error.php84.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_caught_error.php84.php index eeb18dc14..527c703cc 100644 --- a/tests/integration/jit/tracing/test_span_events_are_created_upon_caught_error.php84.php +++ b/tests/integration/jit/tracing/test_span_events_are_created_upon_caught_error.php84.php @@ -117,6 +117,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_exit.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_exit.php index 176730a7f..8765e0106 100644 --- a/tests/integration/jit/tracing/test_span_events_are_created_upon_exit.php +++ b/tests/integration/jit/tracing/test_span_events_are_created_upon_exit.php @@ -79,6 +79,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_error.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_error.php index 51f8b899a..2582db35d 100644 --- a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_error.php +++ b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_error.php @@ -84,6 +84,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_error.php84.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_error.php84.php index 54660f8a3..ccb864cbd 100644 --- a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_error.php84.php +++ b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_error.php84.php @@ -85,6 +85,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception.php index 7444c28e7..124f82321 100644 --- a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception.php +++ b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception.php @@ -117,6 +117,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception.php84.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception.php84.php index 922a0c5a7..c8d8937ab 100644 --- a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception.php84.php +++ b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception.php84.php @@ -118,6 +118,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception_invalid_handler.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception_invalid_handler.php index bd99855b8..4dfe7774d 100644 --- a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception_invalid_handler.php +++ b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception_invalid_handler.php @@ -126,6 +126,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_unhandled_exception.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_unhandled_exception.php index 54269f072..345713ab4 100644 --- a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_unhandled_exception.php +++ b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_unhandled_exception.php @@ -118,6 +118,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/jit/tracing/test_span_events_error_collector_disabled.php b/tests/integration/jit/tracing/test_span_events_error_collector_disabled.php index 0e6fb6db1..b28161f17 100644 --- a/tests/integration/jit/tracing/test_span_events_error_collector_disabled.php +++ b/tests/integration/jit/tracing/test_span_events_error_collector_disabled.php @@ -85,6 +85,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/jit/tracing/test_span_events_exception_uncaught_nested.php b/tests/integration/jit/tracing/test_span_events_exception_uncaught_nested.php index d352b174e..178498e0f 100644 --- a/tests/integration/jit/tracing/test_span_events_exception_uncaught_nested.php +++ b/tests/integration/jit/tracing/test_span_events_exception_uncaught_nested.php @@ -115,6 +115,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_from_segments.php b/tests/integration/opcache/disabled/test_span_events_are_created_from_segments.php index 232c68835..60f1d0b8e 100644 --- a/tests/integration/opcache/disabled/test_span_events_are_created_from_segments.php +++ b/tests/integration/opcache/disabled/test_span_events_are_created_from_segments.php @@ -95,6 +95,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ] diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_caught_error.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_caught_error.php index ce62bfc12..967496f13 100644 --- a/tests/integration/opcache/disabled/test_span_events_are_created_upon_caught_error.php +++ b/tests/integration/opcache/disabled/test_span_events_are_created_upon_caught_error.php @@ -114,6 +114,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_caught_error.php84.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_caught_error.php84.php index 86c24a776..3da396162 100644 --- a/tests/integration/opcache/disabled/test_span_events_are_created_upon_caught_error.php84.php +++ b/tests/integration/opcache/disabled/test_span_events_are_created_upon_caught_error.php84.php @@ -114,6 +114,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_exit.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_exit.php index 633ce880d..534798722 100644 --- a/tests/integration/opcache/disabled/test_span_events_are_created_upon_exit.php +++ b/tests/integration/opcache/disabled/test_span_events_are_created_upon_exit.php @@ -75,6 +75,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_error.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_error.php index 49320f19b..3b7c79700 100644 --- a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_error.php +++ b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_error.php @@ -80,6 +80,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_error.php84.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_error.php84.php index 35014d54f..7da26eebd 100644 --- a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_error.php84.php +++ b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_error.php84.php @@ -81,6 +81,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php index 76dd4fe41..92dd2400b 100644 --- a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php +++ b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php @@ -119,6 +119,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php7.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php7.php index 67bc1b428..af8781c97 100644 --- a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php7.php +++ b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php7.php @@ -87,6 +87,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php84.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php84.php index e4be687b9..2a939881d 100644 --- a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php84.php +++ b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php84.php @@ -117,6 +117,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_unhandled_exception.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_unhandled_exception.php index 94b69f7a8..6d5fef9a0 100644 --- a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_unhandled_exception.php +++ b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_unhandled_exception.php @@ -114,6 +114,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/opcache/disabled/test_span_events_error_collector_disabled.php b/tests/integration/opcache/disabled/test_span_events_error_collector_disabled.php index b8d5584dc..e9786d322 100644 --- a/tests/integration/opcache/disabled/test_span_events_error_collector_disabled.php +++ b/tests/integration/opcache/disabled/test_span_events_error_collector_disabled.php @@ -81,6 +81,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/opcache/disabled/test_span_events_exception_uncaught_nested.php b/tests/integration/opcache/disabled/test_span_events_exception_uncaught_nested.php index 658bcec9e..1fae4261d 100644 --- a/tests/integration/opcache/disabled/test_span_events_exception_uncaught_nested.php +++ b/tests/integration/opcache/disabled/test_span_events_exception_uncaught_nested.php @@ -110,6 +110,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/pdo/mysql/base-class/test_instance_reporting_port.php b/tests/integration/pdo/mysql/base-class/test_instance_reporting_port.php index 0742b5461..c39cb2c4c 100644 --- a/tests/integration/pdo/mysql/base-class/test_instance_reporting_port.php +++ b/tests/integration/pdo/mysql/base-class/test_instance_reporting_port.php @@ -119,6 +119,7 @@ {}, { "peer.hostname": "ENV[MYSQL_HOST]", + "server.address": "ENV[MYSQL_HOST]", "peer.address": "ENV[MYSQL_HOST]:ENV[MYSQL_PORT]", "db.instance": "ENV[MYSQL_DB]", "db.statement": "CREATE TABLE ENV[DATASTORE_COLLECTION] (id INT, description VARCHAR(?));" @@ -143,6 +144,7 @@ {}, { "peer.hostname": "ENV[MYSQL_HOST]", + "server.address": "ENV[MYSQL_HOST]", "peer.address": "ENV[MYSQL_HOST]:ENV[MYSQL_PORT]", "db.instance": "ENV[MYSQL_DB]", "db.statement": "DROP TABLE ENV[DATASTORE_COLLECTION];" diff --git a/tests/integration/pdo/mysql/base-class/test_instance_reporting_socket.php b/tests/integration/pdo/mysql/base-class/test_instance_reporting_socket.php index 95177d7c7..00ef8caa8 100644 --- a/tests/integration/pdo/mysql/base-class/test_instance_reporting_socket.php +++ b/tests/integration/pdo/mysql/base-class/test_instance_reporting_socket.php @@ -118,6 +118,7 @@ {}, { "peer.hostname": "__HOST__", + "server.address": "__HOST__", "peer.address": "__HOST__:ENV[MYSQL_SOCKET]", "db.instance": "ENV[MYSQL_DB]", "db.statement": "CREATE TABLE ENV[DATASTORE_COLLECTION] (id INT, description VARCHAR(?));" @@ -142,6 +143,7 @@ {}, { "peer.hostname": "__HOST__", + "server.address": "__HOST__", "peer.address": "__HOST__:ENV[MYSQL_SOCKET]", "db.instance": "ENV[MYSQL_DB]", "db.statement": "DROP TABLE ENV[DATASTORE_COLLECTION];" diff --git a/tests/integration/pdo/mysql/constructor/test_instance_reporting_port.php b/tests/integration/pdo/mysql/constructor/test_instance_reporting_port.php index 79fc32770..7ffb014d9 100644 --- a/tests/integration/pdo/mysql/constructor/test_instance_reporting_port.php +++ b/tests/integration/pdo/mysql/constructor/test_instance_reporting_port.php @@ -120,6 +120,7 @@ {}, { "peer.hostname": "ENV[MYSQL_HOST]", + "server.address": "ENV[MYSQL_HOST]", "peer.address": "ENV[MYSQL_HOST]:ENV[MYSQL_PORT]", "db.instance": "ENV[MYSQL_DB]", "db.statement": "CREATE TABLE ENV[DATASTORE_COLLECTION] (id INT, description VARCHAR(?));" @@ -144,6 +145,7 @@ {}, { "peer.hostname": "ENV[MYSQL_HOST]", + "server.address": "ENV[MYSQL_HOST]", "peer.address": "ENV[MYSQL_HOST]:ENV[MYSQL_PORT]", "db.instance": "ENV[MYSQL_DB]", "db.statement": "DROP TABLE ENV[DATASTORE_COLLECTION];" diff --git a/tests/integration/pdo/mysql/constructor/test_instance_reporting_socket.php b/tests/integration/pdo/mysql/constructor/test_instance_reporting_socket.php index 073bceb80..ca844967f 100644 --- a/tests/integration/pdo/mysql/constructor/test_instance_reporting_socket.php +++ b/tests/integration/pdo/mysql/constructor/test_instance_reporting_socket.php @@ -119,6 +119,7 @@ {}, { "peer.hostname": "__HOST__", + "server.address": "__HOST__", "peer.address": "__HOST__:ENV[MYSQL_SOCKET]", "db.instance": "ENV[MYSQL_DB]", "db.statement": "CREATE TABLE ENV[DATASTORE_COLLECTION] (id INT, description VARCHAR(?));" @@ -143,6 +144,7 @@ {}, { "peer.hostname": "__HOST__", + "server.address": "__HOST__", "peer.address": "__HOST__:ENV[MYSQL_SOCKET]", "db.instance": "ENV[MYSQL_DB]", "db.statement": "DROP TABLE ENV[DATASTORE_COLLECTION];" diff --git a/tests/integration/pdo/mysql/factory/test_instance_reporting_port.php b/tests/integration/pdo/mysql/factory/test_instance_reporting_port.php index b83389dfb..27d569b71 100644 --- a/tests/integration/pdo/mysql/factory/test_instance_reporting_port.php +++ b/tests/integration/pdo/mysql/factory/test_instance_reporting_port.php @@ -120,6 +120,7 @@ {}, { "peer.hostname": "ENV[MYSQL_HOST]", + "server.address": "ENV[MYSQL_HOST]", "peer.address": "ENV[MYSQL_HOST]:ENV[MYSQL_PORT]", "db.instance": "ENV[MYSQL_DB]", "db.statement": "CREATE TABLE ENV[DATASTORE_COLLECTION] (id INT, description VARCHAR(?));" @@ -144,6 +145,7 @@ {}, { "peer.hostname": "ENV[MYSQL_HOST]", + "server.address": "ENV[MYSQL_HOST]", "peer.address": "ENV[MYSQL_HOST]:ENV[MYSQL_PORT]", "db.instance": "ENV[MYSQL_DB]", "db.statement": "DROP TABLE ENV[DATASTORE_COLLECTION];" diff --git a/tests/integration/pdo/mysql/factory/test_instance_reporting_socket.php b/tests/integration/pdo/mysql/factory/test_instance_reporting_socket.php index 796d108db..4cbefb108 100644 --- a/tests/integration/pdo/mysql/factory/test_instance_reporting_socket.php +++ b/tests/integration/pdo/mysql/factory/test_instance_reporting_socket.php @@ -119,6 +119,7 @@ {}, { "peer.hostname": "__HOST__", + "server.address": "__HOST__", "peer.address": "__HOST__:ENV[MYSQL_SOCKET]", "db.instance": "ENV[MYSQL_DB]", "db.statement": "CREATE TABLE ENV[DATASTORE_COLLECTION] (id INT, description VARCHAR(?));" @@ -143,6 +144,7 @@ {}, { "peer.hostname": "__HOST__", + "server.address": "__HOST__", "peer.address": "__HOST__:ENV[MYSQL_SOCKET]", "db.instance": "ENV[MYSQL_DB]", "db.statement": "DROP TABLE ENV[DATASTORE_COLLECTION];" diff --git a/tests/integration/pdo/pgsql/base-class/test_instance_reporting_port.php b/tests/integration/pdo/pgsql/base-class/test_instance_reporting_port.php index e6c735433..3b915c7ba 100644 --- a/tests/integration/pdo/pgsql/base-class/test_instance_reporting_port.php +++ b/tests/integration/pdo/pgsql/base-class/test_instance_reporting_port.php @@ -118,6 +118,7 @@ {}, { "peer.hostname": "ENV[PG_HOST]", + "server.address": "ENV[PG_HOST]", "peer.address": "ENV[PG_HOST]:ENV[PG_PORT]", "db.instance": "postgres", "db.statement": "CREATE TABLE ENV[DATASTORE_COLLECTION] (id INT, description VARCHAR(?));" @@ -142,6 +143,7 @@ {}, { "peer.hostname": "ENV[PG_HOST]", + "server.address": "ENV[PG_HOST]", "peer.address": "ENV[PG_HOST]:ENV[PG_PORT]", "db.instance": "postgres", "db.statement": "DROP TABLE ENV[DATASTORE_COLLECTION];" diff --git a/tests/integration/pdo/pgsql/constructor/test_instance_reporting_port.php b/tests/integration/pdo/pgsql/constructor/test_instance_reporting_port.php index b894d6dd1..0f25b24b2 100644 --- a/tests/integration/pdo/pgsql/constructor/test_instance_reporting_port.php +++ b/tests/integration/pdo/pgsql/constructor/test_instance_reporting_port.php @@ -119,6 +119,7 @@ {}, { "peer.hostname": "ENV[PG_HOST]", + "server.address": "ENV[PG_HOST]", "peer.address": "ENV[PG_HOST]:ENV[PG_PORT]", "db.instance": "postgres", "db.statement": "CREATE TABLE ENV[DATASTORE_COLLECTION] (id INT, description VARCHAR(?));" @@ -143,6 +144,7 @@ {}, { "peer.hostname": "ENV[PG_HOST]", + "server.address": "ENV[PG_HOST]", "peer.address": "ENV[PG_HOST]:ENV[PG_PORT]", "db.instance": "postgres", "db.statement": "DROP TABLE ENV[DATASTORE_COLLECTION];" diff --git a/tests/integration/pdo/pgsql/factory/test_instance_reporting_port.php b/tests/integration/pdo/pgsql/factory/test_instance_reporting_port.php index 3ec9a9762..137d6742b 100644 --- a/tests/integration/pdo/pgsql/factory/test_instance_reporting_port.php +++ b/tests/integration/pdo/pgsql/factory/test_instance_reporting_port.php @@ -119,6 +119,7 @@ {}, { "peer.hostname": "ENV[PG_HOST]", + "server.address": "ENV[PG_HOST]", "peer.address": "ENV[PG_HOST]:ENV[PG_PORT]", "db.instance": "postgres", "db.statement": "CREATE TABLE ENV[DATASTORE_COLLECTION] (id INT, description VARCHAR(?));" @@ -143,6 +144,7 @@ {}, { "peer.hostname": "ENV[PG_HOST]", + "server.address": "ENV[PG_HOST]", "peer.address": "ENV[PG_HOST]:ENV[PG_PORT]", "db.instance": "postgres", "db.statement": "DROP TABLE ENV[DATASTORE_COLLECTION];" diff --git a/tests/integration/span_events/test_span_events_are_created_from_segments.php b/tests/integration/span_events/test_span_events_are_created_from_segments.php index 4457d1ff4..f002bfd9c 100644 --- a/tests/integration/span_events/test_span_events_are_created_from_segments.php +++ b/tests/integration/span_events/test_span_events_are_created_from_segments.php @@ -64,7 +64,7 @@ }, {}, { - "code.lineno": 99, + "code.lineno": 100, "code.filepath": "__FILE__", "code.function": "a" } @@ -89,6 +89,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ] diff --git a/tests/integration/span_events/test_span_events_are_created_from_segments.php5.php b/tests/integration/span_events/test_span_events_are_created_from_segments.php5.php index fd53eaa6d..0a1315d7c 100644 --- a/tests/integration/span_events/test_span_events_are_created_from_segments.php5.php +++ b/tests/integration/span_events/test_span_events_are_created_from_segments.php5.php @@ -79,6 +79,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ] diff --git a/tests/integration/span_events/test_span_events_are_created_upon_caught_error.php b/tests/integration/span_events/test_span_events_are_created_upon_caught_error.php index 56e161179..f9c2b6d97 100644 --- a/tests/integration/span_events/test_span_events_are_created_upon_caught_error.php +++ b/tests/integration/span_events/test_span_events_are_created_upon_caught_error.php @@ -74,6 +74,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], @@ -95,7 +96,7 @@ { "error.message": "foo", "error.class": "E_USER_ERROR", - "code.lineno": 139, + "code.lineno": 140, "code.filepath": "__FILE__", "code.function": "a" } @@ -116,7 +117,7 @@ }, {}, { - "code.lineno": 133, + "code.lineno": 134, "code.filepath": "__FILE__", "code.function": "{closure}" } diff --git a/tests/integration/span_events/test_span_events_are_created_upon_caught_error.php84.php b/tests/integration/span_events/test_span_events_are_created_upon_caught_error.php84.php index fabe4bddd..20249bbda 100644 --- a/tests/integration/span_events/test_span_events_are_created_upon_caught_error.php84.php +++ b/tests/integration/span_events/test_span_events_are_created_upon_caught_error.php84.php @@ -72,6 +72,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], @@ -93,7 +94,7 @@ { "error.message": "foo", "error.class": "E_USER_WARNING", - "code.lineno": 137, + "code.lineno": 138, "code.filepath": "__FILE__", "code.function": "a" } @@ -114,7 +115,7 @@ }, {}, { - "code.lineno": 131, + "code.lineno": 132, "code.filepath": "__FILE__", "code.function": "{closure:__FILE__:??}" } diff --git a/tests/integration/span_events/test_span_events_are_created_upon_exit.php b/tests/integration/span_events/test_span_events_are_created_upon_exit.php index 9e47469eb..18023e619 100644 --- a/tests/integration/span_events/test_span_events_are_created_upon_exit.php +++ b/tests/integration/span_events/test_span_events_are_created_upon_exit.php @@ -69,6 +69,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], @@ -88,7 +89,7 @@ }, {}, { - "code.lineno": 100, + "code.lineno": 101, "code.filepath": "__FILE__", "code.function": "a" } diff --git a/tests/integration/span_events/test_span_events_are_created_upon_exit.php5.php b/tests/integration/span_events/test_span_events_are_created_upon_exit.php5.php index 344f19247..80a2bb66f 100644 --- a/tests/integration/span_events/test_span_events_are_created_upon_exit.php5.php +++ b/tests/integration/span_events/test_span_events_are_created_upon_exit.php5.php @@ -63,6 +63,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php index a41838d3e..2e5a9c1c1 100644 --- a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php +++ b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php @@ -74,6 +74,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], @@ -95,7 +96,7 @@ { "error.message": "foo", "error.class": "E_USER_ERROR", - "code.lineno": 111, + "code.lineno": 112, "code.filepath": "__FILE__", "code.function": "a" } diff --git a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php5.php b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php5.php index 3e17f5371..2909eaf26 100644 --- a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php5.php +++ b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php5.php @@ -72,6 +72,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php84.php b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php84.php index b56ef56a2..e18d8c74c 100644 --- a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php84.php +++ b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php84.php @@ -72,6 +72,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], @@ -93,7 +94,7 @@ { "error.message": "foo", "error.class": "E_USER_WARNING", - "code.lineno": 109, + "code.lineno": 110, "code.filepath": "__FILE__", "code.function": "a" } diff --git a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php index 24d3e6da2..34f450612 100644 --- a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php +++ b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php @@ -106,6 +106,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php7.php b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php7.php index 24c64e436..905367e0c 100644 --- a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php7.php +++ b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php7.php @@ -76,6 +76,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php84.php b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php84.php index c9e6a3455..852d3c0ce 100644 --- a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php84.php +++ b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php84.php @@ -104,6 +104,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_unhandled_exception.php b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_unhandled_exception.php index 9c5063753..3360fdd37 100644 --- a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_unhandled_exception.php +++ b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_unhandled_exception.php @@ -74,6 +74,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], @@ -95,7 +96,7 @@ { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", "error.class": "RuntimeException", - "code.lineno": 111, + "code.lineno": 112, "code.filepath": "__FILE__", "code.function": "a" } diff --git a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_unhandled_exception.php5.php b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_unhandled_exception.php5.php index d1c2ac442..954d92e28 100644 --- a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_unhandled_exception.php5.php +++ b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_unhandled_exception.php5.php @@ -68,6 +68,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/span_events/test_span_events_error_collector_disabled.php b/tests/integration/span_events/test_span_events_error_collector_disabled.php index 9ecadc228..1b952ec1f 100644 --- a/tests/integration/span_events/test_span_events_error_collector_disabled.php +++ b/tests/integration/span_events/test_span_events_error_collector_disabled.php @@ -70,6 +70,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], @@ -89,7 +90,7 @@ }, {}, { - "code.lineno": 101, + "code.lineno": 102, "code.filepath": "__FILE__", "code.function": "a" } diff --git a/tests/integration/span_events/test_span_events_error_collector_disabled.php5.php b/tests/integration/span_events/test_span_events_error_collector_disabled.php5.php index 0ae31886f..0b1a3eff8 100644 --- a/tests/integration/span_events/test_span_events_error_collector_disabled.php5.php +++ b/tests/integration/span_events/test_span_events_error_collector_disabled.php5.php @@ -64,6 +64,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], diff --git a/tests/integration/span_events/test_span_events_exception_uncaught_nested.php b/tests/integration/span_events/test_span_events_exception_uncaught_nested.php index 0752d1fb6..5101343d9 100644 --- a/tests/integration/span_events/test_span_events_exception_uncaught_nested.php +++ b/tests/integration/span_events/test_span_events_exception_uncaught_nested.php @@ -104,6 +104,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ], @@ -125,7 +126,7 @@ { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", "error.class": "RuntimeException", - "code.lineno": 187, + "code.lineno": 188, "code.filepath": "__FILE__", "code.function": "a" } @@ -148,7 +149,7 @@ { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", "error.class": "RuntimeException", - "code.lineno": 193, + "code.lineno": 194, "code.filepath": "__FILE__", "code.function": "b" } @@ -171,7 +172,7 @@ { "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??", "error.class": "RuntimeException", - "code.lineno": 199, + "code.lineno": 200, "code.filepath": "__FILE__", "code.function": "c" } diff --git a/tests/integration/span_events/test_span_events_exception_uncaught_nested.php5.php b/tests/integration/span_events/test_span_events_exception_uncaught_nested.php5.php index b61d9a928..78881644a 100644 --- a/tests/integration/span_events/test_span_events_exception_uncaught_nested.php5.php +++ b/tests/integration/span_events/test_span_events_exception_uncaught_nested.php5.php @@ -98,6 +98,7 @@ { "db.instance": "unknown", "peer.hostname": "unknown", + "server.address": "unknown", "peer.address": "unknown:unknown" } ],