review and lint

.chloggen/974.yaml

@@ -0,0 +1,7 @@
+change_type: breaking
+
+component: db
+
+note: Clarify database span name format and fallback values.
+
+issues: [974, 704]

docs/database/database-spans.md

@@ -10,6 +10,7 @@ linkTitle: Client Calls
 
 <!-- toc -->
 
+- [Name](#name)
 - [Common attributes](#common-attributes)
   - [Notes and well-known identifiers for `db.system`](#notes-and-well-known-identifiers-for-dbsystem)
 - [Semantic Conventions for specific database technologies](#semantic-conventions-for-specific-database-technologies)
@@ -73,9 +74,9 @@ The <span id="target-placeholder">`{target}`</span> SHOULD adhere to one of the
 - `db.collection.name`
 - `db.namespace`
 - `server.address:server.port`
-- `network.peer.address:network.peer.port`
 - `db.system`
 
+
 ## Common attributes
 
 These attributes will usually be the same for all operations performed over the same database connection.

docs/database/elasticsearch.md

@@ -95,7 +95,7 @@ Tracing instrumentations that do so, MUST also set `http.request.method_original
 
 | Key                                 | Value                                                                                                                               |
 |:------------------------------------|:------------------------------------------------------------------------------------------------------------------------------------|
-| Span name                           | `"search elasticsearch.mydomain.com:9200"`                                                                                          |
+| Span name                           | `"search"`                                                                                          |
 | `db.system`                         | `"elasticsearch"`                                                                                                                   |
 | `server.address`                    | `"elasticsearch.mydomain.com"`                                                                                                      |
 | `server.port`                       | `9200`                                                                                                                              |