rebase and update tests

semantic-conventions/src/opentelemetry/semconv/templating/markdown/__init__.py

@@ -243,7 +243,10 @@ def to_markdown_metric_table(
             "| -------- | --------------- | ----------- | -------------- |\n"
         )
 
-        description = self._description_with_badge(semconv.stability, semconv.deprecated) + semconv.brief
+        description = (
+            self._description_with_badge(semconv.stability, semconv.deprecated)
+            + semconv.brief
+        )
         if semconv.note:
             self.render_ctx.add_note(semconv.note)
             description += f" [{len(self.render_ctx.notes)}]"

semantic-conventions/src/tests/data/compat/enum_type_changed/vnext.yaml

@@ -12,7 +12,6 @@ groups:
               brief: "enum one"
               stability: stable
               value: 1
-              stability: experimental
         brief: "third attribute"
         note: "third attribute note"
         examples: [3]

semantic-conventions/src/tests/data/compat/enum_value_changed/vnext.yaml

@@ -12,7 +12,6 @@ groups:
               brief: "enum one"
               stability: stable
               value: "1"
-              stability: experimental
             - id: enum_two
               brief: "enum two"
               stability: experimental

semantic-conventions/src/tests/data/markdown/stability/all_badges_expected.md

@@ -5,6 +5,16 @@
 | [`test.deprecated_stable_attr`](stable_badges_expected.md) | boolean | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br> |  | `Required` |
 | [`test.exp_attr`](stable_badges_expected.md) | boolean | ![Experimental](https://img.shields.io/badge/-experimental-blue)<br> |  | `Required` |
 | [`test.stable_attr`](stable_badges_expected.md) | boolean | ![Stable](https://img.shields.io/badge/-stable-lightgreen)<br> |  | `Required` |
+| [`test.stable_enum_attr`](stable_badges_expected.md) | string | ![Stable](https://img.shields.io/badge/-stable-lightgreen)<br> | `one` | `Recommended` |
+
+`test.stable_enum_attr` MUST be one of the following:
+
+| Value  | Description |
+|---|---|
+| `one` | ![Stable](https://img.shields.io/badge/-stable-lightgreen)<br>member one |
+| `two` | ![Experimental](https://img.shields.io/badge/-experimental-blue)<br>member two |
+| `three` | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br>member three |
+| `four` | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br>member four |
 <!-- endsemconv -->
 
 <!-- semconv ref_test -->
@@ -14,6 +24,7 @@
 | [`test.deprecated_stable_attr`](stable_badges_expected.md) | boolean | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br> |  | `Required` |
 | [`test.exp_attr`](stable_badges_expected.md) | boolean | ![Experimental](https://img.shields.io/badge/-experimental-blue)<br> |  | `Required` |
 | [`test.stable_attr`](stable_badges_expected.md) | boolean | ![Stable](https://img.shields.io/badge/-stable-lightgreen)<br> |  | `Required` |
+| [`test.stable_enum_attr`](stable_badges_expected.md) | string | ![Stable](https://img.shields.io/badge/-stable-lightgreen)<br> | `one` | `Recommended` |
 <!-- endsemconv -->
 
 <!-- semconv extends_test(full) -->
@@ -23,6 +34,16 @@
 | [`test.deprecated_stable_attr`](stable_badges_expected.md) | boolean | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br> |  | `Required` |
 | [`test.exp_attr`](stable_badges_expected.md) | boolean | ![Experimental](https://img.shields.io/badge/-experimental-blue)<br> |  | `Required` |
 | [`test.stable_attr`](stable_badges_expected.md) | boolean | ![Stable](https://img.shields.io/badge/-stable-lightgreen)<br> |  | `Required` |
+| [`test.stable_enum_attr`](stable_badges_expected.md) | string | ![Stable](https://img.shields.io/badge/-stable-lightgreen)<br> | `one` | `Recommended` |
+
+`test.stable_enum_attr` MUST be one of the following:
+
+| Value  | Description |
+|---|---|
+| `one` | ![Stable](https://img.shields.io/badge/-stable-lightgreen)<br>member one |
+| `two` | ![Experimental](https://img.shields.io/badge/-experimental-blue)<br>member two |
+| `three` | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br>member three |
+| `four` | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br>member four |
 <!-- endsemconv -->
 
 <!-- semconv stable_metric(metric_table) -->

semantic-conventions/src/tests/data/markdown/stability/stability.yaml

@@ -56,6 +56,7 @@ groups:
       - ref: test.stable_attr
       - ref: test.deprecated_stable_attr
       - ref: test.deprecated_experimental_attr
+      - ref: test.stable_enum_attr
   - id: extends_test
     brief: 'extends_test'
     extends: test

semantic-conventions/src/tests/data/markdown/stability/stable_badges_expected.md

@@ -5,6 +5,16 @@
 | [`test.deprecated_stable_attr`](stable_badges_expected.md) | boolean | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br> |  | `Required` |
 | [`test.exp_attr`](stable_badges_expected.md) | boolean |  |  | `Required` |
 | [`test.stable_attr`](stable_badges_expected.md) | boolean | ![Stable](https://img.shields.io/badge/-stable-lightgreen)<br> |  | `Required` |
+| [`test.stable_enum_attr`](stable_badges_expected.md) | string | ![Stable](https://img.shields.io/badge/-stable-lightgreen)<br> | `one` | `Recommended` |
+
+`test.stable_enum_attr` MUST be one of the following:
+
+| Value  | Description |
+|---|---|
+| `one` | ![Stable](https://img.shields.io/badge/-stable-lightgreen)<br>member one |
+| `two` | member two |
+| `three` | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br>member three |
+| `four` | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br>member four |
 <!-- endsemconv -->
 
 <!-- semconv ref_test -->
@@ -14,6 +24,7 @@
 | [`test.deprecated_stable_attr`](stable_badges_expected.md) | boolean | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br> |  | `Required` |
 | [`test.exp_attr`](stable_badges_expected.md) | boolean |  |  | `Required` |
 | [`test.stable_attr`](stable_badges_expected.md) | boolean | ![Stable](https://img.shields.io/badge/-stable-lightgreen)<br> |  | `Required` |
+| [`test.stable_enum_attr`](stable_badges_expected.md) | string | ![Stable](https://img.shields.io/badge/-stable-lightgreen)<br> | `one` | `Recommended` |
 <!-- endsemconv -->
 
 <!-- semconv extends_test(full) -->
@@ -23,6 +34,16 @@
 | [`test.deprecated_stable_attr`](stable_badges_expected.md) | boolean | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br> |  | `Required` |
 | [`test.exp_attr`](stable_badges_expected.md) | boolean |  |  | `Required` |
 | [`test.stable_attr`](stable_badges_expected.md) | boolean | ![Stable](https://img.shields.io/badge/-stable-lightgreen)<br> |  | `Required` |
+| [`test.stable_enum_attr`](stable_badges_expected.md) | string | ![Stable](https://img.shields.io/badge/-stable-lightgreen)<br> | `one` | `Recommended` |
+
+`test.stable_enum_attr` MUST be one of the following:
+
+| Value  | Description |
+|---|---|
+| `one` | ![Stable](https://img.shields.io/badge/-stable-lightgreen)<br>member one |
+| `two` | member two |
+| `three` | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br>member three |
+| `four` | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br>member four |
 <!-- endsemconv -->
 
 <!-- semconv stable_metric(metric_table) -->

semantic-conventions/src/tests/data/yaml/errors/stability/missing_stability_on_enum_member.yaml

@@ -10,3 +10,4 @@ groups:
             - id: one
               value: "one"
               brief: 'member one'
+        stability: experimental

semantic-conventions/src/tests/data/yaml/errors/stability/wrong_stability_value_on_enum_member.yaml

@@ -11,3 +11,4 @@ groups:
               value: "one"
               brief: 'member one'
               stability: will_fail
+        stability: experimental