generating resource and semantic attributes again

Author: bryce-b

Scripts/semantic-convention/generate.sh

@@ -1,17 +1,17 @@
 #!/bin/bash
-set -e
+set -e -x
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 ROOT_DIR="${SCRIPT_DIR}/../../"
 
 # freeze the spec & generator tools versions to make SemanticAttributes generation reproducible
 
 # repository: https://github.com/open-telemetry/semantic-conventions
-SEMCONV_VERSION=1.21.0
+SEMCONV_VERSION=1.37.0
 SPEC_VERSION=v$SEMCONV_VERSION
 
 # repository: https://github.com/open-telemetry/build-tools
-GENERATOR_VERSION=0.21.0
+GENERATOR_VERSION=0.17.1
 
 cd ${SCRIPT_DIR}
 
@@ -25,28 +25,35 @@ git fetch origin "$SPEC_VERSION"
 git reset --hard FETCH_HEAD
 cd ${SCRIPT_DIR}
 
+rm ${ROOT_DIR}/Sources/OpenTelemetryApi/Trace/SemanticAttributes.swift || true
+
 docker run --rm \
   -v ${SCRIPT_DIR}/semantic-conventions/model:/source \
   -v ${SCRIPT_DIR}/templates:/templates \
-  -v ${ROOT_DIR}/Sources/OpenTelemetryApi/Trace/:/output \
-  otel/semconvgen:$GENERATOR_VERSION \
-  --only span,event,attribute_group,scope \
-  -f /source code \
-  --template /templates/SemanticAttributes.swift.j2 \
-  --output /output/SemanticAttributes.swift \
-  -Dsemconv=trace \
+  -v ${ROOT_DIR}/Sources/OpenTelemetryApi/Trace:/output \
+  otel/weaver:v$GENERATOR_VERSION \
+  registry \
+  generate \
+  --registry=/source \
+  --templates=/templates \
+  ./ \
+  /output \
   -Denum=SemanticAttributes
 
+
+rm ${ROOT_DIR}/Sources/OpenTelemetrySdk/Resources/ResourceAttributes.swift || true
+
 docker run --rm \
   -v ${SCRIPT_DIR}/semantic-conventions/model:/source \
   -v ${SCRIPT_DIR}/templates:/templates \
-  -v ${ROOT_DIR}/Sources/OpenTelemetrySdk/Resources/:/output \
-  otel/semconvgen:$GENERATOR_VERSION \
-  --only resource \
-  -f /source code \
-  --template /templates/SemanticAttributes.swift.j2 \
-  --output /output/ResourceAttributes.swift \
-  -Dsemconv=resource \
+  -v ${ROOT_DIR}/Sources/OpenTelemetrySdk/Resources:/output \
+  otel/weaver \
+  registry \
+  generate \
+  --registry=/source \
+  --templates=/templates \
+  ./ \
+  /output \
   -Denum=ResourceAttributes
 
 cd "$ROOT_DIR"

…tes/registry/SemanticAttributes.swift.j2 …tes/registry/SemanticAttributes.swift.j2Scripts/templates/registry/SemanticAttributes.swift.j2 renamed to Scripts/semantic-convention/templates/registry/SemanticAttributes.swift.j2 Scripts/templates/registry/SemanticAttributes.swift.j2 renamed to Scripts/semantic-convention/templates/registry/SemanticAttributes.swift.j2

@@ -24,11 +24,11 @@
   {{ "\"" if type == "String"}}{{value}}{{ "\"" if type == "String"}}
 {%- endmacro %}
 
-import Foundation
-{% set enum = params.enum %}
-public enum {{ enum }}: String {
+{%- set enum = params.enum -%}
 
+import Foundation
 
+public enum {{ enum }}: String {
   {% set attributes = ctx | list | map(attribute="attributes") | flatten %}
     {% for attribute in attributes | unique(attribute="name") %}
     {%- set class_name = attribute.name | pascal_case ~ "Values" %}
@@ -73,15 +73,16 @@ public enum {{ enum }}: String {
     */
     case exception = "exception";
     {%- endif %}
-    {% for attribute in attributes | unique(attribute="name") %}
+
+    {%- for attribute in attributes | unique(attribute="name") %}
     {%- set class_name = attribute.name | pascal_case ~ "Values" %}
     {%- set type = to_swift_return_type(attribute.type) %}
     {%- if attribute.is_enum %}
     /**
     {{attribute.brief | comment}}.
     */
     /// - Tag: otel{{class_name}}
-    {%- if attribute.attr_type.custom_values %}
+        {%- if attribute.attr_type.custom_values %}
     public struct {{class_name}}: CustomStringConvertible {
         {%- for member in attribute.attr_type.members %}
         /**

Scripts/templates/registry/weaver.yaml …onvention/templates/registry/weaver.yamlScripts/templates/registry/weaver.yaml renamed to Scripts/semantic-convention/templates/registry/weaver.yaml Scripts/templates/registry/weaver.yaml renamed to Scripts/semantic-convention/templates/registry/weaver.yaml

@@ -1,5 +1,5 @@
 params:
-  excluded_namespaces: [aws, artifact, azure, cassandra, cloudevents, gen_ai, cloudfoundry, db, aspnetcore, cicd, signalr, gcp, android, dotnet, jvm, kestrel, browser, cloud, container, deployment, faas, feature_flag]
+  excluded_namespaces: [aws, artifact, azure, rpc, cloudevents, gen_ai, cloudfoundry, aspnetcore, cicd, signalr, gcp, android, dotnet, jvm, kestrel, browser, cloud, container, deployment, faas, feature_flag]
 comment_formats:
   default:
     format: markdown
@@ -16,4 +16,5 @@ templates:
         root_namespace: .root_namespace,
         attributes: .attributes,
       })
+    file_name: "{{ params.enum }}.swift"
     application_mode: single

Sources/OpenTelemetryApi/OpenTelemetry.swift

@@ -13,7 +13,7 @@ import Foundation
 ///  and BaggageManager.
 ///  The telemetry objects are lazy-loaded singletons resolved via ServiceLoader mechanism.
 public struct OpenTelemetry {
-  public static var version = "v1.21.0"
+  public static var version = "v1.37.0"
 
   public static var instance = OpenTelemetry()