From af2e40b8fc835ed921efa366cf1c26bee76e693b Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 1 Feb 2024 13:32:20 -0800 Subject: [PATCH 1/3] Fix jvm buffer metric schema translations --- CHANGELOG.md | 2 ++ schema-next.yaml | 4 ++-- schemas/1.22.0 | 4 ++-- schemas/1.23.0 | 4 ++-- schemas/1.23.1 | 4 ++-- schemas/1.24.0 | 4 ++-- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed085131b0..9e264790ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,8 @@ release. - `type` to `process.context_switch_type` - Rename attributes for `process.paging.faults` - `type` to `process.paging.fault_type` +- Fix JVM buffer metric schema translations + ([#999](https://github.com/open-telemetry/semantic-conventions/pull/999)) ### Features diff --git a/schema-next.yaml b/schema-next.yaml index 23ebad9a35..441f34e983 100644 --- a/schema-next.yaml +++ b/schema-next.yaml @@ -140,8 +140,8 @@ versions: attribute_map: pool: jvm.buffer.pool.name apply_to_metrics: - - jvm.buffer.usage - - jvm.buffer.limit + - jvm.buffer.memory.usage + - jvm.buffer.memory.limit - jvm.buffer.count # https://github.com/open-telemetry/semantic-conventions/pull/89 - rename_attributes: diff --git a/schemas/1.22.0 b/schemas/1.22.0 index c5a7f93a74..87ef6eda74 100644 --- a/schemas/1.22.0 +++ b/schemas/1.22.0 @@ -66,8 +66,8 @@ versions: attribute_map: pool: jvm.buffer.pool.name apply_to_metrics: - - jvm.buffer.usage - - jvm.buffer.limit + - jvm.buffer.memory.usage + - jvm.buffer.memory.limit - jvm.buffer.count # https://github.com/open-telemetry/semantic-conventions/pull/89 - rename_attributes: diff --git a/schemas/1.23.0 b/schemas/1.23.0 index a6e29937d0..5d8bb9870e 100644 --- a/schemas/1.23.0 +++ b/schemas/1.23.0 @@ -79,8 +79,8 @@ versions: attribute_map: pool: jvm.buffer.pool.name apply_to_metrics: - - jvm.buffer.usage - - jvm.buffer.limit + - jvm.buffer.memory.usage + - jvm.buffer.memory.limit - jvm.buffer.count # https://github.com/open-telemetry/semantic-conventions/pull/89 - rename_attributes: diff --git a/schemas/1.23.1 b/schemas/1.23.1 index 3662ca07b5..108c4dbdb3 100644 --- a/schemas/1.23.1 +++ b/schemas/1.23.1 @@ -80,8 +80,8 @@ versions: attribute_map: pool: jvm.buffer.pool.name apply_to_metrics: - - jvm.buffer.usage - - jvm.buffer.limit + - jvm.buffer.memory.usage + - jvm.buffer.memory.limit - jvm.buffer.count # https://github.com/open-telemetry/semantic-conventions/pull/89 - rename_attributes: diff --git a/schemas/1.24.0 b/schemas/1.24.0 index f1de094f68..ec37e9c9f2 100644 --- a/schemas/1.24.0 +++ b/schemas/1.24.0 @@ -92,8 +92,8 @@ versions: attribute_map: pool: jvm.buffer.pool.name apply_to_metrics: - - jvm.buffer.usage - - jvm.buffer.limit + - jvm.buffer.memory.usage + - jvm.buffer.memory.limit - jvm.buffer.count # https://github.com/open-telemetry/semantic-conventions/pull/89 - rename_attributes: From 755af49f64270d482f5a2c7128c175975f5a3c39 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 1 Feb 2024 13:37:24 -0800 Subject: [PATCH 2/3] Don't update already published files --- schemas/1.22.0 | 4 ++-- schemas/1.23.0 | 4 ++-- schemas/1.23.1 | 4 ++-- schemas/1.24.0 | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/schemas/1.22.0 b/schemas/1.22.0 index 87ef6eda74..c5a7f93a74 100644 --- a/schemas/1.22.0 +++ b/schemas/1.22.0 @@ -66,8 +66,8 @@ versions: attribute_map: pool: jvm.buffer.pool.name apply_to_metrics: - - jvm.buffer.memory.usage - - jvm.buffer.memory.limit + - jvm.buffer.usage + - jvm.buffer.limit - jvm.buffer.count # https://github.com/open-telemetry/semantic-conventions/pull/89 - rename_attributes: diff --git a/schemas/1.23.0 b/schemas/1.23.0 index 5d8bb9870e..a6e29937d0 100644 --- a/schemas/1.23.0 +++ b/schemas/1.23.0 @@ -79,8 +79,8 @@ versions: attribute_map: pool: jvm.buffer.pool.name apply_to_metrics: - - jvm.buffer.memory.usage - - jvm.buffer.memory.limit + - jvm.buffer.usage + - jvm.buffer.limit - jvm.buffer.count # https://github.com/open-telemetry/semantic-conventions/pull/89 - rename_attributes: diff --git a/schemas/1.23.1 b/schemas/1.23.1 index 108c4dbdb3..3662ca07b5 100644 --- a/schemas/1.23.1 +++ b/schemas/1.23.1 @@ -80,8 +80,8 @@ versions: attribute_map: pool: jvm.buffer.pool.name apply_to_metrics: - - jvm.buffer.memory.usage - - jvm.buffer.memory.limit + - jvm.buffer.usage + - jvm.buffer.limit - jvm.buffer.count # https://github.com/open-telemetry/semantic-conventions/pull/89 - rename_attributes: diff --git a/schemas/1.24.0 b/schemas/1.24.0 index ec37e9c9f2..f1de094f68 100644 --- a/schemas/1.24.0 +++ b/schemas/1.24.0 @@ -92,8 +92,8 @@ versions: attribute_map: pool: jvm.buffer.pool.name apply_to_metrics: - - jvm.buffer.memory.usage - - jvm.buffer.memory.limit + - jvm.buffer.usage + - jvm.buffer.limit - jvm.buffer.count # https://github.com/open-telemetry/semantic-conventions/pull/89 - rename_attributes: From 0cf16083a3f02f690b1ac9fa568bc5ec9e4a745c Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 1 Feb 2024 13:37:43 -0800 Subject: [PATCH 3/3] PR number --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e264790ae..d32d773909 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,7 +30,7 @@ release. - Rename attributes for `process.paging.faults` - `type` to `process.paging.fault_type` - Fix JVM buffer metric schema translations - ([#999](https://github.com/open-telemetry/semantic-conventions/pull/999)) + ([#683](https://github.com/open-telemetry/semantic-conventions/pull/683)) ### Features