From 971113359be070e5dc426520c1a5c07103d3377d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Neum=C3=BCller?= Date: Wed, 21 Jun 2023 09:49:06 +0200 Subject: [PATCH 1/5] Fix CHANGELOG.md (server.name does not exist) --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ef24f9e60..c75843cb3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,7 +34,7 @@ release. ([#3402](https://github.com/open-telemetry/opentelemetry-specification/pull/3402)) BREAKING: rename `net.peer.name` to `server.address` on client side and to `client.address` on server side, `net.peer.port` to `server.port` on client side and to `client.port` on server side, - `net.host.name` and `net.host.port` to `server.name` and `server.port` (since `net.host.*` attributes only applied to server instrumentation) + `net.host.name` and `net.host.port` to `server.address` and `server.port` on client side (`net.host.*` attributes do not apply to server instrumentation) `net.sock.peer.addr` to `server.socket.address` on client side and to `client.socket.address` on server side, `net.sock.peer.port` to `server.socket.port` on client side and to `client.socket.port` on server side, `net.sock.peer.name` to `server.socket.domain` (since `net.sock.peer.name` only applied to client instrumentation), @@ -94,4 +94,4 @@ release. ([#17](https://github.com/open-telemetry/opentelemetry-specification/pull/17)) - Mark service.version as stable. ([#106](https://github.com/open-telemetry/semantic-conventions/pull/106)) - \ No newline at end of file + From 53acf5042e61ccfb3d4c07beb011c9f3e3e1fba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Neum=C3=BCller?= Date: Wed, 21 Jun 2023 09:52:55 +0200 Subject: [PATCH 2/5] Revert stray newline From e8c8012733285682dae42f602b78e6deffca181f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Neum=C3=BCller?= Date: Wed, 21 Jun 2023 10:17:43 +0200 Subject: [PATCH 3/5] Really fix stray newline --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c75843cb3f..2339e68797 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -94,4 +94,3 @@ release. ([#17](https://github.com/open-telemetry/opentelemetry-specification/pull/17)) - Mark service.version as stable. ([#106](https://github.com/open-telemetry/semantic-conventions/pull/106)) - From c4c90075b290c230260fc9e9342817b81e088783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Neum=C3=BCller?= Date: Wed, 21 Jun 2023 10:22:26 +0200 Subject: [PATCH 4/5] Fix accidental reversal/reduncancy --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2339e68797..88db474092 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,7 +34,7 @@ release. ([#3402](https://github.com/open-telemetry/opentelemetry-specification/pull/3402)) BREAKING: rename `net.peer.name` to `server.address` on client side and to `client.address` on server side, `net.peer.port` to `server.port` on client side and to `client.port` on server side, - `net.host.name` and `net.host.port` to `server.address` and `server.port` on client side (`net.host.*` attributes do not apply to server instrumentation) + `net.host.name` and `net.host.port` to `server.address` and `server.port` (since `net.host.*` attributes only applied on server side) `net.sock.peer.addr` to `server.socket.address` on client side and to `client.socket.address` on server side, `net.sock.peer.port` to `server.socket.port` on client side and to `client.socket.port` on server side, `net.sock.peer.name` to `server.socket.domain` (since `net.sock.peer.name` only applied to client instrumentation), From 15ba2fdcd66bbe740520a8e21517ff2b0b120b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Neum=C3=BCller?= Date: Wed, 21 Jun 2023 10:28:44 +0200 Subject: [PATCH 5/5] Minimize --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88db474092..a63a74d990 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,7 +34,7 @@ release. ([#3402](https://github.com/open-telemetry/opentelemetry-specification/pull/3402)) BREAKING: rename `net.peer.name` to `server.address` on client side and to `client.address` on server side, `net.peer.port` to `server.port` on client side and to `client.port` on server side, - `net.host.name` and `net.host.port` to `server.address` and `server.port` (since `net.host.*` attributes only applied on server side) + `net.host.name` and `net.host.port` to `server.address` and `server.port` (since `net.host.*` attributes only applied to server instrumentation), `net.sock.peer.addr` to `server.socket.address` on client side and to `client.socket.address` on server side, `net.sock.peer.port` to `server.socket.port` on client side and to `client.socket.port` on server side, `net.sock.peer.name` to `server.socket.domain` (since `net.sock.peer.name` only applied to client instrumentation),