Merge branch 'main' into add-shutdown-with-timeout-for-log-exporter

mohammadVatandoost · web-flow · commit 8b8188db9560 · 2025-04-14T19:29:03.000+02:00
diff --git a/.cspell.json b/.cspell.json
@@ -29,6 +29,7 @@
         "anyvalue",
         "appender",
         "appenders",
+        "autobenches",
         "Bhasin",
         "BLRP",
         "Cijo",
diff --git a/examples/metrics-advanced/Cargo.toml b/examples/metrics-advanced/Cargo.toml
@@ -13,6 +13,6 @@ bench = false
 
 [dependencies]
 opentelemetry = { path = "../../opentelemetry", features = ["metrics"] }
-opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["spec_unstable_metrics_views", "rt-tokio"] }
+opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["spec_unstable_metrics_views"] }
 opentelemetry-stdout = { workspace = true, features = ["metrics"] }
 tokio = { workspace = true, features = ["full"] }
diff --git a/examples/metrics-basic/Cargo.toml b/examples/metrics-basic/Cargo.toml
@@ -13,7 +13,7 @@ bench = false
 
 [dependencies]
 opentelemetry = { path = "../../opentelemetry", features = ["metrics"] }
-opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["metrics", "rt-tokio"] }
+opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["metrics"] }
 opentelemetry-stdout = { workspace = true, features = ["metrics"] }
 tokio = { workspace = true, features = ["full"] }
 
diff --git a/opentelemetry-prometheus/CHANGELOG.md b/opentelemetry-prometheus/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 ## vNext
 
+## 0.29.1
+
+Released 2025-April-11
+
+- Update `prometheus` dependency version to 0.14
+- Remove `protobuf` dependency
+
 ## v0.29.0
 
 - Update `opentelemetry` dependency version to 0.29
diff --git a/opentelemetry-prometheus/Cargo.toml b/opentelemetry-prometheus/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "opentelemetry-prometheus"
-version = "0.29.0"
-description = "Prometheus exporter for OpenTelemetry"
+version = "0.29.1"
+description = "Prometheus exporter for OpenTelemetry (This crate is discontinued and is no longer maintained)"
 homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-prometheus"
 repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-prometheus"
 readme = "README.md"
@@ -23,8 +23,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 once_cell = { version = "1.13" }
 opentelemetry = { version = "0.29", default-features = false, features = ["metrics"] }
 opentelemetry_sdk = { version = "0.29", default-features = false, features = ["metrics"] }
-prometheus = "0.13"
-protobuf = "2.14"
+prometheus = "0.14"
 tracing = { version = ">=0.1.40", default-features = false, optional = true } # optional for opentelemetry internal logging
 
 [dev-dependencies]
diff --git a/opentelemetry-prometheus/src/lib.rs b/opentelemetry-prometheus/src/lib.rs
@@ -439,13 +439,13 @@ fn validate_metrics(
             );
             return (true, None);
         }
-        if existing.get_help() != description {
+        if existing.help() != description {
             otel_warn!(
                 name: "MetricValidationFailed",
                 message = "Instrument description conflict, using existing",
-                metric_description = format!("Instrument {name}, Existing: {:?}, dropped: {:?}", existing.get_help().to_string(), description.to_string()).as_str(),
+                metric_description = format!("Instrument {name}, Existing: {:?}, dropped: {:?}", existing.help().to_string(), description.to_string()).as_str(),
             );
-            return (false, Some(existing.get_help().to_string()));
+            return (false, Some(existing.help().to_string()));
         }
         (false, None)
     } else {
@@ -491,16 +491,16 @@ fn add_histogram_metric<T: Numeric>(
         let mut h = prometheus::proto::Histogram::default();
         h.set_sample_sum(dp.sum.as_f64());
         h.set_sample_count(dp.count);
-        h.set_bucket(protobuf::RepeatedField::from_vec(bucket));
+        h.set_bucket(bucket);
         let mut pm = prometheus::proto::Metric::default();
-        pm.set_label(protobuf::RepeatedField::from_vec(kvs));
+        pm.set_label(kvs);
         pm.set_histogram(h);
 
         let mut mf = prometheus::proto::MetricFamily::default();
         mf.set_name(name.to_string());
         mf.set_help(description.clone());
         mf.set_field_type(prometheus::proto::MetricType::HISTOGRAM);
-        mf.set_metric(protobuf::RepeatedField::from_vec(vec![pm]));
+        mf.set_metric(vec![pm]);
         res.push(mf);
     }
 }
