Skip to content

Commit d596ab1

Browse files
authored
Merge branch 'main' into bench-simple-processor
2 parents 3422386 + f9076ea commit d596ab1

File tree

2 files changed

+8
-7
lines changed
  • opentelemetry-sdk/src/trace
  • opentelemetry-zipkin/src/propagator

2 files changed

+8
-7
lines changed

opentelemetry-sdk/src/trace/mod.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
//! The tracing SDK consist of a few main structs:
44
//!
55
//! * The [`Tracer`] struct which performs all tracing operations.
6-
//! * The [`Span`] struct with is a mutable object storing information about the current operation execution.
6+
//! * The [`Span`] struct with is a mutable object storing information about the
7+
//! current operation execution.
78
//! * The [`TracerProvider`] struct which configures and produces [`Tracer`]s.
89
mod config;
910
mod events;

opentelemetry-zipkin/src/propagator/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
//! The `B3Propagator` facilitates `SpanContext` propagation using
44
//! B3 Headers. This propagator supports both version of B3 headers,
55
//! 1. Single Header:
6-
//! b3: {trace_id}-{span_id}-{sampling_state}-{parent_span_id}
6+
//! b3: {trace_id}-{span_id}-{sampling_state}-{parent_span_id}
77
//! 2. Multiple Headers:
8-
//! X-B3-TraceId: {trace_id}
9-
//! X-B3-ParentSpanId: {parent_span_id}
10-
//! X-B3-SpanId: {span_id}
11-
//! X-B3-Sampled: {sampling_state}
12-
//! X-B3-Flags: {debug_flag}
8+
//! X-B3-TraceId: {trace_id}
9+
//! X-B3-ParentSpanId: {parent_span_id}
10+
//! X-B3-SpanId: {span_id}
11+
//! X-B3-Sampled: {sampling_state}
12+
//! X-B3-Flags: {debug_flag}
1313
//!
1414
//! If `inject_encoding` is set to `B3Encoding::SingleHeader` then `b3` header is used to inject
1515
//! and extract. Otherwise, separate headers are used to inject and extract.

0 commit comments

Comments
 (0)