ID2

open-telemetry · Jun 10, 2024 · 6390847 · 6390847
1 parent f7e7451
commit 6390847
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -94,7 +94,7 @@ fun generateTask(taskName: String, incubating: Boolean) {
         "-v", "$buildDir/semantic-conventions-${semanticConventionsVersion}/model:/source",
         "-v", "$projectDir/buildscripts/templates:/templates",
         "-v", "$projectDir/$outputDir:/output",
-        "library/semconvgen2",
+        "otel/semconvgen:$generatorVersion",
         "--yaml-root", "/source",
         "--continue-on-validation-errors", "compatibility",
         "code",

diff --git a/buildscripts/templates/SemanticAttributes.java.j2 b/buildscripts/templates/SemanticAttributes.java.j2
@@ -39,6 +39,10 @@
 {%- set filtered_enums = filtered_attributes | selectattr('is_enum', 'equalto', true) | list %}
 {%- set excluded_namespaces_list = excluded_namespaces.replace("\"", "").split(' ') %}
 {%- if root_namespace not in excluded_namespaces_list and filtered_attributes | count > 0 %}
+{%- set name_map ={"messaging.client.id":"messaging_client_id2"} -%}
+{%- macro to_const_name2(fqn) -%}
+{{(name_map[fqn] or fqn) | to_const_name}}
+{%- endmacro %}
 /*
  * Copyright The OpenTelemetry Authors
  * SPDX-License-Identifier: Apache-2.0
@@ -64,7 +68,7 @@ import java.util.List;
 public final class {{ root_namespace | to_camelcase(True) }}{{ classPrefix }}Attributes {
   {%- for attribute in filtered_attributes %}
 
-  {% set attribute_const_name = attribute.fqn | to_const_name -%}
+  {% set attribute_const_name = to_const_name2(attribute.fqn) -%}
   /**
   * {{attribute.brief | render_markdown(code="{{@code {0}}}", paragraph="{0}")}}
     {%- if attribute.note %}

diff --git a/...ting/src/main/java/io/opentelemetry/semconv/incubating/MessagingIncubatingAttributes.java b/...ting/src/main/java/io/opentelemetry/semconv/incubating/MessagingIncubatingAttributes.java
@@ -35,7 +35,15 @@ public final class MessagingIncubatingAttributes {
       longKey("messaging.batch.message_count");
 
   /** A unique identifier for the client that consumes or produces a message. */
-  public static final AttributeKey<String> MESSAGING_CLIENT_ID = stringKey("messaging.client.id");
+  public static final AttributeKey<String> MESSAGING_CLIENT_ID2 = stringKey("messaging.client.id");
+
+  /**
+   * Deprecated, use {@code messaging.client.id} instead.
+   *
+   * @deprecated Deprecated, use `messaging.client.id` instead.
+   */
+  @Deprecated
+  public static final AttributeKey<String> MESSAGING_CLIENT_ID = stringKey("messaging.client_id");
 
   /**
    * A boolean that is true if the message destination is anonymous (could be unnamed or have