Skip to content

Commit 68a52f6

Browse files
authored
rename system.network.dropped to system.network.packet.dropped (#2629)
1 parent df7db48 commit 68a52f6

File tree

3 files changed

+39
-16
lines changed

3 files changed

+39
-16
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Use this changelog template to create an entry for release notes.
2+
#
3+
# If your change doesn't affect end users you should instead start
4+
# your pull request title with [chore] or use the "Skip Changelog" label.
5+
6+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
7+
change_type: breaking
8+
9+
# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
10+
component: system
11+
12+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
13+
note: Rename system.network.dropped to system.network.packet.dropped
14+
and system.network.packets to system.network.packet.count
15+
16+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
17+
# The values here must be integers.
18+
issues: [1700]
19+
20+
# (Optional) One or more lines of additional information to render under the primary note.
21+
# These lines will be padded with 2 spaces and then inserted directly into the document.
22+
# Use pipe (|) for multiline entries.
23+
subtext:

docs/system/system-metrics.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ Resource attributes related to a host, SHOULD be reported under the `host.*` nam
4949
- [Metric: `system.filesystem.utilization`](#metric-systemfilesystemutilization)
5050
- [Metric: `system.filesystem.limit`](#metric-systemfilesystemlimit)
5151
- [Network metrics](#network-metrics)
52-
- [Metric: `system.network.dropped`](#metric-systemnetworkdropped)
53-
- [Metric: `system.network.packets`](#metric-systemnetworkpackets)
52+
- [Metric: `system.network.packet.dropped`](#metric-systemnetworkpacketdropped)
53+
- [Metric: `system.network.packet.count`](#metric-systemnetworkpacketcount)
5454
- [Metric: `system.network.errors`](#metric-systemnetworkerrors)
5555
- [Metric: `system.network.io`](#metric-systemnetworkio)
5656
- [Metric: `system.network.connection.count`](#metric-systemnetworkconnectioncount)
@@ -877,11 +877,11 @@ This metric is [opt-in][MetricOptIn].
877877

878878
**Description:** System level network metrics captured under the namespace `system.network`.
879879

880-
### Metric: `system.network.dropped`
880+
### Metric: `system.network.packet.dropped`
881881

882882
This metric is [recommended][MetricRecommended].
883883

884-
<!-- semconv metric.system.network.dropped -->
884+
<!-- semconv metric.system.network.packet.dropped -->
885885
<!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
886886
<!-- see templates/registry/markdown/snippet.md.j2 -->
887887
<!-- prettier-ignore-start -->
@@ -890,11 +890,11 @@ This metric is [recommended][MetricRecommended].
890890

891891
| Name | Instrument Type | Unit (UCUM) | Description | Stability | Entity Associations |
892892
| -------- | --------------- | ----------- | -------------- | --------- | ------ |
893-
| `system.network.dropped` | Counter | `{packet}` | Count of packets that are dropped or discarded even though there was no error. [1] | ![Development](https://img.shields.io/badge/-development-blue) | [`host`](/docs/registry/entities/host.md#host) |
893+
| `system.network.packet.dropped` | Counter | `{packet}` | Count of packets that are dropped or discarded even though there was no error. [1] | ![Development](https://img.shields.io/badge/-development-blue) | [`host`](/docs/registry/entities/host.md#host) |
894894

895895
**[1]:** Measured as:
896896

897-
- Linux: the `drop` column in `/proc/dev/net` ([source](https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html))
897+
- Linux: the `drop` column in `/proc/net/dev` ([source](https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html))
898898
- Windows: [`InDiscards`/`OutDiscards`](https://docs.microsoft.com/windows/win32/api/netioapi/ns-netioapi-mib_if_row2)
899899
from [`GetIfEntry2`](https://docs.microsoft.com/windows/win32/api/netioapi/nf-netioapi-getifentry2)
900900

@@ -917,11 +917,11 @@ This metric is [recommended][MetricRecommended].
917917
<!-- END AUTOGENERATED TEXT -->
918918
<!-- endsemconv -->
919919

920-
### Metric: `system.network.packets`
920+
### Metric: `system.network.packet.count`
921921

922922
This metric is [recommended][MetricRecommended].
923923

924-
<!-- semconv metric.system.network.packets -->
924+
<!-- semconv metric.system.network.packet.count -->
925925
<!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
926926
<!-- see templates/registry/markdown/snippet.md.j2 -->
927927
<!-- prettier-ignore-start -->
@@ -930,7 +930,7 @@ This metric is [recommended][MetricRecommended].
930930

931931
| Name | Instrument Type | Unit (UCUM) | Description | Stability | Entity Associations |
932932
| -------- | --------------- | ----------- | -------------- | --------- | ------ |
933-
| `system.network.packets` | Counter | `{packet}` | TODO. | ![Development](https://img.shields.io/badge/-development-blue) | [`host`](/docs/registry/entities/host.md#host) |
933+
| `system.network.packet.count` | Counter | `{packet}` | TODO. | ![Development](https://img.shields.io/badge/-development-blue) | [`host`](/docs/registry/entities/host.md#host) |
934934

935935
| Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability |
936936
|---|---|---|---|---|---|
@@ -968,7 +968,7 @@ This metric is [recommended][MetricRecommended].
968968

969969
**[1]:** Measured as:
970970

971-
- Linux: the `errs` column in `/proc/dev/net` ([source](https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html)).
971+
- Linux: the `errs` column in `/proc/net/dev` ([source](https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html)).
972972
- Windows: [`InErrors`/`OutErrors`](https://docs.microsoft.com/windows/win32/api/netioapi/ns-netioapi-mib_if_row2)
973973
from [`GetIfEntry2`](https://docs.microsoft.com/windows/win32/api/netioapi/nf-netioapi-getifentry2).
974974

model/system/metrics.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -399,9 +399,9 @@ groups:
399399
- host
400400

401401
# system.network.* metrics
402-
- id: metric.system.network.dropped
402+
- id: metric.system.network.packet.dropped
403403
type: metric
404-
metric_name: system.network.dropped
404+
metric_name: system.network.packet.dropped
405405
annotations:
406406
code_generation:
407407
metric_value_type: int
@@ -412,7 +412,7 @@ groups:
412412
note: |
413413
Measured as:
414414
415-
- Linux: the `drop` column in `/proc/dev/net` ([source](https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html))
415+
- Linux: the `drop` column in `/proc/net/dev` ([source](https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html))
416416
- Windows: [`InDiscards`/`OutDiscards`](https://docs.microsoft.com/windows/win32/api/netioapi/ns-netioapi-mib_if_row2)
417417
from [`GetIfEntry2`](https://docs.microsoft.com/windows/win32/api/netioapi/nf-netioapi-getifentry2)
418418
attributes:
@@ -421,9 +421,9 @@ groups:
421421
entity_associations:
422422
- host
423423

424-
- id: metric.system.network.packets
424+
- id: metric.system.network.packet.count
425425
type: metric
426-
metric_name: system.network.packets
426+
metric_name: system.network.packet.count
427427
annotations:
428428
code_generation:
429429
metric_value_type: int
@@ -450,7 +450,7 @@ groups:
450450
note: |
451451
Measured as:
452452
453-
- Linux: the `errs` column in `/proc/dev/net` ([source](https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html)).
453+
- Linux: the `errs` column in `/proc/net/dev` ([source](https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html)).
454454
- Windows: [`InErrors`/`OutErrors`](https://docs.microsoft.com/windows/win32/api/netioapi/ns-netioapi-mib_if_row2)
455455
from [`GetIfEntry2`](https://docs.microsoft.com/windows/win32/api/netioapi/nf-netioapi-getifentry2).
456456
attributes:

0 commit comments

Comments
 (0)