-
Notifications
You must be signed in to change notification settings - Fork 941
BREAKING: Replace net.peer.*/net.host.* with client.*/server.* (and source.*/destination.*)
#3402
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
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
cb420e2
up
fbcf76f
changelog
5adafdd
nits and missing parts
1e4aed9
lint
9ef2caf
add source and destination and fix some nits
a479795
Update specification/trace/semantic_conventions/span-general.md
795eee7
Update semantic_conventions/trace/source.yaml
4342d40
cleanups and move new conventions to comon folder
264214e
bookmarks
7cc0802
lint
f52780c
Update CHANGELOG.md
af08a7f
Update schemas/1.21.0
ed33462
Update schemas/1.21.0
f5cffd7
lint
7e5c5aa
add client.address and port and add client to rpc trace attributes
eaa1f87
more nits
582ead7
more nits
f92c55d
lint
e7fbbe1
up
855d546
move deprecated attributes to a different folder and some cleanups
3c7c7f1
move server.socket.* from common http attributes to client and server
22f8e18
PR feedback
f47e2b1
Apply suggestions from code review
d6f0a36
regenerate md
c37b62b
feedback: transformation, server.address for IP
bbb9f10
remove only from .address condition
9030cde
Merge branch 'main' into ecs-net-attributes
reyang 8dedbee
Clarify client/server/source/destination
trask 41056bb
Merge branch 'main' into ecs-net-attributes
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
move server.socket.* from common http attributes to client and server
- Loading branch information
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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`. | ||
|
|
@@ -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/`. | ||
|
|
||
|
|
@@ -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. | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.