feat(rust): accept the global meter provider without a wrapper type

templates/code/rust/README.md

@@ -71,6 +71,17 @@ let tracer = semconv::tracer::Tracer::new(&provider, options);
 ```
 
 Use `InstrumentationOptions::default()` when no scope attributes are needed.
+
+The constructors accept unsized providers, so a handle can come straight from
+the global provider without a wrapper type:
+
+```rust
+let meter = semconv::meter::Meter::new(
+    &*opentelemetry::global::meter_provider(),
+    semconv::options::InstrumentationOptions::default(),
+);
+```
+
 The instrumentation identity is fixed during generation. Set
 `instrumentation_name` and `instrumentation_version` in the Weaver params to
 choose its name and version. The name defaults to `generated-semconv`; an empty

templates/code/rust/logger.rs.j2

@@ -5,7 +5,7 @@ use super::options::InstrumentationOptions;
 pub struct Logger<L: opentelemetry::logs::Logger = <opentelemetry::logs::NoopLoggerProvider as opentelemetry::logs::LoggerProvider>::Logger>(L);
 
 impl<L: opentelemetry::logs::Logger> Logger<L> {
-    pub fn new<P: opentelemetry::logs::LoggerProvider<Logger = L>>(provider: &P, options: InstrumentationOptions) -> Self {
+    pub fn new<P: opentelemetry::logs::LoggerProvider<Logger = L> + ?Sized>(provider: &P, options: InstrumentationOptions) -> Self {
         let logger = provider.logger_with_scope(options.scope.into());
         Self(logger)
     }

templates/code/rust/meter.rs.j2

@@ -5,7 +5,7 @@ use super::options::InstrumentationOptions;
 pub struct Meter(opentelemetry::metrics::Meter);
 
 impl Meter {
-    pub fn new(provider: &impl opentelemetry::metrics::MeterProvider, options: InstrumentationOptions) -> Self {
+    pub fn new(provider: &(impl opentelemetry::metrics::MeterProvider + ?Sized), options: InstrumentationOptions) -> Self {
         let meter = provider.meter_with_scope(options.scope.into());
         Self(meter)
     }

templates/code/rust/tests/allocations/expected/logger.rs

@@ -4,7 +4,7 @@ use super::options::InstrumentationOptions;
 pub struct Logger<L: opentelemetry::logs::Logger = <opentelemetry::logs::NoopLoggerProvider as opentelemetry::logs::LoggerProvider>::Logger>(L);
 
 impl<L: opentelemetry::logs::Logger> Logger<L> {
-    pub fn new<P: opentelemetry::logs::LoggerProvider<Logger = L>>(provider: &P, options: InstrumentationOptions) -> Self {
+    pub fn new<P: opentelemetry::logs::LoggerProvider<Logger = L> + ?Sized>(provider: &P, options: InstrumentationOptions) -> Self {
         let logger = provider.logger_with_scope(options.scope.into());
         Self(logger)
     }

templates/code/rust/tests/allocations/expected/meter.rs

@@ -4,7 +4,7 @@ use super::options::InstrumentationOptions;
 pub struct Meter(opentelemetry::metrics::Meter);
 
 impl Meter {
-    pub fn new(provider: &impl opentelemetry::metrics::MeterProvider, options: InstrumentationOptions) -> Self {
+    pub fn new(provider: &(impl opentelemetry::metrics::MeterProvider + ?Sized), options: InstrumentationOptions) -> Self {
         let meter = provider.meter_with_scope(options.scope.into());
         Self(meter)
     }

templates/code/rust/tests/event_no_attributes/expected/logger.rs

@@ -4,7 +4,7 @@ use super::options::InstrumentationOptions;
 pub struct Logger<L: opentelemetry::logs::Logger = <opentelemetry::logs::NoopLoggerProvider as opentelemetry::logs::LoggerProvider>::Logger>(L);
 
 impl<L: opentelemetry::logs::Logger> Logger<L> {
-    pub fn new<P: opentelemetry::logs::LoggerProvider<Logger = L>>(provider: &P, options: InstrumentationOptions) -> Self {
+    pub fn new<P: opentelemetry::logs::LoggerProvider<Logger = L> + ?Sized>(provider: &P, options: InstrumentationOptions) -> Self {
         let logger = provider.logger_with_scope(options.scope.into());
         Self(logger)
     }

templates/code/rust/tests/events/expected/logger.rs

@@ -4,7 +4,7 @@ use super::options::InstrumentationOptions;
 pub struct Logger<L: opentelemetry::logs::Logger = <opentelemetry::logs::NoopLoggerProvider as opentelemetry::logs::LoggerProvider>::Logger>(L);
 
 impl<L: opentelemetry::logs::Logger> Logger<L> {
-    pub fn new<P: opentelemetry::logs::LoggerProvider<Logger = L>>(provider: &P, options: InstrumentationOptions) -> Self {
+    pub fn new<P: opentelemetry::logs::LoggerProvider<Logger = L> + ?Sized>(provider: &P, options: InstrumentationOptions) -> Self {
         let logger = provider.logger_with_scope(options.scope.into());
         Self(logger)
     }

templates/code/rust/tests/histogram_boundaries_by_unit/expected/meter.rs

@@ -4,7 +4,7 @@ use super::options::InstrumentationOptions;
 pub struct Meter(opentelemetry::metrics::Meter);
 
 impl Meter {
-    pub fn new(provider: &impl opentelemetry::metrics::MeterProvider, options: InstrumentationOptions) -> Self {
+    pub fn new(provider: &(impl opentelemetry::metrics::MeterProvider + ?Sized), options: InstrumentationOptions) -> Self {
         let meter = provider.meter_with_scope(options.scope.into());
         Self(meter)
     }

templates/code/rust/tests/histogram_boundaries_by_unit_params/expected/meter.rs

@@ -4,7 +4,7 @@ use super::options::InstrumentationOptions;
 pub struct Meter(opentelemetry::metrics::Meter);
 
 impl Meter {
-    pub fn new(provider: &impl opentelemetry::metrics::MeterProvider, options: InstrumentationOptions) -> Self {
+    pub fn new(provider: &(impl opentelemetry::metrics::MeterProvider + ?Sized), options: InstrumentationOptions) -> Self {
         let meter = provider.meter_with_scope(options.scope.into());
         Self(meter)
     }

templates/code/rust/tests/imported/expected/logger.rs

@@ -4,7 +4,7 @@ use super::options::InstrumentationOptions;
 pub struct Logger<L: opentelemetry::logs::Logger = <opentelemetry::logs::NoopLoggerProvider as opentelemetry::logs::LoggerProvider>::Logger>(L);
 
 impl<L: opentelemetry::logs::Logger> Logger<L> {
-    pub fn new<P: opentelemetry::logs::LoggerProvider<Logger = L>>(provider: &P, options: InstrumentationOptions) -> Self {
+    pub fn new<P: opentelemetry::logs::LoggerProvider<Logger = L> + ?Sized>(provider: &P, options: InstrumentationOptions) -> Self {
         let logger = provider.logger_with_scope(options.scope.into());
         Self(logger)
     }

templates/code/rust/tests/imported/expected/meter.rs

@@ -4,7 +4,7 @@ use super::options::InstrumentationOptions;
 pub struct Meter(opentelemetry::metrics::Meter);
 
 impl Meter {
-    pub fn new(provider: &impl opentelemetry::metrics::MeterProvider, options: InstrumentationOptions) -> Self {
+    pub fn new(provider: &(impl opentelemetry::metrics::MeterProvider + ?Sized), options: InstrumentationOptions) -> Self {
         let meter = provider.meter_with_scope(options.scope.into());
         Self(meter)
     }

templates/code/rust/tests/imported/expected/tracer.rs

@@ -4,7 +4,7 @@ use super::options::InstrumentationOptions;
 pub struct Tracer<T: opentelemetry::trace::Tracer = opentelemetry::trace::noop::NoopTracer>(T);
 
 impl<T: opentelemetry::trace::Tracer> Tracer<T> {
-    pub fn new<P: opentelemetry::trace::TracerProvider<Tracer = T>>(provider: &P, options: InstrumentationOptions) -> Self {
+    pub fn new<P: opentelemetry::trace::TracerProvider<Tracer = T> + ?Sized>(provider: &P, options: InstrumentationOptions) -> Self {
         let tracer = provider.tracer_with_scope(options.scope.into());
         Self(tracer)
     }

templates/code/rust/tests/imported_typed/expected/logger.rs

@@ -4,7 +4,7 @@ use super::options::InstrumentationOptions;
 pub struct Logger<L: opentelemetry::logs::Logger = <opentelemetry::logs::NoopLoggerProvider as opentelemetry::logs::LoggerProvider>::Logger>(L);
 
 impl<L: opentelemetry::logs::Logger> Logger<L> {
-    pub fn new<P: opentelemetry::logs::LoggerProvider<Logger = L>>(provider: &P, options: InstrumentationOptions) -> Self {
+    pub fn new<P: opentelemetry::logs::LoggerProvider<Logger = L> + ?Sized>(provider: &P, options: InstrumentationOptions) -> Self {
         let logger = provider.logger_with_scope(options.scope.into());
         Self(logger)
     }

templates/code/rust/tests/imported_typed/expected/meter.rs

@@ -4,7 +4,7 @@ use super::options::InstrumentationOptions;
 pub struct Meter(opentelemetry::metrics::Meter);
 
 impl Meter {
-    pub fn new(provider: &impl opentelemetry::metrics::MeterProvider, options: InstrumentationOptions) -> Self {
+    pub fn new(provider: &(impl opentelemetry::metrics::MeterProvider + ?Sized), options: InstrumentationOptions) -> Self {
         let meter = provider.meter_with_scope(options.scope.into());
         Self(meter)
     }

templates/code/rust/tests/imported_typed/expected/tracer.rs

@@ -4,7 +4,7 @@ use super::options::InstrumentationOptions;
 pub struct Tracer<T: opentelemetry::trace::Tracer = opentelemetry::trace::noop::NoopTracer>(T);
 
 impl<T: opentelemetry::trace::Tracer> Tracer<T> {
-    pub fn new<P: opentelemetry::trace::TracerProvider<Tracer = T>>(provider: &P, options: InstrumentationOptions) -> Self {
+    pub fn new<P: opentelemetry::trace::TracerProvider<Tracer = T> + ?Sized>(provider: &P, options: InstrumentationOptions) -> Self {
         let tracer = provider.tracer_with_scope(options.scope.into());
         Self(tracer)
     }

templates/code/rust/tests/literal_escaping/expected/meter.rs

@@ -4,7 +4,7 @@ use super::options::InstrumentationOptions;
 pub struct Meter(opentelemetry::metrics::Meter);
 
 impl Meter {
-    pub fn new(provider: &impl opentelemetry::metrics::MeterProvider, options: InstrumentationOptions) -> Self {
+    pub fn new(provider: &(impl opentelemetry::metrics::MeterProvider + ?Sized), options: InstrumentationOptions) -> Self {
         let meter = provider.meter_with_scope(options.scope.into());
         Self(meter)
     }

templates/code/rust/tests/metrics/expected/meter.rs

@@ -4,7 +4,7 @@ use super::options::InstrumentationOptions;
 pub struct Meter(opentelemetry::metrics::Meter);
 
 impl Meter {
-    pub fn new(provider: &impl opentelemetry::metrics::MeterProvider, options: InstrumentationOptions) -> Self {
+    pub fn new(provider: &(impl opentelemetry::metrics::MeterProvider + ?Sized), options: InstrumentationOptions) -> Self {
         let meter = provider.meter_with_scope(options.scope.into());
         Self(meter)
     }

templates/code/rust/tests/metrics/test.rs

@@ -365,3 +365,32 @@ fn instruments_expose_registry_metadata_as_constants() {
         metric::AuthAttempts::DESCRIPTION
     );
 }
+
+#[test]
+fn meter_accepts_the_global_provider_trait_object() {
+    let (provider, exporter) = provider();
+    opentelemetry::global::set_meter_provider(provider.clone());
+    let meter = meter::Meter::new(
+        &*opentelemetry::global::meter_provider(),
+        InstrumentationOptions::default(),
+    );
+    metric::MyappTaskStarted::new(&meter).add(
+        1,
+        [metric::MyappTaskStartedAttr::TaskId(
+            attribute::MyappTaskId::from("global"),
+        )],
+    );
+
+    provider.force_flush().unwrap();
+    let exported = exporter.get_finished_metrics().unwrap();
+    let scope = exported[0].scope_metrics().next().unwrap();
+    assert_eq!(scope.scope().name(), "generated-semconv");
+    assert_eq!(
+        scope.scope().schema_url(),
+        Some(generated_semconv::SCHEMA_URL)
+    );
+    assert_eq!(
+        scope.metrics().next().unwrap().name(),
+        metric::MyappTaskStarted::NAME
+    );
+}

templates/code/rust/tests/naming/expected/meter.rs

@@ -4,7 +4,7 @@ use super::options::InstrumentationOptions;
 pub struct Meter(opentelemetry::metrics::Meter);
 
 impl Meter {
-    pub fn new(provider: &impl opentelemetry::metrics::MeterProvider, options: InstrumentationOptions) -> Self {
+    pub fn new(provider: &(impl opentelemetry::metrics::MeterProvider + ?Sized), options: InstrumentationOptions) -> Self {
         let meter = provider.meter_with_scope(options.scope.into());
         Self(meter)
     }

templates/code/rust/tests/no_namespace/expected/logger.rs

@@ -4,7 +4,7 @@ use super::options::InstrumentationOptions;
 pub struct Logger<L: opentelemetry::logs::Logger = <opentelemetry::logs::NoopLoggerProvider as opentelemetry::logs::LoggerProvider>::Logger>(L);
 
 impl<L: opentelemetry::logs::Logger> Logger<L> {
-    pub fn new<P: opentelemetry::logs::LoggerProvider<Logger = L>>(provider: &P, options: InstrumentationOptions) -> Self {
+    pub fn new<P: opentelemetry::logs::LoggerProvider<Logger = L> + ?Sized>(provider: &P, options: InstrumentationOptions) -> Self {
         let logger = provider.logger_with_scope(options.scope.into());
         Self(logger)
     }

templates/code/rust/tests/no_namespace/expected/tracer.rs

@@ -4,7 +4,7 @@ use super::options::InstrumentationOptions;
 pub struct Tracer<T: opentelemetry::trace::Tracer = opentelemetry::trace::noop::NoopTracer>(T);
 
 impl<T: opentelemetry::trace::Tracer> Tracer<T> {
-    pub fn new<P: opentelemetry::trace::TracerProvider<Tracer = T>>(provider: &P, options: InstrumentationOptions) -> Self {
+    pub fn new<P: opentelemetry::trace::TracerProvider<Tracer = T> + ?Sized>(provider: &P, options: InstrumentationOptions) -> Self {
         let tracer = provider.tracer_with_scope(options.scope.into());
         Self(tracer)
     }

templates/code/rust/tests/params/expected/logger.rs

@@ -4,7 +4,7 @@ use super::options::InstrumentationOptions;
 pub struct Logger<L: opentelemetry::logs::Logger = <opentelemetry::logs::NoopLoggerProvider as opentelemetry::logs::LoggerProvider>::Logger>(L);
 
 impl<L: opentelemetry::logs::Logger> Logger<L> {
-    pub fn new<P: opentelemetry::logs::LoggerProvider<Logger = L>>(provider: &P, options: InstrumentationOptions) -> Self {
+    pub fn new<P: opentelemetry::logs::LoggerProvider<Logger = L> + ?Sized>(provider: &P, options: InstrumentationOptions) -> Self {
         let logger = provider.logger_with_scope(options.scope.into());
         Self(logger)
     }

templates/code/rust/tests/params/expected/meter.rs

@@ -4,7 +4,7 @@ use super::options::InstrumentationOptions;
 pub struct Meter(opentelemetry::metrics::Meter);
 
 impl Meter {
-    pub fn new(provider: &impl opentelemetry::metrics::MeterProvider, options: InstrumentationOptions) -> Self {
+    pub fn new(provider: &(impl opentelemetry::metrics::MeterProvider + ?Sized), options: InstrumentationOptions) -> Self {
         let meter = provider.meter_with_scope(options.scope.into());
         Self(meter)
     }

templates/code/rust/tests/params/expected/tracer.rs

@@ -4,7 +4,7 @@ use super::options::InstrumentationOptions;
 pub struct Tracer<T: opentelemetry::trace::Tracer = opentelemetry::trace::noop::NoopTracer>(T);
 
 impl<T: opentelemetry::trace::Tracer> Tracer<T> {
-    pub fn new<P: opentelemetry::trace::TracerProvider<Tracer = T>>(provider: &P, options: InstrumentationOptions) -> Self {
+    pub fn new<P: opentelemetry::trace::TracerProvider<Tracer = T> + ?Sized>(provider: &P, options: InstrumentationOptions) -> Self {
         let tracer = provider.tracer_with_scope(options.scope.into());
         Self(tracer)
     }

templates/code/rust/tests/spans/expected/tracer.rs

@@ -4,7 +4,7 @@ use super::options::InstrumentationOptions;
 pub struct Tracer<T: opentelemetry::trace::Tracer = opentelemetry::trace::noop::NoopTracer>(T);
 
 impl<T: opentelemetry::trace::Tracer> Tracer<T> {
-    pub fn new<P: opentelemetry::trace::TracerProvider<Tracer = T>>(provider: &P, options: InstrumentationOptions) -> Self {
+    pub fn new<P: opentelemetry::trace::TracerProvider<Tracer = T> + ?Sized>(provider: &P, options: InstrumentationOptions) -> Self {
         let tracer = provider.tracer_with_scope(options.scope.into());
         Self(tracer)
     }

templates/code/rust/tracer.rs.j2

@@ -5,7 +5,7 @@ use super::options::InstrumentationOptions;
 pub struct Tracer<T: opentelemetry::trace::Tracer = opentelemetry::trace::noop::NoopTracer>(T);
 
 impl<T: opentelemetry::trace::Tracer> Tracer<T> {
-    pub fn new<P: opentelemetry::trace::TracerProvider<Tracer = T>>(provider: &P, options: InstrumentationOptions) -> Self {
+    pub fn new<P: opentelemetry::trace::TracerProvider<Tracer = T> + ?Sized>(provider: &P, options: InstrumentationOptions) -> Self {
         let tracer = provider.tracer_with_scope(options.scope.into());
         Self(tracer)
     }