Merge branch 'main' into add_process_cgroup

.chloggen/1393.yaml

@@ -0,0 +1,4 @@
+change_type: enhancement
+component: gen_ai
+note: Add system-specific conventions for Azure AI Inference.
+issues: [1393]

.chloggen/update-graphql-span-name.yaml

@@ -0,0 +1,4 @@
+change_type: breaking
+component: graphql
+note: Update the GraphQL Span name convention
+issues: [1361]

Makefile

@@ -155,7 +155,7 @@ table-check:
 		--templates=/home/weaver/templates \
 		--target=markdown \
 		--dry-run \
-		/spec
+		/home/weaver/target
 
 .PHONY: schema-check
 schema-check:

README.md

@@ -34,6 +34,9 @@ Maintainers ([@open-telemetry/specs-semconv-maintainers](https://github.com/orgs
 - [Johannes Tax](https://github.com/pyohannes), Grafana Labs
 - [Josh Suereth](https://github.com/jsuereth), Google
 - [Liudmila Molkova](https://github.com/lmolkova), Microsoft
-- [Reiley Yang](https://github.com/reyang), Microsoft
+
+Emeritus Maintainers:
+
+- [Reiley Yang](https://github.com/reyang)
 
 _Find more about the maintainer role in [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer)._

dependencies.Dockerfile

@@ -6,7 +6,7 @@
 FROM otel/weaver:v0.10.0 AS weaver
 
 # OPA is used to test policies enforced by weaver.
-FROM openpolicyagent/opa:0.68.0 AS opa
+FROM openpolicyagent/opa:0.69.0 AS opa
 
 # Semconv gen is used for backwards compatibility checks.
 # TODO(jsuereth): Remove this when no longer used.

docs/attributes-registry/cloudfoundry.md

@@ -28,7 +28,7 @@ CloudFoundry resource attributes.
 variable `VCAP_APPLICATION.application_id`. This is the same value as
 reported by `cf app <app-name> --guid`.
 
-**[2]:** CloudFoundry defines the `instance_id` in the [Loggegator v2 envelope](https://github.com/cloudfoundry/loggregator-api#v2-envelope).
+**[2]:** CloudFoundry defines the `instance_id` in the [Loggregator v2 envelope](https://github.com/cloudfoundry/loggregator-api#v2-envelope).
 It is used for logs and metrics emitted by CloudFoundry. It is
 supposed to contain the application instance index for applications
 deployed on the runtime.

docs/attributes-registry/gen-ai.md

@@ -54,12 +54,13 @@ If none of these options apply, the `gen_ai.system` SHOULD be set to `_OTHER`.
 
 `gen_ai.system` has the following list of well-known values. If one of them applies, then the respective value MUST be used; otherwise, a custom value MAY be used.
 
-| Value       | Description | Stability                                                        |
-| ----------- | ----------- | ---------------------------------------------------------------- |
-| `anthropic` | Anthropic   | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
-| `cohere`    | Cohere      | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
-| `openai`    | OpenAI      | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
-| `vertex_ai` | Vertex AI   | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| Value             | Description        | Stability                                                        |
+| ----------------- | ------------------ | ---------------------------------------------------------------- |
+| `anthropic`       | Anthropic          | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `az.ai.inference` | Azure AI Inference | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `cohere`          | Cohere             | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `openai`          | OpenAI             | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `vertex_ai`       | Vertex AI          | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 
 `gen_ai.token.type` has the following list of well-known values. If one of them applies, then the respective value MUST be used; otherwise, a custom value MAY be used.
 

docs/database/cassandra.md

@@ -74,6 +74,7 @@ Instrumentations SHOULD document how `error.type` is populated.
 **[10]:** If using a port other than the default port for this DBMS and if `server.address` is set.
 
 **[11]:** Operations are only considered batches when they contain two or more operations, and so `db.operation.batch.size` SHOULD never be `1`.
+This attribute has stability level RELEASE CANDIDATE.
 
 **[12]:** For sanitization see [Sanitization of `db.query.text`](../../docs/database/database-spans.md#sanitization-of-dbquerytext).
 For batch operations, if the individual operations are known to have the same query text then that query text SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated with separator `; ` or some other database system specific separator if more applicable.

docs/database/cosmosdb.md

@@ -186,6 +186,7 @@ Instrumentations SHOULD document how `error.type` is populated.
 **[8]:** When `az.namespace` attribute is populated, it MUST be set to `Microsoft.DocumentDB` for all operations performed by Cosmos DB client.
 
 **[9]:** Operations are only considered batches when they contain two or more operations, and so `db.operation.batch.size` SHOULD never be `1`.
+This attribute has stability level RELEASE CANDIDATE.
 
 **[10]:** For sanitization see [Sanitization of `db.query.text`](../../docs/database/database-spans.md#sanitization-of-dbquerytext).
 For batch operations, if the individual operations are known to have the same query text then that query text SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated with separator `; ` or some other database system specific separator if more applicable.

docs/database/couchdb.md

@@ -48,6 +48,7 @@ Instrumentations SHOULD document how `error.type` is populated.
 **[7]:** If using a port other than the default port for this DBMS and if `server.address` is set.
 
 **[8]:** Operations are only considered batches when they contain two or more operations, and so `db.operation.batch.size` SHOULD never be `1`.
+This attribute has stability level RELEASE CANDIDATE.
 
 **[9]:** When observed from the client side, and when communicating through an intermediary, `server.address` SHOULD represent the server address behind any intermediaries, for example proxies, if it's available.
 

docs/database/database-spans.md

@@ -141,6 +141,7 @@ Instrumentations SHOULD document how `error.type` is populated.
 **[11]:** If using a port other than the default port for this DBMS and if `server.address` is set.
 
 **[12]:** Operations are only considered batches when they contain two or more operations, and so `db.operation.batch.size` SHOULD never be `1`.
+This attribute has stability level RELEASE CANDIDATE.
 
 **[13]:** For sanitization see [Sanitization of `db.query.text`](../../docs/database/database-spans.md#sanitization-of-dbquerytext).
 For batch operations, if the individual operations are known to have the same query text then that query text SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated with separator `; ` or some other database system specific separator if more applicable.

docs/database/elasticsearch.md

@@ -81,6 +81,7 @@ Instrumentations SHOULD document how `error.type` is populated.
 **[11]:** When communicating with an Elastic Cloud deployment, this should be collected from the "X-Found-Handling-Cluster" HTTP response header.
 
 **[12]:** Operations are only considered batches when they contain two or more operations, and so `db.operation.batch.size` SHOULD never be `1`.
+This attribute has stability level RELEASE CANDIDATE.
 
 **[13]:** For sanitization see [Sanitization of `db.query.text`](../../docs/database/database-spans.md#sanitization-of-dbquerytext).
 For batch operations, if the individual operations are known to have the same query text then that query text SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated with separator `; ` or some other database system specific separator if more applicable.

docs/database/hbase.md

@@ -57,6 +57,7 @@ Instrumentations SHOULD document how `error.type` is populated.
 **[8]:** If using a port other than the default port for this DBMS and if `server.address` is set.
 
 **[9]:** Operations are only considered batches when they contain two or more operations, and so `db.operation.batch.size` SHOULD never be `1`.
+This attribute has stability level RELEASE CANDIDATE.
 
 **[10]:** When observed from the client side, and when communicating through an intermediary, `server.address` SHOULD represent the server address behind any intermediaries, for example proxies, if it's available.
 

docs/database/mariadb.md

@@ -99,6 +99,7 @@ Instrumentations SHOULD document how `error.type` is populated.
 **[9]:** If using a port other than the default port for this DBMS and if `server.address` is set.
 
 **[10]:** Operations are only considered batches when they contain two or more operations, and so `db.operation.batch.size` SHOULD never be `1`.
+This attribute has stability level RELEASE CANDIDATE.
 
 **[11]:** For sanitization see [Sanitization of `db.query.text`](../../docs/database/database-spans.md#sanitization-of-dbquerytext).
 For batch operations, if the individual operations are known to have the same query text then that query text SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated with separator `; ` or some other database system specific separator if more applicable.

docs/database/mongodb.md

@@ -54,6 +54,7 @@ Instrumentations SHOULD document how `error.type` is populated.
 **[8]:** If using a port other than the default port for this DBMS and if `server.address` is set.
 
 **[9]:** Operations are only considered batches when they contain two or more operations, and so `db.operation.batch.size` SHOULD never be `1`.
+This attribute has stability level RELEASE CANDIDATE.
 
 **[10]:** When observed from the client side, and when communicating through an intermediary, `server.address` SHOULD represent the server address behind any intermediaries, for example proxies, if it's available.
 

docs/database/mssql.md

@@ -69,6 +69,7 @@ Instrumentations SHOULD document how `error.type` is populated.
 **[9]:** If using a port other than the default port for this DBMS and if `server.address` is set.
 
 **[10]:** Operations are only considered batches when they contain two or more operations, and so `db.operation.batch.size` SHOULD never be `1`.
+This attribute has stability level RELEASE CANDIDATE.
 
 **[11]:** For sanitization see [Sanitization of `db.query.text`](../../docs/database/database-spans.md#sanitization-of-dbquerytext).
 For batch operations, if the individual operations are known to have the same query text then that query text SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated with separator `; ` or some other database system specific separator if more applicable.

docs/database/mysql.md

@@ -99,6 +99,7 @@ Instrumentations SHOULD document how `error.type` is populated.
 **[9]:** If using a port other than the default port for this DBMS and if `server.address` is set.
 
 **[10]:** Operations are only considered batches when they contain two or more operations, and so `db.operation.batch.size` SHOULD never be `1`.
+This attribute has stability level RELEASE CANDIDATE.
 
 **[11]:** For sanitization see [Sanitization of `db.query.text`](../../docs/database/database-spans.md#sanitization-of-dbquerytext).
 For batch operations, if the individual operations are known to have the same query text then that query text SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated with separator `; ` or some other database system specific separator if more applicable.

docs/database/postgresql.md

@@ -106,6 +106,7 @@ Instrumentations SHOULD document how `error.type` is populated.
 **[9]:** If using a port other than the default port for this DBMS and if `server.address` is set.
 
 **[10]:** Operations are only considered batches when they contain two or more operations, and so `db.operation.batch.size` SHOULD never be `1`.
+This attribute has stability level RELEASE CANDIDATE.
 
 **[11]:** For sanitization see [Sanitization of `db.query.text`](../../docs/database/database-spans.md#sanitization-of-dbquerytext).
 For batch operations, if the individual operations are known to have the same query text then that query text SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated with separator `; ` or some other database system specific separator if more applicable.

docs/database/redis.md

@@ -63,6 +63,7 @@ Instrumentations SHOULD document how `error.type` is populated.
 **[8]:** If using a port other than the default port for this DBMS and if `server.address` is set.
 
 **[9]:** Operations are only considered batches when they contain two or more operations, and so `db.operation.batch.size` SHOULD never be `1`.
+This attribute has stability level RELEASE CANDIDATE.
 
 **[10]:** For **Redis**, the value provided for `db.query.text` SHOULD correspond to the syntax of the Redis CLI. If, for example, the [`HMSET` command](https://redis.io/commands/hmset) is invoked, `"HMSET myhash field1 'Hello' field2 'World'"` would be a suitable value for `db.query.text`.
 

docs/database/sql.md

@@ -131,6 +131,7 @@ Instrumentations SHOULD document how `error.type` is populated.
 **[9]:** If using a port other than the default port for this DBMS and if `server.address` is set.
 
 **[10]:** Operations are only considered batches when they contain two or more operations, and so `db.operation.batch.size` SHOULD never be `1`.
+This attribute has stability level RELEASE CANDIDATE.
 
 **[11]:** For sanitization see [Sanitization of `db.query.text`](../../docs/database/database-spans.md#sanitization-of-dbquerytext).
 For batch operations, if the individual operations are known to have the same query text then that query text SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated with separator `; ` or some other database system specific separator if more applicable.

docs/gen-ai/README.md

@@ -20,4 +20,9 @@ Semantic conventions for Generative AI operations are defined for the following
 * [Metrics](gen-ai-metrics.md): Semantic Conventions for Generative AI operations - *metrics*.
 * [Spans](gen-ai-spans.md): Semantic Conventions for Generative AI requests - *spans*.
 
+Technology specific semantic conventions are defined for the following GenAI system:
+
+* [Azure AI Inference](./azure-ai-inference.md): Semantic Conventions for Azure AI Inference.
+* [OpenAI](./openai.md): Semantic Conventions for OpenAI.
+
 [DocumentStatus]: https://opentelemetry.io/docs/specs/otel/document-status