Skip to content

Commit 16724fe

Browse files
authored
[chore] Rename */database to */db to match area names (#3108)
1 parent 5636e58 commit 16724fe

32 files changed

+107
-90
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@
129129
/docs/non-normative/code-attrs-migration.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-code-attribute-approvers
130130

131131
# Database semantic conventions
132-
/docs/database/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-db-approvers
133-
/model/database/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-db-approvers
132+
/docs/db/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-db-approvers
133+
/model/db/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-db-approvers
134134
/docs/non-normative/database-test-cases/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-db-approvers
135135
/docs/non-normative/db-migration.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-db-approvers
136136

docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Semantic Conventions are defined for the following areas:
2323
* [CICD](cicd/README.md): Semantic Conventions for CICD systems.
2424
* [Cloud Providers](cloud-providers/README.md): Semantic Conventions for cloud providers libraries.
2525
* [CloudEvents](cloudevents/README.md): Semantic Conventions for the CloudEvents specification.
26-
* [Database](database/README.md): Semantic Conventions for database operations.
26+
* [Database](db/README.md): Semantic Conventions for database operations.
2727
* [Exceptions](exceptions/README.md): Semantic Conventions for exceptions.
2828
* [FaaS](faas/README.md): Semantic Conventions for Function as a Service (FaaS) operations.
2929
* [Feature Flags](feature-flags/README.md): Semantic Conventions for feature flag evaluations.

docs/cloud-providers/aws-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ interesting conventions are found.
7272

7373
The following Semantic Conventions extend the general AWS SDK attributes for specific AWS services:
7474

75-
- [AWS DynamoDB](/docs/database/dynamodb.md): Semantic Conventions for _AWS DynamoDB_.
75+
- [AWS DynamoDB](/docs/db/dynamodb.md): Semantic Conventions for _AWS DynamoDB_.
7676
- [AWS S3](/docs/object-stores/s3.md): Semantic Conventions for _AWS S3_.
7777
- [AWS Bedrock](/docs/gen-ai/aws-bedrock.md): Semantic Conventions for _AWS Bedrock_.
7878
- [AWS SNS](/docs/messaging/sns.md): Semantic Conventions for _AWS SNS_.

docs/database/README.md renamed to docs/db/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<!--- Hugo front matter used to generate the website version of this page:
22
linkTitle: Database
3+
aliases: [/docs/specs/semconv/database]
34
--->
45

56
# Semantic conventions for database calls and systems

docs/database/cassandra.md renamed to docs/db/cassandra.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<!--- Hugo front matter used to generate the website version of this page:
22
linkTitle: Cassandra
3+
aliases: [/docs/specs/semconv/database/cassandra.md]
34
--->
45

56
# Semantic conventions for Cassandra client operations
@@ -24,11 +25,11 @@ The Semantic Conventions for [Cassandra](https://cassandra.apache.org/) extend a
2425

2526
**Status:** ![Development](https://img.shields.io/badge/-development-blue)
2627

27-
Spans representing calls to a Cassandra database adhere to the general [Semantic Conventions for Database Client Spans](/docs/database/database-spans.md).
28+
Spans representing calls to a Cassandra database adhere to the general [Semantic Conventions for Database Client Spans](/docs/db/database-spans.md).
2829

2930
`db.system.name` MUST be set to `"cassandra"` and SHOULD be provided **at span creation time**.
3031

31-
**Span name** SHOULD follow the general [database span name convention](/docs/database/database-spans.md#name)
32+
**Span name** SHOULD follow the general [database span name convention](/docs/db/database-spans.md#name)
3233

3334
**Span kind** SHOULD be `CLIENT`.
3435

@@ -111,13 +112,13 @@ calls involving complex queries.
111112
Summary may be available to the instrumentation through
112113
instrumentation hooks or other means. If it is not available, instrumentations
113114
that support query parsing SHOULD generate a summary following
114-
[Generating query summary](/docs/database/database-spans.md#generating-a-summary-of-the-query)
115+
[Generating query summary](/docs/db/database-spans.md#generating-a-summary-of-the-query)
115116
section.
116117

117-
**[14] `db.query.text`:** Non-parameterized query text SHOULD NOT be collected by default unless there is sanitization that excludes sensitive data, e.g. by redacting all literal values present in the query text. See [Sanitization of `db.query.text`](/docs/database/database-spans.md#sanitization-of-dbquerytext).
118+
**[14] `db.query.text`:** Non-parameterized query text SHOULD NOT be collected by default unless there is sanitization that excludes sensitive data, e.g. by redacting all literal values present in the query text. See [Sanitization of `db.query.text`](/docs/db/database-spans.md#sanitization-of-dbquerytext).
118119
Parameterized query text SHOULD be collected by default (the query parameter values themselves are opt-in, see [`db.query.parameter.<key>`](/docs/registry/attributes/db.md)).
119120

120-
**[15] `db.query.text`:** For sanitization see [Sanitization of `db.query.text`](/docs/database/database-spans.md#sanitization-of-dbquerytext).
121+
**[15] `db.query.text`:** For sanitization see [Sanitization of `db.query.text`](/docs/db/database-spans.md#sanitization-of-dbquerytext).
121122
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.
122123
Parameterized query text SHOULD NOT be sanitized. Even though parameterized query text can potentially have sensitive data, by using a parameterized query the user is giving a strong signal that any sensitive data will be passed as parameter values, and the benefit to observability of capturing the static part of the query text by default outweighs the risk.
123124

docs/database/cosmosdb.md renamed to docs/db/cosmosdb.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<!--- Hugo front matter used to generate the website version of this page:
22
linkTitle: Cosmos DB
3+
aliases: [/docs/specs/semconv/database/cosmosdb.md]
34
--->
45

56
# Semantic conventions for Microsoft Azure Cosmos DB client operations
@@ -30,14 +31,14 @@ extend and override the [Database Semantic Conventions](README.md).
3031

3132
**Status:** ![Development](https://img.shields.io/badge/-development-blue)
3233

33-
Cosmos DB instrumentations include call-level spans that represent logical database calls and adhere to the general [Semantic Conventions for Database Client Spans](/docs/database/database-spans.md).
34+
Cosmos DB instrumentations include call-level spans that represent logical database calls and adhere to the general [Semantic Conventions for Database Client Spans](/docs/db/database-spans.md).
3435

3536
Additional spans representing network calls may also be created depending on the connection mode (Gateway or Direct).
3637
Semantic conventions described in this document apply to the call-level spans only.
3738

3839
`db.system.name` MUST be set to `"azure.cosmosdb"` and SHOULD be provided **at span creation time**.
3940

40-
**Span name** SHOULD follow the general [database span name convention](/docs/database/database-spans.md#name)
41+
**Span name** SHOULD follow the general [database span name convention](/docs/db/database-spans.md#name)
4142

4243
**Span kind** SHOULD be `CLIENT`.
4344

@@ -211,7 +212,7 @@ Instrumentations SHOULD document how `error.type` is populated.
211212

212213
**[9] `db.operation.batch.size`:** Operations are only considered batches when they contain two or more operations, and so `db.operation.batch.size` SHOULD never be `1`.
213214

214-
**[10] `db.query.text`:** For sanitization see [Sanitization of `db.query.text`](/docs/database/database-spans.md#sanitization-of-dbquerytext).
215+
**[10] `db.query.text`:** For sanitization see [Sanitization of `db.query.text`](/docs/db/database-spans.md#sanitization-of-dbquerytext).
215216
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.
216217
Parameterized query text SHOULD NOT be sanitized. Even though parameterized query text can potentially have sensitive data, by using a parameterized query the user is giving a strong signal that any sensitive data will be passed as parameter values, and the benefit to observability of capturing the static part of the query text by default outweighs the risk.
217218

@@ -316,15 +317,15 @@ The following metrics provide insights into Azure Cosmos DB client operation per
316317

317318
This metric is [required][MetricRequired].
318319

319-
It captures the total time taken by an Azure Cosmos DB operation. This metric follows the common [db.client.operation.duration](/docs/database/database-metrics.md#metric-dbclientoperationduration) definition.
320+
It captures the total time taken by an Azure Cosmos DB operation. This metric follows the common [db.client.operation.duration](/docs/db/database-metrics.md#metric-dbclientoperationduration) definition.
320321

321322
Refer [azure.cosmosdb.client.operation.request_charge](#metric-azurecosmosdbclientoperationrequest_charge) metrics for dimensions.
322323

323324
### Metric: `db.client.response.returned_rows`
324325

325326
This metric is [required][MetricRequired].
326327

327-
It captures the number of items returned by a query or feed operation in Azure Cosmos DB. It helps identify response sizes that may contribute to high latency, increased memory/CPU usage, or network call failures. This metric follows the common [`db.client.response.returned_rows`](/docs/database/database-metrics.md#metric-dbclientresponsereturned_rows) definition.
328+
It captures the number of items returned by a query or feed operation in Azure Cosmos DB. It helps identify response sizes that may contribute to high latency, increased memory/CPU usage, or network call failures. This metric follows the common [`db.client.response.returned_rows`](/docs/db/database-metrics.md#metric-dbclientresponsereturned_rows) definition.
328329

329330
Refer [azure.cosmosdb.client.operation.request_charge](#metric-azurecosmosdbclientoperationrequest_charge) metrics for dimensions.
330331

docs/database/couchdb.md renamed to docs/db/couchdb.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<!--- Hugo front matter used to generate the website version of this page:
22
linkTitle: CouchDB
3+
aliases: [/docs/specs/semconv/database/couchdb.md]
34
--->
45

56
# Semantic conventions for CouchDB client operations
@@ -30,11 +31,11 @@ The following table outlines the span attributes applicable to CouchDB.
3031

3132
**Status:** ![Development](https://img.shields.io/badge/-development-blue)
3233

33-
Spans representing calls to CouchDB adhere to the general [Semantic Conventions for Database Client Spans](/docs/database/database-spans.md).
34+
Spans representing calls to CouchDB adhere to the general [Semantic Conventions for Database Client Spans](/docs/db/database-spans.md).
3435

3536
`db.system.name` MUST be set to `"couchdb"` and SHOULD be provided **at span creation time**.
3637

37-
**Span name** SHOULD follow the general [database span name convention](/docs/database/database-spans.md#name)
38+
**Span name** SHOULD follow the general [database span name convention](/docs/db/database-spans.md#name)
3839

3940
**Span kind** SHOULD be `CLIENT`.
4041

docs/database/database-metrics.md renamed to docs/db/database-metrics.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<!--- Hugo front matter used to generate the website version of this page:
22
linkTitle: Metrics
3+
aliases: [/docs/specs/semconv/database/database-metrics.md]
34
--->
45

56
# Semantic conventions for database client metrics
@@ -152,7 +153,7 @@ calls involving complex queries.
152153
Summary may be available to the instrumentation through
153154
instrumentation hooks or other means. If it is not available, instrumentations
154155
that support query parsing SHOULD generate a summary following
155-
[Generating query summary](/docs/database/database-spans.md#generating-a-summary-of-the-query)
156+
[Generating query summary](/docs/db/database-spans.md#generating-a-summary-of-the-query)
156157
section.
157158

158159
**[14] `db.stored_procedure.name`:** If operation applies to a specific stored procedure.
@@ -168,7 +169,7 @@ If a database operation involved multiple network calls (for example retries), t
168169

169170
**[17] `server.address`:** 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.
170171

171-
**[18] `db.query.text`:** For sanitization see [Sanitization of `db.query.text`](/docs/database/database-spans.md#sanitization-of-dbquerytext).
172+
**[18] `db.query.text`:** For sanitization see [Sanitization of `db.query.text`](/docs/db/database-spans.md#sanitization-of-dbquerytext).
172173
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.
173174
Parameterized query text SHOULD NOT be sanitized. Even though parameterized query text can potentially have sensitive data, by using a parameterized query the user is giving a strong signal that any sensitive data will be passed as parameter values, and the benefit to observability of capturing the static part of the query text by default outweighs the risk.
174175

@@ -338,15 +339,15 @@ calls involving complex queries.
338339
Summary may be available to the instrumentation through
339340
instrumentation hooks or other means. If it is not available, instrumentations
340341
that support query parsing SHOULD generate a summary following
341-
[Generating query summary](/docs/database/database-spans.md#generating-a-summary-of-the-query)
342+
[Generating query summary](/docs/db/database-spans.md#generating-a-summary-of-the-query)
342343
section.
343344

344345
**[14] `network.peer.address`:** Semantic conventions for individual database systems SHOULD document whether `network.peer.*` attributes are applicable. Network peer address and port are useful when the application interacts with individual database nodes directly.
345346
If a database operation involved multiple network calls (for example retries), the address of the last contacted node SHOULD be used.
346347

347348
**[15] `server.address`:** 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.
348349

349-
**[16] `db.query.text`:** For sanitization see [Sanitization of `db.query.text`](/docs/database/database-spans.md#sanitization-of-dbquerytext).
350+
**[16] `db.query.text`:** For sanitization see [Sanitization of `db.query.text`](/docs/db/database-spans.md#sanitization-of-dbquerytext).
350351
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.
351352
Parameterized query text SHOULD NOT be sanitized. Even though parameterized query text can potentially have sensitive data, by using a parameterized query the user is giving a strong signal that any sensitive data will be passed as parameter values, and the benefit to observability of capturing the static part of the query text by default outweighs the risk.
352353

docs/database/database-spans.md renamed to docs/db/database-spans.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<!--- Hugo front matter used to generate the website version of this page:
22
linkTitle: Spans
3+
aliases: [/docs/specs/semconv/database/database-spans.md]
34
--->
45

56
# Semantic conventions for database client spans
@@ -96,7 +97,7 @@ it is RECOMMENDED to instrument the higher-level convenience APIs.
9697
These often allow setting `db.operation.*` attributes, which usually are not
9798
readily available at the generic query level.
9899

99-
**Span name** is covered in the [Name](/docs/database/database-spans.md#name) section.
100+
**Span name** is covered in the [Name](/docs/db/database-spans.md#name) section.
100101

101102
**Span kind** SHOULD be `CLIENT`. It MAY be set to `INTERNAL` on spans representing
102103
in-memory database calls.
@@ -188,13 +189,13 @@ calls involving complex queries.
188189
Summary may be available to the instrumentation through
189190
instrumentation hooks or other means. If it is not available, instrumentations
190191
that support query parsing SHOULD generate a summary following
191-
[Generating query summary](/docs/database/database-spans.md#generating-a-summary-of-the-query)
192+
[Generating query summary](/docs/db/database-spans.md#generating-a-summary-of-the-query)
192193
section.
193194

194-
**[15] `db.query.text`:** Non-parameterized query text SHOULD NOT be collected by default unless there is sanitization that excludes sensitive data, e.g. by redacting all literal values present in the query text. See [Sanitization of `db.query.text`](/docs/database/database-spans.md#sanitization-of-dbquerytext).
195+
**[15] `db.query.text`:** Non-parameterized query text SHOULD NOT be collected by default unless there is sanitization that excludes sensitive data, e.g. by redacting all literal values present in the query text. See [Sanitization of `db.query.text`](/docs/db/database-spans.md#sanitization-of-dbquerytext).
195196
Parameterized query text SHOULD be collected by default (the query parameter values themselves are opt-in, see [`db.query.parameter.<key>`](/docs/registry/attributes/db.md)).
196197

197-
**[16] `db.query.text`:** For sanitization see [Sanitization of `db.query.text`](/docs/database/database-spans.md#sanitization-of-dbquerytext).
198+
**[16] `db.query.text`:** For sanitization see [Sanitization of `db.query.text`](/docs/db/database-spans.md#sanitization-of-dbquerytext).
198199
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.
199200
Parameterized query text SHOULD NOT be sanitized. Even though parameterized query text can potentially have sensitive data, by using a parameterized query the user is giving a strong signal that any sensitive data will be passed as parameter values, and the benefit to observability of capturing the static part of the query text by default outweighs the risk.
200201

docs/database/dynamodb.md renamed to docs/db/dynamodb.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<!--- Hugo front matter used to generate the website version of this page:
22
linkTitle: DynamoDB
3+
aliases: [/docs/specs/semconv/database/dynamodb.md]
34
--->
45

56
# Semantic conventions for AWS DynamoDB client operations
@@ -27,7 +28,7 @@ linkTitle: DynamoDB
2728
<!-- tocstop -->
2829

2930
The Semantic Conventions for [AWS DynamoDB](https://aws.amazon.com/dynamodb/) extend and override the general
30-
[AWS SDK Semantic Conventions](/docs/cloud-providers/aws-sdk.md) and [Database Semantic Conventions](/docs/database/README.md).
31+
[AWS SDK Semantic Conventions](/docs/cloud-providers/aws-sdk.md) and [Database Semantic Conventions](/docs/db/README.md).
3132

3233
## Spans
3334

0 commit comments

Comments
 (0)