Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Local span perf improvements #505

Merged
merged 3 commits into from
Mar 31, 2021
Merged

Local span perf improvements #505

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b7d4e0
Local span perf improvements
jtescher Mar 30, 2021
9b327a2
Revert import ordering
jtescher Mar 31, 2021
c288e9d
Merge branch 'main' into local-span-perf
jtescher Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/aws-xray/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ async fn handle(req: Request<Body>) -> Result<Response<Body>, Infallible> {
.to_str()
.unwrap();

let span = global::tracer("example/server").start_with_context("hello", parent_context);
let mut span = global::tracer("example/server").start_with_context("hello", parent_context);
span.add_event(format!("Handling - {}", x_amzn_trace_id), Vec::new());

Ok(Response::new(
Expand Down
2 changes: 1 addition & 1 deletion examples/datadog/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use std::time::Duration;

fn bar() {
let tracer = global::tracer("component-bar");
let span = tracer.start("bar");
let mut span = tracer.start("bar");
span.set_attribute(Key::new("span.type").string("sql"));
span.set_attribute(Key::new("sql.query").string("SELECT * FROM table"));
thread::sleep(Duration::from_millis(6));
Expand Down
2 changes: 1 addition & 1 deletion examples/grpc/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ impl Greeter for MyGreeter {
) -> Result<Response<HelloReply>, Status> {
let parent_cx =
global::get_text_map_propagator(|prop| prop.extract(&MetadataMap(request.metadata())));
let span = global::tracer("greeter").start_with_context("Processing reply", parent_cx);
let mut span = global::tracer("greeter").start_with_context("Processing reply", parent_cx);
span.set_attribute(KeyValue::new("request", format!("{:?}", request)));

// Return an instance of type HelloReply
Expand Down
2 changes: 1 addition & 1 deletion examples/http/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ async fn handle(req: Request<Body>) -> Result<Response<Body>, Infallible> {
let parent_cx = global::get_text_map_propagator(|propagator| {
propagator.extract(&HeaderExtractor(req.headers()))
});
let span = global::tracer("example/server").start_with_context("hello", parent_cx);
let mut span = global::tracer("example/server").start_with_context("hello", parent_cx);
span.add_event("handling this...".to_string(), Vec::new());

Ok(Response::new("Hello, World!".into()))
Expand Down
2 changes: 1 addition & 1 deletion examples/zipkin/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::time::Duration;

fn bar() {
let tracer = global::tracer("component-bar");
let span = tracer.start("bar");
let mut span = tracer.start("bar");
thread::sleep(Duration::from_millis(6));
span.end()
}
Expand Down
3 changes: 2 additions & 1 deletion opentelemetry-aws/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ pub mod trace {

impl TextMapPropagator for XrayPropagator {
fn inject_context(&self, cx: &Context, injector: &mut dyn Injector) {
let span_context = cx.span().span_context();
let span = cx.span();
let span_context = span.span_context();
if span_context.is_valid() {
let xray_trace_id: XrayTraceId = span_context.trace_id().into();

Expand Down
3 changes: 2 additions & 1 deletion opentelemetry-datadog/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,8 @@ mod propagator {

impl TextMapPropagator for DatadogPropagator {
fn inject_context(&self, cx: &Context, injector: &mut dyn Injector) {
let span_context = cx.span().span_context();
let span = cx.span();
let span_context = span.span_context();
if span_context.is_valid() {
injector.set(
DATADOG_TRACE_ID_HEADER,
Expand Down
3 changes: 2 additions & 1 deletion opentelemetry-jaeger/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,8 @@ mod propagator {

impl TextMapPropagator for Propagator {
fn inject_context(&self, cx: &Context, injector: &mut dyn Injector) {
let span_context = cx.span().span_context();
let span = cx.span();
let span_context = span.span_context();
if span_context.is_valid() {
let flag: u8 = if span_context.is_sampled() {
if span_context.is_debug() {
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-otlp/tests/smoke.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ async fn smoke_tracer() {
.expect("failed to install");

println!("Sending span...");
let span = tracer
let mut span = tracer
.span_builder("my-test-span")
.with_kind(SpanKind::Server)
.start(&tracer);
Expand Down
3 changes: 2 additions & 1 deletion opentelemetry-zipkin/src/propagator/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,8 @@ impl TextMapPropagator for Propagator {
/// Properly encodes the values of the `Context`'s `SpanContext` and injects
/// them into the `Injector`.
fn inject_context(&self, context: &Context, injector: &mut dyn Injector) {
let span_context = context.span().span_context();
let span = context.span();
let span_context = span.span_context();
if span_context.is_valid() {
if self.inject_encoding.support(&B3Encoding::SingleHeader) {
let mut value = format!(
Expand Down
8 changes: 4 additions & 4 deletions opentelemetry/benches/trace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ fn criterion_benchmark(c: &mut Criterion) {
trace_benchmark_group(c, "start-end-span", |tracer| tracer.start("foo").end());

trace_benchmark_group(c, "start-end-span-4-attrs", |tracer| {
let span = tracer.start("foo");
let mut span = tracer.start("foo");
span.set_attribute(Key::new("key1").bool(false));
span.set_attribute(Key::new("key2").string("hello"));
span.set_attribute(Key::new("key4").f64(123.456));
span.end();
});

trace_benchmark_group(c, "start-end-span-8-attrs", |tracer| {
let span = tracer.start("foo");
let mut span = tracer.start("foo");
span.set_attribute(Key::new("key1").bool(false));
span.set_attribute(Key::new("key2").string("hello"));
span.set_attribute(Key::new("key4").f64(123.456));
Expand All @@ -43,7 +43,7 @@ fn criterion_benchmark(c: &mut Criterion) {
});

trace_benchmark_group(c, "start-end-span-all-attr-types", |tracer| {
let span = tracer.start("foo");
let mut span = tracer.start("foo");
span.set_attribute(Key::new("key1").bool(false));
span.set_attribute(Key::new("key2").string("hello"));
span.set_attribute(Key::new("key3").i64(123));
Expand All @@ -52,7 +52,7 @@ fn criterion_benchmark(c: &mut Criterion) {
});

trace_benchmark_group(c, "start-end-span-all-attr-types-2x", |tracer| {
let span = tracer.start("foo");
let mut span = tracer.start("foo");
span.set_attribute(Key::new("key1").bool(false));
span.set_attribute(Key::new("key2").string("hello"));
span.set_attribute(Key::new("key3").i64(123));
Expand Down
18 changes: 9 additions & 9 deletions opentelemetry/src/global/trace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ impl trace::Span for BoxedSpan {
/// keys"](https://github.com/open-telemetry/opentelemetry-specification/tree/v0.5.0/specification/trace/semantic_conventions/README.md)
/// which have prescribed semantic meanings.
fn add_event_with_timestamp(
&self,
&mut self,
name: String,
timestamp: SystemTime,
attributes: Vec<KeyValue>,
Expand All @@ -45,23 +45,23 @@ impl trace::Span for BoxedSpan {
/// Note that the OpenTelemetry project documents certain ["standard
/// attributes"](https://github.com/open-telemetry/opentelemetry-specification/tree/v0.5.0/specification/trace/semantic_conventions/README.md)
/// that have prescribed semantic meanings.
fn set_attribute(&self, attribute: KeyValue) {
fn set_attribute(&mut self, attribute: KeyValue) {
self.0.set_attribute(attribute)
}

/// Sets the status of the `Span`. If used, this will override the default `Span`
/// status, which is `Unset`.
fn set_status(&self, code: trace::StatusCode, message: String) {
fn set_status(&mut self, code: trace::StatusCode, message: String) {
self.0.set_status(code, message)
}

/// Updates the `Span`'s name.
fn update_name(&self, new_name: String) {
fn update_name(&mut self, new_name: String) {
self.0.update_name(new_name)
}

/// Finishes the span with given timestamp.
fn end_with_timestamp(&self, timestamp: SystemTime) {
fn end_with_timestamp(&mut self, timestamp: SystemTime) {
self.0.end_with_timestamp(timestamp);
}
}
Expand Down Expand Up @@ -128,7 +128,7 @@ pub trait GenericTracer: fmt::Debug + 'static {

impl<S, T> GenericTracer for T
where
S: trace::Span + Send + Sync,
S: trace::Span + Send + Sync + 'static,
T: trace::Tracer<Span = S>,
{
/// Create a new invalid span for use in cases where there are no active spans.
Expand Down Expand Up @@ -165,7 +165,7 @@ pub trait GenericTracerProvider: fmt::Debug + 'static {

impl<S, T, P> GenericTracerProvider for P
where
S: trace::Span + Send + Sync,
S: trace::Span + Send + Sync + 'static,
T: trace::Tracer<Span = S> + Send + Sync,
P: trace::TracerProvider<Tracer = T>,
{
Expand Down Expand Up @@ -193,7 +193,7 @@ impl GlobalTracerProvider {
/// Create a new GlobalTracerProvider instance from a struct that implements `TracerProvider`.
fn new<P, T, S>(provider: P) -> Self
where
S: trace::Span + Send + Sync,
S: trace::Span + Send + Sync + 'static,
T: trace::Tracer<Span = S> + Send + Sync,
P: trace::TracerProvider<Tracer = T> + Send + Sync,
{
Expand Down Expand Up @@ -258,7 +258,7 @@ pub fn tracer_with_version(name: &'static str, version: &'static str) -> BoxedTr
/// [`TracerProvider`]: crate::trace::TracerProvider
pub fn set_tracer_provider<P, T, S>(new_provider: P) -> GlobalTracerProvider
where
S: trace::Span + Send + Sync,
S: trace::Span + Send + Sync + 'static,
T: trace::Tracer<Span = S> + Send + Sync,
P: trace::TracerProvider<Tracer = T> + Send + Sync,
{
Expand Down
14 changes: 6 additions & 8 deletions opentelemetry/src/sdk/export/trace/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
//! Trace exporters
use std::fmt::Debug;
use std::sync::Arc;
use std::time::SystemTime;

use async_trait::async_trait;
#[cfg(feature = "serialize")]
use serde::{Deserialize, Serialize};

use crate::{
sdk,
trace::{Event, Link, SpanContext, SpanId, SpanKind, StatusCode, TraceError},
};
use async_trait::async_trait;
#[cfg(feature = "serialize")]
use serde::{Deserialize, Serialize};
use std::fmt::Debug;
use std::sync::Arc;
use std::time::SystemTime;
jtescher marked this conversation as resolved.
Show resolved Hide resolved

pub mod stdout;

Expand Down
9 changes: 5 additions & 4 deletions opentelemetry/src/sdk/propagation/composite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,15 @@ mod tests {

impl TextMapPropagator for TestPropagator {
fn inject_context(&self, cx: &Context, injector: &mut dyn Injector) {
let span = cx.span().span_context();
let span = cx.span();
let span_context = span.span_context();
injector.set(
"testheader",
format!(
"{}-{}-{}",
span.trace_id().to_u128(),
span.span_id().to_u64(),
span.trace_flags()
span_context.trace_id().to_u128(),
span_context.span_id().to_u64(),
span_context.trace_flags()
),
)
}
Expand Down
3 changes: 2 additions & 1 deletion opentelemetry/src/sdk/propagation/trace_context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ impl TextMapPropagator for TraceContextPropagator {
/// Properly encodes the values of the `SpanContext` and injects them
/// into the `Injector`.
fn inject_context(&self, cx: &Context, injector: &mut dyn Injector) {
let span_context = cx.span().span_context();
let span = cx.span();
let span_context = span.span_context();
if span_context.is_valid() {
let header_value = format!(
"{:02x}-{:032x}-{:016x}-{:02x}",
Expand Down
3 changes: 2 additions & 1 deletion opentelemetry/src/sdk/trace/sampler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ impl ShouldSample for Sampler {
.should_sample(parent_context, trace_id, name, span_kind, attributes, links)
.decision,
|ctx| {
let parent_span_context = ctx.span().span_context();
let span = ctx.span();
let parent_span_context = span.span_context();
if parent_span_context.is_sampled() {
SamplingDecision::RecordAndSample
} else {
Expand Down