feat(agent): add server.address field for datastores

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;

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"
       }
     ]

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ]

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ]

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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"
       }
     ],

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];"

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];"

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];"

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];"

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];"

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];"