From b14f50d05b988703ee392efa334ee9d8854646b0 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Fri, 22 Jul 2022 09:04:51 -0700 Subject: [PATCH 1/2] add schema definition for direction change This is a follow up to https://github.com/open-telemetry/opentelemetry-specification/pull/2617 now that https://github.com/open-telemetry/opentelemetry-specification/pull/2653 has been merged. --- internal/tools/schema_check.sh | 2 +- schemas/1.13.0 | 82 ++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 schemas/1.13.0 diff --git a/internal/tools/schema_check.sh b/internal/tools/schema_check.sh index f9b1826a629..86c8e253be3 100755 --- a/internal/tools/schema_check.sh +++ b/internal/tools/schema_check.sh @@ -6,7 +6,7 @@ set -e -BUILD_TOOL_SCHEMAS_VERSION=0.12.1 +BUILD_TOOL_SCHEMAS_VERSION=0.13.0 # List of vesions that do not require or have a schema. declare -a skip_versions=("1.0.0" "1.0.1" "1.1.0" "1.2.0" "1.3.0" "1.6.0") diff --git a/schemas/1.13.0 b/schemas/1.13.0 new file mode 100644 index 00000000000..d0dfafa66d2 --- /dev/null +++ b/schemas/1.13.0 @@ -0,0 +1,82 @@ +file_format: 1.1.0 +schema_url: https://opentelemetry.io/schemas/1.13.0 +versions: + 1.13.0: + metrics: + changes: + - split: + apply_to_metric: system.paging.operations + by_attribute: direction + metrics_from_attributes: + system.paging.operations.in: in + system.paging.operations.out: out + - split: + apply_to_metric: system.disk.io + by_attribute: direction + metrics_from_attributes: + system.disk.io.read: read + system.disk.io.write: write + - split: + apply_to_metric: system.disk.operations + by_attribute: direction + metrics_from_attributes: + system.disk.operations.read: read + system.disk.operations.write: write + - 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 + - split: + apply_to_metric: system.disk.merged + by_attribute: direction + metrics_from_attributes: + system.disk.merged.read: read + system.disk.merged.write: write + - split: + apply_to_metric: system.network.dropped + by_attribute: direction + metrics_from_attributes: + system.network.dropped.receive: receive + system.network.dropped.transmit: transmit + - split: + apply_to_metric: system.network.packets + by_attribute: direction + metrics_from_attributes: + system.network.packets.receive: receive + system.network.packets.transmit: transmit + - split: + apply_to_metric: system.network.errors + by_attribute: direction + metrics_from_attributes: + system.network.errors.receive: receive + system.network.errors.transmit: transmit + - split: + apply_to_metric: system.network.io + by_attribute: direction + metrics_from_attributes: + system.network.io.receive: receive + system.network.io.transmit: transmit + + 1.12.0: + spans: + changes: + - rename_attributes: + attribute_map: + net.peer.ip: net.sock.peer.addr + net.host.ip: net.sock.host.addr + 1.11.0: + 1.10.0: + 1.9.0: + 1.8.0: + spans: + changes: + - rename_attributes: + attribute_map: + db.cassandra.keyspace: db.name + db.hbase.namespace: db.name + 1.7.0: + 1.6.1: + 1.5.0: + 1.4.0: From 60df79c9cc24775aa23190d3b0f3992299377210 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Wed, 27 Jul 2022 12:33:45 -0700 Subject: [PATCH 2/2] add process.network.io and process.disk.io --- schemas/1.13.0 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/schemas/1.13.0 b/schemas/1.13.0 index d0dfafa66d2..6202271c0dc 100644 --- a/schemas/1.13.0 +++ b/schemas/1.13.0 @@ -4,60 +4,83 @@ 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 1.12.0: spans: