From 776cdd91a55fca0c02a246aa48362df188abb694 Mon Sep 17 00:00:00 2001 From: Michael Murphy <5879863+mrblonde91@users.noreply.github.com> Date: Mon, 16 Jan 2023 09:06:25 +0000 Subject: [PATCH 1/3] Add Cloud Spanner --- semantic_conventions/trace/database.yaml | 3 +++ .../trace/semantic_conventions/database.md | 15 +++++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/semantic_conventions/trace/database.yaml b/semantic_conventions/trace/database.yaml index 2e70d7da859..737c2459bb4 100644 --- a/semantic_conventions/trace/database.yaml +++ b/semantic_conventions/trace/database.yaml @@ -160,6 +160,9 @@ groups: - id: clickhouse value: 'clickhouse' brief: 'ClickHouse' + - id: spanner + value: 'spanner' + brief: 'Cloud Spanner' - id: connection_string tag: connection-level type: string diff --git a/specification/trace/semantic_conventions/database.md b/specification/trace/semantic_conventions/database.md index 7349bbf6dd5..5453c611053 100644 --- a/specification/trace/semantic_conventions/database.md +++ b/specification/trace/semantic_conventions/database.md @@ -6,16 +6,10 @@ -- [Connection-level attributes](#connection-level-attributes) - * [Notes and well-known identifiers for `db.system`](#notes-and-well-known-identifiers-for-dbsystem) - * [Connection-level attributes for specific technologies](#connection-level-attributes-for-specific-technologies) -- [Call-level attributes](#call-level-attributes) - * [Call-level attributes for specific technologies](#call-level-attributes-for-specific-technologies) - + [Cassandra](#cassandra) -- [Examples](#examples) - * [MySQL](#mysql) - * [Redis](#redis) - * [MongoDB](#mongodb) +- [Semantic conventions for database client calls](#semantic-conventions-for-database-client-calls) + - [Connection-level attributes](#connection-level-attributes) + - [Call-level attributes](#call-level-attributes) + - [Examples](#examples) @@ -117,6 +111,7 @@ Some database systems may allow a connection to switch to a different `db.user`, | `cockroachdb` | CockroachDB | | `opensearch` | OpenSearch | | `clickhouse` | ClickHouse | +| `spanner` | Cloud Spanner | ### Notes and well-known identifiers for `db.system` From dced0252f30102092c41b09ad4c23d5420fbda39 Mon Sep 17 00:00:00 2001 From: Michael Murphy <5879863+mrblonde91@users.noreply.github.com> Date: Mon, 16 Jan 2023 09:09:21 +0000 Subject: [PATCH 2/3] Add mssql compact --- CHANGELOG.md | 3 +++ semantic_conventions/trace/database.yaml | 3 +++ .../trace/semantic_conventions/database.md | 15 +++++++++++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a84359118f2..c94e7f322f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ release. - Remove spaces from example exporter User-Agent header to conform to RFC7231 & RFC7230. [#3052](https://github.com/open-telemetry/opentelemetry-specification/pull/3052) +- Add Cloud Spanner and Microsoft SQL Server Compact to db.system semantic conventions. + [#3105](https://github.com/open-telemetry/opentelemetry-specification/pull/3105) + ### Context ### Traces diff --git a/semantic_conventions/trace/database.yaml b/semantic_conventions/trace/database.yaml index 737c2459bb4..c8d6bb049f4 100644 --- a/semantic_conventions/trace/database.yaml +++ b/semantic_conventions/trace/database.yaml @@ -163,6 +163,9 @@ groups: - id: spanner value: 'spanner' brief: 'Cloud Spanner' + - id: mssqlcompact + value: 'mssqlcompact' + brief: 'Microsoft SQL Server Compact' - id: connection_string tag: connection-level type: string diff --git a/specification/trace/semantic_conventions/database.md b/specification/trace/semantic_conventions/database.md index 5453c611053..17fea4c807a 100644 --- a/specification/trace/semantic_conventions/database.md +++ b/specification/trace/semantic_conventions/database.md @@ -6,10 +6,16 @@ -- [Semantic conventions for database client calls](#semantic-conventions-for-database-client-calls) - - [Connection-level attributes](#connection-level-attributes) - - [Call-level attributes](#call-level-attributes) - - [Examples](#examples) +- [Connection-level attributes](#connection-level-attributes) + * [Notes and well-known identifiers for `db.system`](#notes-and-well-known-identifiers-for-dbsystem) + * [Connection-level attributes for specific technologies](#connection-level-attributes-for-specific-technologies) +- [Call-level attributes](#call-level-attributes) + * [Call-level attributes for specific technologies](#call-level-attributes-for-specific-technologies) + + [Cassandra](#cassandra) +- [Examples](#examples) + * [MySQL](#mysql) + * [Redis](#redis) + * [MongoDB](#mongodb) @@ -112,6 +118,7 @@ Some database systems may allow a connection to switch to a different `db.user`, | `opensearch` | OpenSearch | | `clickhouse` | ClickHouse | | `spanner` | Cloud Spanner | +| `mssqlcompact` | Microsoft SQL Server Compact | ### Notes and well-known identifiers for `db.system` From dbf0979d26424bb670480cb6069ddefdefedfb45 Mon Sep 17 00:00:00 2001 From: Michael Murphy <5879863+mrblonde91@users.noreply.github.com> Date: Wed, 18 Jan 2023 17:27:18 +0000 Subject: [PATCH 3/3] Relocate mssql compact --- semantic_conventions/trace/database.yaml | 6 +++--- specification/trace/semantic_conventions/database.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/semantic_conventions/trace/database.yaml b/semantic_conventions/trace/database.yaml index c8d6bb049f4..d0abc8048d8 100644 --- a/semantic_conventions/trace/database.yaml +++ b/semantic_conventions/trace/database.yaml @@ -19,6 +19,9 @@ groups: - id: mssql value: 'mssql' brief: 'Microsoft SQL Server' + - id: mssqlcompact + value: 'mssqlcompact' + brief: 'Microsoft SQL Server Compact' - id: mysql value: 'mysql' brief: 'MySQL' @@ -163,9 +166,6 @@ groups: - id: spanner value: 'spanner' brief: 'Cloud Spanner' - - id: mssqlcompact - value: 'mssqlcompact' - brief: 'Microsoft SQL Server Compact' - id: connection_string tag: connection-level type: string diff --git a/specification/trace/semantic_conventions/database.md b/specification/trace/semantic_conventions/database.md index 17fea4c807a..1bb9a36028f 100644 --- a/specification/trace/semantic_conventions/database.md +++ b/specification/trace/semantic_conventions/database.md @@ -70,6 +70,7 @@ Some database systems may allow a connection to switch to a different `db.user`, |---|---| | `other_sql` | Some other SQL database. Fallback only. See notes. | | `mssql` | Microsoft SQL Server | +| `mssqlcompact` | Microsoft SQL Server Compact | | `mysql` | MySQL | | `oracle` | Oracle Database | | `db2` | IBM Db2 | @@ -118,7 +119,6 @@ Some database systems may allow a connection to switch to a different `db.user`, | `opensearch` | OpenSearch | | `clickhouse` | ClickHouse | | `spanner` | Cloud Spanner | -| `mssqlcompact` | Microsoft SQL Server Compact | ### Notes and well-known identifiers for `db.system`