Update to latest and generate enum for attributes with fixed values

Author: bidetofevil

android-agent/build.gradle.kts

@@ -31,6 +31,7 @@ dependencies {
     implementation(project(":instrumentation:screen-orientation"))
 
     testImplementation(libs.opentelemetry.semconv.kotlin)
+    testImplementation(project(":semconv"))
     testImplementation(libs.robolectric)
     testImplementation(libs.okhttp.mockwebserver)
     testImplementation(libs.androidx.test.core)

android-agent/src/test/kotlin/io/opentelemetry/android/agent/EndUserClientSemConvTest.kt

@@ -5,12 +5,10 @@
 
 package io.opentelemetry.android.agent
 
-import io.opentelemetry.kotlin.semconv.AppAttributes
-import io.opentelemetry.kotlin.semconv.IncubatingApi
+import io.opentelemetry.android.semconv.AppAttributes
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 
-@OptIn(IncubatingApi::class)
 class EndUserClientSemConvTest {
     @Test
     fun `constants generated from the end-user-client registry are usable`() {

build.gradle.kts

@@ -26,7 +26,6 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        mavenLocal()
     }
 }
 

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 opentelemetry-instrumentation-alpha = "2.29.0-alpha"
 #opentelemetry-instrumentation = "2.9.0" // alpha bom includes non-alpha bom
 opentelemetry-contrib = "1.58.0-alpha"
-opentelemetry-semconv-kotlin = "0.6.0-SNAPSHOT"
+opentelemetry-semconv-kotlin = "0.5.0"
 junit = "6.1.1"
 byteBuddy = "1.18.11"
 okhttp = "5.4.0"

semconv/model/android/registry.yaml

@@ -1,3 +1,12 @@
+# Imports the end-user-client registry's `app` attributes and events so Kotlin constants are
+# generated for them in this module (constants for imported attributes are only generated for
+# groups that are part of this registry). Attribute group entries match the public attribute
+# group ids the end-user-client registry declares; event entries match event names directly.
+imports:
+  attribute_groups:
+    - registry.end_user_client.app
+  events:
+    - app.nav_complete
 groups:
   - id: registry.android.semconv
     type: attribute_group

semconv/model/manifest.yaml

@@ -5,4 +5,4 @@ dependencies:
   - name: otel
     registry_path: https://github.com/open-telemetry/semantic-conventions@v1.43.0[model]
   - name: end-user-client
-    registry_path: https://github.com/bidetofevil/semantic-conventions-end-user-client@v0.2.0-dev[model]
+    registry_path: https://github.com/bidetofevil/semantic-conventions-end-user-client@v0.3.0-dev[model]

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

@@ -20,4 +20,21 @@ object {{ my_class_name }} {
 {%- endif %}
     const val {{ attribute.name | screaming_snake_case }}: String = "{{ attribute.name }}"
 {%- endfor %}
+{%- for attribute in ctx.attributes | rejectattr("name", "in", ctx.excluded_attributes) %}
+{%- if attribute is enum %}
+
+    {{ ("Values for " ~ (attribute.name | screaming_snake_case) ~ ".") | comment | trim | indent(4) -}}
+{%- if attribute is deprecated %}
+    @Deprecated("{{ attribute.deprecated.note | replace('\n', ' ') | trim }}")
+{%- endif %}
+    enum class {{ attribute.name | pascal_case }}Values(
+        val value: {{ attribute.type | instantiated_type | map_text("kotlin_enum_type") }},
+    ) {
+{%- for member in attribute.type.members %}
+{{ "\n" if not loop.first }}        {{ [member.brief or (member.id ~ '.')] | comment | trim | indent(8) }}
+        {{ member.id | screaming_snake_case }}({{ member.value | print_member_value }}),
+{%- endfor %}
+    }
+{%- endif %}
+{%- endfor %}
 }