Merge branch 'main' into expose-builders

Author: cijothomas

.github/workflows/ci.yml

@@ -98,6 +98,8 @@ jobs:
         with:
           toolchain: nightly-2024-06-30
           components: rustfmt
+      - name: Patch dependencies versions
+        run: bash ./scripts/patch_dependencies.sh
       - name: external-type-check
         run: |
           cargo install [email protected]
@@ -218,11 +220,11 @@ jobs:
   build-examples:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable
         with:
           components: rustfmt
-      - uses: arduino/setup-protoc@v3
+      - uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Build examples

examples/tracing-http-propagator/src/server.rs

@@ -19,6 +19,7 @@ use opentelemetry_sdk::{
 };
 use opentelemetry_semantic_conventions::trace;
 use opentelemetry_stdout::{LogExporter, SpanExporter};
+use std::time::Duration;
 use std::{convert::Infallible, net::SocketAddr, sync::OnceLock};
 use tokio::net::TcpListener;
 use tracing::info;
@@ -131,7 +132,7 @@ impl SpanProcessor for EnrichWithBaggageSpanProcessor {
         Ok(())
     }
 
-    fn shutdown(&self) -> OTelSdkResult {
+    fn shutdown_with_timeout(&self, _timeout: Duration) -> OTelSdkResult {
         Ok(())
     }
 

opentelemetry-proto/src/transform/metrics.rs

@@ -114,9 +114,13 @@ pub mod tonic {
         fn from(rm: &ResourceMetrics) -> Self {
             ExportMetricsServiceRequest {
                 resource_metrics: vec![TonicResourceMetrics {
-                    resource: Some((&rm.resource).into()),
-                    scope_metrics: rm.scope_metrics.iter().map(Into::into).collect(),
-                    schema_url: rm.resource.schema_url().map(Into::into).unwrap_or_default(),
+                    resource: Some((rm.resource()).into()),
+                    scope_metrics: rm.scope_metrics().map(Into::into).collect(),
+                    schema_url: rm
+                        .resource()
+                        .schema_url()
+                        .map(Into::into)
+                        .unwrap_or_default(),
                 }],
             }
         }
@@ -135,10 +139,10 @@ pub mod tonic {
     impl From<&SdkScopeMetrics> for TonicScopeMetrics {
         fn from(sm: &SdkScopeMetrics) -> Self {
             TonicScopeMetrics {
-                scope: Some((&sm.scope, None).into()),
-                metrics: sm.metrics.iter().map(Into::into).collect(),
+                scope: Some((sm.scope(), None).into()),
+                metrics: sm.metrics().map(Into::into).collect(),
                 schema_url: sm
-                    .scope
+                    .scope()
                     .schema_url()
                     .map(ToOwned::to_owned)
                     .unwrap_or_default(),
@@ -149,11 +153,11 @@ pub mod tonic {
     impl From<&SdkMetric> for TonicMetric {
         fn from(metric: &SdkMetric) -> Self {
             TonicMetric {
-                name: metric.name.to_string(),
-                description: metric.description.to_string(),
-                unit: metric.unit.to_string(),
+                name: metric.name().to_string(),
+                description: metric.description().to_string(),
+                unit: metric.unit().to_string(),
                 metadata: vec![], // internal and currently unused
-                data: Some(match &metric.data {
+                data: Some(match metric.data() {
                     AggregatedMetrics::F64(data) => data.into(),
                     AggregatedMetrics::U64(data) => data.into(),
                     AggregatedMetrics::I64(data) => data.into(),
@@ -208,17 +212,16 @@ pub mod tonic {
         fn from(hist: &SdkHistogram<T>) -> Self {
             TonicHistogram {
                 data_points: hist
-                    .data_points
-                    .iter()
+                    .data_points()
                     .map(|dp| TonicHistogramDataPoint {
-                        attributes: dp.attributes.iter().map(Into::into).collect(),
+                        attributes: dp.attributes().map(Into::into).collect(),
                         start_time_unix_nano: to_nanos(hist.start_time),
                         time_unix_nano: to_nanos(hist.time),
                         count: dp.count,
                         sum: Some(dp.sum.into_f64()),
-                        bucket_counts: dp.bucket_counts.clone(),
-                        explicit_bounds: dp.bounds.clone(),
-                        exemplars: dp.exemplars.iter().map(Into::into).collect(),
+                        bucket_counts: dp.bucket_counts().collect(),
+                        explicit_bounds: dp.bounds().collect(),
+                        exemplars: dp.exemplars().map(Into::into).collect(),
                         flags: TonicDataPointFlags::default() as u32,
                         min: dp.min.map(Numeric::into_f64),
                         max: dp.max.map(Numeric::into_f64),
@@ -236,10 +239,9 @@ pub mod tonic {
         fn from(hist: &SdkExponentialHistogram<T>) -> Self {
             TonicExponentialHistogram {
                 data_points: hist
-                    .data_points
-                    .iter()
+                    .data_points()
                     .map(|dp| TonicExponentialHistogramDataPoint {
-                        attributes: dp.attributes.iter().map(Into::into).collect(),
+                        attributes: dp.attributes().map(Into::into).collect(),
                         start_time_unix_nano: to_nanos(hist.start_time),
                         time_unix_nano: to_nanos(hist.time),
                         count: dp.count as u64,
@@ -255,7 +257,7 @@ pub mod tonic {
                             bucket_counts: dp.negative_bucket.counts.clone(),
                         }),
                         flags: TonicDataPointFlags::default() as u32,
-                        exemplars: dp.exemplars.iter().map(Into::into).collect(),
+                        exemplars: dp.exemplars().map(Into::into).collect(),
                         min: dp.min.map(Numeric::into_f64),
                         max: dp.max.map(Numeric::into_f64),
                         zero_threshold: dp.zero_threshold,
@@ -273,13 +275,12 @@ pub mod tonic {
         fn from(sum: &SdkSum<T>) -> Self {
             TonicSum {
                 data_points: sum
-                    .data_points
-                    .iter()
+                    .data_points()
                     .map(|dp| TonicNumberDataPoint {
-                        attributes: dp.attributes.iter().map(Into::into).collect(),
+                        attributes: dp.attributes().map(Into::into).collect(),
                         start_time_unix_nano: to_nanos(sum.start_time),
                         time_unix_nano: to_nanos(sum.time),
-                        exemplars: dp.exemplars.iter().map(Into::into).collect(),
+                        exemplars: dp.exemplars().map(Into::into).collect(),
                         flags: TonicDataPointFlags::default() as u32,
                         value: Some(dp.value.into()),
                     })
@@ -297,13 +298,12 @@ pub mod tonic {
         fn from(gauge: &SdkGauge<T>) -> Self {
             TonicGauge {
                 data_points: gauge
-                    .data_points
-                    .iter()
+                    .data_points()
                     .map(|dp| TonicNumberDataPoint {
-                        attributes: dp.attributes.iter().map(Into::into).collect(),
+                        attributes: dp.attributes().map(Into::into).collect(),
                         start_time_unix_nano: gauge.start_time.map(to_nanos).unwrap_or_default(),
                         time_unix_nano: to_nanos(gauge.time),
-                        exemplars: dp.exemplars.iter().map(Into::into).collect(),
+                        exemplars: dp.exemplars().map(Into::into).collect(),
                         flags: TonicDataPointFlags::default() as u32,
                         value: Some(dp.value.into()),
                     })
@@ -319,8 +319,7 @@ pub mod tonic {
         fn from(ex: &SdkExemplar<T>) -> Self {
             TonicExemplar {
                 filtered_attributes: ex
-                    .filtered_attributes
-                    .iter()
+                    .filtered_attributes()
                     .map(|kv| (&kv.key, &kv.value).into())
                     .collect(),
                 time_unix_nano: to_nanos(ex.time),

opentelemetry-sdk/CHANGELOG.md

@@ -25,6 +25,7 @@ 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)
+- The `shutdown_with_timeout` method is added to SpanProcessor, SpanExporter trait and TracerProvider.
 - The `shutdown_with_timeout` method is added to LogExporter trait.
 - The `shutdown_with_timeout` method is added to LogProvider and LogProcessor trait.
 - *Breaking* `MetricError`, `MetricResult` no longer public (except when
@@ -41,12 +42,39 @@ also modified to suppress telemetry before invoking exporters.
   behind feature flag "experimental_metrics_custom_reader".
   [#2928](https://github.com/open-telemetry/opentelemetry-rust/pull/2928)
 
+- TODO: Placeholder for View related changelog. Polish this after all
+  changes are done.
+  Hide public fields from `Stream` struct.
+
 - *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)
 - *Breaking* change, affecting custom `PushMetricExporter` authors:
   - The `export` method on `PushMetricExporter` now accepts `&ResourceMetrics`
     instead of `&mut ResourceMetrics`.
+  - `ResourceMetrics` no longer exposes `scope_metrics` field, but instead
+    offers `scope_metrics()` method that returns an iterator over the same.
+  - `ScopeMetrics` no longer exposes `metrics` field, but instead offers
+    `metrics()` method that returns an iterator over the same.
+  - `Sum`, `Gauge`, `Histogram` & `ExponentialHistogram` no longer exposes
+    `data_points` field, but instead offers `data_points()` method that returns
+    an iterator over the same.
+  - `SumDataPoint`, `GaugeDataPoint`, `HistogramDataPoint` &
+    `ExponentialHistogramDataPoint` no longer exposes `attributes`, `exemplars`
+    field, but instead offers `attributes()`, and `exemplars()` method that
+    returns an iterator over the same.
+  - `Exemplar` no longer exposes `filtered_attributes` field, but instead
+     offers `filtered_attributes()` method that returns an iterator over
+     the same.
+  - `HistogramDataPoint` no longer exposes `bounds` and `bucket_counts`, but
+    instead offers `bounds()` and `bucket_counts()` methods that returns an
+    iterator over the same.
+  - `Metric` no longer exposes `name`, `description`, `unit`, `data` fields, but
+    instead offers `name()`, `description()`, `unit()`, and `data()` accessor methods.
+  - `ResourceMetrics` no longer exposes `resource` field, but instead offers
+    a `resource()` accessor method.
+  - `ScopeMetrics` no longer exposes `scope` field, but instead offers
+    a `scope()` accessor method.
 
 ## 0.29.0
 

opentelemetry-sdk/benches/metric.rs

@@ -9,7 +9,6 @@ use opentelemetry_sdk::{
         data::ResourceMetrics, new_view, reader::MetricReader, Aggregation, Instrument,
         InstrumentKind, ManualReader, Pipeline, SdkMeterProvider, Stream, Temporality, View,
     },
-    Resource,
 };
 use rand::Rng;
 use std::sync::{Arc, Weak};
@@ -240,10 +239,7 @@ fn counters(c: &mut Criterion) {
     });
 
     let (rdr, cntr) = bench_counter(None, "cumulative");
-    let mut rm = ResourceMetrics {
-        resource: Resource::builder_empty().build(),
-        scope_metrics: Vec::new(),
-    };
+    let mut rm = ResourceMetrics::default();
 
     group.bench_function("CollectOneAttr", |b| {
         let mut v = 0;
@@ -337,10 +333,7 @@ fn benchmark_collect_histogram(b: &mut Bencher, n: usize) {
         h.record(1, &[]);
     }
 
-    let mut rm = ResourceMetrics {
-        resource: Resource::builder_empty().build(),
-        scope_metrics: Vec::new(),
-    };
+    let mut rm = ResourceMetrics::default();
 
     b.iter(|| {
         let _ = r.collect(&mut rm);

opentelemetry-sdk/src/logs/batch_log_processor.rs

@@ -101,8 +101,6 @@ type LogsData = Box<(SdkLogRecord, InstrumentationScope)>;
 /// cause deadlock. Instead, call `shutdown()` from a separate thread or use
 /// tokio's `spawn_blocking`.
 ///
-/// [`shutdown()`]: crate::logs::LoggerProvider::shutdown
-/// [`force_flush()`]: crate::logs::LoggerProvider::force_flush
 ///
 /// ### Using a BatchLogProcessor:
 ///

opentelemetry-sdk/src/metrics/aggregation.rs

@@ -151,10 +151,8 @@ impl Aggregation {
 #[cfg(test)]
 mod tests {
     use crate::metrics::error::{MetricError, MetricResult};
-    use crate::metrics::{
-        internal::{EXPO_MAX_SCALE, EXPO_MIN_SCALE},
-        Aggregation,
-    };
+    use crate::metrics::internal::{EXPO_MAX_SCALE, EXPO_MIN_SCALE};
+    use crate::metrics::Aggregation;
 
     #[test]
     fn validate_aggregation() {