@@ -525,7 +525,7 @@ fn add_sum_metric<T: Numeric>(
         );
 
         let mut pm = prometheus::proto::Metric::default();
-        pm.set_label(protobuf::RepeatedField::from_vec(kvs));
+        pm.set_label(kvs);
 
         if sum.is_monotonic {
             let mut c = prometheus::proto::Counter::default();
@@ -541,7 +541,7 @@ fn add_sum_metric<T: Numeric>(
         mf.set_name(name.to_string());
         mf.set_help(description.clone());
         mf.set_field_type(metric_type);
-        mf.set_metric(protobuf::RepeatedField::from_vec(vec![pm]));
+        mf.set_metric(vec![pm]);
         res.push(mf);
     }
 }
@@ -562,14 +562,14 @@ fn add_gauge_metric<T: Numeric>(
         let mut g = prometheus::proto::Gauge::default();
         g.set_value(dp.value.as_f64());
         let mut pm = prometheus::proto::Metric::default();
-        pm.set_label(protobuf::RepeatedField::from_vec(kvs));
+        pm.set_label(kvs);
         pm.set_gauge(g);
 
         let mut mf = prometheus::proto::MetricFamily::default();
         mf.set_name(name.to_string());
         mf.set_help(description.to_string());
         mf.set_field_type(MetricType::GAUGE);
-        mf.set_metric(protobuf::RepeatedField::from_vec(vec![pm]));
+        mf.set_metric(vec![pm]);
         res.push(mf);
     }
 }
@@ -583,17 +583,17 @@ fn create_info_metric(
     g.set_value(1.0);
 
     let mut m = prometheus::proto::Metric::default();
-    m.set_label(protobuf::RepeatedField::from_vec(get_attrs(
+    m.set_label(get_attrs(
         &mut resource.iter(),
         &[],
-    )));
+    ));
     m.set_gauge(g);
 
     let mut mf = MetricFamily::default();
     mf.set_name(target_info_name.into());
     mf.set_help(target_info_description.into());
     mf.set_field_type(MetricType::GAUGE);
-    mf.set_metric(protobuf::RepeatedField::from_vec(vec![m]));
+    mf.set_metric(vec![m]);
     mf
 }
 
@@ -614,14 +614,14 @@ fn create_scope_info_metric(scope: &InstrumentationScope) -> MetricFamily {
     }
 
     let mut m = prometheus::proto::Metric::default();
-    m.set_label(protobuf::RepeatedField::from_vec(labels));
+    m.set_label(labels);
     m.set_gauge(g);
 
     let mut mf = MetricFamily::default();
     mf.set_name(SCOPE_INFO_METRIC_NAME.into());
     mf.set_help(SCOPE_INFO_DESCRIPTION.into());
     mf.set_field_type(MetricType::GAUGE);
-    mf.set_metric(protobuf::RepeatedField::from_vec(vec![m]));
+    mf.set_metric(vec![m]);
     mf
 }
 
diff --git a/opentelemetry-sdk/CHANGELOG.md b/opentelemetry-sdk/CHANGELOG.md
@@ -2,14 +2,16 @@
 
 ## vNext
 
