stamp 0.3.0: upgrading opentelemetry to 0.22, remove incompatible ope…

…ntelemetry-api dependency
francoposa · May 5, 2024 · 68284a3 · 68284a3
1 parent b2c3afa
commit 68284a3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tower-otel-http-metrics"
 edition = "2021"
-version = "0.3.0-alpha0"
+version = "0.3.0"
 license = "MIT"
 description = "OpenTelemetry Metrics Middleware for Tower-compatible Rust HTTP servers"
 homepage = "https://github.com/francoposa/tower-otel-http-metrics"

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ use std::time::Duration;
 
 use axum::routing::{get, post, put, Router};
 use bytes::Bytes;
-use opentelemetry_api::global;
+use opentelemetry::{global, KeyValue};
 use opentelemetry_otlp::{
     WithExportConfig, {self},
 };
@@ -42,9 +42,10 @@ fn init_otel_resource() -> Resource {
             Box::new(TelemetryResourceDetector),
         ],
     );
-    let otlp_resource_override = Resource::new(vec![
-        opentelemetry_semantic_conventions::resource::SERVICE_NAME.string(SERVICE_NAME),
-    ]);
+    let otlp_resource_override = Resource::new(vec![KeyValue {
+        key: opentelemetry_semantic_conventions::resource::SERVICE_NAME.into(),
+        value: SERVICE_NAME.into(),
+    }]);
     otlp_resource_detected.merge(&otlp_resource_override)
 }
 
@@ -107,7 +108,7 @@ use http_body_util::Full;
 use hyper::body::Bytes;
 use hyper::server::conn::http1;
 use hyper::{Request, Response};
-use opentelemetry_api::global;
+use opentelemetry::{global, KeyValue};
 use opentelemetry_otlp::{
     WithExportConfig, {self},
 };
@@ -130,9 +131,10 @@ fn init_otel_resource() -> Resource {
             Box::new(TelemetryResourceDetector),
         ],
     );
-    let otlp_resource_override = Resource::new(vec![
-        opentelemetry_semantic_conventions::resource::SERVICE_NAME.string(SERVICE_NAME),
-    ]);
+    let otlp_resource_override = Resource::new(vec![KeyValue {
+        key: opentelemetry_semantic_conventions::resource::SERVICE_NAME.into(),
+        value: SERVICE_NAME.into(),
+    }]);
     otlp_resource_detected.merge(&otlp_resource_override)
 }
 

diff --git a/development/config/otel-collector-config.yaml b/development/config/otel-collector-config.yaml
@@ -12,8 +12,6 @@ receivers:
         endpoint: 0.0.0.0:4317
 
 exporters:
-  logging:
-    loglevel: debug
   debug:
     verbosity: detailed
   otlphttp/grafana-cloud:
@@ -64,10 +62,10 @@ service:
   pipelines:
     metrics:
       receivers: [ otlp ]
-      exporters: [ logging, otlphttp/mimir-monolithic-mode-local ]
+      exporters: [ debug, otlphttp/mimir-monolithic-mode-docker-compose ]
 #    traces:
 #      receivers: [ otlp ]
-#      exporters: [ logging ]
+#      exporters: [ debug ]
 #    logs:
 #      receivers: [ otlp ]
-#      exporters: [ logging ]
+#      exporters: [ debug ]
diff --git a/development/docker-compose.yaml b/development/docker-compose.yaml
@@ -4,7 +4,7 @@ networks:
 
 services:
   otel-collector:
-    image: otel/opentelemetry-collector:latest
+    image: otel/opentelemetry-collector-contrib:latest
     container_name: otel-collector
     command:
       - "--config=/etc/otel-collector-config.yaml"