reflect the feedback

.chloggen/1469.yaml

@@ -0,0 +1,5 @@
+change_type: 'enhancement'
+component: gen_ai
+note: Yamlify gen_ai events and clean up examples.
+
+issues: [1469]

.chloggen/1646.yaml

@@ -0,0 +1,4 @@
+change_type: breaking
+component: event
+note: Deprecate `event.name` attribute in favor of the top level event name property on the log record
+issues: [1646]

.chloggen/1694.yaml

@@ -0,0 +1,8 @@
+change_type: enhancement
+component: docs
+note: Update attribute, events, and metrics naming guidance to include new best practices.
+subtext: |
+  - Use namespaces (with `.` delimiter) whenever possible.
+  - Use precise, descriptive, unambiguous names that leave room for expansion.
+
+issues: [1694]

.chloggen/add_deploy_replica_metrics.yaml

@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: k8s
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add metrics for k8s deployment, replicaset, replication_controller, statefulset and hpa.
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [1636, 1637, 1644]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext: |
+  This addition focused on providing consistency between these metrics, while
+  also ensuring alignment with recommendations from Kubernetes.
+  More details in https://github.com/open-telemetry/semantic-conventions/issues/1637

.chloggen/add_ds_metrics.yaml

@@ -0,0 +1,22 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: k8s
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add k8s deamonset related metrics
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [1649]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

.chloggen/aws.extended_request_id.yaml

@@ -0,0 +1,22 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: aws
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add extended request ID to general AWS attributes as `aws.extended_request_id`
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [1670]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

.chloggen/clarify-temporary-destination.yaml

@@ -0,0 +1,5 @@
+change_type: enhancement
+component: messaging
+note: Further clarify `{destination}` value on span names
+issues: [1635]
+subtext:

.chloggen/fix_system_net_state.yaml

@@ -0,0 +1,22 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: system
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Replace `system.network.state` with `network.connection.state`
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [308]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

.chloggen/genai-request-seed.yaml

@@ -0,0 +1,5 @@
+change_type: 'enhancement'
+component: gen_ai
+note: Introduce gen_ai.request.seed and deprecated gen_ai.openai.request.seed
+
+issues: [1710]

.chloggen/k8s-migration.yaml

@@ -0,0 +1,22 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: k8s
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add migration guide for K8s semantic conventions
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [1597]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

.chloggen/rule_new.yaml

@@ -0,0 +1,22 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: new_component
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: security-rule
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Introducing a new security rule namespace
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [903]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

.github/CODEOWNERS

@@ -32,14 +32,15 @@
 /model/jvm/                       @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-jvm-approvers
 
 # HTTP semantic conventions
-/docs/http/                       @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
-/model/http/                      @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
-/model/error/                     @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
-/model/client/                    @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
-/model/network/                   @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers @open-telemetry/semconv-system-approvers @open-telemetry/semconv-security-approvers
-/model/server/                    @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
-/model/url/                       @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
-/model/user-agent/                @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
+/docs/http/                            @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
+/model/http/                           @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
+/model/error/                          @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
+/model/client/                         @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
+/model/network/                        @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers @open-telemetry/semconv-system-approvers @open-telemetry/semconv-security-approvers
+/model/server/                         @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
+/model/url/                            @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
+/model/user-agent/                     @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
+/docs/non-normative/http-migration.md  @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
 
 # System semantic conventions
 /docs/process/                    @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-system-approvers @open-telemetry/semconv-security-approvers
@@ -58,8 +59,9 @@
 /model/device/                    @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-mobile-approvers
 
 # K8s semantic conventions
-/docs/resource/k8s.md             @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
-/model/k8s/                       @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
+/docs/resource/k8s.md                @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
+/model/k8s/                          @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
+/docs/non-normative/k8s-migration.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
 
 # Container semantic conventions
 /docs/resource/container.md       @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-container-approvers
@@ -95,8 +97,9 @@
 /model/vcs/                       @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers
 
 # Database semantic conventions
