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

Change Span to refer to SpanStack, rather than TracingContext. #39

Merged
merged 5 commits into from
Aug 2, 2022
Merged

Change Span to refer to SpanStack, rather than TracingContext. #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a38c0e2
Set reporter.
jmjoy Jul 30, 2022
8d47e0d
Merge branch 'master' into set-reporter
jmjoy Jul 30, 2022
f4e9c45
Change Span to refer to SpanStack, rather than TracingContext.
jmjoy Aug 1, 2022
508b2c7
Fmt.
jmjoy Aug 2, 2022
a3e3f18
Remove TracingContext segment_link field.
jmjoy Aug 2, 2022
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
4 changes: 2 additions & 2 deletions e2e/src/main.rs
View file
Open in desktop
Expand Up @@ -112,8 +112,8 @@ async fn handle_pong(_req: Request<Body>) -> Result<Response<Body>, Infallible>
.unwrap(),
)
.unwrap();
let mut context = tracer::create_trace_context_from_propagation(ctx);
let _span = context.create_entry_span("/pong");
let mut context = tracer::create_trace_context();
let _span = context.create_entry_span_with_propagation("/pong", &ctx);
Ok(Response::new(Body::from("hoge")))
}

Expand Down
71 changes: 37 additions & 34 deletions src/context/span.rs
View file
Open in desktop
Expand Up @@ -14,12 +14,17 @@
// limitations under the License.
//

use crate::skywalking_proto::v3::{SpanLayer, SpanObject, SpanType};
use std::fmt::Formatter;

use super::{
system_time::{fetch_time, TimePeriod},
trace_context::{TracingContext, WeakTracingContext},
trace_context::SpanStack,
};
use crate::{
error::LOCK_MSG,
skywalking_proto::v3::{SpanLayer, SpanObject, SpanType},
};
use std::{
fmt::Formatter,
sync::{Arc, Weak},
};

/// Span is a concept that represents trace information for a single RPC.
Expand Down Expand Up @@ -60,34 +65,38 @@ use super::{
#[must_use = "assign a variable name to guard the span not be dropped immediately."]
pub struct Span {
index: usize,
context: WeakTracingContext,
stack: Weak<SpanStack>,
}

impl std::fmt::Debug for Span {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
let mut d = f.debug_struct("Span");
match self.context.upgrade() {
Some(context) => {
let op = context.try_with_active_span_stack(|stack| {
d.field("data", &stack.get(self.index));
});
if op.is_none() {
d.field("data", &format_args!("<locked>"));
}
}
None => {
d.field("context", &format_args!("<dropped>"));
}
}
d.finish()
let span_object: SpanObject;
f.debug_struct("Span")
.field(
"data",
match self.stack.upgrade() {
Some(stack) => match stack.active.try_read() {
Ok(spans) => match spans.get(self.index) {
Some(span) => {
span_object = span.clone();
&span_object
}
None => &"<hanged>",
},
Err(_) => &"<locked>",
},
None => &"<dropped>",
},
)
.finish()
}
}

const SKYWALKING_RUST_COMPONENT_ID: i32 = 11000;

impl Span {
pub(crate) fn new(index: usize, context: WeakTracingContext) -> Self {
Self { index, context }
pub(crate) fn new(index: usize, stack: Weak<SpanStack>) -> Self {
Self { index, stack }
}

#[allow(clippy::too_many_arguments)]
Expand All @@ -114,21 +123,17 @@ impl Span {
}
}

fn upgrade_context(&self) -> TracingContext {
self.context.upgrade().expect("Context has dropped")
fn upgrade_stack(&self) -> Arc<SpanStack> {
self.stack.upgrade().expect("Context has dropped")
}

// Notice: Perhaps in the future, `RwLock` can be used instead of `Mutex`, so
// `with_*` can be nested. (Although I can't find the meaning of such use at
// present.)
pub fn with_span_object<T>(&self, f: impl FnOnce(&SpanObject) -> T) -> T {
self.upgrade_context()
.with_active_span_stack(|stack| f(&stack[self.index]))
self.upgrade_stack()
.with_active(|stack| f(&stack[self.index]))
}

pub fn with_span_object_mut<T>(&mut self, f: impl FnOnce(&mut SpanObject) -> T) -> T {
self.upgrade_context()
.with_active_span_stack_mut(|stack| f(&mut stack[self.index]))
f(&mut (self.upgrade_stack().active.try_write().expect(LOCK_MSG))[self.index])
}

pub fn span_id(&self) -> i32 {
Expand Down Expand Up @@ -159,9 +164,7 @@ impl Drop for Span {
///
/// Panic if context is dropped or this span isn't the active span.
fn drop(&mut self) {
if self.upgrade_context().finalize_span(self.index).is_err() {
panic!("Dropped span isn't the active span");
}
self.upgrade_stack().finalize_span(self.index);
}
}

Expand Down