diff --git a/docs/attributes-registry/db.md b/docs/attributes-registry/db.md index 85c5ce353..e36db87d9 100644 --- a/docs/attributes-registry/db.md +++ b/docs/attributes-registry/db.md @@ -23,7 +23,7 @@ This group defines the attributes used to describe telemetry in the context of d | `db.client.connection.state` | string | The state of a connection in the pool | `idle` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `db.collection.name` | string | The name of a collection (table, container) within the database. [1] | `public.users`; `customers` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `db.namespace` | string | The name of the database, fully qualified within the server address and port. [2] | `customers`; `test.users` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | -| `db.operation.batch.size` | int | The number of queries included in a [batch operation](/docs/database/database-spans.md#batch-operations). [3] | `2`; `3`; `4` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| `db.operation.batch.size` | int | The number of queries included in a batch operation. [3] | `2`; `3`; `4` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `db.operation.name` | string | The name of the operation or command being executed. [4] | `findAndModify`; `HMSET`; `SELECT` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `db.query.parameter.` | string | A query parameter used in `db.query.text`, with `` being the parameter name, and the attribute value being a string representation of the parameter value. [5] | `someval`; `55` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `db.query.text` | string | The database query being executed. [6] | `SELECT * FROM wuser_table where username = ?`; `SET mykey "WuValue"` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | diff --git a/docs/general/attributes.md b/docs/general/attributes.md index a1ce082ad..62f572e00 100644 --- a/docs/general/attributes.md +++ b/docs/general/attributes.md @@ -25,7 +25,7 @@ Particular operations may refer to or require some of these attributes. - [Destination](#destination) - [Other network attributes](#other-network-attributes) - [`network.peer.*` and `network.local.*` attributes](#networkpeer-and-networklocal-attributes) - - [Client/server examples using `network.peer.*`](#clientserver-examples-using--networkpeer) + - [Client/server examples using `network.peer.*`](#clientserver-examples-using-networkpeer) - [Simple client/server example](#simple-clientserver-example) - [Client/server example with reverse proxy](#clientserver-example-with-reverse-proxy) - [Client/server example with forward proxy](#clientserver-example-with-forward-proxy) @@ -288,7 +288,7 @@ of `sockaddr_in` structure. ([Linux or other POSIX systems](https://man7.org/linux/man-pages/man2/getsockname.2.html) / [Windows](https://docs.microsoft.com/windows/win32/api/winsock2/nf-winsock2-getsockname)). -##### Client/server examples using `network.peer.*` +##### Client/server examples using `network.peer.*` Note that `network.local.*` attributes are not included in these examples since they are typically Opt-In. diff --git a/docs/messaging/gcp-pubsub.md b/docs/messaging/gcp-pubsub.md index 8077d03b5..9bbcc160e 100644 --- a/docs/messaging/gcp-pubsub.md +++ b/docs/messaging/gcp-pubsub.md @@ -44,7 +44,7 @@ If one of them applies, then the respective value MUST be used; otherwise, a cus - `send` for publishing operations - `modack` for extending the lease for a single message or batch of messages - `subscribe` for operations that represent the time from after the message was received to when the message is acknowledged, negatively acknowledged, or expired. -- `create` and `receive` for [common messaging operations](/docs/messaging/messaging-spans.md#common-messaging-operations) +- `create` and `receive` for [common messaging operations](/docs/messaging/messaging-spans.md#operation-types) **[2]:** The `error.type` SHOULD be predictable, and SHOULD have low cardinality. diff --git a/model/registry/db.yaml b/model/registry/db.yaml index 47fe7f24b..5d029c1fe 100644 --- a/model/registry/db.yaml +++ b/model/registry/db.yaml @@ -79,7 +79,7 @@ groups: - id: db.operation.batch.size type: int stability: experimental - brief: The number of queries included in a [batch operation](/docs/database/database-spans.md#batch-operations). + brief: The number of queries included in a batch operation. note: > Operations are only considered batches when they contain two or more operations, and so `db.operation.batch.size` SHOULD never be `1`. diff --git a/model/trace/messaging.yaml b/model/trace/messaging.yaml index c429f7a54..cc10819f8 100644 --- a/model/trace/messaging.yaml +++ b/model/trace/messaging.yaml @@ -205,7 +205,7 @@ groups: - `send` for publishing operations - `modack` for extending the lease for a single message or batch of messages - `subscribe` for operations that represent the time from after the message was received to when the message is acknowledged, negatively acknowledged, or expired. - - `create` and `receive` for [common messaging operations](/docs/messaging/messaging-spans.md#common-messaging-operations) + - `create` and `receive` for [common messaging operations](/docs/messaging/messaging-spans.md#operation-types) - id: messaging.servicebus type: attribute_group extends: attributes.messaging.trace.minimal