Merge branch 'main' into appender-tracing-fix-trace-context

Author: lalitb

.cspell.json

@@ -49,7 +49,9 @@
         "nocapture",
         "Ochtman",
         "opentelemetry",
+        "OTELCOL",
         "OTLP",
+        "periodicreader",
         "protoc",
         "quantile",
         "Redelmeier",
@@ -59,6 +61,7 @@
         "shoppingcart",
         "struct",
         "Tescher",
+        "testresults",
         "tracerprovider",
         "updown",
         "Zhongyang",

.github/workflows/integration_tests.yml

@@ -24,5 +24,5 @@ jobs:
         with:
           components: rustfmt
       - uses: arduino/setup-protoc@v3
-      - name: Run integration tests using docker compose
+      - name: Run integration tests
         run: ./scripts/integration_tests.sh

opentelemetry-appender-log/examples/logs-basic.rs

@@ -7,7 +7,6 @@
 use log::{error, info, warn, Level};
 use opentelemetry_appender_log::OpenTelemetryLogBridge;
 use opentelemetry_sdk::logs::{BatchLogProcessor, LoggerProvider};
-use opentelemetry_sdk::runtime;
 use opentelemetry_stdout::LogExporter;
 
 #[tokio::main]
@@ -16,7 +15,7 @@ async fn main() {
     let exporter = LogExporter::default();
     //Create a LoggerProvider and register the exporter
     let logger_provider = LoggerProvider::builder()
-        .with_log_processor(BatchLogProcessor::builder(exporter, runtime::Tokio).build())
+        .with_log_processor(BatchLogProcessor::builder(exporter).build())
         .build();
 
     // Setup Log Appender for the log crate.

opentelemetry-appender-tracing/src/layer.rs

@@ -316,7 +316,7 @@ mod tests {
     async fn batch_processor_no_deadlock() {
         let exporter: ReentrantLogExporter = ReentrantLogExporter;
         let logger_provider = LoggerProvider::builder()
-            .with_batch_exporter(exporter.clone(), opentelemetry_sdk::runtime::Tokio)
+            .with_batch_exporter(exporter.clone())
             .build();
 
         let layer = layer::OpenTelemetryTracingBridge::new(&logger_provider);

opentelemetry-http/CHANGELOG.md

@@ -3,7 +3,7 @@
 ## vNext
 
 - Bump msrv to 1.75.0.
-
+- Add "internal-logs" feature flag (enabled by default), and emit internal logs.
 
 ## 0.27.0
 

opentelemetry-http/Cargo.toml

@@ -10,9 +10,11 @@ edition = "2021"
 rust-version = "1.75.0"
 
 [features]
+default = ["internal-logs"]
 hyper = ["dep:http-body-util", "dep:hyper", "dep:hyper-util", "dep:tokio"]
 reqwest-rustls = ["reqwest", "reqwest/rustls-tls-native-roots"]
 reqwest-rustls-webpki-roots = ["reqwest", "reqwest/rustls-tls-webpki-roots"]
+internal-logs = ["tracing", "opentelemetry/internal-logs"]
 
 [dependencies]
 async-trait = { workspace = true }
@@ -24,3 +26,4 @@ hyper-util = { workspace = true, features = ["client-legacy", "http1", "http2"],
 opentelemetry = { version = "0.27", path = "../opentelemetry", features = ["trace"] }
 reqwest = { workspace = true, features = ["blocking"], optional = true }
 tokio = { workspace = true, features = ["time"], optional = true }
+tracing = {workspace = true, optional = true}

opentelemetry-http/src/lib.rs

@@ -66,11 +66,14 @@ pub trait HttpClient: Debug + Send + Sync {
 
 #[cfg(feature = "reqwest")]
 mod reqwest {
+    use opentelemetry::otel_debug;
+
     use super::{async_trait, Bytes, HttpClient, HttpError, Request, Response};
 
     #[async_trait]
     impl HttpClient for reqwest::Client {
         async fn send(&self, request: Request<Vec<u8>>) -> Result<Response<Bytes>, HttpError> {
+            otel_debug!(name: "ReqwestClient.Send");
             let request = request.try_into()?;
             let mut response = self.execute(request).await?.error_for_status()?;
             let headers = std::mem::take(response.headers_mut());
@@ -87,6 +90,7 @@ mod reqwest {
     #[async_trait]
     impl HttpClient for reqwest::blocking::Client {
         async fn send(&self, request: Request<Vec<u8>>) -> Result<Response<Bytes>, HttpError> {
+            otel_debug!(name: "ReqwestBlockingClient.Send");
             let request = request.try_into()?;
             let mut response = self.execute(request)?.error_for_status()?;
             let headers = std::mem::take(response.headers_mut());
@@ -102,16 +106,16 @@ mod reqwest {
 
 #[cfg(feature = "hyper")]
 pub mod hyper {
-    use crate::ResponseExt;
-
     use super::{async_trait, Bytes, HttpClient, HttpError, Request, Response};
+    use crate::ResponseExt;
     use http::HeaderValue;
     use http_body_util::{BodyExt, Full};
     use hyper::body::{Body as HttpBody, Frame};
     use hyper_util::client::legacy::{
         connect::{Connect, HttpConnector},
         Client,
     };
+    use opentelemetry::otel_debug;
     use std::fmt::Debug;
     use std::pin::Pin;
     use std::task::{self, Poll};
@@ -156,6 +160,7 @@ pub mod hyper {
     #[async_trait]
     impl HttpClient for HyperClient {
         async fn send(&self, request: Request<Vec<u8>>) -> Result<Response<Bytes>, HttpError> {
+            otel_debug!(name: "HyperClient.Send");
             let (parts, body) = request.into_parts();
             let mut request = Request::from_parts(parts, Body(Full::from(body)));
             if let Some(ref authorization) = self.authorization {

opentelemetry-otlp/Cargo.toml

@@ -58,7 +58,7 @@ trace = ["opentelemetry/trace", "opentelemetry_sdk/trace", "opentelemetry-proto/
 metrics = ["opentelemetry/metrics", "opentelemetry_sdk/metrics", "opentelemetry-proto/metrics"]
 logs = ["opentelemetry/logs", "opentelemetry_sdk/logs", "opentelemetry-proto/logs"]
 populate-logs-event-name = ["opentelemetry-proto/populate-logs-event-name"]
-internal-logs = ["tracing"]
+internal-logs = ["tracing", "opentelemetry/internal-logs"]
 
 # add ons
 serialize = ["serde", "serde_json"]

opentelemetry-otlp/examples/basic-otlp-http/Cargo.toml

@@ -16,7 +16,7 @@ experimental_metrics_periodicreader_with_async_runtime = ["opentelemetry_sdk/exp
 once_cell = { workspace = true }
 opentelemetry = { path = "../../../opentelemetry" }
 opentelemetry_sdk = { path = "../../../opentelemetry-sdk", features = ["rt-tokio", "experimental_metrics_periodicreader_with_async_runtime"]}
-opentelemetry-otlp = { path = "../..", features = ["http-proto", "http-json", "logs"] , default-features = false}
+opentelemetry-otlp = { path = "../..", features = ["http-proto", "http-json", "logs", "internal-logs"] , default-features = false}
 opentelemetry-appender-tracing = { path = "../../../opentelemetry-appender-tracing", default-features = false}
 
 tokio = { workspace = true, features = ["full"] }

opentelemetry-otlp/examples/basic-otlp-http/README.md

@@ -16,7 +16,7 @@ recommended approach when using OTLP exporters. While it can be modified to use
 a `SimpleExporter`, this requires enabling feature flag `reqwest-blocking-client` and
 making the `main()` a normal main and *not* `tokio::main`
 
-// TODO: Metrics does not work with non tokio main when using `reqwest-blocking-client` today, fix that when switching 
+// TODO: Metrics does not work with non tokio main when using `reqwest-blocking-client` today, fix that when switching
 // default to use own thread.
 // TODO: Document `hyper` feature flag when using SimpleProcessor.
 
@@ -66,14 +66,12 @@ Run the app which exports logs, metrics and traces via OTLP to the collector
 cargo run
 ```
 
-
 By default the app will use a `reqwest` client to send. A hyper 0.14 client can be used with the `hyper` feature enabled
 
 ```shell
 cargo run --no-default-features --features=hyper
 ```
 
-
 ## View results
 
 You should be able to see something similar below with different time and ID in the same console that docker runs.
@@ -135,7 +133,7 @@ SpanEvent #0
      -> Timestamp: 2024-05-14 02:15:56.824201397 +0000 UTC
      -> DroppedAttributesCount: 0
      -> Attributes::
-          -> bogons: Int(100)
+          -> some.key: Int(100)
         {"kind": "exporter", "data_type": "traces", "name": "logging"}
 ...
 ```