Skip to content

Commit

Permalink
Revert "split system.network.connections into TCP and UDP metrics (#2675
Browse files Browse the repository at this point in the history 
)"
  • Loading branch information
@tigrannajaryan
tigrannajaryan committed Aug 30, 2022
1 parent 916e1d7 commit e4d449a
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 27 deletions.
2 changes: 0 additions & 2 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ release.
([#2663](https://github.com/open-telemetry/opentelemetry-specification/pull/2663))
- Add `process.parent_pid` attribute for use in reporting parent process id (PID)
([#2691](https://github.com/open-telemetry/opentelemetry-specification/pull/2691)).
- Separate tcp/udp protocols for metric `system.network.connections`.
([#2675](https://github.com/open-telemetry/opentelemetry-specification/pull/2675))
- Add OpenSearch to db.system semantic conventions
([#2718](https://github.com/open-telemetry/opentelemetry-specification/pull/2718)).

Expand Down
9 changes: 0 additions & 9 deletions schemas/1.13.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,6 @@ file_format: 1.1.0
schema_url: https://opentelemetry.io/schemas/1.13.0
versions:
1.13.0:
metrics:
changes:
# https://github.com/open-telemetry/opentelemetry-specification/pull/2675
- split:
apply_to_metric: system.network.connections
by_attribute: protocol
metrics_from_attributes:
system.network.tcp.connections: tcp
system.network.udp.connections: udp
spans:
changes:
# https://github.com/open-telemetry/opentelemetry-specification/pull/2614
Expand Down
29 changes: 13 additions & 16 deletions specification/metrics/semantic_conventions/system-metrics.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,22 +118,19 @@ perf counter (similar for Writes)

**Description:** System level network metrics.

| Name | Description | Units | Instrument Type ([*](README.md#instrument-types)) | Value Type | Attribute Key | Attribute Values |
|-----------------------------------------|-------------------------------------------------------------------------------|---------------|---------------------------------------------------|------------|---------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| system.network.dropped<sup>\[1\]</sup> | Count of packets that are dropped or discarded even though there was no error | {packets} | Counter | Int64 | device | (identifier) |
| | | | | | direction | transmit, receive |
| system.network.packets | | {packets} | Counter | Int64 | device | (identifier) |
| | | | | | direction | transmit, receive |
| system.network.errors<sup>\[2\]</sup> | Count of network errors detected | {errors} | Counter | Int64 | device | (identifier) |
| | | | | | direction | transmit, receive |
| system<!--notlink-->.network.io | | By | Counter | Int64 | device | (identifier) |
| | | | | | direction | transmit, receive |
| system.network.connections (deprecated) | | {connections} | UpDownCounter | Int64 | device | (identifier) |
| | | | | | protocol | tcp, udp, [etc.](https://en.wikipedia.org/wiki/Transport_layer#Protocols) |
| | | | | | state | If specified, SHOULD be one of: close, close_wait, closing, delete, established, fin_wait_1, fin_wait_2, last_ack, listen, syn_recv, syn_sent, time_wait. A stateless protocol MUST NOT set this attribute. |
| system.network.tcp.connections | Count of TCP connections | {connections} | UpDownCounter | Int64 | device | (identifier) |
| | | | | | state | SHOULD be one of: close, close_wait, closing, delete, established, fin_wait_1, fin_wait_2, last_ack, listen, syn_recv, syn_sent, time_wait. A stateless protocol MUST NOT set this attribute. |
| system.network.udp.connections | Count of UDP connections | {connections} | UpDownCounter | Int64 | device | (identifier) |
| Name | Description | Units | Instrument Type ([*](README.md#instrument-types)) | Value Type | Attribute Key | Attribute Values |
|----------------------------------------|-------------------------------------------------------------------------------|---------------|---------------------------------------------------|------------|---------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| system.network.dropped<sup>\[1\]</sup> | Count of packets that are dropped or discarded even though there was no error | {packets} | Counter | Int64 | device | (identifier) |
| | | | | | direction | transmit, receive |
| system.network.packets | | {packets} | Counter | Int64 | device | (identifier) |
| | | | | | direction | transmit, receive |
| system.network.errors<sup>\[2\]</sup> | Count of network errors detected | {errors} | Counter | Int64 | device | (identifier) |
| | | | | | direction | transmit, receive |
| system<!--notlink-->.network.io | | By | Counter | Int64 | device | (identifier) |
| | | | | | direction | transmit, receive |
| system.network.connections | | {connections} | UpDownCounter | Int64 | device | (identifier) |
| | | | | | protocol | tcp, udp, [etc.](https://en.wikipedia.org/wiki/Transport_layer#Protocols) |
| | | | | | state | If specified, SHOULD be one of: close, close_wait, closing, delete, established, fin_wait_1, fin_wait_2, last_ack, listen, syn_recv, syn_sent, time_wait. A stateless protocol MUST NOT set this attribute. |

<sup>1</sup> Measured as:

Expand Down

0 comments on commit e4d449a

Please sign in to comment.