Combine groups in templates

thompson-tomo · thompson-tomo · commit 5187b63cf1c8 · 2025-10-30T15:23:50.000+11:00
diff --git a/docs/registry/attributes/android.md b/docs/registry/attributes/android.md
@@ -31,9 +31,7 @@ The Android platform on which the Android application is running.
 
 | Key | Value Type | Summary | Example Values | Deprecation Explanation |
 |---|---|---|---|---|
-| <a id="android-state" href="#android-state">`android.state`</a> | string | This attribute represents the state of the application. [1] | `created`; `background`; `foreground` |  Use `android.app.state` instead.  |
-
-**[1] `android.state`:** The Android lifecycle states are defined in [Activity lifecycle callbacks](https://developer.android.com/guide/components/activities/activity-lifecycle#lc), and from which the `OS identifiers` are derived.
+| <a id="android-state" href="#android-state">`android.state`</a> | string | Deprecated. Use `android.app.state` attribute instead. | `created`; `background`; `foreground` |  Use `android.app.state` instead.  |
 
 ---
 
diff --git a/docs/registry/attributes/code.md b/docs/registry/attributes/code.md
@@ -3,9 +3,6 @@
 
 # Code
 
-- [Code Attributes](#code-attributes)
-- [Deprecated Code Attributes](#deprecated-code-attributes)
-
 ## Code Attributes
 
 These attributes provide context about source code
@@ -36,10 +33,6 @@ Examples:
 * Rust: `playground::my_module::my_cool_func`
 * C function: `fopen`
 
-## Deprecated Code Attributes
-
-These deprecated attributes provide context about source code
-
 <details>
 <summary><b>Deprecated Attributes:</b></summary>
 
diff --git a/docs/registry/attributes/container.md b/docs/registry/attributes/container.md
@@ -3,9 +3,6 @@
 
 # Container
 
-- [Container Attributes](#container-attributes)
-- [Deprecated Container Attributes](#deprecated-container-attributes)
-
 ## Container Attributes
 
 A container instance.
@@ -44,10 +41,6 @@ The ID is assigned by the container runtime and can vary in different environmen
 
 **[6] `container.label.<key>`:** For example, a docker container label `app` with value `nginx` SHOULD be recorded as the `container.label.app` attribute with value `"nginx"`.
 
-## Deprecated Container Attributes
-
-Describes deprecated container attributes.
-
 <details>
 <summary><b>Deprecated Attributes:</b></summary>
 
diff --git a/docs/registry/attributes/db.md b/docs/registry/attributes/db.md
@@ -4,7 +4,6 @@
 # DB
 
 - [General Database Attributes](#general-database-attributes)
-- [Deprecated Database Attributes](#deprecated-database-attributes)
 - [Deprecated Database Metrics](#deprecated-database-metrics)
 
 ## General Database Attributes
@@ -168,10 +167,6 @@ stored procedure name then that stored procedure name SHOULD be used.
 | `teradata` | [Teradata](https://www.teradata.com/) | ![Development](https://img.shields.io/badge/-development-blue) |
 | `trino` | [Trino](https://trino.io/) | ![Development](https://img.shields.io/badge/-development-blue) |
 
-## Deprecated Database Attributes
-
-Describes deprecated database attributes.
-
 <details>
 <summary><b>Deprecated Attributes:</b></summary>
 
diff --git a/docs/registry/attributes/deployment.md b/docs/registry/attributes/deployment.md
@@ -3,9 +3,6 @@
 
 # Deployment
 
-- [Deployment Attributes](#deployment-attributes)
-- [Deployment Deprecated Attributes](#deployment-deprecated-attributes)
-
 ## Deployment Attributes
 
 This document defines attributes for software deployments.
@@ -36,10 +33,6 @@ considered to be identifying the same service:
 | `failed` | failed | ![Development](https://img.shields.io/badge/-development-blue) |
 | `succeeded` | succeeded | ![Development](https://img.shields.io/badge/-development-blue) |
 
-## Deployment Deprecated Attributes
-
-Describes deprecated deployment attributes.
-
 <details>
 <summary><b>Deprecated Attributes:</b></summary>
 
diff --git a/docs/registry/attributes/enduser.md b/docs/registry/attributes/enduser.md
@@ -3,9 +3,6 @@
 
 # Enduser
 
-- [End User Attributes](#end-user-attributes)
-- [Deprecated End User Attributes](#deprecated-end-user-attributes)
-
 ## End User Attributes
 
 Describes the end user.
@@ -27,10 +24,6 @@ Describes the end user.
 > [!Warning]
 > This field contains sensitive (linkable PII) information.
 
-## Deprecated End User Attributes
-
-Describes deprecated enduser attributes.
-
 <details>
 <summary><b>Deprecated Attributes:</b></summary>
 
diff --git a/docs/registry/attributes/exception.md b/docs/registry/attributes/exception.md
@@ -3,9 +3,6 @@
 
 # Exception
 
-- [Exception Attributes](#exception-attributes)
-- [Deprecated Exception Attributes](#deprecated-exception-attributes)
-
 ## Exception Attributes
 
 This document defines the shared attributes used to report a single exception associated with a span or log.
@@ -18,10 +15,6 @@ This document defines the shared attributes used to report a single exception as
 | <a id="exception-stacktrace" href="#exception-stacktrace">`exception.stacktrace`</a> | ![Stable](https://img.shields.io/badge/-stable-lightgreen) | string | A stacktrace as a string in the natural representation for the language runtime. The representation is to be determined and documented by each language SIG. | `Exception in thread "main" java.lang.RuntimeException: Test exception\n at com.example.GenerateTrace.methodB(GenerateTrace.java:13)\n at com.example.GenerateTrace.methodA(GenerateTrace.java:9)\n at com.example.GenerateTrace.main(GenerateTrace.java:5)` |
 | <a id="exception-type" href="#exception-type">`exception.type`</a> | ![Stable](https://img.shields.io/badge/-stable-lightgreen) | string | The type of the exception (its fully-qualified class name, if applicable). The dynamic type of the exception should be preferred over the static type in languages that support it. | `java.net.ConnectException`; `OSError` |
 
-## Deprecated Exception Attributes
-
-Deprecated exception attributes.
-
 <details>
 <summary><b>Deprecated Attributes:</b></summary>
 
diff --git a/docs/registry/attributes/feature-flag.md b/docs/registry/attributes/feature-flag.md
@@ -3,9 +3,6 @@
 
 # Feature flag
 
-- [Feature Flag Attributes](#feature-flag-attributes)
-- [Deprecated Feature Flag Attributes](#deprecated-feature-flag-attributes)
-
 ## Feature Flag Attributes
 
 This document defines attributes for Feature Flags.
@@ -50,10 +47,6 @@ For example, the variant `red` maybe be used for the value `#c05543`.
 | `targeting_match` | The resolved value was the result of a dynamic evaluation, such as a rule or specific user-targeting. | ![Release Candidate](https://img.shields.io/badge/-rc-mediumorchid) |
 | `unknown` | The reason for the resolved value could not be determined. | ![Release Candidate](https://img.shields.io/badge/-rc-mediumorchid) |
 
-## Deprecated Feature Flag Attributes
-
-Describes deprecated feature flag attributes.
-
 <details>
 <summary><b>Deprecated Attributes:</b></summary>
 
diff --git a/docs/registry/attributes/gen-ai.md b/docs/registry/attributes/gen-ai.md
@@ -4,7 +4,6 @@
 # Gen AI
 
 - [GenAI Attributes](#genai-attributes)
-- [Deprecated GenAI Attributes](#deprecated-genai-attributes)
 - [Deprecated OpenAI GenAI Attributes](#deprecated-openai-genai-attributes)
 
 ## GenAI Attributes
@@ -235,10 +234,6 @@ Datastore: A tool used by the agent to access and query structured or unstructur
 | `input` | Input tokens (prompt, input, etc.) | ![Development](https://img.shields.io/badge/-development-blue) |
 | `output` | Output tokens (completion, response, etc.) | ![Development](https://img.shields.io/badge/-development-blue) |
 
-## Deprecated GenAI Attributes
-
-Describes deprecated `gen_ai` attributes.
-
 <details>
 <summary><b>Deprecated Attributes:</b></summary>
 
diff --git a/docs/registry/attributes/http.md b/docs/registry/attributes/http.md
@@ -3,9 +3,6 @@
 
 # HTTP
 
-- [HTTP Attributes](#http-attributes)
-- [Deprecated HTTP Attributes](#deprecated-http-attributes)
-
 ## HTTP Attributes
 
 This document defines semantic convention attributes in the HTTP namespace.
@@ -116,10 +113,6 @@ support custom route formatting. Instrumentations SHOULD document the format and
 | `QUERY` | QUERY method. | ![Development](https://img.shields.io/badge/-development-blue) |
 | `TRACE` | TRACE method. | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
 
-## Deprecated HTTP Attributes
-
-Describes deprecated HTTP attributes.
-
 <details>
 <summary><b>Deprecated Attributes:</b></summary>
 
diff --git a/docs/registry/attributes/ios.md b/docs/registry/attributes/ios.md
@@ -3,9 +3,6 @@
 
 # iOS
 
-- [iOS Attributes](#ios-attributes)
-- [Deprecated iOS Attributes](#deprecated-ios-attributes)
-
 ## iOS Attributes
 
 This group describes iOS-specific attributes.
@@ -30,10 +27,6 @@ This group describes iOS-specific attributes.
 | `inactive` | The app is now `inactive`. Associated with UIKit notification `applicationWillResignActive`. | ![Development](https://img.shields.io/badge/-development-blue) |
 | `terminate` | The app is about to terminate. Associated with UIKit notification `applicationWillTerminate`. | ![Development](https://img.shields.io/badge/-development-blue) |
 
-## Deprecated iOS Attributes
-
-The iOS platform on which the iOS application is running.
-
 <details>
 <summary><b>Deprecated Attributes:</b></summary>
 
diff --git a/docs/registry/attributes/k8s.md b/docs/registry/attributes/k8s.md
@@ -3,9 +3,6 @@
 
 # K8s
 
-- [Kubernetes Attributes](#kubernetes-attributes)
-- [Deprecated Kubernetes Attributes](#deprecated-kubernetes-attributes)
-
 ## Kubernetes Attributes
 
 Kubernetes resource attributes.
@@ -350,10 +347,6 @@ When this occurs, the exact value as reported by the Kubernetes API SHOULD be us
 | `persistentVolumeClaim` | A [persistentVolumeClaim](https://v1-30.docs.kubernetes.io/docs/concepts/storage/volumes/#persistentvolumeclaim) volume | ![Development](https://img.shields.io/badge/-development-blue) |
 | `secret` | A [secret](https://v1-30.docs.kubernetes.io/docs/concepts/storage/volumes/#secret) volume | ![Development](https://img.shields.io/badge/-development-blue) |
 
-## Deprecated Kubernetes Attributes
-
-Describes deprecated k8s attributes.
-
 <details>
 <summary><b>Deprecated Attributes:</b></summary>
 
diff --git a/docs/registry/attributes/messaging.md b/docs/registry/attributes/messaging.md
@@ -10,7 +10,6 @@
 - [RabbitMQ Attributes](#rabbitmq-attributes)
 - [RocketMQ Attributes](#rocketmq-attributes)
 - [Azure Service Bus Attributes](#azure-service-bus-attributes)
-- [Deprecated Messaging Attributes](#deprecated-messaging-attributes)
 
 ## General Messaging Attributes
 
@@ -89,6 +88,24 @@ size should be used.
 | `rocketmq` | Apache RocketMQ | ![Development](https://img.shields.io/badge/-development-blue) |
 | `servicebus` | Azure Service Bus | ![Development](https://img.shields.io/badge/-development-blue) |
 
+<details>
+<summary><b>Deprecated Attributes:</b></summary>
+
+| Key | Value Type | Summary | Example Values | Deprecation Explanation |
+|---|---|---|---|---|
+| <a id="messaging-client-id" href="#messaging-client-id">`messaging.client_id`</a> | string | Deprecated, use `messaging.client.id` instead. | `client-5`; `myhost@8742@s8083jm` |  Use `messaging.client.id` instead.  |
+| <a id="messaging-destination-publish-anonymous" href="#messaging-destination-publish-anonymous">`messaging.destination_publish.anonymous`</a> | boolean | Deprecated, no replacement at this time. |  |  Removed. No replacement at this time.  |
+| <a id="messaging-destination-publish-name" href="#messaging-destination-publish-name">`messaging.destination_publish.name`</a> | string | Deprecated, no replacement at this time. | `MyQueue`; `MyTopic` |  Removed. No replacement at this time.  |
+| <a id="messaging-eventhubs-consumer-group" href="#messaging-eventhubs-consumer-group">`messaging.eventhubs.consumer.group`</a> | string | Deprecated, use `messaging.consumer.group.name` instead. | `$Default` |  Use `messaging.consumer.group.name` instead.  |
+| <a id="messaging-kafka-consumer-group" href="#messaging-kafka-consumer-group">`messaging.kafka.consumer.group`</a> | string | Deprecated, use `messaging.consumer.group.name` instead. | `my-group` |  Use `messaging.consumer.group.name` instead.  |
+| <a id="messaging-kafka-destination-partition" href="#messaging-kafka-destination-partition">`messaging.kafka.destination.partition`</a> | int | Deprecated, use `messaging.destination.partition.id` instead. | `2` |  Record string representation of the partition id in `messaging.destination.partition.id` attribute.  |
+| <a id="messaging-kafka-message-offset" href="#messaging-kafka-message-offset">`messaging.kafka.message.offset`</a> | int | Deprecated, use `messaging.kafka.offset` instead. | `42` |  Use `messaging.kafka.offset` instead.  |
+| <a id="messaging-operation" href="#messaging-operation">`messaging.operation`</a> | string | Deprecated, use `messaging.operation.type` instead. | `publish`; `create`; `process` |  Use `messaging.operation.type` instead.  |
+| <a id="messaging-rocketmq-client-group" href="#messaging-rocketmq-client-group">`messaging.rocketmq.client_group`</a> | string | Deprecated, use `messaging.consumer.group.name` instead. | `myConsumerGroup` |  Replaced by `messaging.consumer.group.name` on the consumer spans. No replacement for producer spans.  |
+| <a id="messaging-servicebus-destination-subscription-name" href="#messaging-servicebus-destination-subscription-name">`messaging.servicebus.destination.subscription_name`</a> | string | Deprecated, use `messaging.destination.subscription.name` instead. | `subscription-a` |  Use `messaging.destination.subscription.name` instead.  |
+
+</details>
+
 ## Azure Event Hubs Attributes
 
 This group describes attributes specific to Azure Event Hubs.
@@ -196,25 +213,3 @@ This group describes attributes specific to Azure Service Bus.
 | `complete` | Message is completed | ![Development](https://img.shields.io/badge/-development-blue) |
 | `dead_letter` | Message is sent to dead letter queue | ![Development](https://img.shields.io/badge/-development-blue) |
 | `defer` | Message is deferred | ![Development](https://img.shields.io/badge/-development-blue) |
-
-## Deprecated Messaging Attributes
-
-Describes deprecated messaging attributes.
-
-<details>
-<summary><b>Deprecated Attributes:</b></summary>
-
-| Key | Value Type | Summary | Example Values | Deprecation Explanation |
-|---|---|---|---|---|
-| <a id="messaging-client-id" href="#messaging-client-id">`messaging.client_id`</a> | string | Deprecated, use `messaging.client.id` instead. | `client-5`; `myhost@8742@s8083jm` |  Use `messaging.client.id` instead.  |
-| <a id="messaging-destination-publish-anonymous" href="#messaging-destination-publish-anonymous">`messaging.destination_publish.anonymous`</a> | boolean | Deprecated, no replacement at this time. |  |  Removed. No replacement at this time.  |
-| <a id="messaging-destination-publish-name" href="#messaging-destination-publish-name">`messaging.destination_publish.name`</a> | string | Deprecated, no replacement at this time. | `MyQueue`; `MyTopic` |  Removed. No replacement at this time.  |
-| <a id="messaging-eventhubs-consumer-group" href="#messaging-eventhubs-consumer-group">`messaging.eventhubs.consumer.group`</a> | string | Deprecated, use `messaging.consumer.group.name` instead. | `$Default` |  Use `messaging.consumer.group.name` instead.  |
-| <a id="messaging-kafka-consumer-group" href="#messaging-kafka-consumer-group">`messaging.kafka.consumer.group`</a> | string | Deprecated, use `messaging.consumer.group.name` instead. | `my-group` |  Use `messaging.consumer.group.name` instead.  |
-| <a id="messaging-kafka-destination-partition" href="#messaging-kafka-destination-partition">`messaging.kafka.destination.partition`</a> | int | Deprecated, use `messaging.destination.partition.id` instead. | `2` |  Record string representation of the partition id in `messaging.destination.partition.id` attribute.  |
-| <a id="messaging-kafka-message-offset" href="#messaging-kafka-message-offset">`messaging.kafka.message.offset`</a> | int | Deprecated, use `messaging.kafka.offset` instead. | `42` |  Use `messaging.kafka.offset` instead.  |
-| <a id="messaging-operation" href="#messaging-operation">`messaging.operation`</a> | string | Deprecated, use `messaging.operation.type` instead. | `publish`; `create`; `process` |  Use `messaging.operation.type` instead.  |
-| <a id="messaging-rocketmq-client-group" href="#messaging-rocketmq-client-group">`messaging.rocketmq.client_group`</a> | string | Deprecated, use `messaging.consumer.group.name` instead. | `myConsumerGroup` |  Replaced by `messaging.consumer.group.name` on the consumer spans. No replacement for producer spans.  |
-| <a id="messaging-servicebus-destination-subscription-name" href="#messaging-servicebus-destination-subscription-name">`messaging.servicebus.destination.subscription_name`</a> | string | Deprecated, use `messaging.destination.subscription.name` instead. | `subscription-a` |  Use `messaging.destination.subscription.name` instead.  |
-
-</details>
diff --git a/docs/registry/attributes/network.md b/docs/registry/attributes/network.md
@@ -3,9 +3,6 @@
 
 # Network
 
-- [Network Attributes](#network-attributes)
-- [Deprecated Network Attributes](#deprecated-network-attributes)
-
 ## Network Attributes
 
 These attributes may be used for any network related operation.
@@ -134,10 +131,6 @@ different processes could be listening on TCP port 12345 and UDP port 12345.
 | `ipv4` | IPv4 | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
 | `ipv6` | IPv6 | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
 
-## Deprecated Network Attributes
-
-These attributes may be used for any network related operation.
-
 <details>
 <summary><b>Deprecated Attributes:</b></summary>
 
diff --git a/docs/registry/attributes/process.md b/docs/registry/attributes/process.md
@@ -5,7 +5,6 @@
 
 - [Process Attributes](#process-attributes)
 - [Process Linux Attributes](#process-linux-attributes)
-- [Deprecated Process Attributes](#deprecated-process-attributes)
 
 ## Process Attributes
 
@@ -84,22 +83,6 @@ with value `"/usr/local/bin:/usr/bin"`.
 | `sleeping` | sleeping | ![Development](https://img.shields.io/badge/-development-blue) |
 | `stopped` | stopped | ![Development](https://img.shields.io/badge/-development-blue) |
 
-## Process Linux Attributes
-
-Describes Linux Process attributes
-
-**Attributes:**
-
-| Key | Stability | Value Type | Description | Example Values |
-|---|---|---|---|---|
-| <a id="process-linux-cgroup" href="#process-linux-cgroup">`process.linux.cgroup`</a> | ![Development](https://img.shields.io/badge/-development-blue) | string | The control group associated with the process. [5] | `1:name=systemd:/user.slice/user-1000.slice/session-3.scope`; `0::/user.slice/user-1000.slice/user@1000.service/tmux-spawn-0267755b-4639-4a27-90ed-f19f88e53748.scope` |
-
-**[5] `process.linux.cgroup`:** Control groups (cgroups) are a kernel feature used to organize and manage process resources. This attribute provides the path(s) to the cgroup(s) associated with the process, which should match the contents of the [/proc/\[PID\]/cgroup](https://man7.org/linux/man-pages/man7/cgroups.7.html) file.
-
-## Deprecated Process Attributes
-
-Deprecated process attributes.
-
 <details>
 <summary><b>Deprecated Attributes:</b></summary>
 
@@ -139,3 +122,15 @@ Deprecated process attributes.
 | `minor` | minor | ![Development](https://img.shields.io/badge/-development-blue) |
 
 </details>
+
+## Process Linux Attributes
+
+Describes Linux Process attributes
+
+**Attributes:**
+
+| Key | Stability | Value Type | Description | Example Values |
+|---|---|---|---|---|
+| <a id="process-linux-cgroup" href="#process-linux-cgroup">`process.linux.cgroup`</a> | ![Development](https://img.shields.io/badge/-development-blue) | string | The control group associated with the process. [5] | `1:name=systemd:/user.slice/user-1000.slice/session-3.scope`; `0::/user.slice/user-1000.slice/user@1000.service/tmux-spawn-0267755b-4639-4a27-90ed-f19f88e53748.scope` |
+
+**[5] `process.linux.cgroup`:** Control groups (cgroups) are a kernel feature used to organize and manage process resources. This attribute provides the path(s) to the cgroup(s) associated with the process, which should match the contents of the [/proc/\[PID\]/cgroup](https://man7.org/linux/man-pages/man7/cgroups.7.html) file.
diff --git a/docs/registry/attributes/rpc.md b/docs/registry/attributes/rpc.md
@@ -3,9 +3,6 @@
 
 # RPC
 
-- [Remote Procedure Call (RPC) Attributes](#remote-procedure-call-rpc-attributes)
-- [Deprecated RPC Attributes](#deprecated-rpc-attributes)
-
 ## Remote Procedure Call (RPC) Attributes
 
 This document defines attributes for remote procedure calls.
@@ -128,10 +125,6 @@ the `rpc.grpc.response.metadata.my-custom-key` attribute with value `["attribute
 | `jsonrpc` | JSON-RPC | ![Development](https://img.shields.io/badge/-development-blue) |
 | `onc_rpc` | [ONC RPC (Sun RPC)](https://datatracker.ietf.org/doc/html/rfc5531) | ![Development](https://img.shields.io/badge/-development-blue) |
 
-## Deprecated RPC Attributes
-
-Deprecated rpc message attributes.
-
 <details>
 <summary><b>Deprecated Attributes:</b></summary>
 
diff --git a/docs/registry/attributes/system.md b/docs/registry/attributes/system.md
diff --git a/docs/registry/attributes/tls.md b/docs/registry/attributes/tls.md
diff --git a/model/android/deprecated/registry-deprecated.yaml b/model/android/deprecated/registry-deprecated.yaml
diff --git a/model/android/registry.yaml b/model/android/registry.yaml
diff --git a/templates/registry/markdown/attribute_namespace.md.j2 b/templates/registry/markdown/attribute_namespace.md.j2
diff --git a/templates/registry/markdown/attribute_table.j2 b/templates/registry/markdown/attribute_table.j2
