Merge branch 'main' into cijothomas/test-for-observablecounter

Author: lalitb

.github/workflows/ci.yml

@@ -59,7 +59,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2023-10-10
+          toolchain: nightly-2024-02-07
           components: rustfmt
           override: true
       - name: external-type-check

stress/src/logs.rs

@@ -1,9 +1,5 @@
-use opentelemetry::KeyValue;
 use opentelemetry_appender_tracing::layer;
-use opentelemetry_sdk::{
-    logs::{Config, LogProcessor, LoggerProvider},
-    Resource,
-};
+use opentelemetry_sdk::logs::{LogProcessor, LoggerProvider};
 use tracing::error;
 use tracing_subscriber::{prelude::*, Layer};
 
@@ -65,12 +61,6 @@ impl LogProcessor for NoOpLogProcessor {
 fn main() {
     // LoggerProvider with a no-op processor.
     let provider: LoggerProvider = LoggerProvider::builder()
-        .with_config(
-            Config::default().with_resource(Resource::new(vec![KeyValue::new(
-                "service.name",
-                "log-appender-tracing-example",
-            )])),
-        )
         .with_log_processor(NoOpLogProcessor {})
         .build();
 

stress/src/traces.rs

@@ -1,19 +1,44 @@
 use lazy_static::lazy_static;
 use opentelemetry::{
-    trace::{Span, SpanBuilder, Tracer, TracerProvider as _},
-    KeyValue,
+    trace::{Span, SpanBuilder, TraceResult, Tracer, TracerProvider as _},
+    Context, KeyValue,
+};
+use opentelemetry_sdk::{
+    export::trace::SpanData,
+    trace::{self as sdktrace, SpanProcessor},
 };
-use opentelemetry_sdk::trace as sdktrace;
 
 mod throughput;
 
 lazy_static! {
     static ref PROVIDER: sdktrace::TracerProvider = sdktrace::TracerProvider::builder()
         .with_config(sdktrace::config().with_sampler(sdktrace::Sampler::AlwaysOn))
+        .with_span_processor(NoOpSpanProcessor {})
         .build();
     static ref TRACER: sdktrace::Tracer = PROVIDER.tracer("stress");
 }
 
+#[derive(Debug)]
+pub struct NoOpSpanProcessor;
+
+impl SpanProcessor for NoOpSpanProcessor {
+    fn on_start(&self, _span: &mut opentelemetry_sdk::trace::Span, _cx: &Context) {
+        // No-op
+    }
+
+    fn on_end(&self, _span: SpanData) {
+        // No-op
+    }
+
+    fn force_flush(&self) -> TraceResult<()> {
+        Ok(())
+    }
+
+    fn shutdown(&mut self) -> TraceResult<()> {
+        Ok(())
+    }
+}
+
 fn main() {
     throughput::test_throughput(test_span);
 }