From cacca12f01a016b47ca666e10767c5474e113c68 Mon Sep 17 00:00:00 2001
From: Liudmila Molkova <limolkova@microsoft.com>
Date: Mon, 26 Feb 2024 15:29:36 -0800
Subject: [PATCH] rebase and fix tests

---
 .../vnext.yaml                                |  1 +
 .../vprev.yaml                                |  1 +
 .../compat/attribute_type_changed/vprev.yaml  |  1 +
 .../data/compat/removed_attribute/vprev.yaml  |  2 ++
 .../src/tests/data/compat/success/vprev.yaml  |  1 +
 .../markdown/stability/all_badges_expected.md | 30 +++++++++----------
 .../markdown/stability/badges_expected.md     | 10 -------
 .../markdown/stability/labels_expected.md     | 10 -------
 .../stability/stable_badges_expected.md       | 30 +++++++++----------
 9 files changed, 36 insertions(+), 50 deletions(-)
 delete mode 100644 semantic-conventions/src/tests/data/markdown/stability/badges_expected.md
 delete mode 100644 semantic-conventions/src/tests/data/markdown/stability/labels_expected.md

diff --git a/semantic-conventions/src/tests/data/compat/attribute_stable_to_experimental/vnext.yaml b/semantic-conventions/src/tests/data/compat/attribute_stable_to_experimental/vnext.yaml
index a26c943f..d83717a1 100644
--- a/semantic-conventions/src/tests/data/compat/attribute_stable_to_experimental/vnext.yaml
+++ b/semantic-conventions/src/tests/data/compat/attribute_stable_to_experimental/vnext.yaml
@@ -22,3 +22,4 @@ groups:
         brief: "Request headers."
         note: "Request headers note."
         examples: '`first.fifth_attr.bar=["foo"]`'
+        stability: experimental
\ No newline at end of file
diff --git a/semantic-conventions/src/tests/data/compat/attribute_stable_to_experimental/vprev.yaml b/semantic-conventions/src/tests/data/compat/attribute_stable_to_experimental/vprev.yaml
index 74f0d577..4664a214 100644
--- a/semantic-conventions/src/tests/data/compat/attribute_stable_to_experimental/vprev.yaml
+++ b/semantic-conventions/src/tests/data/compat/attribute_stable_to_experimental/vprev.yaml
@@ -10,6 +10,7 @@ groups:
         brief: "first attribute"
         note: "first attribute note"
         examples: "first example"
+        stability: experimental
       - id: second_attr
         type: int
         brief: "second attribute"
diff --git a/semantic-conventions/src/tests/data/compat/attribute_type_changed/vprev.yaml b/semantic-conventions/src/tests/data/compat/attribute_type_changed/vprev.yaml
index 74f0d577..4664a214 100644
--- a/semantic-conventions/src/tests/data/compat/attribute_type_changed/vprev.yaml
+++ b/semantic-conventions/src/tests/data/compat/attribute_type_changed/vprev.yaml
@@ -10,6 +10,7 @@ groups:
         brief: "first attribute"
         note: "first attribute note"
         examples: "first example"
+        stability: experimental
       - id: second_attr
         type: int
         brief: "second attribute"
diff --git a/semantic-conventions/src/tests/data/compat/removed_attribute/vprev.yaml b/semantic-conventions/src/tests/data/compat/removed_attribute/vprev.yaml
index 5d674714..5d3189d3 100644
--- a/semantic-conventions/src/tests/data/compat/removed_attribute/vprev.yaml
+++ b/semantic-conventions/src/tests/data/compat/removed_attribute/vprev.yaml
@@ -10,6 +10,7 @@ groups:
         brief: "first attribute"
         note: "first attribute note"
         examples: "first example"
+        stability: experimental
       - id: second_attr
         type: int
         brief: "second attribute"
@@ -20,3 +21,4 @@ groups:
         type: template[string[]]
         brief: "request headers"
         examples: '`first.fifth_attr.foo=["bar"]`'
+        stability: experimental
\ No newline at end of file
diff --git a/semantic-conventions/src/tests/data/compat/success/vprev.yaml b/semantic-conventions/src/tests/data/compat/success/vprev.yaml
index 8fc72dc2..0c3ca727 100644
--- a/semantic-conventions/src/tests/data/compat/success/vprev.yaml
+++ b/semantic-conventions/src/tests/data/compat/success/vprev.yaml
@@ -10,6 +10,7 @@ groups:
         brief: "first attribute"
         note: "first attribute note"
         examples: "first example"
+        stability: experimental
       - id: second_attr
         type: int
         brief: "second attribute"
diff --git a/semantic-conventions/src/tests/data/markdown/stability/all_badges_expected.md b/semantic-conventions/src/tests/data/markdown/stability/all_badges_expected.md
index 7bbe6fb7..856f8a0c 100644
--- a/semantic-conventions/src/tests/data/markdown/stability/all_badges_expected.md
+++ b/semantic-conventions/src/tests/data/markdown/stability/all_badges_expected.md
@@ -1,28 +1,28 @@
 <!-- semconv test -->
-| Attribute  | Type | Description  | Examples  | Requirement Level |
+| Attribute  | Type | Description  | Examples  | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) |
 |---|---|---|---|---|
