Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
b555081
Align network attributes with ECS
Apr 14, 2023
cb420e2
up
Apr 15, 2023
fbcf76f
changelog
Apr 15, 2023
5adafdd
nits and missing parts
Apr 15, 2023
1e4aed9
lint
Apr 15, 2023
9ef2caf
add source and destination and fix some nits
Apr 20, 2023
a479795
Update specification/trace/semantic_conventions/span-general.md
Apr 20, 2023
795eee7
Update semantic_conventions/trace/source.yaml
Apr 20, 2023
4342d40
cleanups and move new conventions to comon folder
Apr 20, 2023
264214e
bookmarks
Apr 20, 2023
7cc0802
lint
Apr 20, 2023
f52780c
Update CHANGELOG.md
Apr 21, 2023
af08a7f
Update schemas/1.21.0
Apr 21, 2023
ed33462
Update schemas/1.21.0
Apr 21, 2023
f5cffd7
lint
Apr 21, 2023
7e5c5aa
add client.address and port and add client to rpc trace attributes
Apr 21, 2023
eaa1f87
more nits
Apr 22, 2023
582ead7
more nits
Apr 22, 2023
f92c55d
lint
Apr 22, 2023
e7fbbe1
up
Apr 22, 2023
855d546
move deprecated attributes to a different folder and some cleanups
Apr 24, 2023
3c7c7f1
move server.socket.* from common http attributes to client and server
Apr 25, 2023
22f8e18
PR feedback
Apr 26, 2023
f47e2b1
Apply suggestions from code review
Apr 28, 2023
d6f0a36
regenerate md
Apr 28, 2023
c37b62b
feedback: transformation, server.address for IP
Apr 28, 2023
bbb9f10
remove only from .address condition
Apr 28, 2023
9030cde
Merge branch 'main' into ecs-net-attributes
reyang May 1, 2023
8dedbee
Clarify client/server/source/destination
trask May 2, 2023
41056bb
Merge branch 'main' into ecs-net-attributes
May 8, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
move server.socket.* from common http attributes to client and server
  • Loading branch information
Liudmila Molkova committed Apr 28, 2023
commit 3c7c7f17918a3432a99a8ac2891ab53c374e229d
7 changes: 5 additions & 2 deletions semantic_conventions/trace/http.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ groups:
examples: 3495
- ref: http.method
sampling_relevant: true
- ref: server.socket.address
- ref: server.socket.port
- ref: net.sock.family
examples: ['inet', 'inet6']
- ref: user_agent.original
Expand Down Expand Up @@ -83,6 +81,8 @@ groups:
When [request target](https://www.rfc-editor.org/rfc/rfc9110.html#target.resource) is absolute URI, `server.port` MUST match
URI port identifier, otherwise it MUST match `Host` header port identifier.
- ref: server.socket.domain
- ref: server.socket.address
- ref: server.socket.port

- id: trace.http.server
prefix: http
Expand Down Expand Up @@ -130,6 +130,9 @@ groups:
- ref: server.socket.address
requirement_level: opt_in
brief: Local socket address. Useful in case of a multi-IP host.
- ref: server.socket.port
requirement_level: opt_in
brief: Local socket port. Useful in case of a multi-port host.
- ref: client.address
note: >
The IP address of the original client behind all proxies, if
Expand Down
5 changes: 3 additions & 2 deletions specification/trace/semantic_conventions/http.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ sections below.
| [`net.protocol.name`](span-general.md) | string | Application layer protocol used. The value SHOULD be normalized to lowercase. | `http`; `spdy` | Recommended: if not default (`http`). |
| [`net.protocol.version`](span-general.md) | string | Version of the application layer protocol used. See note below. [1] | `1.0`; `1.1`; `2.0` | Recommended |
| [`net.sock.family`](span-general.md) | string | Protocol [address family](https://man7.org/linux/man-pages/man7/address_families.7.html) which is used for communication. | `inet`; `inet6` | Conditionally Required: [2] |
| [`server.socket.address`](span-general.md) | string | Physical server IP address or Unix socket address. | `10.5.3.2` | Recommended: Only if different than `server.address`. |
| [`server.socket.port`](span-general.md) | int | Physical server port. | `16456` | Recommended: Only if different than `server.port`. |
| `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 |

**[1]:** `net.protocol.version` refers to the version of the protocol used and might be different from the protocol client's version. If the HTTP client used has a version of `0.27.2`, but sends HTTP version `1.1`, this attribute should be set to `1.1`.
Expand Down Expand Up @@ -129,7 +127,9 @@ For an HTTP client span, `SpanKind` MUST be `Client`.
| `http.resend_count` | int | The ordinal number of request resending attempt (for any reason, including redirects). [2] | `3` | Recommended: if and only if request was retried. |
| [`server.address`](span-general.md) | string | Host identifier of the ["URI origin"](https://www.rfc-editor.org/rfc/rfc9110.html#name-uri-origin) HTTP request is sent to. [3] | `example.com` | Required |
| [`server.port`](span-general.md) | int | Port identifier of the ["URI origin"](https://www.rfc-editor.org/rfc/rfc9110.html#name-uri-origin) HTTP request is sent to. [4] | `80`; `8080`; `443` | Conditionally Required: [5] |
| [`server.socket.address`](span-general.md) | string | Physical server IP address or Unix socket address. | `10.5.3.2` | Recommended: Only if different than `server.address`. |
| [`server.socket.domain`](span-general.md) | string | The domain name of an immediate peer. [6] | `proxy.example.com` | Recommended |
| [`server.socket.port`](span-general.md) | int | Physical server port. | `16456` | Recommended: Only if different than `server.port`. |

**[1]:** `http.url` MUST NOT contain credentials passed via URL in form of `https://username:[email protected]/`. In such case the attribute's value should be `https://www.example.com/`.

Expand Down Expand Up @@ -245,6 +245,7 @@ If the route cannot be determined, the `name` attribute MUST be set as defined i
| [`server.address`](span-general.md) | string | Name of the local HTTP server that received the request. [4] | `example.com` | Required |
| [`server.port`](span-general.md) | int | Port of the local HTTP server that received the request. [5] | `80`; `8080`; `443` | Conditionally Required: [6] |
| [`server.socket.address`](span-general.md) | string | Local socket address. Useful in case of a multi-IP host. | `10.5.3.2` | Opt-In |
| [`server.socket.port`](span-general.md) | int | Local socket port. Useful in case of a multi-port host. | `16456` | Opt-In |

**[1]:** MUST NOT be populated 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.
SHOULD include the [application root](/specification/trace/semantic_conventions/http.md#http-server-definitions) if there is one.
Expand Down