rebase and merge

open-telemetry · Apr 19, 2022 · 05abaeb · 05abaeb
2 parents 863cfbd + 06cd3b2
commit 05abaeb
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/specification/trace/semantic_conventions/http.md b/specification/trace/semantic_conventions/http.md
@@ -89,7 +89,7 @@ Following attributes MUST be provided **at span creation time** (when provided a
 * `http.method`
 <!-- endsemconv -->
 
-It is recommended to also use the general [network attributes][], especially `net.peer.ip`. If `net.transport` is not specified, it can be assumed to be `IP.TCP` except if `http.flavor` is `QUIC`, in which case `IP.UDP` is assumed.
+It is recommended to also use the general [network attributes][], especially `net.peer.ip`. If `net.transport` is not specified, it can be assumed to be `IP.TCP` except if `http.flavor` is `QUIC`, in which case `IP.UDP` is assumed. See [client](#http-client) and [server](#http-server) sections for more details.
 
 ### HTTP request and response headers
 
@@ -135,7 +135,7 @@ before any HTTP-redirects that may happen when executing the request.
 | [`net.peer.name`](span-general.md) | string | Best known remote hostname or similar, see note below. [1] | `example.com` | Yes |
 | [`net.peer.port`](span-general.md) | int | Remote port number. | `80`; `8080`; `443` | Yes, if not default. |
 | [`net.peer.ip`](span-general.md) | string | Remote address of the peer (dotted decimal for IPv4 or [RFC5952](https://tools.ietf.org/html/rfc5952) for IPv6) | `127.0.0.1` | Opt-out |
-| `http.retry_count` | int | The ordinal number of request re-sending attempt. | `3` | Opt-out. If and only if a request was retried. |
+| `http.retry_count` | int | The ordinal number of request re-sending attempt. First retry (the seconds attempt) should be reported with count `1` | `3` | Opt-out. If and only if a request was retried. |
 
 **[1]:** `net.peer.name` Best known HTTP remote hostname is identified according with the following order:
 
@@ -237,7 +237,7 @@ If the route cannot be determined, the `name` attribute MUST be set as defined i
 - Host component of request URL
 - Server IP address
 
-*[2]:** MUST NOT populate `http.route` when this is not supported by the HTTP server framework as the route attribute should have low-cardinality and the URI path can NOT substitute it.
+**[2]:** MUST NOT populate `http.route` when this is not supported by the HTTP server framework as the route attribute should have low-cardinality and the URI path can NOT substitute it.
 
 **[3]:** This is not necessarily the same as `net.peer.ip`, which would
 identify the network-level peer, which may be a proxy.