Merge branch 'main' into jmacd/expobound

open-telemetry · Aug 24, 2022 · db67882 · db67882
2 parents 7a8f4e2 + 8c3a85a
commit db67882
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/semconv/template.j2 b/semconv/template.j2
@@ -16,12 +16,16 @@ Type: {{ attr.attr_type }}
 {%- else %}
 Type: Enum
 {%- endif %}
-{%- if attr.required == Required.ALWAYS %}
-Required: Always
-{%- elif attr.required == Required.CONDITIONAL %}
-Required: {{ attr.required_msg }}
+{%- if attr.requirement_level == RequirementLevel.REQUIRED %}
+RequirementLevel: Required
+{%- elif attr.requirement_level == RequirementLevel.CONDITIONALLY_REQUIRED %}
+RequirementLevel: ConditionallyRequired
+  {%- if attr.requirement_level_msg != "" %} ({{ attr.requirement_level_msg }}){%- endif %}
+{%- elif attr.requirement_level == RequirementLevel.RECOMMENDED %}
+RequirementLevel: Recommended
+  {%- if attr.requirement_level_msg != "" %} ({{ attr.requirement_level_msg }}){%- endif %}
 {%- else %}
-Required: No
+RequirementLevel: Optional
 {%- endif %}
 {{ attr.stability |  replace("Level.", ": ") | capitalize }}
 {%- if attr.deprecated != None %}