-/docs/database/                   @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-db-approvers
-/model/database/                  @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-db-approvers
+/docs/database/                      @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-db-approvers
+/model/database/                     @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-db-approvers
+/docs/non-normative/db-migration.md  @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-db-approvers
 
 # Messaging semantic conventions
 /docs/messaging/                  @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-messaging-approvers
@@ -107,7 +110,8 @@
 /model/feature-flags/              @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-feature-flag-approvers
 
 # Tooling
-/policies/                        @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-maintainers
-/policies_test/                   @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-maintainers
-/templates/                       @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-maintainers
-/internal/                        @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-maintainers
+/policies/                              @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-maintainers
+/policies_test/                         @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-maintainers
+/templates/                             @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-maintainers
+/internal/                              @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-maintainers
+/docs/non-normative/code-generation.md  @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-maintainers

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -42,7 +42,6 @@ body:
         - area:dns
         - area:dotnet
         - area:error
-        - area:event
         - area:exception
         - area:faas
         - area:feature-flag
@@ -71,6 +70,7 @@ body:
         - area:process
         - area:profile
         - area:rpc
+        - area:security-rule
         - area:server
         - area:service
         - area:session

.github/ISSUE_TEMPLATE/change_proposal.yaml

@@ -34,7 +34,6 @@ body:
         - area:dns
         - area:dotnet
         - area:error
-        - area:event
         - area:exception
         - area:faas
         - area:feature-flag
@@ -63,6 +62,7 @@ body:
         - area:process
         - area:profile
         - area:rpc
+        - area:security-rule
         - area:server
         - area:service
         - area:session

.github/ISSUE_TEMPLATE/new-conventions.yaml

@@ -43,7 +43,6 @@ body:
         - area:dns
         - area:dotnet
         - area:error
-        - area:event
         - area:exception
         - area:faas
         - area:feature-flag
@@ -72,6 +71,7 @@ body:
         - area:process
         - area:profile
         - area:rpc
+        - area:security-rule
         - area:server
         - area:service
         - area:session

.markdown_link_check_config.json

@@ -6,6 +6,9 @@
     {
       "pattern": "^https://github\\.com/open-telemetry/semantic-conventions/(issues|pull|actions)"
     },
+    {
+      "pattern": "^https://blogs.oracle.com/linux/post/understanding-linux-kernel-memory-statistics$"
+    },
     {
       "pattern": "^#"
     }

.vscode/settings.json

