diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b633c965..cf8ad9330 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ release. - BREAKING: Rename `http.client.duration` and `http.server.duration` metrics to `http.client.request.duration` and `http.server.request.duration` respectively. ([#224](https://github.com/open-telemetry/semantic-conventions/pull/224)) +- Update HTTP `network.protocol.version` examples to match HTTP RFCs. + ([#228](https://github.com/open-telemetry/semantic-conventions/pull/228)) ## v1.21.0 (2023-07-13) diff --git a/docs/http/http-spans.md b/docs/http/http-spans.md index 946e1be2c..dd15d3255 100644 --- a/docs/http/http-spans.md +++ b/docs/http/http-spans.md @@ -101,7 +101,7 @@ sections below. | `http.response.body.size` | int | The size of the response payload body in bytes. This is the number of bytes transferred excluding headers and is often, but not always, present as the [Content-Length](https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length) header. For requests using transport encoding, this should be the compressed size. | `3495` | Recommended | | `http.request.method` | string | HTTP request method. [2] | `GET`; `POST`; `HEAD` | Required | | [`network.protocol.name`](../general/attributes.md) | string | [OSI Application Layer](https://osi-model.com/application-layer/) or non-OSI equivalent. The value SHOULD be normalized to lowercase. | `http`; `spdy` | Recommended: if not default (`http`). | -| [`network.protocol.version`](../general/attributes.md) | string | Version of the application layer protocol used. See note below. [3] | `1.0`; `1.1`; `2.0` | Recommended | +| [`network.protocol.version`](../general/attributes.md) | string | Version of the application layer protocol used. See note below. [3] | `1.0`; `1.1`; `2`; `3` | Recommended | | [`network.transport`](../general/attributes.md) | string | [OSI Transport Layer](https://osi-model.com/transport-layer/) or [Inter-process Communication method](https://en.wikipedia.org/wiki/Inter-process_communication). The value SHOULD be normalized to lowercase. | `tcp`; `udp` | Conditionally Required: [4] | | [`network.type`](../general/attributes.md) | string | [OSI Network Layer](https://osi-model.com/network-layer/) or non-OSI equivalent. The value SHOULD be normalized to lowercase. | `ipv4`; `ipv6` | Recommended | | `user_agent.original` | string | Value of the [HTTP User-Agent](https://www.rfc-editor.org/rfc/rfc9110.html#field.user-agent) header sent by the client. | `CERN-LineMode/2.15 libwww/2.17b3` | Recommended | diff --git a/model/http-common.yaml b/model/http-common.yaml index 682b2cb98..9db84ce58 100644 --- a/model/http-common.yaml +++ b/model/http-common.yaml @@ -68,7 +68,7 @@ groups: requirement_level: recommended: if not default (`http`). - ref: network.protocol.version - examples: ['1.0', '1.1', '2.0'] + examples: ['1.0', '1.1', '2', '3'] - id: attributes.http.client prefix: http