Merge pull request dora-rs#461 from dora-rs/fix-meter-conflict

Fix meter conflict

README.md

@@ -56,8 +56,8 @@ Feel free to reach out if you have any questions!
 Quickest way:
 
 ```bash
-cargo install dora-cli
-pip install dora-rs ## For Python API
+cargo install dora-cli # In case of issues, you can try to add `--locked`
+pip install dora-rs # For Python API
 
 dora --help
 ```

libraries/extensions/telemetry/metrics/Cargo.toml

@@ -9,8 +9,8 @@ license.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-opentelemetry = { version = "0.21", features = ["metrics"] }
-opentelemetry-otlp = { version = "0.14.0", features = ["tonic", "metrics"] }
-opentelemetry_sdk = { version = "0.21", features = ["rt-tokio", "metrics"] }
+opentelemetry = { version = "0.22.0", features = ["metrics"] }
+opentelemetry-otlp = { version = "0.15.0", features = ["tonic", "metrics"] }
+opentelemetry_sdk = { version = "0.22.0", features = ["rt-tokio", "metrics"] }
 eyre = "0.6.12"
-opentelemetry-system-metrics = { version = "0.1.6" }
+opentelemetry-system-metrics = { version = "0.1.8" }

libraries/extensions/telemetry/metrics/src/lib.rs

@@ -15,14 +15,14 @@ use std::time::Duration;
 use eyre::{Context, Result};
 use opentelemetry::metrics::{self, MeterProvider as _};
 use opentelemetry_otlp::{ExportConfig, WithExportConfig};
-use opentelemetry_sdk::{metrics::MeterProvider, runtime};
+use opentelemetry_sdk::{metrics::SdkMeterProvider, runtime};
 use opentelemetry_system_metrics::init_process_observer;
 /// Init opentelemetry meter
 ///
 /// Use the default Opentelemetry exporter with default config
 /// TODO: Make Opentelemetry configurable
 ///
-pub fn init_metrics() -> metrics::Result<MeterProvider> {
+pub fn init_metrics() -> metrics::Result<SdkMeterProvider> {
     let endpoint = std::env::var("OTEL_EXPORTER_OTLP_METRICS_ENDPOINT")
         .unwrap_or_else(|_| "http://localhost:4317".to_string());
     let export_config = ExportConfig {
@@ -41,7 +41,7 @@ pub fn init_metrics() -> metrics::Result<MeterProvider> {
         .build()
 }
 
-pub fn init_meter_provider(meter_id: String) -> Result<MeterProvider> {
+pub fn init_meter_provider(meter_id: String) -> Result<SdkMeterProvider> {
     let meter_provider = init_metrics().context("Could not create opentelemetry meter")?;
     let meter = meter_provider.meter(meter_id);
     let _ = init_process_observer(meter).context("could not initiale system metrics observer")?;