From 16078fcb7f911774b92c6388f7a5324dfe124a11 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Fri, 4 Oct 2024 11:30:48 -0700 Subject: [PATCH 1/3] v0.26 --- opentelemetry-aws/CHANGELOG.md | 8 ++++++++ opentelemetry-aws/Cargo.toml | 2 +- opentelemetry-contrib/CHANGELOG.md | 7 +++++++ opentelemetry-contrib/Cargo.toml | 2 +- opentelemetry-etw-logs/CHANGELOG.md | 6 ++++++ opentelemetry-etw-logs/Cargo.toml | 2 +- opentelemetry-etw-metrics/CHANGELOG.md | 7 +++++++ opentelemetry-etw-metrics/Cargo.toml | 10 +++++----- opentelemetry-resource-detectors/CHANGELOG.md | 7 +++++++ opentelemetry-resource-detectors/Cargo.toml | 2 +- opentelemetry-stackdriver/CHANGELOG.md | 8 +++++++- opentelemetry-stackdriver/Cargo.toml | 2 +- opentelemetry-user-events-logs/CHANGELOG.md | 6 ++++++ opentelemetry-user-events-logs/Cargo.toml | 2 +- opentelemetry-user-events-metrics/CHANGELOG.md | 7 +++++++ opentelemetry-user-events-metrics/Cargo.toml | 4 ++-- opentelemetry-zpages/CHANGELOG.md | 6 ++++++ opentelemetry-zpages/Cargo.toml | 2 +- 18 files changed, 75 insertions(+), 15 deletions(-) diff --git a/opentelemetry-aws/CHANGELOG.md b/opentelemetry-aws/CHANGELOG.md index 478a0bfa..a4dec980 100644 --- a/opentelemetry-aws/CHANGELOG.md +++ b/opentelemetry-aws/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## vNext + +## v0.14.0 + +### Changed + +- Bump opentelemetry and opentelemetry_sdk versions to 0.26.0 + ## v0.13.0 ### Added diff --git a/opentelemetry-aws/Cargo.toml b/opentelemetry-aws/Cargo.toml index 03558e11..abd01b6f 100644 --- a/opentelemetry-aws/Cargo.toml +++ b/opentelemetry-aws/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opentelemetry-aws" -version = "0.13.0" +version = "0.14.0" description = "AWS exporters and propagators for OpenTelemetry" homepage = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-aws" repository = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-aws" diff --git a/opentelemetry-contrib/CHANGELOG.md b/opentelemetry-contrib/CHANGELOG.md index 5dfdf3de..fb8ec5b0 100644 --- a/opentelemetry-contrib/CHANGELOG.md +++ b/opentelemetry-contrib/CHANGELOG.md @@ -2,6 +2,13 @@ ## vNext +## v0.18.0 + +### Changed + +- Bump opentelemetry and opentelemetry_sdk versions to 0.26 +- Bump opentelemetry-semantic-conventions version to 0.26 + ## v0.17.0 ### Changed diff --git a/opentelemetry-contrib/Cargo.toml b/opentelemetry-contrib/Cargo.toml index 6e2727be..a948af31 100644 --- a/opentelemetry-contrib/Cargo.toml +++ b/opentelemetry-contrib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opentelemetry-contrib" -version = "0.17.0" +version = "0.18.0" description = "Rust contrib repo for OpenTelemetry" homepage = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-contrib" repository = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-contrib" diff --git a/opentelemetry-etw-logs/CHANGELOG.md b/opentelemetry-etw-logs/CHANGELOG.md index 51e03074..f767692b 100644 --- a/opentelemetry-etw-logs/CHANGELOG.md +++ b/opentelemetry-etw-logs/CHANGELOG.md @@ -2,6 +2,12 @@ ## vNext +## v0.5.0 + +### Changed + +- Bump opentelemetry and opentelemetry_sdk versions to 0.26 + ## v0.4.0 ### Changed diff --git a/opentelemetry-etw-logs/Cargo.toml b/opentelemetry-etw-logs/Cargo.toml index fc868914..154dc298 100644 --- a/opentelemetry-etw-logs/Cargo.toml +++ b/opentelemetry-etw-logs/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "opentelemetry-etw-logs" description = "OpenTelemetry logs exporter to ETW (Event Tracing for Windows)" -version = "0.4.0" +version = "0.5.0" edition = "2021" homepage = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-etw-logs" repository = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-etw-logs" diff --git a/opentelemetry-etw-metrics/CHANGELOG.md b/opentelemetry-etw-metrics/CHANGELOG.md index 47a39a9b..8d89c0b8 100644 --- a/opentelemetry-etw-metrics/CHANGELOG.md +++ b/opentelemetry-etw-metrics/CHANGELOG.md @@ -2,6 +2,13 @@ ## vNext +## v0.5.0 + +### Changed + + - Bump opentelemetry and opentelemetry_sdk versions to 0.26 + - Bump opentelemetry-proto version to 0.26 + ## v0.4.0 - Improved logging when ETW write fails due to size limit being hit. diff --git a/opentelemetry-etw-metrics/Cargo.toml b/opentelemetry-etw-metrics/Cargo.toml index 36dc689a..6ea69e55 100644 --- a/opentelemetry-etw-metrics/Cargo.toml +++ b/opentelemetry-etw-metrics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opentelemetry-etw-metrics" -version = "0.4.0" +version = "0.5.0" edition = "2021" description = "OpenTelemetry metrics exporter to ETW (Event Tracing for Windows)" homepage = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-etw-metrics" @@ -8,12 +8,12 @@ repository = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/ readme = "README.md" keywords = ["opentelemetry", "metrics", "etw"] license = "Apache-2.0" -rust-version = "1.65" +rust-version = "1.71.1" [dependencies] -opentelemetry = { version = "0.25", features = ["metrics"] } -opentelemetry_sdk = { version = "0.25", features = ["metrics", "rt-tokio"] } -opentelemetry-proto = { version = "0.25", features = ["gen-tonic", "metrics"] } +opentelemetry = { workspace = true, features = ["metrics"] } +opentelemetry_sdk = { workspace = true, features = ["metrics", "rt-tokio"] } +opentelemetry-proto = { workspace = true, features = ["gen-tonic", "metrics"] } async-trait = "0.1" prost = "0.13" tracelogging = "1.2.1" diff --git a/opentelemetry-resource-detectors/CHANGELOG.md b/opentelemetry-resource-detectors/CHANGELOG.md index 82bd9b8b..568afc11 100644 --- a/opentelemetry-resource-detectors/CHANGELOG.md +++ b/opentelemetry-resource-detectors/CHANGELOG.md @@ -2,6 +2,13 @@ ## vNext +## v0.5.0 + +### Changed + +- Bump opentelemetry and opentelemetry_sdk versions to 0.26 +- Bump opentelemetry-semantic-conventions version to 0.26 + ## v0.4.0 ### Changed diff --git a/opentelemetry-resource-detectors/Cargo.toml b/opentelemetry-resource-detectors/Cargo.toml index 3580ed62..c410beee 100644 --- a/opentelemetry-resource-detectors/Cargo.toml +++ b/opentelemetry-resource-detectors/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opentelemetry-resource-detectors" -version = "0.4.0" +version = "0.5.0" edition = "2021" description = "A collection of community supported resource detectors for OpenTelemetry" homepage = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-resource-detectors" diff --git a/opentelemetry-stackdriver/CHANGELOG.md b/opentelemetry-stackdriver/CHANGELOG.md index 5b36355d..f54a5417 100644 --- a/opentelemetry-stackdriver/CHANGELOG.md +++ b/opentelemetry-stackdriver/CHANGELOG.md @@ -4,7 +4,13 @@ ## v0.22.0 -### Added +### Changed + +- Update to opentelemetry v0.26.0, opentelemetry_sdk v0.26.0, opentelemetry-semantic-conventions v0.26.0 + +## v0.22.0 + +### Changed - Update to opentelemetry v0.25.0, opentelemetry_sdk v0.25.0, opentelemetry-semantic-conventions v0.25.0 - Added support for `MonitoredResource::CloudRunJob` [#100](https://github.com/open-telemetry/opentelemetry-rust-contrib/issues/100) diff --git a/opentelemetry-stackdriver/Cargo.toml b/opentelemetry-stackdriver/Cargo.toml index 716d7f28..540c281a 100644 --- a/opentelemetry-stackdriver/Cargo.toml +++ b/opentelemetry-stackdriver/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opentelemetry-stackdriver" -version = "0.22.0" +version = "0.23.0" description = "A Rust opentelemetry exporter that uploads traces to Google Stackdriver trace." documentation = "https://docs.rs/opentelemetry-stackdriver/" repository = "https://github.com/open-telemetry/opentelemetry-rust-contrib" diff --git a/opentelemetry-user-events-logs/CHANGELOG.md b/opentelemetry-user-events-logs/CHANGELOG.md index cd9c975f..6d1ea744 100644 --- a/opentelemetry-user-events-logs/CHANGELOG.md +++ b/opentelemetry-user-events-logs/CHANGELOG.md @@ -2,6 +2,12 @@ ## vNext +## v0.7.0 + +### Changed + +- Bump opentelemetry and opentelemetry_sdk versions to 0.26 + ## v0.6.0 ### Changed diff --git a/opentelemetry-user-events-logs/Cargo.toml b/opentelemetry-user-events-logs/Cargo.toml index 723d893d..c1f61c45 100644 --- a/opentelemetry-user-events-logs/Cargo.toml +++ b/opentelemetry-user-events-logs/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "opentelemetry-user-events-logs" description = "OpenTelemetry-Rust exporter to userevents" -version = "0.6.0" +version = "0.7.0" edition = "2021" homepage = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-user-events-logs" repository = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-user-events-logs" diff --git a/opentelemetry-user-events-metrics/CHANGELOG.md b/opentelemetry-user-events-metrics/CHANGELOG.md index 6c3b2e9e..68d2286b 100644 --- a/opentelemetry-user-events-metrics/CHANGELOG.md +++ b/opentelemetry-user-events-metrics/CHANGELOG.md @@ -6,6 +6,13 @@ ### Changed +- Bump opentelemetry and opentelemetry_sdk versions to 0.26, + opentelemetry-proto version to 0.26. + +## v0.6.0 + +### Changed + - Bump opentelemetry and opentelemetry_sdk versions to 0.25, opentelemetry-proto version to 0.25. diff --git a/opentelemetry-user-events-metrics/Cargo.toml b/opentelemetry-user-events-metrics/Cargo.toml index 7b212595..748a1e6c 100644 --- a/opentelemetry-user-events-metrics/Cargo.toml +++ b/opentelemetry-user-events-metrics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opentelemetry-user-events-metrics" -version = "0.6.0" +version = "0.7.0" description = "OpenTelemetry metrics exporter to user events" homepage = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-user-events-metrics" repository = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-user-events-metrics" @@ -8,7 +8,7 @@ readme = "README.md" keywords = ["opentelemetry", "metrics", "user-events"] license = "Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version = "1.71.1" [dependencies] opentelemetry = { workspace = true, features = ["metrics"] } diff --git a/opentelemetry-zpages/CHANGELOG.md b/opentelemetry-zpages/CHANGELOG.md index 25a89dfd..86216c41 100644 --- a/opentelemetry-zpages/CHANGELOG.md +++ b/opentelemetry-zpages/CHANGELOG.md @@ -2,6 +2,12 @@ ## vNext +## v0.11.0 + +### Changed + +- Bump opentelemetry version to 0.26, opentelemetry_sdk version to 0.26 + ## v0.10.0 ### Changed diff --git a/opentelemetry-zpages/Cargo.toml b/opentelemetry-zpages/Cargo.toml index e99c5f43..7825e905 100644 --- a/opentelemetry-zpages/Cargo.toml +++ b/opentelemetry-zpages/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opentelemetry-zpages" -version = "0.10.0" +version = "0.11.0" description = "ZPages implementation for OpenTelemetry" homepage = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-zpages" repository = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-zpages" From 5119dc67c732041f4669e4730020c9a9cdd3c97b Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Fri, 4 Oct 2024 11:36:30 -0700 Subject: [PATCH 2/3] fix --- opentelemetry-etw-metrics/CHANGELOG.md | 1 + opentelemetry-stackdriver/CHANGELOG.md | 2 +- opentelemetry-user-events-metrics/CHANGELOG.md | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/opentelemetry-etw-metrics/CHANGELOG.md b/opentelemetry-etw-metrics/CHANGELOG.md index 8d89c0b8..c4f53d91 100644 --- a/opentelemetry-etw-metrics/CHANGELOG.md +++ b/opentelemetry-etw-metrics/CHANGELOG.md @@ -8,6 +8,7 @@ - Bump opentelemetry and opentelemetry_sdk versions to 0.26 - Bump opentelemetry-proto version to 0.26 + - Bump rust msrv to v1.71.1 ## v0.4.0 diff --git a/opentelemetry-stackdriver/CHANGELOG.md b/opentelemetry-stackdriver/CHANGELOG.md index f54a5417..2c1a4fa2 100644 --- a/opentelemetry-stackdriver/CHANGELOG.md +++ b/opentelemetry-stackdriver/CHANGELOG.md @@ -2,7 +2,7 @@ ## vNext -## v0.22.0 +## v0.23.0 ### Changed diff --git a/opentelemetry-user-events-metrics/CHANGELOG.md b/opentelemetry-user-events-metrics/CHANGELOG.md index 68d2286b..c5951ecc 100644 --- a/opentelemetry-user-events-metrics/CHANGELOG.md +++ b/opentelemetry-user-events-metrics/CHANGELOG.md @@ -2,12 +2,13 @@ ## vNext -## v0.6.0 +## v0.7.0 ### Changed - Bump opentelemetry and opentelemetry_sdk versions to 0.26, opentelemetry-proto version to 0.26. +- Bump msrv to 1.71.1 ## v0.6.0 From 3aa7a38d454b3e659c5ae97520608969831f1f2d Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Fri, 4 Oct 2024 11:42:36 -0700 Subject: [PATCH 3/3] fix etw metrics build --- opentelemetry-etw-metrics/src/exporter/mod.rs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/opentelemetry-etw-metrics/src/exporter/mod.rs b/opentelemetry-etw-metrics/src/exporter/mod.rs index 14d8bc59..d450bcea 100644 --- a/opentelemetry-etw-metrics/src/exporter/mod.rs +++ b/opentelemetry-etw-metrics/src/exporter/mod.rs @@ -9,8 +9,8 @@ use opentelemetry_sdk::metrics::{ ScopeMetrics, Temporality, }, exporter::PushMetricsExporter, - reader::{AggregationSelector, DefaultAggregationSelector, TemporalitySelector}, - Aggregation, InstrumentKind, + reader::TemporalitySelector, + InstrumentKind, }; use prost::Message; @@ -51,12 +51,6 @@ impl TemporalitySelector for MetricsExporter { } } -impl AggregationSelector for MetricsExporter { - fn aggregation(&self, kind: InstrumentKind) -> Aggregation { - DefaultAggregationSelector::new().aggregation(kind) - } -} - impl Debug for MetricsExporter { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { f.write_str("ETW metrics exporter")