Skip to content

Commit 3cf53cc

Browse files
MrAliaspellared
andauthored
Upgrade semconv gen to weaver v0.17.0 (#7172)
- Remove temporary fix to filter out deprecated metrics (addressed in open-telemetry/weaver#870) - Handle empty briefs gracefully - Handle empty attributes gracefully - Regenerate v1.36.0 semconv to fix docs [Weaver v0.17.0 release](https://github.com/open-telemetry/weaver/releases/tag/v0.17.0) Follow up to #7163 --------- Co-authored-by: Robert Pająk <[email protected]>
1 parent b3cea33 commit 3cf53cc

File tree

10 files changed

+153
-98
lines changed

10 files changed

+153
-98
lines changed

semconv/templates/registry/go/helpers.j2

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,16 @@ Examples: {{ attr.examples | trim("[]") }}
4141
{%- endmacro -%}
4242

4343
{%- macro lower_first(line) -%}
44+
{%- if line is string and line | length > 1 -%}
4445
{%- if line[0] is upper and line[1] is upper -%}
4546
{#- Assume an acronym -#}
4647
{{ line }}
4748
{%- else -%}
4849
{{ line[0]|lower }}{{ line[1:] }}
4950
{%- endif -%}
51+
{%- elif line is not none -%}
52+
{{ line }}
53+
{%- endif -%}
5054
{%- endmacro -%}
5155

5256
{%- macro first_word(line, delim=" ") -%}

semconv/templates/registry/go/instrument.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ func (m {{ name }}) Add(
133133
{%- macro add_method(metric, inst, pkg="") -%}
134134

135135
// Add adds incr to the existing count.
136-
{%- if metric.attributes | length > 0 %}
136+
{%- if metric.attributes is not none and metric.attributes | length > 0 %}
137137
{{ params_docs(metric.attributes, pkg=pkg) }}
138138
{%- if metric.note is defined %}
139139
//
@@ -189,7 +189,7 @@ func (m {{ name }}) Record(
189189
{%- macro record_method(metric, inst, pkg="") -%}
190190

191191
// Record records val to the current distribution.
192-
{%- if metric.attributes | length > 0 %}
192+
{%- if metric.attributes is not none and metric.attributes | length > 0 %}
193193
{{ params_docs(metric.attributes, pkg=pkg) }}
194194
{%- if metric.note is defined %}
195195
//

semconv/templates/registry/go/metric.go.j2

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,27 @@ var (
2626
type {{ name }}Attr {{ h.member_type(attr.type.members[0]) }}
2727

2828
var (
29-
{%- for m in attr.type.members if not m.deprecated %}
30-
{%- set m_name = name ~ h.to_go_name(m.id, ctx.root_namespace) %}
31-
{{ h.prefix_brief(m.brief, m_name ~ " is ") | comment(format="go_1tab") }}
32-
{{ m_name }} {{ name }}Attr = {% if attr.type.members[0].value is string -%}
33-
"{{ m.value }}"
29+
{%- for m in attr.type.members %}
30+
{%- set m_name = name ~ h.to_go_name(m.id, ctx.root_namespace) -%}
31+
32+
{% if attr.type.members[0].value is string -%}
33+
{%- set m_value = '"' + m.value + '"' -%}
3434
{%- else -%}
35-
{{ m.value }}
35+
{%- set m_value = m.value -%}
3636
{%- endif -%}
37+
38+
{%- if m.brief is defined %}
39+
{%- set m_brief = m.brief -%}
40+
{%- else %}
41+
{%- set m_brief = "standardized value " + m_value + ' of ' + name + 'Attr.' -%}
42+
{%- endif %}
43+
{{ h.prefix_brief(m_brief, m_name ~ " is ") | comment(format="go_1tab") }}
44+
{{ m_name }} {{ name }}Attr = {{ m_value }}
3745
{%- endfor %}
3846
)
3947
{%- endfor %}
4048

41-
{%- for metric in ctx.metrics if not metric.deprecated %}
49+
{%- for metric in ctx.metrics %}
4250
{%- set metric_name = h.to_go_name(metric.metric_name, ctx.root_namespace) %}
4351
{%- set metric_inst = metric.metric_name | map_text("instrument", i.instrument_default(metric)) %}
4452

semconv/templates/registry/go/weaver.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ templates:
2727
"exclude_deprecated": true,
2828
"exclude_root_namespace": $excluded_namespaces,
2929
})
30-
| map(select(has("deprecated") | not))
3130
| semconv_group_metrics_by_root_namespace
3231
application_mode: each
3332
file_name: "{{ctx.root_namespace | camel_case | lower }}conv/metric.go"

semconv/v1.36.0/azureconv/metric.go

Lines changed: 10 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

semconv/v1.36.0/containerconv/metric.go

Lines changed: 15 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

semconv/v1.36.0/dbconv/metric.go

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

semconv/v1.36.0/k8sconv/metric.go

Lines changed: 10 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

semconv/v1.36.0/processconv/metric.go

Lines changed: 23 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)