Bump the otel group across 1 directory with 4 updates (#134)

Author: dependabot[bot]

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to
 
 ### Updated
 
+- Bumped opentelemetry version to 0.28
 - MSRV is now 1.81
 
 ---

Cargo.toml

@@ -37,12 +37,12 @@ required-features = ["json-logger"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-opentelemetry = {version = "0.27", optional = true}
-opentelemetry-otlp = {version = "0.27", features = ["http-proto", "reqwest-client"], default-features = false, optional = true}
-opentelemetry_sdk = {version = "0.27", features = ["rt-tokio"], optional = true}
+opentelemetry = {version = "0.28", optional = true}
+opentelemetry-otlp = {version = "0.28", features = ["http-proto", "reqwest-blocking-client"], default-features = false, optional = true}
+opentelemetry_sdk = {version = "0.28", features = ["rt-tokio"], optional = true}
 tracing = {version = "0.1"}
 tracing-log = {version = "0.2"}
-tracing-opentelemetry = {version = "0.28", optional = true}
+tracing-opentelemetry = {version = "0.29", optional = true}
 tracing-subscriber = {version = "0.3", features = ["env-filter"]}
 
 # serialization/deserialization

Dockerfile

@@ -1,8 +1,10 @@
 FROM public.ecr.aws/prima/rust:1.81.0
 
-# Serve per avere l'owner dei file scritti dal container uguale all'utente Linux sull'host
+WORKDIR /code
+
 USER app
 
-WORKDIR /code
+COPY ["entrypoint", "/entrypoint"]
+
+ENTRYPOINT ["/entrypoint"]
 
-ENTRYPOINT ["/bin/bash"]

entrypoint

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+if [ "$1" == "mix" ]; then
+  exec "$@"
+else [ -n "$1" ];
+  sh -c "$@"
+fi

src/telemetry.rs

@@ -32,17 +32,6 @@ pub fn configure<T>(config: &SubscriberConfig<T>) -> sdktrace::Tracer {
         .as_ref()
         .expect("Telemetry config must be provided when the `traces` feature is enabled.");
 
-    let runtime = {
-        #[cfg(feature = "rt-tokio-current-thread")]
-        {
-            opentelemetry_sdk::runtime::TokioCurrentThread
-        }
-        #[cfg(not(feature = "rt-tokio-current-thread"))]
-        {
-            opentelemetry_sdk::runtime::Tokio
-        }
-    };
-
     let collector_url = normalize_collector_url(&telemetry.collector_url);
 
     let otlp_exporter = SpanExporter::builder()
@@ -51,14 +40,14 @@ pub fn configure<T>(config: &SubscriberConfig<T>) -> sdktrace::Tracer {
         .build()
         .expect("Failed to configure the OpenTelemetry OTLP span exporter");
 
-    let resource = Resource::new(vec![
-        KeyValue::new("environment", config.env.to_string()),
-        KeyValue::new("country", config.country.to_string()),
-        KeyValue::new("service.name", telemetry.service_name.clone()),
-    ]);
+    let resource = Resource::builder()
+        .with_service_name(telemetry.service_name.clone())
+        .with_attribute(KeyValue::new("environment", config.env.to_string()))
+        .with_attribute(KeyValue::new("country", config.country.to_string()))
+        .build();
 
-    let tracer_provider = sdktrace::TracerProvider::builder()
-        .with_batch_exporter(otlp_exporter, runtime)
+    let tracer_provider = sdktrace::SdkTracerProvider::builder()
+        .with_batch_exporter(otlp_exporter)
         .with_resource(resource)
         .build();
 
@@ -72,9 +61,10 @@ pub fn configure<T>(config: &SubscriberConfig<T>) -> sdktrace::Tracer {
 }
 
 // Consider to remove this wrapper when https://github.com/open-telemetry/opentelemetry-rust/issues/1961 is resolved
-static TRACER_PROVIDER: Lazy<Mutex<Option<sdktrace::TracerProvider>>> = Lazy::new(Default::default);
+static TRACER_PROVIDER: Lazy<Mutex<Option<sdktrace::SdkTracerProvider>>> =
+    Lazy::new(Default::default);
 
-fn set_tracer_provider(new_provider: sdktrace::TracerProvider) {
+fn set_tracer_provider(new_provider: sdktrace::SdkTracerProvider) {
     global::set_tracer_provider(new_provider.clone());
 
     let mut tracer_provider = TRACER_PROVIDER
@@ -84,8 +74,6 @@ fn set_tracer_provider(new_provider: sdktrace::TracerProvider) {
 }
 
 pub(crate) fn shutdown_tracer_provider() {
-    global::shutdown_tracer_provider();
-
     let tracer_provider = TRACER_PROVIDER
         .lock()
         .expect("OpenTelemetry tracer provider mutex poisoned")