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 proxy.* for now
  • Loading branch information
trask committed Sep 27, 2023
commit 00e7a3877fac45354532e81a2aaaac717982eace
2 changes: 0 additions & 2 deletions docs/http/http-spans.md
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,6 @@ 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). [1] | `3` | Recommended: if and only if request was retried. |
| [`network.peer.address`](../general/attributes.md) | string | Peer address of the network connection - IP address or Unix domain socket name. | `10.1.2.80`; `/tmp/my.sock` | Recommended: If different than `server.address`. |
| [`network.peer.port`](../general/attributes.md) | int | Peer port number of the network connection. | `65123` | Recommended: If `network.peer.address` is set. |
| `proxy.address` | string | Proxy address - domain name if available without reverse DNS lookup, otherwise IP address or Unix domain socket name. | `proxy.example.com`; `10.1.2.80`; `/tmp/my.sock` | Recommended |
| `proxy.port` | int | Proxy port number. | `65123` | Recommended |
| [`server.address`](../general/attributes.md) | string | Host identifier of the ["URI origin"](https://www.rfc-editor.org/rfc/rfc9110.html#name-uri-origin) HTTP request is sent to. [2] | `example.com`; `10.1.2.80`; `/tmp/my.sock` | Required |
| [`server.port`](../general/attributes.md) | int | Port identifier of the ["URI origin"](https://www.rfc-editor.org/rfc/rfc9110.html#name-uri-origin) HTTP request is sent to. [3] | `80`; `8080`; `443` | Conditionally Required: [4] |
| [`url.full`](../url/url.md) | string | Absolute URL describing a network resource according to [RFC3986](https://www.rfc-editor.org/rfc/rfc3986) [5] | `https://www.foo.bar/search?q=OpenTelemetry#SemConv`; `//localhost` | Required |
Expand Down
2 changes: 0 additions & 2 deletions docs/messaging/messaging-spans.md
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,6 @@ The following operations related to messages are defined for these semantic conv
| [`network.protocol.version`](../general/attributes.md) | string | Version of the application layer protocol used. See note below. [16] | `3.1.1` | 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` | Recommended |
| [`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 |
| `proxy.address` | string | Proxy address - domain name if available without reverse DNS lookup, otherwise IP address or Unix domain socket name. | `proxy.example.com`; `10.1.2.80`; `/tmp/my.sock` | Recommended |
| `proxy.port` | int | Proxy port number. | `65123` | Recommended |
| [`server.address`](../general/attributes.md) | string | Server address - domain name if available without reverse DNS lookup, otherwise IP address or Unix domain socket name. [17] | `example.com`; `10.1.2.80`; `/tmp/my.sock` | Conditionally Required: If available. |

**[1]:** If a custom value is used, it MUST be of low cardinality.
Expand Down
2 changes: 0 additions & 2 deletions docs/rpc/rpc-spans.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,6 @@ Generally, a user SHOULD NOT set `peer.service` to a fully qualified RPC service
|---|---|---|---|---|
| [`network.peer.address`](../general/attributes.md) | string | Peer address of the network connection - IP address or Unix domain socket name. | `10.1.2.80`; `/tmp/my.sock` | Recommended: If different than `server.address`. |
| [`network.peer.port`](../general/attributes.md) | int | Peer port number of the network connection. | `65123` | Recommended: If `network.peer.address` is set. |
| `proxy.address` | string | Proxy address - domain name if available without reverse DNS lookup, otherwise IP address or Unix domain socket name. | `proxy.example.com`; `10.1.2.80`; `/tmp/my.sock` | Recommended |
| `proxy.port` | int | Proxy port number. | `65123` | Recommended |
<!-- endsemconv -->

### Server attributes
Expand Down
2 changes: 1 addition & 1 deletion model/deprecated/network.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ groups:
- id: sock.peer.name
type: string
stability: deprecated
brief: Deprecated, use `proxy.address` if applicable.
brief: Deprecated, no replacement at this time.
examples: ['/var/my.sock']
- id: sock.peer.addr
type: string
Expand Down
14 changes: 0 additions & 14 deletions model/proxy.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions model/trace/http.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,6 @@ groups:
- ref: network.peer.port
requirement_level:
recommended: If `network.peer.address` is set.
- ref: proxy.address
- ref: proxy.port
- ref: url.full
sampling_relevant: true
requirement_level: required
Expand Down
2 changes: 0 additions & 2 deletions model/trace/messaging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,6 @@ groups:
tag: connection-level
- ref: network.type
tag: connection-level
- ref: proxy.address
- ref: proxy.port
- ref: network.protocol.name
examples: ['amqp', 'mqtt']
- ref: network.protocol.version
Expand Down
2 changes: 0 additions & 2 deletions model/trace/rpc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ groups:
- ref: network.peer.port
requirement_level:
recommended: If `network.peer.address` is set.
- ref: proxy.address
- ref: proxy.port

- id: rpc.server
prefix: rpc
Expand Down