From 984a20f57fd5760edbba85adbc56ccbe8f074f38 Mon Sep 17 00:00:00 2001
From: Robert Crowe <nobby.crowe@gmail.com>
Date: Wed, 26 May 2021 23:00:16 +0100
Subject: [PATCH] Add cockroachdb to db.system semantic conventions

---
 CHANGELOG.md                                         | 1 +
 semantic_conventions/trace/database.yaml             | 3 +++
 specification/trace/semantic_conventions/database.md | 1 +
 3 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36e889a4c2f..15679e04106 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ release.
 - Add JSON RPC specific conventions ([#1643](https://github.com/open-telemetry/opentelemetry-specification/pull/1643)).
 - Add Memcached to Database specific conventions ([#1689](https://github.com/open-telemetry/opentelemetry-specification/pull/1689)).
 - Add semantic convention attributes for the host device and added OS name and version ([#1596](https://github.com/open-telemetry/opentelemetry-specification/pull/1596)).
+- Add CockroachDB to Database specific conventions ([#...](https://github.com/open-telemetry/opentelemetry-specification/pull/...)).
 
 ### Compatibility
 
diff --git a/semantic_conventions/trace/database.yaml b/semantic_conventions/trace/database.yaml
index 27b464fdad9..3e5c16a002e 100644
--- a/semantic_conventions/trace/database.yaml
+++ b/semantic_conventions/trace/database.yaml
@@ -150,6 +150,9 @@ groups:
               - id: memcached
                 value: 'memcached'
                 brief: 'Memcached'
+              - id: cockroachdb
+                value: 'cockroachdb'
+                brief: 'CockroachDB'
         - 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 967ec95c852..5e32da167a7 100644
--- a/specification/trace/semantic_conventions/database.md
+++ b/specification/trace/semantic_conventions/database.md
@@ -107,6 +107,7 @@ Some database systems may allow a connection to switch to a different `db.user`,
 | `geode` | Apache Geode |
 | `elasticsearch` | Elasticsearch |
 | `memcached` | Memcached |
+| `cockroachdb` | CockroachDB |
 <!-- endsemconv -->
 
 ### Notes and well-known identifiers for `db.system`