From 072b8666703b765c6458f275efa419862c4902d5 Mon Sep 17 00:00:00 2001
From: John Children <john.a.children@gmail.com>
Date: Thu, 6 Aug 2020 15:57:56 +0100
Subject: [PATCH] Update database semantic conventions

Release v0.6.0 of the opentelemetry spec included some changes to the
database semantic conventions, among them being changes to some of the
fields used to convert to Azure Dependency Targets etc.

https://github.com/open-telemetry/opentelemetry-specification/pull/575

This commit updates the exporter to handle the new names for these
fields, however as the new equivalent to `db.instance` is `db.name`,
which can change when the database is changed inside a connection.
---
 README.md  |  4 ++--
 src/lib.rs | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index af5eb32..987d38a 100644
--- a/README.md
+++ b/README.md
@@ -56,9 +56,9 @@ The following of the Span's attributes map to special fields in Application Insi
 | `db.statement`                           | Dependency Data                |
 | `http.host`                              | Dependency Target              |
 | `net.peer.name`                          | Dependency Target              |
-| `db.instance`                            | Dependency Target              |
+| `db.name`                                | Dependency Target              |
 | `http.status_code`                       | Dependency Result code         |
-| `db.type`                                | Dependency Type                |
+| `db.system`                              | Dependency Type                |
 | `messaging.system`                       | Dependency Type                |
 | `"HTTP"` if any `http.` attribute exists | Dependency Type                |
 | `"DB"` if any `db.` attribute exists     | Dependency Type                |
diff --git a/src/lib.rs b/src/lib.rs
index 9aafb48..07107dd 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -50,9 +50,9 @@
 //! | `db.statement`                           | Dependency Data                |
 //! | `http.host`                              | Dependency Target              |
 //! | `net.peer.name`                          | Dependency Target              |
-//! | `db.instance`                            | Dependency Target              |
+//! | `db.name`                                | Dependency Target              |
 //! | `http.status_code`                       | Dependency Result code         |
-//! | `db.type`                                | Dependency Type                |
+//! | `db.system`                              | Dependency Type                |
 //! | `messaging.system`                       | Dependency Type                |
 //! | `"HTTP"` if any `http.` attribute exists | Dependency Type                |
 //! | `"DB"` if any `db.` attribute exists     | Dependency Type                |
@@ -116,8 +116,8 @@ impl Exporter {
             "db.statement",
             "http.host",
             "net.peer.name",
-            "db.instance",
-            "db.type",
+            "db.name",
+            "db.system",
             "messaging.system",
         ]
         .iter()
@@ -254,14 +254,14 @@ impl Exporter {
                     data.target = Some(String::from(*host));
                 } else if let Some(peer_name) = attrs.get("net.peer.name") {
                     data.target = Some(String::from(*peer_name));
-                } else if let Some(db_instance) = attrs.get("db.instance") {
-                    data.target = Some(String::from(*db_instance));
+                } else if let Some(db_name) = attrs.get("db.name") {
+                    data.target = Some(String::from(*db_name));
                 }
                 if span.span_kind == SpanKind::Internal {
                     data.type_ = Some("InProc".into());
                     data.success = Some(true);
-                } else if let Some(db_type) = attrs.get("db.type") {
-                    data.type_ = Some(String::from(*db_type));
+                } else if let Some(db_system) = attrs.get("db.system") {
+                    data.type_ = Some(String::from(*db_system));
                 } else if let Some(messaging_system) = attrs.get("messaging.system") {
                     data.type_ = Some(String::from(*messaging_system));
                 } else if attrs.keys().any(|x| x.starts_with("http.")) {