add server.address field

ZNeumann · ZNeumann · commit 0a7b02d50e3f · 2025-04-07T09:50:19.000-06:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -143,6 +143,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/tests/integration/pdo/pgsql/constructor/test_instance_reporting_port.php b/tests/integration/pdo/pgsql/constructor/test_instance_reporting_port.php
diff --git a/tests/integration/pdo/pgsql/factory/test_instance_reporting_port.php b/tests/integration/pdo/pgsql/factory/test_instance_reporting_port.php
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,7 @@`
`99`	`99`	`{`
`100`	`100`	`"db.instance": "unknown",`
`101`	`101`	`"peer.hostname": "unknown",`
	`102`	`+ "server.address": "unknown",`
`102`	`103`	`"peer.address": "unknown:unknown"`
`103`	`104`	`}`
`104`	`105`	`]`
Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@`
`117`	`117`	`{`
`118`	`118`	`"db.instance": "unknown",`
`119`	`119`	`"peer.hostname": "unknown",`
	`120`	`+ "server.address": "unknown",`
`120`	`121`	`"peer.address": "unknown:unknown"`
`121`	`122`	`}`
`122`	`123`	`],`
Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,7 @@`
`118`	`118`	`{`
`119`	`119`	`"db.instance": "unknown",`
`120`	`120`	`"peer.hostname": "unknown",`
	`121`	`+ "server.address": "unknown",`
`121`	`122`	`"peer.address": "unknown:unknown"`
`122`	`123`	`}`
`123`	`124`	`],`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@`
`79`	`79`	`{`
`80`	`80`	`"db.instance": "unknown",`
`81`	`81`	`"peer.hostname": "unknown",`
	`82`	`+ "server.address": "unknown",`
`82`	`83`	`"peer.address": "unknown:unknown"`
`83`	`84`	`}`
`84`	`85`	`],`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@`
`84`	`84`	`{`
`85`	`85`	`"db.instance": "unknown",`
`86`	`86`	`"peer.hostname": "unknown",`
	`87`	`+ "server.address": "unknown",`
`87`	`88`	`"peer.address": "unknown:unknown"`
`88`	`89`	`}`
`89`	`90`	`],`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@`
`85`	`85`	`{`
`86`	`86`	`"db.instance": "unknown",`
`87`	`87`	`"peer.hostname": "unknown",`
	`88`	`+ "server.address": "unknown",`
`88`	`89`	`"peer.address": "unknown:unknown"`
`89`	`90`	`}`
`90`	`91`	`],`
Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,7 @@`
`120`	`120`	`{`
`121`	`121`	`"db.instance": "unknown",`
`122`	`122`	`"peer.hostname": "unknown",`
	`123`	`+ "server.address": "unknown",`
`123`	`124`	`"peer.address": "unknown:unknown"`
`124`	`125`	`}`
`125`	`126`	`],`
Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,7 @@`
`121`	`121`	`{`
`122`	`122`	`"db.instance": "unknown",`
`123`	`123`	`"peer.hostname": "unknown",`
	`124`	`+ "server.address": "unknown",`
`124`	`125`	`"peer.address": "unknown:unknown"`
`125`	`126`	`}`
`126`	`127`	`],`
Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,7 @@`
`131`	`131`	`{`
`132`	`132`	`"db.instance": "unknown",`
`133`	`133`	`"peer.hostname": "unknown",`
	`134`	`+ "server.address": "unknown",`
`134`	`135`	`"peer.address": "unknown:unknown"`
`135`	`136`	`}`
`136`	`137`	`],`
Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,7 @@`
`114`	`114`	`{`
`115`	`115`	`"db.instance": "unknown",`
`116`	`116`	`"peer.hostname": "unknown",`
	`117`	`+ "server.address": "unknown",`
`117`	`118`	`"peer.address": "unknown:unknown"`
`118`	`119`	`}`
`119`	`120`	`],`