Cleanup enum generation (#52)

Author: jack-berg

buildscripts/templates/SemanticAttributes.java.j2

@@ -28,14 +28,15 @@
     {{type | to_camelcase(False)}}Key
   {%- endif -%}
 {%- endmacro %}
-{%- macro stable_class_ref(const_name) -%}
-{{stablePkg}}.{{ root_namespace | to_camelcase(True) }}Attributes#{{const_name}}
+{%- macro stable_class_ref(const_name, separator) -%}
+{{stablePkg}}.{{ root_namespace | to_camelcase(True) }}Attributes{{separator}}{{const_name}}
 {%- endmacro %}
 {%- if filter != 'any' %}
 {%- set filtered_attributes = attributes_and_templates | select(filter) | list %}
 {%- else %}
 {%- set filtered_attributes = attributes_and_templates | list %}
 {%- endif %}
+{%- set filtered_enums = filtered_attributes | selectattr('is_enum', 'equalto', true) | list %}
 {%- if filtered_attributes | count > 0 %}
 /*
  * Copyright The OpenTelemetry Authors
@@ -73,11 +74,11 @@ public final class {{ root_namespace | to_camelcase(True) }}{{ classPrefix }}Att
         <ul> {{attribute.note | replace("> ", "") | render_markdown(code="{{@code {0}}}", paragraph="<li>{0}</li>", list="{0}")}} </ul>
 
     {%- endif %}
-    {%- if attribute | is_deprecated %}
   *
+    {%- if attribute | is_deprecated %}
   * @deprecated {{attribute.brief | to_doc_brief}}.
     {%- elif attribute | is_stable and stablePkg != "" %}
-  * @deprecated deprecated in favor of stable {@link {{stable_class_ref(attribute_const_name)}}} attribute.
+  * @deprecated deprecated in favor of stable {@link {{stable_class_ref(attribute_const_name, '#')}}} attribute.
     {%- endif %}
   */
     {%- if attribute | is_deprecated or attribute | is_stable and stablePkg != "" %}
@@ -90,14 +91,28 @@ public final class {{ root_namespace | to_camelcase(True) }}{{ classPrefix }}Att
     {%- endif %}
   {%- endfor %}
 
+  {%- if filtered_enums | count > 0  %}
   // Enum definitions
-  {%- for attribute in filtered_attributes if attribute.is_enum %}
-  {%- set class_name = attribute.fqn | to_camelcase(True) ~ "Values" %}
-  {%- set type = to_java_return_type(attribute.attr_type.enum_type) %}
+  {%- endif %}
+  {%- for enum_attribute in filtered_enums %}
+  {%- set class_name = enum_attribute.fqn | to_camelcase(True) ~ "Values" %}
+  {%- set type = to_java_return_type(enum_attribute.attr_type.enum_type) %}
+  /**
+  * Values for {@link #{{ enum_attribute.fqn | to_const_name }}}.
+  *
+    {%- if enum_attribute | is_deprecated %}
+  * @deprecated {{enum_attribute.brief | to_doc_brief}}.
+    {%- elif enum_attribute | is_stable and stablePkg != "" %}
+  * @deprecated deprecated in favor of stable {@link {{stable_class_ref(class_name, '.')}}} attribute.
+    {%- endif %}
+  */
+    {%- if enum_attribute | is_deprecated or enum_attribute | is_stable and stablePkg != "" %}
+  @Deprecated
+    {%- endif %}
   public static final class {{class_name}} {
-    {%- for member in attribute.attr_type.members %}
+    {%- for member in enum_attribute.attr_type.members %}
       /** {% filter escape %}{{member.brief | to_doc_brief}}.{% endfilter %} */
-      public static final {{ type }} {{ member.member_id | to_const_name }} = {{ attribute | print_member_value(member) }};
+      public static final {{ type }} {{ member.member_id | to_const_name }} = {{ enum_attribute | print_member_value(member) }};
 
     {%- endfor %}
 

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AndroidIncubatingAttributes.java

@@ -36,6 +36,7 @@ public final class AndroidIncubatingAttributes {
   public static final AttributeKey<String> ANDROID_STATE = stringKey("android.state");
 
   // Enum definitions
+  /** Values for {@link #ANDROID_STATE}. */
   public static final class AndroidStateValues {
     /**
      * Any time before Activity.onResume() or, if the app has no Activity, Context.startService()

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AwsIncubatingAttributes.java

@@ -344,6 +344,7 @@ public final class AwsIncubatingAttributes {
   public static final AttributeKey<String> AWS_S3_UPLOAD_ID = stringKey("aws.s3.upload_id");
 
   // Enum definitions
+  /** Values for {@link #AWS_ECS_LAUNCHTYPE}. */
   public static final class AwsEcsLaunchtypeValues {
     /** ec2. */
     public static final String EC2 = "ec2";

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/BrowserIncubatingAttributes.java

@@ -74,7 +74,5 @@ public final class BrowserIncubatingAttributes {
    */
   public static final AttributeKey<String> BROWSER_PLATFORM = stringKey("browser.platform");
 
-  // Enum definitions
-
   private BrowserIncubatingAttributes() {}
 }

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ClientIncubatingAttributes.java

@@ -48,7 +48,5 @@ public final class ClientIncubatingAttributes {
    */
   @Deprecated public static final AttributeKey<Long> CLIENT_PORT = longKey("client.port");
 
-  // Enum definitions
-
   private ClientIncubatingAttributes() {}
 }

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CloudIncubatingAttributes.java

@@ -96,6 +96,7 @@ public final class CloudIncubatingAttributes {
   public static final AttributeKey<String> CLOUD_RESOURCE_ID = stringKey("cloud.resource_id");
 
   // Enum definitions
+  /** Values for {@link #CLOUD_PLATFORM}. */
   public static final class CloudPlatformValues {
     /** Alibaba Cloud Elastic Compute Service. */
     public static final String ALIBABA_CLOUD_ECS = "alibaba_cloud_ecs";
@@ -181,6 +182,7 @@ public static final class CloudPlatformValues {
     private CloudPlatformValues() {}
   }
 
+  /** Values for {@link #CLOUD_PROVIDER}. */
   public static final class CloudProviderValues {
     /** Alibaba Cloud. */
     public static final String ALIBABA_CLOUD = "alibaba_cloud";

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CloudeventsIncubatingAttributes.java

@@ -53,7 +53,5 @@ public final class CloudeventsIncubatingAttributes {
   public static final AttributeKey<String> CLOUDEVENTS_EVENT_TYPE =
       stringKey("cloudevents.event_type");
 
-  // Enum definitions
-
   private CloudeventsIncubatingAttributes() {}
 }

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CodeIncubatingAttributes.java

@@ -45,7 +45,5 @@ public final class CodeIncubatingAttributes {
    */
   public static final AttributeKey<String> CODE_NAMESPACE = stringKey("code.namespace");
 
-  // Enum definitions
-
   private CodeIncubatingAttributes() {}
 }

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ContainerIncubatingAttributes.java

@@ -104,7 +104,5 @@ public final class ContainerIncubatingAttributes {
   /** The container runtime managing this container. */
   public static final AttributeKey<String> CONTAINER_RUNTIME = stringKey("container.runtime");
 
-  // Enum definitions
-
   private ContainerIncubatingAttributes() {}
 }

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DbIncubatingAttributes.java

@@ -222,6 +222,7 @@ public final class DbIncubatingAttributes {
   public static final AttributeKey<String> DB_USER = stringKey("db.user");
 
   // Enum definitions
+  /** Values for {@link #DB_CASSANDRA_CONSISTENCY_LEVEL}. */
   public static final class DbCassandraConsistencyLevelValues {
     /** all. */
     public static final String ALL = "all";
@@ -259,6 +260,7 @@ public static final class DbCassandraConsistencyLevelValues {
     private DbCassandraConsistencyLevelValues() {}
   }
 
+  /** Values for {@link #DB_COSMOSDB_CONNECTION_MODE}. */
   public static final class DbCosmosdbConnectionModeValues {
     /** Gateway (HTTP) connections mode. */
     public static final String GATEWAY = "gateway";
@@ -269,6 +271,7 @@ public static final class DbCosmosdbConnectionModeValues {
     private DbCosmosdbConnectionModeValues() {}
   }
 
+  /** Values for {@link #DB_COSMOSDB_OPERATION_TYPE}. */
   public static final class DbCosmosdbOperationTypeValues {
     /** invalid. */
     public static final String INVALID = "Invalid";
@@ -318,6 +321,7 @@ public static final class DbCosmosdbOperationTypeValues {
     private DbCosmosdbOperationTypeValues() {}
   }
 
+  /** Values for {@link #DB_SYSTEM}. */
   public static final class DbSystemValues {
     /** Some other SQL database. Fallback only. See notes. */
     public static final String OTHER_SQL = "other_sql";