From d3387e65bd66456e96a2815a9cd5a956750f179e Mon Sep 17 00:00:00 2001
From: Liudmila Molkova <limolkova@microsoft.com>
Date: Fri, 23 Feb 2024 16:54:25 -0800
Subject: [PATCH 1/2] Add a few attributes that were removed as deprecated

---
 model/registry/deprecated/container.yaml | 10 ++++++++++
 model/registry/deprecated/k8s.yaml       | 10 ++++++++++
 model/registry/deprecated/system.yaml    | 20 ++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 model/registry/deprecated/container.yaml
 create mode 100644 model/registry/deprecated/k8s.yaml
 create mode 100644 model/registry/deprecated/system.yaml

diff --git a/model/registry/deprecated/container.yaml b/model/registry/deprecated/container.yaml
new file mode 100644
index 0000000000..e4b720f41c
--- /dev/null
+++ b/model/registry/deprecated/container.yaml
@@ -0,0 +1,10 @@
+groups:
+  - id: deprecated.container.attributes
+    type: attribute_group
+    brief: "Describes deprecated container attributes."
+    attributes:
+      - id: container.labels
+        type: template[string]
+        examples: [ 'container.label.app=nginx' ]
+        brief: "Deprecated, use `container.label` instead."
+        deprecated: "Replaced by `container.label`."
diff --git a/model/registry/deprecated/k8s.yaml b/model/registry/deprecated/k8s.yaml
new file mode 100644
index 0000000000..3168f7be98
--- /dev/null
+++ b/model/registry/deprecated/k8s.yaml
@@ -0,0 +1,10 @@
+groups:
+  - id: deprecated.k8s.attributes
+    type: attribute_group
+    brief: "Describes deprecated k8s attributes."
+    attributes:
+      - id: k8s.pod.labels
+        type: template[string]
+        examples: ['k8s.pod.label.app=my-app']
+        brief: "Deprecated, use `k8s.pod.label` instead."
+        deprecated: "Replaced by `k8s.pod.label`."
diff --git a/model/registry/deprecated/system.yaml b/model/registry/deprecated/system.yaml
new file mode 100644
index 0000000000..2356ebc562
--- /dev/null
+++ b/model/registry/deprecated/system.yaml
@@ -0,0 +1,20 @@
+groups:
+  - id: attributes.system.deprecated
+    type: attribute_group
+    brief: "Deprecated system attributes."
+    attributes:
+      - id: system.processes.status
+        type:
+          allow_custom_values: true
+          members:
+            - id: running
+              value: 'running'
+            - id: sleeping
+              value: 'sleeping'
+            - id: stopped
+              value: 'stopped'
+            - id: defunct
+              value: 'defunct'
+        brief: "Deprecated, use `system.process.status` instead."
+        deprecated: "Replaced by `system.process.status`."
+        examples: ["running"]

From f6f4ead93651fa26652d11605beffc12873d1738 Mon Sep 17 00:00:00 2001
From: Liudmila Molkova <limolkova@microsoft.com>
Date: Mon, 26 Feb 2024 09:24:03 -0800
Subject: [PATCH 2/2] consistent naming for deprecated groups

---
 docs/attributes-registry/network.md      | 2 +-
 model/registry/deprecated/container.yaml | 2 +-
 model/registry/deprecated/k8s.yaml       | 2 +-
 model/registry/deprecated/network.yaml   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/attributes-registry/network.md b/docs/attributes-registry/network.md
index 9c388f4d75..a06417c9dc 100644
--- a/docs/attributes-registry/network.md
+++ b/docs/attributes-registry/network.md
@@ -100,7 +100,7 @@ different processes could be listening on TCP port 12345 and UDP port 12345.
 
 ## Deprecated Network Attributes
 
-<!-- semconv network-deprecated(omit_requirement_level) -->
+<!-- semconv attributes.network.deprecated(omit_requirement_level) -->
 | Attribute  | Type | Description  | Examples  |
 |---|---|---|---|
 | `net.host.name` | string | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br>Deprecated, use `server.address`. | `example.com` |
diff --git a/model/registry/deprecated/container.yaml b/model/registry/deprecated/container.yaml
index e4b720f41c..8c19e64f8b 100644
--- a/model/registry/deprecated/container.yaml
+++ b/model/registry/deprecated/container.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: deprecated.container.attributes
+  - id: attributes.container.deprecated
     type: attribute_group
     brief: "Describes deprecated container attributes."
     attributes:
diff --git a/model/registry/deprecated/k8s.yaml b/model/registry/deprecated/k8s.yaml
index 3168f7be98..5793257d7f 100644
--- a/model/registry/deprecated/k8s.yaml
+++ b/model/registry/deprecated/k8s.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: deprecated.k8s.attributes
+  - id: attributes.k8s.deprecated
     type: attribute_group
     brief: "Describes deprecated k8s attributes."
     attributes:
diff --git a/model/registry/deprecated/network.yaml b/model/registry/deprecated/network.yaml
index 135373fa09..63e3959d7e 100644
--- a/model/registry/deprecated/network.yaml
+++ b/model/registry/deprecated/network.yaml
@@ -1,5 +1,5 @@
 groups:
-  - id: network-deprecated
+  - id: attributes.network.deprecated
     prefix: net
     type: attribute_group
     brief: >