-| [`test.deprecated_experimental_attr`](stable_badges_expected.md) | boolean | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br> |  | Required |
-| [`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.deprecated_experimental_attr`](stable_badges_expected.md) | boolean | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br> |  | `Required` |
+| [`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` |
 <!-- endsemconv -->
 
 <!-- semconv ref_test -->
-| Attribute  | Type | Description  | Examples  | Requirement Level |
+| Attribute  | Type | Description  | Examples  | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) |
 |---|---|---|---|---|
-| [`test.deprecated_experimental_attr`](stable_badges_expected.md) | boolean | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br> |  | Required |
-| [`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.deprecated_experimental_attr`](stable_badges_expected.md) | boolean | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br> |  | `Required` |
+| [`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` |
 <!-- endsemconv -->
 
 <!-- semconv extends_test(full) -->
-| Attribute  | Type | Description  | Examples  | Requirement Level |
+| Attribute  | Type | Description  | Examples  | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) |
 |---|---|---|---|---|
-| [`test.deprecated_experimental_attr`](stable_badges_expected.md) | boolean | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br> |  | Required |
-| [`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.deprecated_experimental_attr`](stable_badges_expected.md) | boolean | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br> |  | `Required` |
+| [`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` |
 <!-- endsemconv -->
 
 <!-- semconv stable_metric(metric_table) -->
diff --git a/semantic-conventions/src/tests/data/markdown/stability/badges_expected.md b/semantic-conventions/src/tests/data/markdown/stability/badges_expected.md
deleted file mode 100644
index 8c53eba4..00000000
--- a/semantic-conventions/src/tests/data/markdown/stability/badges_expected.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Common Attributes
-
-<!-- semconv test -->
-| Attribute  | Type | Description  | Examples  | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) |
-|---|---|---|---|---|
-| [`test.def_stability`](labels_expected.md) | boolean |  |  | `Required` |
-| [`test.deprecated_attr`](labels_expected.md) | boolean | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br> |  | `Required` |
-| [`test.exp_attr`](labels_expected.md) | boolean |  |  | `Required` |
-| [`test.stable_attr`](labels_expected.md) | boolean | ![Stable](https://img.shields.io/badge/-stable-lightgreen)<br> |  | `Required` |
-<!-- endsemconv -->
diff --git a/semantic-conventions/src/tests/data/markdown/stability/labels_expected.md b/semantic-conventions/src/tests/data/markdown/stability/labels_expected.md
deleted file mode 100644
index d6edf766..00000000
--- a/semantic-conventions/src/tests/data/markdown/stability/labels_expected.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Common Attributes
-
-<!-- semconv test -->
-| Attribute  | Type | Description  | Examples  | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) |
-|---|---|---|---|---|
-| [`test.def_stability`](labels_expected.md) | boolean |  |  | `Required` |
-| [`test.deprecated_attr`](labels_expected.md) | boolean | **Deprecated: Removed.**<br> |  | `Required` |
-| [`test.exp_attr`](labels_expected.md) | boolean |  |  | `Required` |
-| [`test.stable_attr`](labels_expected.md) | boolean |  |  | `Required` |
-<!-- endsemconv -->
diff --git a/semantic-conventions/src/tests/data/markdown/stability/stable_badges_expected.md b/semantic-conventions/src/tests/data/markdown/stability/stable_badges_expected.md
index e1a57a66..b1e779ad 100644
--- a/semantic-conventions/src/tests/data/markdown/stability/stable_badges_expected.md
+++ b/semantic-conventions/src/tests/data/markdown/stability/stable_badges_expected.md
@@ -1,28 +1,28 @@
 <!-- semconv test -->
-| Attribute  | Type | Description  | Examples  | Requirement Level |
+| Attribute  | Type | Description  | Examples  | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) |
 |---|---|---|---|---|
-| [`test.deprecated_experimental_attr`](stable_badges_expected.md) | boolean | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br> |  | Required |
-| [`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.deprecated_experimental_attr`](stable_badges_expected.md) | boolean | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br> |  | `Required` |
+| [`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` |
 <!-- endsemconv -->
 
 <!-- semconv ref_test -->
-| Attribute  | Type | Description  | Examples  | Requirement Level |
+| Attribute  | Type | Description  | Examples  | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) |
 |---|---|---|---|---|
-| [`test.deprecated_experimental_attr`](stable_badges_expected.md) | boolean | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br> |  | Required |
-| [`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.deprecated_experimental_attr`](stable_badges_expected.md) | boolean | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br> |  | `Required` |
+| [`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` |
 <!-- endsemconv -->
 
 <!-- semconv extends_test(full) -->
-| Attribute  | Type | Description  | Examples  | Requirement Level |
+| Attribute  | Type | Description  | Examples  | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) |
 |---|---|---|---|---|
-| [`test.deprecated_experimental_attr`](stable_badges_expected.md) | boolean | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br> |  | Required |
-| [`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.deprecated_experimental_attr`](stable_badges_expected.md) | boolean | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br> |  | `Required` |
+| [`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` |
 <!-- endsemconv -->
 
 <!-- semconv stable_metric(metric_table) -->