From e43a952fe26bedd11f106b611a6d5ced722fdccd Mon Sep 17 00:00:00 2001
From: Yaniv Davidi <yaniv.davi@gmail.com>
Date: Fri, 26 Feb 2021 00:47:00 +0200
Subject: [PATCH] Add elasticsearch to db.system semantic conventions (#1463)

---
 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 f35d8c18516..4b031a1eac1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ release.
 - Adds `none` as a possible value for OTEL_TRACES_EXPORTER and OTEL_METRICS_EXPORTER to disable export
   ([#1439](https://github.com/open-telemetry/opentelemetry-specification/pull/1439))
 - Add [`ForceFlush`](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/sdk.md#forceflush) to SDK's `TracerProvider` ([#1452](https://github.com/open-telemetry/opentelemetry-specification/pull/1452))
+- Add `elasticsearch` to `db.system` semantic conventions ([#1463](https://github.com/open-telemetry/opentelemetry-specification/pull/1463))
 
 ## v1.0.1 (2021-02-11)
 
diff --git a/semantic_conventions/trace/database.yaml b/semantic_conventions/trace/database.yaml
index ff9b51973fe..e9ef142be0f 100644
--- a/semantic_conventions/trace/database.yaml
+++ b/semantic_conventions/trace/database.yaml
@@ -144,6 +144,9 @@ groups:
               - id: geode
                 value: 'geode'
                 brief: 'Apache Geode'
+              - id: elasticsearch
+                value: 'elasticsearch'
+                brief: 'Elasticsearch'
         - 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 fd64812f9b6..322e89c4d09 100644
--- a/specification/trace/semantic_conventions/database.md
+++ b/specification/trace/semantic_conventions/database.md
@@ -105,6 +105,7 @@ Some database systems may allow a connection to switch to a different `db.user`,
 | `dynamodb` | Amazon DynamoDB |
 | `neo4j` | Neo4j |
 | `geode` | Apache Geode |
+| `elasticsearch` | Elasticsearch |
 <!-- endsemconv -->
 
 ### Notes and well-known identifiers for `db.system`