Merge branch 'main' into background_thread_batch_log

Author: ThomsonTan

.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/ci.yml

@@ -148,7 +148,7 @@ jobs:
         if: hashFiles('Cargo.lock') == ''
         run: cargo generate-lockfile
       - name: cargo llvm-cov
-        run: cargo llvm-cov --locked --all-features --workspace --lcov --output-path lcov.info
+        run: cargo llvm-cov --locked --all-features --workspace --lcov --lib --output-path lcov.info
       - name: Upload to codecov.io
         uses: codecov/codecov-action@v4
         env:

examples/logs-basic/Cargo.toml

@@ -6,10 +6,8 @@ license = "Apache-2.0"
 publish = false
 
 [dependencies]
-opentelemetry = { path = "../../opentelemetry", features = ["logs"] }
 opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["logs"] }
 opentelemetry-stdout = { path = "../../opentelemetry-stdout", features = ["logs"]}
 opentelemetry-appender-tracing = { path = "../../opentelemetry-appender-tracing", default-features = false}
-opentelemetry-semantic-conventions = { path = "../../opentelemetry-semantic-conventions" }
 tracing = { workspace = true, features = ["std"]}
 tracing-subscriber = { workspace = true, features = ["registry", "std"] }

examples/metrics-advanced/Cargo.toml

@@ -10,4 +10,3 @@ opentelemetry = { path = "../../opentelemetry", features = ["metrics"] }
 opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["spec_unstable_metrics_views", "rt-tokio"] }
 opentelemetry-stdout = { path = "../../opentelemetry-stdout", features = ["metrics"] }
 tokio = { workspace = true, features = ["full"] }
-serde_json = { workspace = true }

examples/metrics-basic/Cargo.toml

@@ -10,5 +10,4 @@ opentelemetry = { path = "../../opentelemetry", features = ["metrics"] }
 opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["metrics", "rt-tokio"] }
 opentelemetry-stdout = { path = "../../opentelemetry-stdout", features = ["metrics"]}
 tokio = { workspace = true, features = ["full"] }
-serde_json = { workspace = true }
 

examples/tracing-grpc/Cargo.toml

@@ -20,7 +20,6 @@ opentelemetry-stdout = { path = "../../opentelemetry-stdout", features = ["trace
 prost = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 tonic = { workspace = true }
-serde_json = { workspace = true }
 
 [build-dependencies]
 tonic-build = { workspace = true }

examples/tracing-jaeger/Cargo.toml

@@ -9,5 +9,4 @@ publish = false
 opentelemetry = { path = "../../opentelemetry" }
 opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["rt-tokio"] }
 opentelemetry-otlp = { path = "../../opentelemetry-otlp", features = ["tonic"] }
-opentelemetry-semantic-conventions = { path = "../../opentelemetry-semantic-conventions" }
 tokio = { workspace = true, features = ["full"] }

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

@@ -16,16 +16,9 @@ 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-http = { path = "../../../opentelemetry-http", optional = true, default-features = false}
 opentelemetry-otlp = { path = "../..", features = ["http-proto", "http-json", "logs"] , default-features = false}
 opentelemetry-appender-tracing = { path = "../../../opentelemetry-appender-tracing", default-features = false}
-opentelemetry-semantic-conventions = { path = "../../../opentelemetry-semantic-conventions" }
 
-async-trait = { workspace = true, optional = true }
-bytes = { workspace = true, optional = true }
-http = { workspace = true, optional = true }
-http-body-util = { workspace = true, optional = true  }
 tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true, features = ["std"]}
-tracing-core = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter","registry", "std", "fmt"] }

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"}
 ...
 ```

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

@@ -106,7 +106,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
 
     // Create a new tracing::Fmt layer to print the logs to stdout. It has a
     // default filter of `info` level and above, and `debug` and above for logs
-    // from OpenTelemtry crates. The filter levels can be customized as needed.
+    // from OpenTelemetry crates. The filter levels can be customized as needed.
     let filter_fmt = EnvFilter::new("info").add_directive("opentelemetry=debug".parse().unwrap());
     let fmt_layer = tracing_subscriber::fmt::layer()
         .with_thread_names(true)
@@ -148,7 +148,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
         let span = cx.span();
         span.add_event(
             "Nice operation!".to_string(),
-            vec![KeyValue::new("bogons", 100)],
+            vec![KeyValue::new("some.key", 100)],
         );
         span.set_attribute(KeyValue::new("another.key", "yes"));