Fix codegen template to handle all attribute types

Author: bidetofevil

semconv/templates/registry/kotlin/kotlin_event_template.kt.j2

@@ -6,10 +6,11 @@
 
 package io.opentelemetry.android.semconv.events
 
+import io.opentelemetry.api.common.AttributeKey
 import io.opentelemetry.api.common.Attributes
 import io.opentelemetry.api.logs.Logger
 
-// Autogenerated OpenTelemetry Android semantic convention event for '{{ctx.name}}'.
+// Autogenerated OpenTelemetry Android semantic convention event for '{{ ctx.name }}'.
 //
 // DO NOT EDIT - AUTOGENERATED FILE
 {{ [ctx.brief, concat_if("\n\nNotes:\n\n", ctx.note)] | comment }}
@@ -30,7 +31,14 @@ class {{ my_class_name }}(
         val attributes = Attributes.builder()
 {%- for attribute in ctx.attributes %}
         {%- set required = attribute.requirement_level == "required" %}
+        {%- if attribute.type in ["string[]", "boolean[]", "int[]", "double[]"] %}
+        {%- set key = 'AttributeKey.' ~ (attribute.type | map_text("kotlin_key_factory")) ~ '("' ~ attribute.name ~ '")' %}
         {%- if required %}
+        attributes.put({{ key }}, {{ attribute.name | camel_case }})
+        {%- else %}
+        {{ attribute.name | camel_case }}?.let { attributes.put({{ key }}, it) }
+        {%- endif %}
+        {%- elif required %}
         attributes.put("{{ attribute.name }}", {{ attribute.name | camel_case }})
         {%- else %}
         {{ attribute.name | camel_case }}?.let { attributes.put("{{ attribute.name }}", it) }

semconv/templates/registry/kotlin/kotlin_semconv_template.kt.j2

@@ -21,19 +21,13 @@ object {{ my_class_name }} {
     @Deprecated("{{ attribute.deprecated.note | replace('\n', ' ') | trim }}")
 {%- endif %}
     const val {{ attribute.name | screaming_snake_case }}: String = "{{ attribute.name }}"
+{%- if attribute.type != "any" %}
+{%- set itype = attribute.type | instantiated_type %}
+{%- if itype in ["string", "boolean", "int", "double", "string[]", "boolean[]", "int[]", "double[]"] %}
     @JvmField
-{%- if attribute.type == "string" %}
-    val {{ attribute.name | screaming_snake_case }}_KEY: AttributeKey<String> =
-        AttributeKey.stringKey({{ attribute.name | screaming_snake_case }})
-{%- elif attribute.type == "boolean" %}
-    val {{ attribute.name | screaming_snake_case }}_KEY: AttributeKey<Boolean> =
-        AttributeKey.booleanKey({{ attribute.name | screaming_snake_case }})
-{%- elif attribute.type == "int" %}
-    val {{ attribute.name | screaming_snake_case }}_KEY: AttributeKey<Long> =
-        AttributeKey.longKey({{ attribute.name | screaming_snake_case }})
-{%- elif attribute.type == "double" %}
-    val {{ attribute.name | screaming_snake_case }}_KEY: AttributeKey<Double> =
-        AttributeKey.doubleKey({{ attribute.name | screaming_snake_case }})
+    val {{ attribute.name | screaming_snake_case }}_KEY: AttributeKey<{{ itype | map_text("kotlin_key_generic") }}> =
+        AttributeKey.{{ itype | map_text("kotlin_key_factory") }}({{ attribute.name | screaming_snake_case }})
+{%- endif %}
 {%- endif %}
 {%- endfor %}
 }

semconv/templates/registry/kotlin/weaver.yaml

@@ -42,6 +42,7 @@ templates:
           note: .note,
           deprecated: .deprecated,
           attributes: ((.attributes // [])
+            | map(select(.type != "any"))
             | unique_by(.name))
         })
     application_mode: each
@@ -50,6 +51,24 @@ text_maps:
   kotlin_enum_type:
     int: Long
     string: String
+  kotlin_key_generic:
+    string: String
+    boolean: Boolean
+    int: Long
+    double: Double
+    "string[]": List<String>
+    "boolean[]": List<Boolean>
+    "int[]": List<Long>
+    "double[]": List<Double>
+  kotlin_key_factory:
+    string: stringKey
+    boolean: booleanKey
+    int: longKey
+    double: doubleKey
+    "string[]": stringArrayKey
+    "boolean[]": booleanArrayKey
+    "int[]": longArrayKey
+    "double[]": doubleArrayKey
   kotlin_event_type:
     int: Long
     double: Double