From 794637ba5a55b215494a53fb9617f35a6fc03941 Mon Sep 17 00:00:00 2001 From: Cijo Thomas Date: Wed, 14 Feb 2024 11:05:18 -0800 Subject: [PATCH 1/3] Make stress test more realistic --- stress/src/logs.rs | 6 ------ stress/src/traces.rs | 27 ++++++++++++++++++++++++--- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/stress/src/logs.rs b/stress/src/logs.rs index 6c64c0fb81..32db5064f0 100644 --- a/stress/src/logs.rs +++ b/stress/src/logs.rs @@ -65,12 +65,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(); diff --git a/stress/src/traces.rs b/stress/src/traces.rs index 0d76cf8a97..3f25446e28 100644 --- a/stress/src/traces.rs +++ b/stress/src/traces.rs @@ -1,19 +1,40 @@ 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::trace as sdktrace; +use opentelemetry_sdk::{export::trace::SpanData, trace::{self as sdktrace, SpanProcessor}}; 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); } From f4fbe6afa5b99e0ff7c3c1a80d3115f68a1a4f91 Mon Sep 17 00:00:00 2001 From: Cijo Thomas Date: Wed, 14 Feb 2024 11:12:17 -0800 Subject: [PATCH 2/3] fix lint --- stress/src/traces.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/stress/src/traces.rs b/stress/src/traces.rs index 3f25446e28..2f95135dbc 100644 --- a/stress/src/traces.rs +++ b/stress/src/traces.rs @@ -1,8 +1,12 @@ use lazy_static::lazy_static; use opentelemetry::{ - trace::{Span, SpanBuilder, TraceResult, Tracer, TracerProvider as _}, Context, KeyValue + trace::{Span, SpanBuilder, TraceResult, Tracer, TracerProvider as _}, + Context, KeyValue, +}; +use opentelemetry_sdk::{ + export::trace::SpanData, + trace::{self as sdktrace, SpanProcessor}, }; -use opentelemetry_sdk::{export::trace::SpanData, trace::{self as sdktrace, SpanProcessor}}; mod throughput; From 93d179d7305c532ce5569bd17629575430f984d0 Mon Sep 17 00:00:00 2001 From: Cijo Thomas Date: Wed, 14 Feb 2024 12:03:59 -0800 Subject: [PATCH 3/3] fmt --- stress/src/logs.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/stress/src/logs.rs b/stress/src/logs.rs index 32db5064f0..27ddb40965 100644 --- a/stress/src/logs.rs +++ b/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};