feat: use QCS core-deps; update OTEL version

Author: BatmanAoD

Cargo.lock

@@ -4,22 +4,34 @@ members = ["crates/*", "examples/*"]
 resolver = "2"
 
 [workspace.dependencies]
-# All OTEL packages must have the same version number.
+qcs-dependencies-client = { version = "0.3.1" }
+# opentelemetry, opentelemetry_sdk, tracing-opentelemetry: use qcs-dependencies-client
 # When updating the OTEL version, be sure to update these optional dependencies in `tracing-subscriber` as well:
 # * opentelemetry-otlp
 # * opentelemetry-proto
-opentelemetry = "0.30.0"
-opentelemetry_sdk = "0.30.0"
 pyo3 = { version = "0.27.2", features = ["macros"] }
 pyo3-async-runtimes = { version = "0.27", features = ["tokio-runtime"] }
 pyo3-build-config = "0.27.2"
-rigetti-pyo3 = "0.5.0"
+rigetti-pyo3 = { version = "0.5.5" }
 rstest = "0.17.0"
 serde = { version = "1.0.145", features = ["derive"] }
 thiserror = "2.0.17"
 tokio = { version = "1.36.0", features = [] }
 tracing = { version = "0.1.41", features = ["log"] }
 # Despite how close the version numbers are, this package's release numbers *do
 # not* match the OTEL SDK version that it requires.
-tracing-opentelemetry = "0.31.0"
 tracing-subscriber = "0.3.19"
+futures-core = "0.3.30"
+futures-util = "0.3.31"
+handlebars = "6.4.0"
+once_cell = "1.17.1"
+opentelemetry-otlp = "0.31.0"
+opentelemetry-proto = "0.31.0"
+proc-macro2 = "1.0.58"
+pyo3-opentelemetry = { path = "crates/opentelemetry" }
+pyo3-opentelemetry-macros = { version = "0.6.0", path = "crates/opentelemetry-macros" }
+pyo3-tracing-subscriber = { path = "crates/tracing-subscriber", default-features = false }
+quote = "1.0.26"
+serde_json = "1.0.128"
+syn = "2.0.14"
+# tonic: use qcs-dependencies-client (grpc feature)

Cargo.toml

@@ -16,9 +16,9 @@ rust-version = "1.83.0"
 proc-macro = true
 
 [dependencies]
-proc-macro2 = "1.0.58"
-quote = "1.0.26"
-syn = { version = "2.0.14", features = ["full", "derive"] }
+proc-macro2 = { workspace = true }
+quote = { workspace = true }
+syn = { workspace = true, features = ["full", "derive"] }
 
 [dev-dependencies]
 rstest = { workspace = true } 

crates/opentelemetry-macros/Cargo.toml

