Skip to content

Commit 0e33b91

Browse files
authored
Merge branch 'main' into main
2 parents 2a8540b + 66e3ea5 commit 0e33b91

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ tokio-stream = "0.1.1"
4545
tracing = { version = "0.1", default-features = false }
4646
tracing-core = { version = "0.1", default-features = false }
4747
tracing-subscriber = { version = "0.3", default-features = false }
48-
url = { version = "2.2", default-features = false }
48+
url = { version = "=2.5.0", default-features = false } #pinning the version supporting rustc 1.65

opentelemetry-otlp/examples/basic-otlp-http/src/main.rs

+3-6
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,11 @@ fn init_tracer_provider() -> Result<sdktrace::TracerProvider, TraceError> {
5252
}
5353

5454
fn init_metrics() -> Result<opentelemetry_sdk::metrics::SdkMeterProvider, MetricsError> {
55-
let provider = opentelemetry_otlp::new_pipeline()
55+
opentelemetry_otlp::new_pipeline()
5656
.metrics(opentelemetry_sdk::runtime::Tokio)
5757
.with_exporter(http_exporter().with_endpoint("http://localhost:4318/v1/metrics"))
5858
.with_resource(RESOURCE.clone())
59-
.build();
60-
match provider {
61-
Ok(provider) => Ok(provider),
62-
Err(err) => Err(err),
63-
}
59+
.build()
6460
}
6561

6662
#[tokio::main]
@@ -83,6 +79,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
8379
);
8480

8581
let meter_provider = result.unwrap();
82+
global::set_meter_provider(meter_provider.clone());
8683

8784
// Opentelemetry will not provide a global API to manage the logger
8885
// provider. Application users must manage the lifecycle of the logger

0 commit comments

Comments
 (0)