update more otel stuff

Author: mellowagain

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
       - run: cargo test --features=prometheus-exporter,metrics-0_21
       - run: cargo test --features=prometheus-exporter,prometheus-0_13
       - run: cargo test --features=prometheus-exporter,prometheus-client-0_22,exemplars-tracing
-      - run: cargo test --features=prometheus-exporter,prometheus-client-0_22,exemplars-tracing-opentelemetry-0_24
+      - run: cargo test --features=prometheus-exporter,prometheus-client-0_22,exemplars-tracing-opentelemetry-0_25
       - run: cargo test --features=prometheus-exporter,opentelemetry-0_24
 
       # Build the crate using the other optional features

autometrics/Cargo.toml

@@ -24,7 +24,7 @@ metrics = ["metrics-0_21"]
 opentelemetry = ["opentelemetry-0_24"]
 prometheus = ["prometheus-0_13"]
 prometheus-client = ["prometheus-client-0_22"]
-exemplars-tracing-opentelemetry = ["exemplars-tracing-opentelemetry-0_24"]
+exemplars-tracing-opentelemetry = ["exemplars-tracing-opentelemetry-0_25"]
 
 # Misc
 prometheus-exporter = [
@@ -72,11 +72,11 @@ otel-push-exporter-async-std = [
 
 # Exemplars
 exemplars-tracing = ["tracing", "tracing-subscriber"]
-exemplars-tracing-opentelemetry-0_24 = [
+exemplars-tracing-opentelemetry-0_25 = [
   "dep:opentelemetry",
   "opentelemetry_sdk/trace",
   "tracing",
-  "dep:tracing-opentelemetry-0-24",
+  "dep:tracing-opentelemetry",
 ]
 
 # Custom objectives
@@ -99,7 +99,7 @@ metrics = { version = "0.21", default-features = false, optional = true }
 # Used for prometheus-exporter feature
 http = { version = "1.0.0", optional = true }
 metrics-exporter-prometheus = { version = "0.12", default-features = false, optional = true }
-opentelemetry-prometheus = { version = "0.16", optional = true }
+opentelemetry-prometheus = { version = "0.17", optional = true }
 opentelemetry_sdk = { version = "0.24.1", default-features = false, features = [
   "metrics",
 ], optional = true }
@@ -116,7 +116,7 @@ tracing-subscriber = { version = "0.3", default-features = false, features = [
 ], optional = true }
 
 # Used for exemplars-tracing-opentelemetry feature
-tracing-opentelemetry-0-24 = { package = "tracing-opentelemetry", version = "0.24", default-features = false, optional = true }
+tracing-opentelemetry = { version = "0.25", default-features = false, optional = true }
 
 [dev-dependencies]
 async-trait = "0.1.74"

autometrics/build.rs

@@ -12,7 +12,7 @@ pub fn main() {
     #[cfg(feature = "prometheus-client")]
     println!("cargo:warning=The `prometheus-client` feature is deprecated and will be removed in the next version. Please use `prometheus-client-0_22` instead.");
     #[cfg(feature = "exemplars-tracing-opentelemetry")]
-    println!("cargo:warning=The `exemplars-tracing-opentelemetry` feature is deprecated and will be removed in the next version. Please use `exemplars-tracing-opentelemetry-0_24` instead.");
+    println!("cargo:warning=The `exemplars-tracing-opentelemetry` feature is deprecated and will be removed in the next version. Please use `exemplars-tracing-opentelemetry-0_25` instead.");
 
     cfg_aliases! {
       // Backends
@@ -32,7 +32,7 @@ pub fn main() {
       // Exemplars
       exemplars: { any(exemplars_tracing, exemplars_tracing_opentelemetry) },
       exemplars_tracing: { feature = "exemplars-tracing" },
-      exemplars_tracing_opentelemetry: { any(feature = "exemplars-tracing-opentelemetry-0_24", feature = "exemplars-tracing-opentelemetry") },
+      exemplars_tracing_opentelemetry: { any(feature = "exemplars-tracing-opentelemetry-0_25", feature = "exemplars-tracing-opentelemetry") },
 
       // Custom objectives
       custom_objective_percentile: { feature = "custom-objective-percentile" },

autometrics/src/exemplars/tracing_opentelemetry.rs

@@ -2,7 +2,7 @@ use super::TraceLabels;
 use opentelemetry::trace::TraceContextExt as _;
 use std::iter::FromIterator;
 use tracing::Span;
-use tracing_opentelemetry_0_24::OpenTelemetrySpanExt;
+use tracing_opentelemetry::OpenTelemetrySpanExt;
 
 pub fn get_exemplar() -> Option<TraceLabels> {
     // Get the OpenTelemetry Context from the tracing span

autometrics/src/lib.rs

@@ -9,7 +9,7 @@ mod constants;
 #[cfg(any(
     feature = "exemplars-tracing",
     feature = "exemplars-tracing-opentelemetry",
-    feature = "exemplars-tracing-opentelemetry-0_24",
+    feature = "exemplars-tracing-opentelemetry-0_25",
 ))]
 pub mod exemplars;
 mod labels;

autometrics/src/otel_push_exporter.rs

@@ -1,17 +1,17 @@
 use opentelemetry::metrics::MetricsError;
 use opentelemetry_otlp::{ExportConfig, Protocol, WithExportConfig};
 use opentelemetry_otlp::{OtlpMetricPipeline, OTEL_EXPORTER_OTLP_TIMEOUT_DEFAULT};
-use opentelemetry_sdk::metrics::MeterProvider;
+use opentelemetry_sdk::metrics::SdkMeterProvider;
 use std::ops::Deref;
 use std::time::Duration;
 
-/// Newtype struct holding a [`MeterProvider`] with a custom `Drop` implementation to automatically clean up itself
+/// Newtype struct holding a [`SdkMeterProvider`] with a custom `Drop` implementation to automatically clean up itself
 #[repr(transparent)]
 #[must_use = "Assign this to a unused variable instead: `let _meter = ...` (NOT `let _ = ...`), as else it will be dropped immediately - which will cause it to be shut down"]
-pub struct OtelMeterProvider(MeterProvider);
+pub struct OtelMeterProvider(SdkMeterProvider);
 
 impl Deref for OtelMeterProvider {
-    type Target = MeterProvider;
+    type Target = SdkMeterProvider;
 
     fn deref(&self) -> &Self::Target {
         &self.0

autometrics/src/prometheus_exporter.rs

@@ -29,6 +29,8 @@ use metrics_exporter_prometheus::{BuildError, PrometheusBuilder, PrometheusHandl
 use once_cell::sync::OnceCell;
 #[cfg(opentelemetry)]
 use opentelemetry::metrics::MetricsError;
+#[cfg(opentelemetry)]
+use opentelemetry_sdk::metrics::SdkMeterProvider;
 #[cfg(any(opentelemetry, prometheus))]
 use prometheus::TextEncoder;
 use thiserror::Error;
@@ -213,7 +215,7 @@ fn initialize_prometheus_exporter() -> Result<GlobalPrometheus, ExporterInitiali
         use opentelemetry::global;
         use opentelemetry_prometheus::exporter;
         use opentelemetry_sdk::metrics::reader::AggregationSelector;
-        use opentelemetry_sdk::metrics::{Aggregation, InstrumentKind, MeterProvider};
+        use opentelemetry_sdk::metrics::{Aggregation, InstrumentKind};
 
         /// A custom aggregation selector that uses the configured histogram buckets,
         /// along with the other default aggregation settings.
@@ -228,7 +230,9 @@ fn initialize_prometheus_exporter() -> Result<GlobalPrometheus, ExporterInitiali
                     | InstrumentKind::UpDownCounter
                     | InstrumentKind::ObservableCounter
                     | InstrumentKind::ObservableUpDownCounter => Aggregation::Sum,
-                    InstrumentKind::ObservableGauge => Aggregation::LastValue,
+                    InstrumentKind::ObservableGauge | InstrumentKind::Gauge => {
+                        Aggregation::LastValue
+                    }
                     InstrumentKind::Histogram => Aggregation::ExplicitBucketHistogram {
                         boundaries: self.histogram_buckets.clone(),
                         record_min_max: false,
@@ -246,7 +250,7 @@ fn initialize_prometheus_exporter() -> Result<GlobalPrometheus, ExporterInitiali
             .without_target_info()
             .build()?;
 
-        let meter_provider = MeterProvider::builder().with_reader(exporter).build();
+        let meter_provider = SdkMeterProvider::builder().with_reader(exporter).build();
 
         global::set_meter_provider(meter_provider);
     }

autometrics/src/settings.rs

@@ -195,7 +195,7 @@ impl AutometricsSettingsBuilder {
         let (prometheus_client_registry, prometheus_client_metrics) =
             crate::tracker::prometheus_client::initialize_registry(
                 self.prometheus_client_registry
-                    .unwrap_or_else(|| <prometheus_client::registry::Registry>::default()),
+                    .unwrap_or_else(<prometheus_client::registry::Registry>::default),
             );
 
         let repo_url = self

autometrics/tests/exemplars_test.rs

@@ -70,8 +70,8 @@ fn tracing_opentelemetry_context() {
     let tracer = provider.tracer("test");
 
     // This adds the OpenTelemetry Context to every tracing Span
-    #[cfg(feature = "exemplars-tracing-opentelemetry-0_24")]
-    let otel_layer = tracing_opentelemetry_0_22::layer().with_tracer(tracer);
+    #[cfg(feature = "exemplars-tracing-opentelemetry-0_25")]
+    let otel_layer = tracing_opentelemetry::layer().with_tracer(tracer);
 
     let subscriber = Registry::default().with(otel_layer);
 

examples/exemplars-tracing-opentelemetry/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 autometrics = { path = "../../autometrics", features = [
   "prometheus-client-0_22",
   "prometheus-exporter",
-  "exemplars-tracing-opentelemetry-0_24",
+  "exemplars-tracing-opentelemetry-0_25",
 ] }
 autometrics-example-util = { path = "../util" }
 axum = { version = "0.7.2", features = ["json"] }