From dabf2079b7ab626250d9178d2c2fe628425784ba Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 12 Oct 2022 18:28:35 +0200 Subject: [PATCH 1/3] Added info what are the new semantic attributes to be used Related change - https://github.com/open-telemetry/opentelemetry-specification/commit/0b45213858e23aedb6f6de5fab17d2843a9f24c5 --- .../semantic-convention/templates/SemanticAttributes.java.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildscripts/semantic-convention/templates/SemanticAttributes.java.j2 b/buildscripts/semantic-convention/templates/SemanticAttributes.java.j2 index 5051cd3d742..abaa75bdd7b 100644 --- a/buildscripts/semantic-convention/templates/SemanticAttributes.java.j2 +++ b/buildscripts/semantic-convention/templates/SemanticAttributes.java.j2 @@ -166,13 +166,13 @@ public final class {{class}} { public static final AttributeKey HTTP_HOST = stringKey("http.host"); /** - * @deprecated This item has been removed as of 1.13.0 of the semantic conventions. + * @deprecated This item has been removed as of 1.13.0 of the semantic conventions. Please use {@link SemanticAttributes.NET_SOCK_PEER_ADDR} instead. */ @Deprecated public static final AttributeKey NET_PEER_IP = stringKey("net.peer.ip"); /** - * @deprecated This item has been removed as of 1.13.0 of the semantic conventions. + * @deprecated This item has been removed as of 1.13.0 of the semantic conventions. Please use {@link SemanticAttributes.NET_SOCK_HOST_ADDR} instead. */ @Deprecated public static final AttributeKey NET_HOST_IP = stringKey("net.host.ip"); From 51a2de876152f06cd91e53e556bd9ccf460e5c94 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 17 Oct 2022 12:34:29 +0200 Subject: [PATCH 2/3] Regenerated the code --- .../semconv/trace/attributes/SemanticAttributes.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/semconv/src/main/java/io/opentelemetry/semconv/trace/attributes/SemanticAttributes.java b/semconv/src/main/java/io/opentelemetry/semconv/trace/attributes/SemanticAttributes.java index 8bc72516772..8ff9978768b 100644 --- a/semconv/src/main/java/io/opentelemetry/semconv/trace/attributes/SemanticAttributes.java +++ b/semconv/src/main/java/io/opentelemetry/semconv/trace/attributes/SemanticAttributes.java @@ -1414,12 +1414,14 @@ private MessageTypeValues() {} @Deprecated public static final AttributeKey HTTP_HOST = stringKey("http.host"); /** - * @deprecated This item has been removed as of 1.13.0 of the semantic conventions. + * @deprecated This item has been removed as of 1.13.0 of the semantic conventions. Please use + * {@link SemanticAttributes.NET_SOCK_PEER_ADDR} instead. */ @Deprecated public static final AttributeKey NET_PEER_IP = stringKey("net.peer.ip"); /** - * @deprecated This item has been removed as of 1.13.0 of the semantic conventions. + * @deprecated This item has been removed as of 1.13.0 of the semantic conventions. Please use + * {@link SemanticAttributes.NET_SOCK_HOST_ADDR} instead. */ @Deprecated public static final AttributeKey NET_HOST_IP = stringKey("net.host.ip"); From e9fdb7450bb9b8252c4dcf34b762d87a2b17aab6 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 17 Oct 2022 12:53:16 +0200 Subject: [PATCH 3/3] Fixed . to # --- .../semantic-convention/templates/SemanticAttributes.java.j2 | 4 ++-- .../semconv/trace/attributes/SemanticAttributes.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildscripts/semantic-convention/templates/SemanticAttributes.java.j2 b/buildscripts/semantic-convention/templates/SemanticAttributes.java.j2 index abaa75bdd7b..e0c5135515f 100644 --- a/buildscripts/semantic-convention/templates/SemanticAttributes.java.j2 +++ b/buildscripts/semantic-convention/templates/SemanticAttributes.java.j2 @@ -166,13 +166,13 @@ public final class {{class}} { public static final AttributeKey HTTP_HOST = stringKey("http.host"); /** - * @deprecated This item has been removed as of 1.13.0 of the semantic conventions. Please use {@link SemanticAttributes.NET_SOCK_PEER_ADDR} instead. + * @deprecated This item has been removed as of 1.13.0 of the semantic conventions. Please use {@link SemanticAttributes#NET_SOCK_PEER_ADDR} instead. */ @Deprecated public static final AttributeKey NET_PEER_IP = stringKey("net.peer.ip"); /** - * @deprecated This item has been removed as of 1.13.0 of the semantic conventions. Please use {@link SemanticAttributes.NET_SOCK_HOST_ADDR} instead. + * @deprecated This item has been removed as of 1.13.0 of the semantic conventions. Please use {@link SemanticAttributes#NET_SOCK_HOST_ADDR} instead. */ @Deprecated public static final AttributeKey NET_HOST_IP = stringKey("net.host.ip"); diff --git a/semconv/src/main/java/io/opentelemetry/semconv/trace/attributes/SemanticAttributes.java b/semconv/src/main/java/io/opentelemetry/semconv/trace/attributes/SemanticAttributes.java index 8ff9978768b..d3287d37091 100644 --- a/semconv/src/main/java/io/opentelemetry/semconv/trace/attributes/SemanticAttributes.java +++ b/semconv/src/main/java/io/opentelemetry/semconv/trace/attributes/SemanticAttributes.java @@ -1415,13 +1415,13 @@ private MessageTypeValues() {} /** * @deprecated This item has been removed as of 1.13.0 of the semantic conventions. Please use - * {@link SemanticAttributes.NET_SOCK_PEER_ADDR} instead. + * {@link SemanticAttributes#NET_SOCK_PEER_ADDR} instead. */ @Deprecated public static final AttributeKey NET_PEER_IP = stringKey("net.peer.ip"); /** * @deprecated This item has been removed as of 1.13.0 of the semantic conventions. Please use - * {@link SemanticAttributes.NET_SOCK_HOST_ADDR} instead. + * {@link SemanticAttributes#NET_SOCK_HOST_ADDR} instead. */ @Deprecated public static final AttributeKey NET_HOST_IP = stringKey("net.host.ip");