Skip to content

Commit

Permalink
Revert #2617, #2675, #2688: "add metrics to replace metrics with `dir…
Browse files Browse the repository at this point in the history 
…ection`" (#2748)

Please review this carefully. It is not an automatic reverting, I had to fix merge conflicts manually and may have made mistakes, so a thorough review is needed.

Changes:
- This reverts #2617. We are reverting it until we are certain how to resolve issue #2726
- Also reverts the corresponding schema file changes done in #2688
- Also reverts #2675

~Note that this does not revert #2675 which I believe to still be valid. If you think otherwise please speak.~ [UPDATE: discussed in Spec SIG and decided to revert 2675 too].

Contributes to #2726
  • Loading branch information
@tigrannajaryan
tigrannajaryan authored Sep 2, 2022
1 parent a757f31 commit f0c001e
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 156 deletions.
5 changes: 0 additions & 5 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ release.
([#2618](https://github.com/open-telemetry/opentelemetry-specification/pull/2618))
- Change `faas.document.time` and `faas.time` level from `required` to `recommended`
([#2627](https://github.com/open-telemetry/opentelemetry-specification/pull/2627))
- Remove `direction` dimension, instead creating metrics with names reflecting those
dimensions.
([#2617](https://github.com/open-telemetry/opentelemetry-specification/pull/2617))
- Add `rpc.grpc.status_code` to RPC metric semantic conventions
([#2604](https://github.com/open-telemetry/opentelemetry-specification/pull/2604)).
- Add `http.*.*.size` metric semantic conventions for tracking size of requests
Expand All @@ -71,8 +68,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
86 changes: 0 additions & 86 deletions schemas/1.13.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,92 +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/2617
- split:
apply_to_metric: system.paging.operations
by_attribute: direction
metrics_from_attributes:
system.paging.operations.in: in
system.paging.operations.out: out
# https://github.com/open-telemetry/opentelemetry-specification/pull/2617
- split:
apply_to_metric: system.disk.io
by_attribute: direction
metrics_from_attributes:
system.disk.io.read: read
system.disk.io.write: write
# https://github.com/open-telemetry/opentelemetry-specification/pull/2617
- split:
apply_to_metric: system.disk.operations
by_attribute: direction
metrics_from_attributes:
system.disk.operations.read: read
system.disk.operations.write: write
# https://github.com/open-telemetry/opentelemetry-specification/pull/2617
- split:
apply_to_metric: system.disk.operation_time
by_attribute: direction
metrics_from_attributes:
system.disk.operation_time.read: read
system.disk.operation_time.write: write
# https://github.com/open-telemetry/opentelemetry-specification/pull/2617
- split:
apply_to_metric: system.disk.merged
by_attribute: direction
metrics_from_attributes:
system.disk.merged.read: read
system.disk.merged.write: write
# https://github.com/open-telemetry/opentelemetry-specification/pull/2617
- split:
apply_to_metric: system.network.dropped
by_attribute: direction
metrics_from_attributes:
system.network.dropped.receive: receive
system.network.dropped.transmit: transmit
# https://github.com/open-telemetry/opentelemetry-specification/pull/2617
- split:
apply_to_metric: system.network.packets
by_attribute: direction
metrics_from_attributes:
system.network.packets.receive: receive
system.network.packets.transmit: transmit
# https://github.com/open-telemetry/opentelemetry-specification/pull/2617
- split:
apply_to_metric: system.network.errors
by_attribute: direction
metrics_from_attributes:
system.network.errors.receive: receive
system.network.errors.transmit: transmit
# https://github.com/open-telemetry/opentelemetry-specification/pull/2617
- split:
apply_to_metric: system.network.io
by_attribute: direction
metrics_from_attributes:
system.network.io.receive: receive
system.network.io.transmit: transmit
# https://github.com/open-telemetry/opentelemetry-specification/pull/2617
- split:
apply_to_metric: process.disk.io
by_attribute: direction
metrics_from_attributes:
process.disk.io.read: read
process.disk.io.write: write
# https://github.com/open-telemetry/opentelemetry-specification/pull/2617
- split:
apply_to_metric: process.network.io
by_attribute: direction
metrics_from_attributes:
process.network.io.receive: receive
process.network.io.transmit: transmit
# 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
22 changes: 9 additions & 13 deletions specification/metrics/semantic_conventions/process-metrics.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,15 @@ metrics](runtime-environment-metrics.md).

Below is a table of Process metric instruments.

| Name | Instrument Type ([*](README.md#instrument-types)) | Units | Description | Labels |
| --------------------------------- | ------------------------------------------------- | ---------- | ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `process.cpu.time` | Counter | s | Total CPU seconds broken down by different states. | `state`, if specified, SHOULD be one of: `system`, `user`, `wait`. A process SHOULD be characterized _either_ by data points with no `state` labels, _or only_ data points with `state` labels. |
| `process.cpu.utilization` | Gauge | s | Difference in process.cpu.time since the last measurement, divided by the elapsed time and number of CPUs available to the process. | `state`, if specified, SHOULD be one of: `system`, `user`, `wait`. A process SHOULD be characterized _either_ by data points with no `state` labels, _or only_ data points with `state` labels. |
| `process.memory.usage` | UpDownCounter | By | The amount of physical memory in use. | |
| `process.memory.virtual` | UpDownCounter | By | The amount of committed virtual memory. | |
| `process.disk.io` (deprecated) | Counter | By | Disk bytes transferred. | `direction` SHOULD be one of: `read`, `write` |
| `process.disk.io.read` | Counter | By | Disk bytes read. | |
| `process.disk.io.write` | Counter | By | Disk bytes written. | |
| `process.network.io` (deprecated) | Counter | By | Network bytes transferred. | `direction` SHOULD be one of: `receive`, `transmit` |
| `process.network.io.receive` | Counter | By | Network bytes received. | |
| `process.network.io.transmit` | Counter | By | Network bytes transmitted. | |
| `process.threads` | UpDownCounter | {threads} | Process threads count. | |
| Name | Instrument Type ([*](README.md#instrument-types)) | Units | Description | Labels |
|---------------------------|---------------------------------------------------|-------|-------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `process.cpu.time` | Counter | s | Total CPU seconds broken down by different states. | `state`, if specified, SHOULD be one of: `system`, `user`, `wait`. A process SHOULD be characterized _either_ by data points with no `state` labels, _or only_ data points with `state` labels. |
| `process.cpu.utilization` | Gauge | s | Difference in process.cpu.time since the last measurement, divided by the elapsed time and number of CPUs available to the process. | `state`, if specified, SHOULD be one of: `system`, `user`, `wait`. A process SHOULD be characterized _either_ by data points with no `state` labels, _or only_ data points with `state` labels. |
| `process.memory.usage` | UpDownCounter | By | The amount of physical memory in use. | |
| `process.memory.virtual` | UpDownCounter | By | The amount of committed virtual memory. | |
| `process.disk.io` | Counter | By | Disk bytes transferred. | `direction` SHOULD be one of: `read`, `write` |
| `process.network.io` | Counter | By | Network bytes transferred. | `direction` SHOULD be one of: `receive`, `transmit` |
| `process.threads` | UpDownCounter | {threads} | Process threads count. | |

## Attributes

Expand Down
Loading

0 comments on commit f0c001e

Please sign in to comment.