-[#2868](https://github.com/open-telemetry/opentelemetry-rust/pull/2868)
-`SdkLogger`, `SdkTracer` modified to respect telemetry suppression based on
+- **Feature**: Added context based telemetry suppression. [#2868](https://github.com/open-telemetry/opentelemetry-rust/pull/2868)
+  - `SdkLogger`, `SdkTracer` modified to respect telemetry suppression based on
 `Context`. In other words, if the current context has telemetry suppression
-enabled, then logs/spans will be ignored. The flag is typically set by OTel
+enabled, then logs/spans will be ignored.
+  - The flag is typically set by OTel
 components to prevent telemetry from itself being fed back into OTel.
-`BatchLogProcessor`, `BatchSpanProcessor`, and `PeriodicReader` modified to set
+  - `BatchLogProcessor`, `BatchSpanProcessor`, and `PeriodicReader` modified to set
 the suppression flag in their dedicated thread, so that telemetry generated from
-those threads will not be fed back into OTel. Similarly, `SimpleLogProcessor`
+those threads will not be fed back into OTel.
+  - Similarly, `SimpleLogProcessor`
 also modified to suppress telemetry before invoking exporters.
 
 - **Feature**: Implemented and enabled cardinality capping for Metrics by
@@ -23,15 +25,25 @@ also modified to suppress telemetry before invoking exporters.
   - Fixed the overflow attribute to correctly use the boolean value `true`
     instead of the string `"true"`.
     [#2878](https://github.com/open-telemetry/opentelemetry-rust/issues/2878)
-- *Breaking* change for custom `MetricReader` authors.
-  The `shutdown_with_timeout` method is added to `MetricReader` trait.
-  `collect` method on `MetricReader` modified to return `OTelSdkResult`.
 - *Breaking* The `shutdown_with_timeout` method is added to LogExporter trait. This is breaking change for custom `LogExporter` authors.
 - [#2905](https://github.com/open-telemetry/opentelemetry-rust/pull/2905)
 - *Breaking* `MetricError`, `MetricResult` no longer public (except when
   `spec_unstable_metrics_views` feature flag is enabled). `OTelSdkResult` should
-  be used instead, wherever applicable.
+  be used instead, wherever applicable. [#2906](https://github.com/open-telemetry/opentelemetry-rust/pull/2906)
+- *Breaking* change, affecting custom `MetricReader` authors:
+  - The
+  `shutdown_with_timeout` method is added to `MetricReader` trait.
+  - `collect`
+  method on `MetricReader` modified to return `OTelSdkResult`.
   [#2905](https://github.com/open-telemetry/opentelemetry-rust/pull/2905)
+  - `MetricReader`
+  trait, `ManualReader` struct, `Pipeline` struct, `InstrumentKind` enum moved
+  behind feature flag "experimental_metrics_custom_reader".
+  [#2928](https://github.com/open-telemetry/opentelemetry-rust/pull/2928)
+
+- *Breaking* `Aggregation` enum moved behind feature flag
+  "spec_unstable_metrics_views". This was only required when using Views.
+  [#2928](https://github.com/open-telemetry/opentelemetry-rust/pull/2928)
 
 ## 0.29.0
 
diff --git a/opentelemetry-sdk/Cargo.toml b/opentelemetry-sdk/Cargo.toml
@@ -53,6 +53,7 @@ rt-tokio-current-thread = ["tokio", "tokio-stream", "experimental_async_runtime"
 internal-logs = ["opentelemetry/internal-logs"]
 experimental_metrics_periodicreader_with_async_runtime = ["metrics", "experimental_async_runtime"]
 spec_unstable_metrics_views = ["metrics"]
+experimental_metrics_custom_reader = ["metrics"]
 experimental_logs_batch_log_processor_with_async_runtime = ["logs", "experimental_async_runtime"]
 experimental_logs_concurrent_log_processor = ["logs"]
 experimental_trace_batch_span_processor_with_async_runtime = ["trace", "experimental_async_runtime"]
@@ -107,7 +108,7 @@ required-features = ["testing"]
 [[bench]]
 name = "metric"
 harness = false
-required-features = ["metrics", "spec_unstable_metrics_views"]
+required-features = ["metrics", "spec_unstable_metrics_views", "experimental_metrics_custom_reader"]
 
 [[bench]]
 name = "log"
diff --git a/opentelemetry-sdk/src/metrics/meter.rs b/opentelemetry-sdk/src/metrics/meter.rs
@@ -696,7 +696,7 @@ where
 mod tests {
     use std::borrow::Cow;
 
-    use crate::metrics::MetricError;
+    use crate::metrics::error::MetricError;
 
     use super::{
         validate_instrument_name, validate_instrument_unit, INSTRUMENT_NAME_EMPTY,
diff --git a/opentelemetry-sdk/src/metrics/meter_provider.rs b/opentelemetry-sdk/src/metrics/meter_provider.rs
@@ -16,8 +16,8 @@ use crate::error::OTelSdkResult;
 use crate::Resource;
 
 use super::{
-    exporter::PushMetricExporter, meter::SdkMeter, noop::NoopMeter, pipeline::Pipelines,
-    reader::MetricReader, view::View, PeriodicReader,
+    exporter::PushMetricExporter, meter::SdkMeter, noop::NoopMeter,
+    periodic_reader::PeriodicReader, pipeline::Pipelines, reader::MetricReader, view::View,
 };
 
 /// Handles the creation and coordination of [Meter]s.
diff --git a/opentelemetry-sdk/src/metrics/mod.rs b/opentelemetry-sdk/src/metrics/mod.rs
@@ -39,12 +39,15 @@
 //!
 //! [Resource]: crate::Resource
 
+#[allow(unreachable_pub)]
+#[allow(unused)]
 pub(crate) mod aggregation;
 pub mod data;
 mod error;
 pub mod exporter;
 pub(crate) mod instrument;
 pub(crate) mod internal;
+#[cfg(feature = "experimental_metrics_custom_reader")]
 pub(crate) mod manual_reader;
 pub(crate) mod meter;
 mod meter_provider;
@@ -54,7 +57,10 @@ pub(crate) mod periodic_reader;
 /// Module for periodic reader with async runtime.
 pub mod periodic_reader_with_async_runtime;
 pub(crate) mod pipeline;
+#[cfg(feature = "experimental_metrics_custom_reader")]
 pub mod reader;
+#[cfg(not(feature = "experimental_metrics_custom_reader"))]
+pub(crate) mod reader;
 pub(crate) mod view;
 
 /// In-Memory metric exporter for testing purpose.
@@ -65,25 +71,25 @@ pub mod in_memory_exporter;
 #[cfg_attr(docsrs, doc(cfg(any(feature = "testing", test))))]
 pub use in_memory_exporter::{InMemoryMetricExporter, InMemoryMetricExporterBuilder};
 
+#[cfg(feature = "spec_unstable_metrics_views")]
 pub use aggregation::*;
 #[cfg(feature = "spec_unstable_metrics_views")]
 pub use error::{MetricError, MetricResult};
+#[cfg(feature = "experimental_metrics_custom_reader")]
 pub use manual_reader::*;
 pub use meter_provider::*;
 pub use periodic_reader::*;
+#[cfg(feature = "experimental_metrics_custom_reader")]
 pub use pipeline::Pipeline;
 
+#[cfg(feature = "experimental_metrics_custom_reader")]
 pub use instrument::InstrumentKind;
 
 #[cfg(feature = "spec_unstable_metrics_views")]
 pub use instrument::*;
-// #[cfg(not(feature = "spec_unstable_metrics_views"))]
-// pub(crate) use instrument::*;
 
 #[cfg(feature = "spec_unstable_metrics_views")]
 pub use view::*;
-// #[cfg(not(feature = "spec_unstable_metrics_views"))]
-// pub(crate) use view::*;
 
 use std::hash::Hash;
 
diff --git a/opentelemetry-sdk/src/metrics/periodic_reader.rs b/opentelemetry-sdk/src/metrics/periodic_reader.rs
@@ -17,7 +17,8 @@ use crate::{
 };
 
 use super::{
-    data::ResourceMetrics, instrument::InstrumentKind, reader::MetricReader, Pipeline, Temporality,
+    data::ResourceMetrics, instrument::InstrumentKind, pipeline::Pipeline, reader::MetricReader,
+    Temporality,
 };
 
 const DEFAULT_INTERVAL: Duration = Duration::from_secs(60);
diff --git a/opentelemetry-sdk/src/metrics/periodic_reader_with_async_runtime.rs b/opentelemetry-sdk/src/metrics/periodic_reader_with_async_runtime.rs
@@ -20,7 +20,9 @@ use crate::{
     Resource,
 };
 
-use super::{data::ResourceMetrics, reader::MetricReader, InstrumentKind, Pipeline};
+use super::{
+    data::ResourceMetrics, instrument::InstrumentKind, pipeline::Pipeline, reader::MetricReader,
+};
 
 const DEFAULT_TIMEOUT: Duration = Duration::from_secs(30);
 const DEFAULT_INTERVAL: Duration = Duration::from_secs(60);
diff --git a/opentelemetry-sdk/src/metrics/pipeline.rs b/opentelemetry-sdk/src/metrics/pipeline.rs
@@ -23,7 +23,7 @@ use crate::{
 
 use self::internal::AggregateFns;
 
-use super::{Aggregation, Temporality};
+use super::{aggregation::Aggregation, Temporality};
 
 /// Connects all of the instruments created by a meter provider to a [MetricReader].
 ///
diff --git a/opentelemetry-sdk/src/metrics/reader.rs b/opentelemetry-sdk/src/metrics/reader.rs
@@ -3,7 +3,7 @@ use crate::error::OTelSdkResult;
 use std::time::Duration;
 use std::{fmt, sync::Weak};
 
-use super::{data::ResourceMetrics, pipeline::Pipeline, InstrumentKind, Temporality};
+use super::{data::ResourceMetrics, instrument::InstrumentKind, pipeline::Pipeline, Temporality};
 
 /// The interface used between the SDK and an exporter.
 ///
diff --git a/opentelemetry-sdk/src/testing/metrics/metric_reader.rs b/opentelemetry-sdk/src/testing/metrics/metric_reader.rs
@@ -1,7 +1,7 @@
 use crate::error::{OTelSdkError, OTelSdkResult};
 use crate::metrics::Temporality;
 use crate::metrics::{
-    data::ResourceMetrics, pipeline::Pipeline, reader::MetricReader, InstrumentKind,
+    data::ResourceMetrics, instrument::InstrumentKind, pipeline::Pipeline, reader::MetricReader,
 };
 use std::sync::{Arc, Mutex, Weak};
 use std::time::Duration;
diff --git a/stress/Cargo.toml b/stress/Cargo.toml
@@ -52,7 +52,7 @@ ctrlc = { workspace = true }
 lazy_static = { workspace = true }
 num_cpus = { workspace = true }
 opentelemetry = { path = "../opentelemetry", features = ["metrics", "logs", "trace", "spec_unstable_logs_enabled"] }
-opentelemetry_sdk = { path = "../opentelemetry-sdk", features = ["metrics", "logs", "trace", "spec_unstable_logs_enabled", "experimental_logs_concurrent_log_processor"] }
+opentelemetry_sdk = { path = "../opentelemetry-sdk", features = ["metrics", "logs", "trace", "spec_unstable_logs_enabled", "experimental_logs_concurrent_log_processor", "experimental_metrics_custom_reader"] }
 opentelemetry-appender-tracing = { workspace = true, features = ["spec_unstable_logs_enabled"] }
 rand = { workspace = true, features = ["small_rng", "os_rng"] }
 tracing = { workspace = true, features = ["std"]}