@@ -211,8 +211,8 @@ fn wrap_block_in_current_context(
     let error_handler: proc_macro2::TokenStream = match config.on_context_extraction_failure {
         RuntimeErrorHandler::Trace => syn::parse_quote! {
             if let Err(e) = #context_guard_name {
-                use opentelemetry::trace::TraceContextExt;
-                let ctx = opentelemetry::Context::current();
+                use ::pyo3_opentelemetry::__opentelemetry::trace::TraceContextExt;
+                let ctx = ::pyo3_opentelemetry::__opentelemetry::Context::current();
                 ctx.span().record_error(&e);
             }
         },

crates/opentelemetry-macros/src/lib.rs

@@ -11,18 +11,16 @@ repository = "https://github.com/rigetti/pyo3-opentelemetry"
 rust-version = "1.83.0"
 
 [dependencies]
-opentelemetry = { workspace = true }
-opentelemetry_sdk = { workspace = true }
+qcs-dependencies-client = { workspace = true }
 pyo3 = { workspace = true }
-pyo3-opentelemetry-macros = { path = "../opentelemetry-macros", version = "0.6.0" }
+pyo3-opentelemetry-macros = { workspace = true }
 
 [dev-dependencies]
-futures-util = "0.3.31"
-once_cell = "1.17.1"
-opentelemetry = { workspace = true, features = ["trace"] }
+futures-util = { workspace = true }
+once_cell = { workspace = true }
+qcs-dependencies-client = { workspace = true }
 tokio = { workspace = true, features = ["sync", "parking_lot", "macros"] }
 tracing = { workspace = true }
-tracing-opentelemetry = { workspace = true }
 tracing-subscriber = { workspace = true }
 
 [features]

crates/opentelemetry/Cargo.toml

@@ -97,10 +97,13 @@ use std::collections::HashMap;
 
 use pyo3::{prelude::*, types::IntoPyDict};
 
-use opentelemetry::{propagation::Extractor, Context};
+use qcs_dependencies_client::opentelemetry::{propagation::Extractor, Context};
 
 pub use pyo3_opentelemetry_macros::pypropagate;
 
+#[doc(hidden)]
+pub use qcs_dependencies_client::opentelemetry as __opentelemetry;
+
 /// A context carrier for propagating `OpenTelemetry` context from Python to Rust.
 #[derive(Default, Clone, Debug, FromPyObject)]
 struct Carrier {
@@ -142,10 +145,11 @@ impl Carrier {
     /// When a `Propagator` is passed to a function or method, this method should be called
     /// at the beginning of the function or method to attach the context. This should not be used with
     /// async functions.
-    fn attach(&self) -> opentelemetry::ContextGuard {
-        use opentelemetry::propagation::TextMapPropagator;
+    fn attach(&self) -> qcs_dependencies_client::opentelemetry::ContextGuard {
+        use qcs_dependencies_client::opentelemetry::propagation::TextMapPropagator;
 
-        let propagator = opentelemetry_sdk::propagation::TraceContextPropagator::new();
+        let propagator =
+            qcs_dependencies_client::opentelemetry_sdk::propagation::TraceContextPropagator::new();
         Context::attach(propagator.extract(self))
     }
 }
@@ -177,7 +181,9 @@ impl Carrier {
 /// Any Python error that occurs while trying to get the current context from Python will
 /// be returned; this includes import errors when importing `opentelemetry.context` and
 /// `opentelemetry.propagate`.
-pub fn attach_otel_context_from_python(py: Python<'_>) -> PyResult<opentelemetry::ContextGuard> {
+pub fn attach_otel_context_from_python(
+    py: Python<'_>,
+) -> PyResult<qcs_dependencies_client::opentelemetry::ContextGuard> {
     let get_current_context = py.import("opentelemetry.context")?.getattr("get_current")?;
     let inject = py.import("opentelemetry.propagate")?.getattr("inject")?;
 

crates/opentelemetry/src/lib.rs

@@ -11,28 +11,27 @@ repository = "https://github.com/rigetti/pyo3-opentelemetry"
 rust-version = "1.83.0"
 
 [dependencies]
-handlebars = { version = "6.4.0", optional = true }
+handlebars = { workspace = true, optional = true }
 pyo3 = { workspace = true, optional = true }
-opentelemetry = { workspace = true }
+qcs-dependencies-client = { workspace = true }
 # These packages *MUST* be kept in sync with the OTEL package versions; but
 # since they are optional, they cannot be workspace dependencies.
-opentelemetry-otlp = { version = "0.30.0", features = ["grpc-tonic", "trace", "tls-roots"], optional = true }
-opentelemetry-proto = { version = "0.30.0", optional = true, features = ["tonic"] }
-opentelemetry_sdk = { workspace = true, features = ["rt-tokio", "rt-tokio-current-thread"] }
+# opentelemetry-otlp: grpc-tonic and tls-roots features provided by qcs-dependencies-client
+opentelemetry-otlp = { workspace = true, features = ["trace"], optional = true }
+opentelemetry-proto = { workspace = true, features = ["tonic"], optional = true }
+opentelemetry_sdk = { version = "0.31.0", features = ["rt-tokio", "rt-tokio-current-thread"] }
 pyo3-async-runtimes = { workspace = true, features = ["tokio-runtime"], optional = true }
 rigetti-pyo3 = { workspace = true, features = [ "async-tokio", "opentelemetry" ] }
 serde = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread"] }
-tonic = { version = "0.13.1", features = ["tls-aws-lc", "tls-native-roots"], optional = true }
 tracing = { workspace = true }
-tracing-opentelemetry = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter", "fmt", "json"] }
-futures-core = "0.3.30"
-serde_json = "1.0.128"
+futures-core = { workspace = true }
+serde_json = { workspace = true }
 
 [features]
-layer-otel-otlp = ["layer-otel-otlp-file", "dep:tonic"]
+layer-otel-otlp = ["layer-otel-otlp-file", "qcs-dependencies-client/grpc"]
 layer-otel-otlp-file = ["dep:opentelemetry-otlp", "dep:opentelemetry-proto"]
 stubs = ["dep:handlebars"]
 pyo3 = ["dep:pyo3", "dep:pyo3-async-runtimes"]

crates/tracing-subscriber/Cargo.toml

@@ -1,8 +1,8 @@
 use std::borrow::Cow;
 use std::collections::HashMap;
 
-use opentelemetry::InstrumentationScope;
 use pyo3::prelude::*;
+use qcs_dependencies_client::opentelemetry::InstrumentationScope;
 use rigetti_pyo3::create_init_submodule;
 
 #[pyclass(name = "InstrumentationLibrary")]
@@ -45,9 +45,9 @@ impl From<PyInstrumentationLibrary> for InstrumentationScope {
         }
         let mut attributes = Vec::new();
         for (key, value) in py_instrumentation_library.attributes {
-            let kv = opentelemetry::KeyValue::new(
-                opentelemetry::Key::new(key),
-                opentelemetry::Value::from(value),
+            let kv = qcs_dependencies_client::opentelemetry::KeyValue::new(
+                qcs_dependencies_client::opentelemetry::Key::new(key),
+                qcs_dependencies_client::opentelemetry::Value::from(value),
             );
             attributes.push(kv);
         }

crates/tracing-subscriber/src/common.rs

@@ -14,17 +14,17 @@
 
 use std::{collections::HashMap, time::Duration};
 
-use opentelemetry::{trace::TracerProvider, InstrumentationScope};
 use opentelemetry_otlp::{WithExportConfig, WithTonicConfig};
 use opentelemetry_sdk::{
     trace::{Sampler, SpanLimits},
     Resource,
 };
 use pyo3::prelude::*;
+use qcs_dependencies_client::opentelemetry::{trace::TracerProvider, InstrumentationScope};
 use tracing_subscriber::Layer;
 
 use crate::create_init_submodule;
-use tonic::metadata::{
+use qcs_dependencies_client::tonic::metadata::{
     errors::{InvalidMetadataKey, InvalidMetadataValue},
     MetadataKey,
 };
@@ -41,13 +41,13 @@ pub(crate) struct Config {
     /// OpenTelemetry resource attributes describing the entity that produced the telemetry.
     resource: Resource,
     /// The metadata map to use for requests to the remote collector.
-    metadata_map: Option<tonic::metadata::MetadataMap>,
+    metadata_map: Option<qcs_dependencies_client::tonic::metadata::MetadataMap>,
     /// The sampler to use for the [`opentelemetry_sdk::trace::SdkTracerProvider`].
     sampler: Sampler,
     /// The endpoint to which the exporter will send trace data. If not set, this must be set by
     /// OTLP environment variables.
     endpoint: Option<String>,
-    /// Timeout applied the [`tonic::transport::Channel`] used to send trace data to the remote collector.
+    /// Timeout applied the [`qcs_dependencies_client::tonic::transport::Channel`] used to send trace data to the remote collector.
     timeout: Option<Duration>,
     /// A timeout applied to the shutdown of the [`crate::contextmanager::Tracing`] context
     /// manager upon exiting, before the underlying [`opentelemetry_sdk::trace::SdkTracerProvider`]
@@ -110,7 +110,7 @@ impl Config {
             |instrumentation_library| provider.tracer_with_scope(instrumentation_library.clone()),
         );
 
-        let layer = tracing_opentelemetry::layer()
+        let layer = qcs_dependencies_client::tracing_opentelemetry::layer()
             .with_tracer(tracer)
             .with_filter(env_filter);
         Ok(WithShutdown {
@@ -303,7 +303,7 @@ impl From<PyResource> for Resource {
         let kvs = resource
             .attrs
             .into_iter()
-            .map(|(k, v)| opentelemetry::KeyValue::new(k, v));
+            .map(|(k, v)| qcs_dependencies_client::opentelemetry::KeyValue::new(k, v));
 
         if let Some(schema_url) = resource.schema_url {
             Self::builder().with_schema_url(kvs, schema_url)
@@ -340,7 +340,7 @@ pub(crate) enum PyResourceValueArray {
     String(Vec<String>),
 }
 
-impl From<PyResourceValueArray> for opentelemetry::Array {
+impl From<PyResourceValueArray> for qcs_dependencies_client::opentelemetry::Array {
     fn from(py_resource_value_array: PyResourceValueArray) -> Self {
         match py_resource_value_array {
             PyResourceValueArray::Bool(b) => Self::Bool(b),
@@ -353,7 +353,7 @@ impl From<PyResourceValueArray> for opentelemetry::Array {
     }
 }
 
-impl From<PyResourceValue> for opentelemetry::Value {
+impl From<PyResourceValue> for qcs_dependencies_client::opentelemetry::Value {
     fn from(py_resource_value: PyResourceValue) -> Self {
         match py_resource_value {
             PyResourceValue::Bool(b) => Self::Bool(b),
@@ -393,7 +393,8 @@ impl From<PySampler> for Sampler {
 const OTEL_EXPORTER_OTLP_HEADERS: &str = "OTEL_EXPORTER_OTLP_HEADERS";
 const OTEL_EXPORTER_OTLP_TRACES_HEADERS: &str = "OTEL_EXPORTER_OTLP_TRACES_HEADERS";
 
-fn get_metadata_from_environment() -> Result<tonic::metadata::MetadataMap, ConfigError> {
+fn get_metadata_from_environment(
+) -> Result<qcs_dependencies_client::tonic::metadata::MetadataMap, ConfigError> {
     [
         OTEL_EXPORTER_OTLP_HEADERS,
         OTEL_EXPORTER_OTLP_TRACES_HEADERS,
@@ -411,7 +412,7 @@ fn get_metadata_from_environment() -> Result<tonic::metadata::MetadataMap, Confi
             .collect::<Vec<(String, String)>>()
     })
     .try_fold(
-        tonic::metadata::MetadataMap::new(),
+        qcs_dependencies_client::tonic::metadata::MetadataMap::new(),
         |mut metadata, (k, v)| {
             let key = k.parse::<MetadataKey<_>>().map_err(ConfigError::from)?;
             metadata.insert(key, v.parse().map_err(ConfigError::from)?);
@@ -428,7 +429,7 @@ impl TryFrom<PyConfig> for Config {
         let metadata_map = match config.metadata_map {
             Some(m) => Some(m.into_iter().try_fold(
                 env_metadata_map,
-                |mut metadata_map: tonic::metadata::MetadataMap,
+                |mut metadata_map: qcs_dependencies_client::tonic::metadata::MetadataMap,
                  (k, v)|
                  -> Result<_, Self::Error> {
                     let key = k.parse::<MetadataKey<_>>().map_err(ConfigError::from)?;

crates/tracing-subscriber/src/layers/otel_otlp.rs

@@ -151,7 +151,7 @@ impl crate::layers::Config for Config {
     }
 
     fn build(&self, batch: bool) -> LayerBuildResult<WithShutdown> {
-        use opentelemetry::trace::TracerProvider as _;
+        use qcs_dependencies_client::opentelemetry::trace::TracerProvider as _;
         let file = self
             .file_path
             .as_ref()
@@ -176,7 +176,7 @@ impl crate::layers::Config for Config {
             },
         );
         let env_filter = build_env_filter(self.filter.clone())?;
-        let layer = tracing_opentelemetry::layer()
+        let layer = qcs_dependencies_client::tracing_opentelemetry::layer()
             .with_tracer(tracer)
             .with_filter(env_filter);
         Ok(WithShutdown {