@@ -10,7 +10,7 @@
         "MD040": false,
     },
     "yaml.schemas": {
-        "https://raw.githubusercontent.com/open-telemetry/weaver/v0.9.2/schemas/semconv.schema.json": [
+        "https://raw.githubusercontent.com/open-telemetry/weaver/v0.12.0/schemas/semconv.schema.json": [
             "model/**/*.yaml"
         ]
     },

CONTRIBUTING.md

@@ -13,6 +13,7 @@ requirements and recommendations.
 
 - [Sign the CLA](#sign-the-cla)
 - [How to Contribute](#how-to-contribute)
+  - [Which semantic conventions belong in this repo](#which-semantic-conventions-belong-in-this-repo)
   - [Prerequisites](#prerequisites)
   - [1. Modify the YAML model](#1-modify-the-yaml-model)
     - [Code structure](#code-structure)
@@ -62,6 +63,25 @@ key, but non-obvious, aspects:
 
 Please make sure all Pull Requests are compliant with these rules!
 
+### Which semantic conventions belong in this repo
+
+This repo contains semantic conventions supported by the OpenTelemetry ecosystem
+including, but not limited to, components hosted in OpenTelemetry.
+
+Instrumentations hosted in OpenTelemetry SHOULD contribute their semantic
+conventions to this repo with the following exceptions:
+
+- Instrumentations that follow external schema not fully compatible with OpenTelemetry such as
+  [Kafka client JMX metrics](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/v2.10.0/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/README.md)
+  or [RabbitMQ Collector Receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.116.0/receiver/rabbitmqreceiver)
+  SHOULD document such conventions in their own repository.
+
+Having all OTel conventions in this repo allows to reuse common attributes, enforce naming and compatibility policies,
+and helps to keep conventions consistent and backward compatible.
+
+Want to define your own conventions outside this repo while building on OTel’s?
+Come help us [decentralize semantic conventions](https://github.com/open-telemetry/weaver/issues/215).
+
 ### Prerequisites
 
 The Specification uses several tools to check things like style,
@@ -399,7 +419,7 @@ exists in some form in ECS, consider the following guidelines:
     data, user issue reports, feature requests, examples of prior work on a
     different standard or comparable evidence about the alternatives.
   - When no suitable alternatives are provided, altering an ECS name solely
-    for the purpose of complying with [Name Pluralization guidelines](docs/general/attribute-naming.md#name-pluralization-guidelines)
+    for the purpose of complying with [Name Pluralization guidelines](docs/general/naming.md#attribute-name-pluralization-guidelines)
     MAY BE avoided.
 - Do not use an existing ECS name as a namespace. If the name must differ, use a
   different namespace name to avoid clashes or avoid using the namespace

dependencies.Dockerfile

@@ -3,7 +3,7 @@
 # Dependabot can keep this file up to date with latest containers.
 
 # Weaver is used to generate markdown docs, and enforce policies on the model.
-FROM otel/weaver:v0.10.0 AS weaver
+FROM otel/weaver:v0.12.0 AS weaver
 
 # OPA is used to test policies enforced by weaver.
 FROM openpolicyagent/opa:0.70.0 AS opa

docs/attributes-registry/README.md

@@ -84,6 +84,7 @@ Currently, the following namespaces exist:
 - [Process](process.md)
 - [Profile](profile.md)
 - [RPC](rpc.md)
+- [Security Rule](security-rule.md)
 - [Server](server.md)
 - [Service](service.md)
 - [Session](session.md)
@@ -101,4 +102,4 @@ Currently, the following namespaces exist:
 - [VCS](vcs.md)
 - [Webengine](webengine.md)
 
-[developers recommendations]: ../general/attribute-naming.md#recommendations-for-application-developers
+[developers recommendations]: ../general/naming.md#recommendations-for-application-developers

docs/attributes-registry/aws.md

@@ -20,7 +20,8 @@ This document defines generic attributes for AWS services.
 
 | Attribute | Type | Description | Examples | Stability |
 |---|---|---|---|---|
-| <a id="aws-request-id" href="#aws-request-id">`aws.request_id`</a> | string | The AWS request ID as returned in the response headers `x-amz-request-id` or `x-amz-requestid`. | `79b9da39-b7ae-508a-a6bc-864b2829c622`; `C9ER4AJX75574TDJ` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| <a id="aws-extended-request-id" href="#aws-extended-request-id">`aws.extended_request_id`</a> | string | The AWS extended request ID as returned in the response header `x-amz-id-2`. | `wzHcyEWfmOGDIE5QOhTAqFDoDWP3y8IUvpNINCwL9N4TEHbUw0/gZJ+VZTmCNCWR7fezEN3eCiQ=` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| <a id="aws-request-id" href="#aws-request-id">`aws.request_id`</a> | string | The AWS request ID as returned in the response headers `x-amzn-requestid`, `x-amzn-request-id` or `x-amz-request-id`. | `79b9da39-b7ae-508a-a6bc-864b2829c622`; `C9ER4AJX75574TDJ` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 
 ## Amazon DynamoDB Attributes
 

docs/attributes-registry/azure.md

@@ -6,7 +6,7 @@
 
 # Azure
 
-## Azure Sdk Attributes
+## Azure SDK Attributes
 
 This document defines generic attributes for Azure SDK.
 

docs/attributes-registry/cicd.md

@@ -6,7 +6,7 @@
 
 # CICD
 
-## CICD Pipeline Attributes
+## CI/CD Pipeline Attributes
 
 This group describes attributes specific to pipelines within a Continuous Integration and Continuous Deployment (CI/CD) system. A [pipeline](https://wikipedia.org/wiki/Pipeline_(computing)) in this case is a series of steps that are performed in order to deliver a new version of software. This aligns with the [Britannica](https://www.britannica.com/dictionary/pipeline) definition of a pipeline where a **pipeline** is the system for developing and producing something. In the context of CI/CD, a pipeline produces or delivers software.