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
0f7b90e
alt
trask Sep 20, 2023
0279698
physical
trask Sep 25, 2023
41f6f1f
Merge remote-tracking branch 'upstream/main' into alt-network
trask Sep 26, 2023
93443ef
network.peer.* / network.local.*
trask Sep 26, 2023
00e7a38
Remove proxy.* for now
trask Sep 27, 2023
4cbf9b0
Merge remote-tracking branch 'upstream/main' into alt-network
trask Sep 27, 2023
b41ecd5
attributes.md
trask Sep 27, 2023
2110115
changelog.md
trask Sep 27, 2023
6f9b43b
toc
trask Sep 27, 2023
52b7714
examples
trask Sep 27, 2023
e07ee3d
fix
trask Sep 27, 2023
2957475
toc
trask Sep 27, 2023
975c885
Fix port on image
trask Sep 28, 2023
c5f2688
Unix domain *socket* name
trask Sep 28, 2023
4b450bf
remove redundant
trask Sep 28, 2023
a7e812b
or other POSIX systems
trask Sep 28, 2023
995f7ce
update ports in images
trask Sep 28, 2023
328a2c6
Remove de-duplication
trask Sep 28, 2023
2e941f4
Update docs/general/attributes.md
trask Sep 28, 2023
49d5705
simplify
trask Sep 28, 2023
1a14e45
Merge branch 'alt-network' of https://github.com/trask/semantic-conve…
trask Sep 28, 2023
0d7d06b
toc
trask Sep 28, 2023
3590acf
tables
trask Sep 28, 2023
24b2689
Merge remote-tracking branch 'upstream/main' into alt-network
trask Oct 2, 2023
f2a0c2a
remove source and destination domain attribute
trask Oct 2, 2023
6039383
fix
trask Oct 2, 2023
d714318
Merge remote-tracking branch 'upstream/main' into alt-network
trask Oct 3, 2023
ab91760
Merge branch 'main' into alt-network
trask Oct 9, 2023
94b35a7
empty
trask Oct 9, 2023
0b74968
Merge remote-tracking branch 'upstream/main' into alt-network
trask Oct 9, 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
Remove de-duplication
  • Loading branch information
trask committed Sep 28, 2023
commit 328a2c651994548ff73e507fc63349be562ca847
8 changes: 3 additions & 5 deletions docs/general/attributes.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,6 @@ These attributes identify network peers that are directly connected to each othe

For IP-based communication, `network.peer.address` and `network.local.address` should be IP addresses, Unix domain socket names, or other addresses specific to network type.

Semantic conventions and instrumentations that populate `address`/`port` pairs
on `server.*`, `client.*`, `destination.*` or `source.*`, SHOULD only populate the `address`/`port` pair on
`network.peer.*` and `network.local.*` when they are not the same.

_Note: Specific structures and methods to obtain socket-level attributes are mentioned here only as examples. Instrumentations would usually use Socket API provided by their environment or sockets implementations._

When connecting using `connect(2)`
Expand All @@ -168,7 +164,9 @@ with `AF_INET` address family, `network.peer.address` and `network.peer.port` re
`network.local.address` and `network.local.port` can be obtained by calling `getsockname` method on [Linux or other POSIX systems](https://man7.org/linux/man-pages/man2/getsockname.2.html) or
[Windows](https://docs.microsoft.com/windows/win32/api/winsock2/nf-winsock2-getsockname).

#### Client/server examples using `network.peer.*` and `network.local.*`
#### Client/server examples using `network.peer.*`

Note that `network.local.*` attributes are not included in these examples since they are typically Opt-In.

##### Simple client/server example

Expand Down
Binary file modified docs/general/forward-proxy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/general/reverse-proxy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/general/simple.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions model/trace/http.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,7 @@ groups:
known (e.g. from [Forwarded](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Forwarded) or a similar header).
Otherwise, the immediate client peer port.
- ref: network.peer.address
requirement_level:
recommended: If different than `client.address`.
- ref: network.peer.port
requirement_level:
recommended: If `network.peer.address` is set.
- ref: url.path
requirement_level: required
sampling_relevant: true
Expand Down