Skip to content

fix(semconv): repair generate.sh version step and update weaver to 0.28.0 #1274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MariusCiocanel wants to merge 3 commits into
base: main
Choose a base branch
from
+9 −5
Open

fix(semconv): repair generate.sh version step and update weaver to 0.28.0 #1274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23e0c03
fix(semconv): make generate.sh version update match let and fail on n…
MariusCiocanel Nov 4, 2026
37a1ef2
fix(semconv): trim namespace separator before camel_case in template
MariusCiocanel Nov 5, 2026
eb0dfbd
build(semconv): bump weaver to 0.28.0
MariusCiocanel Nov 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Scripts/semantic-convention/generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ ROOT_DIR="${SCRIPT_DIR}/../.."
SEMCONV_VERSION=1.38.0
SPEC_VERSION=v$SEMCONV_VERSION

# repository: https://github.com/open-telemetry/build-tools
GENERATOR_VERSION=0.17.1
# repository: https://github.com/open-telemetry/weaver
GENERATOR_VERSION=0.28.0

cd ${SCRIPT_DIR}

Expand Down Expand Up @@ -42,4 +42,8 @@ cd "$ROOT_DIR"


# update spec version reported by library
sed -E -i '' 's/public static var version = ".+"/public static var version = "'$SPEC_VERSION\"/ ${ROOT_DIR}/Sources/OpenTelemetryApi/OpenTelemetry.swift
VERSION_FILE="${ROOT_DIR}/Sources/OpenTelemetryApi/OpenTelemetry.swift"
VERSION_PATTERN='public static (var|let) version = ".+"'
grep -Eq "$VERSION_PATTERN" "$VERSION_FILE" || { echo "error: no version declaration found in ${VERSION_FILE}" >&2; exit 1; }
sed -E -i.bak "s/${VERSION_PATTERN}/public static \1 version = \"${SPEC_VERSION}\"/" "$VERSION_FILE"
rm "${VERSION_FILE}.bak"
4 changes: 2 additions & 2 deletions Scripts/semantic-convention/templates/registry/SemanticAttributes.swift.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Double
{{ template.set_file_name(filename) }}

{%- macro print_example(attribute, example) -%}
{%- set attribute_name = "SemanticConventions." + ctx.root_namespace|pascal_case + "." + attribute.name | replace(ctx.root_namespace, "") | camel_case ~ ".rawValue" -%}
{%- set attribute_name = "SemanticConventions." + ctx.root_namespace|pascal_case + "." + attribute.name | replace(ctx.root_namespace, "") | trim(".") | camel_case ~ ".rawValue" -%}
{% if attribute.type|lower == "string" or attribute.type|lower == "template[string]" -%}
attributes[{{attribute_name}}] = "{{example | replace("\"", "\\\"")}}"
{% elif attribute is enum %}
Expand Down Expand Up @@ -104,7 +104,7 @@ extension SemanticConventions {
{% if attribute.deprecated %}
@available(*, deprecated)
{% endif %}
case {{reserved_words_filter(attribute.name | replace(ctx.root_namespace, "") | camel_case)}} = "{{attribute.name}}"
case {{reserved_words_filter(attribute.name | replace(ctx.root_namespace, "") | trim(".") | camel_case)}} = "{{attribute.name}}"
{% endfor %}
{% for attribute in attributes | unique(attribute="name") %}
{% set class_name = attribute.name | replace(ctx.root_namespace, "") | pascal_case ~ "Values" %}
Expand Down
Loading