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
Fix port on image
  • Loading branch information
trask committed Sep 28, 2023
commit 975c885e80a0c8c32482d0aff18bdad842979c29
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.
3 changes: 0 additions & 3 deletions docs/http/http-metrics.md
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,6 @@ of `[ 0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1, 2.5, 5, 7.5, 10
| `error.type` | string | Describes a class of error the operation ended with. [1] | `timeout`; `name_resolution_error`; `500` | Conditionally Required: If request has ended with an error. |
| `http.request.method` | string | HTTP request method. [2] | `GET`; `POST`; `HEAD` | Required |
| `http.response.status_code` | int | [HTTP response status code](https://tools.ietf.org/html/rfc7231#section-6). | `200` | Conditionally Required: If and only if one was received/sent. |
| [`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.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. | `amqp`; `http`; `mqtt` | Recommended |
| [`network.protocol.version`](../general/attributes.md) | string | Version of the application layer protocol used. See note below. [3] | `3.1.1` | 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. [4] | `example.com`; `10.1.2.80`; `/tmp/my.sock` | Required |
Expand Down Expand Up @@ -552,7 +551,6 @@ This metric is optional.
| `error.type` | string | Describes a class of error the operation ended with. [1] | `timeout`; `name_resolution_error`; `500` | Conditionally Required: If request has ended with an error. |
| `http.request.method` | string | HTTP request method. [2] | `GET`; `POST`; `HEAD` | Required |
| `http.response.status_code` | int | [HTTP response status code](https://tools.ietf.org/html/rfc7231#section-6). | `200` | Conditionally Required: If and only if one was received/sent. |
| [`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.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. | `amqp`; `http`; `mqtt` | Recommended |
| [`network.protocol.version`](../general/attributes.md) | string | Version of the application layer protocol used. See note below. [3] | `3.1.1` | 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. [4] | `example.com`; `10.1.2.80`; `/tmp/my.sock` | Required |
Expand Down Expand Up @@ -645,7 +643,6 @@ This metric is optional.
| `error.type` | string | Describes a class of error the operation ended with. [1] | `timeout`; `name_resolution_error`; `500` | Conditionally Required: If request has ended with an error. |
| `http.request.method` | string | HTTP request method. [2] | `GET`; `POST`; `HEAD` | Required |
| `http.response.status_code` | int | [HTTP response status code](https://tools.ietf.org/html/rfc7231#section-6). | `200` | Conditionally Required: If and only if one was received/sent. |
| [`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.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. | `amqp`; `http`; `mqtt` | Recommended |
| [`network.protocol.version`](../general/attributes.md) | string | Version of the application layer protocol used. See note below. [3] | `3.1.1` | 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. [4] | `example.com`; `10.1.2.80`; `/tmp/my.sock` | Required |
Expand Down
3 changes: 0 additions & 3 deletions model/metrics/http.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@ groups:
- ref: http.response.status_code
- ref: network.protocol.name
- ref: network.protocol.version
- ref: network.peer.address
requirement_level:
recommended: If different than `server.address`.
- ref: error.type
requirement_level:
conditionally_required: If request has ended with an error.
Expand Down