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

Otel papercut fixes #2291

Merged
merged 1 commit into from
Nov 14, 2024
+43 −19
Merged

Otel papercut fixes #2291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions crates/tracing-instrumentation/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,14 +381,13 @@ macro_rules! invocation_span {
$crate::invocation_span!(
level = $lvl,
relation = $relation,
prefix = $prefix,
name = format!("{} {}", $prefix, $target.short()),
attributes=attributes,
fields=($($field = $field_value),*)
)
}
};
(level= $lvl:expr, relation = $relation:expr, prefix= $prefix:expr, id= $id:expr, name= $name:expr, tags=($($($key:ident).+ = $value:expr),*), fields=($($field:ident = $field_value:expr),*)) => {
(level= $lvl:expr, relation = $relation:expr, id= $id:expr, name= $name:expr, tags=($($($key:ident).+ = $value:expr),*), fields=($($field:ident = $field_value:expr),*)) => {
{
use opentelemetry::KeyValue;

Expand All @@ -400,14 +399,13 @@ macro_rules! invocation_span {
$crate::invocation_span!(
level = $lvl,
relation = $relation,
prefix = $prefix,
name = format!("{} {}", $prefix, $name),
name = $name,
attributes=attributes,
fields=($($field = $field_value),*)
)
}
};
(level= $lvl:expr, relation=$relation:expr, prefix= $prefix:expr, name= $name:expr, attributes=$attributes:ident, fields=($($field:ident = $field_value:expr),*)) => {
(level= $lvl:expr, relation=$relation:expr, name= $name:expr, attributes=$attributes:ident, fields=($($field:ident = $field_value:expr),*)) => {
{
use opentelemetry::{KeyValue, Context, trace::{Tracer, Link, TracerProvider, TraceContextExt}};
use restate_types::invocation::SpanRelation;
Expand Down Expand Up @@ -493,6 +491,16 @@ macro_rules! info_invocation_span {
fields = ()
)
};
(relation=$relation:expr, id= $id:expr, name= $name:expr, tags=($($($key:ident).+ = $value:expr),*)) => {
$crate::invocation_span!(
level = ::tracing::Level::INFO,
relation = $relation,
id = $id,
name = $name,
tags = ($($($key).+ = $value),*),
fields = ()
)
};
}

#[cfg(test)]
Expand Down
2 changes: 1 addition & 1 deletion crates/types/src/config/cli_option_overrides.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ pub struct CommonOptionCliOverride {
/// through [opentelemetry_otlp](https://docs.rs/opentelemetry-otlp/0.12.0/opentelemetry_otlp/).
///
/// To configure the sampling, please refer to the [opentelemetry autoconfigure docs](https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk-extensions/autoconfigure/README.md#sampler).
#[clap(long, env = "RESTATE_SERVICES_RUNTIME_ENDPOINT", global = true)]
#[clap(long, env = "RESTATE_TRACING_SERVICES_ENDPOINT", global = true)]
pub tracing_services_endpoint: Option<String>,

/// # Distributed Tracing JSON Export Path
Expand Down
42 changes: 29 additions & 13 deletions crates/worker/src/partition/state_machine/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ use restate_types::time::MillisSinceEpoch;
use restate_wal_protocol::timer::TimerKeyDisplay;
use restate_wal_protocol::timer::TimerKeyValue;
use restate_wal_protocol::Command;
use std::borrow::Cow;
use std::collections::HashSet;
use std::fmt;
use std::fmt::{Debug, Formatter};
Expand Down Expand Up @@ -1793,7 +1794,6 @@ impl<Codec: RawEntryCodec> StateMachine<Codec> {
.journal_metadata
.span_context
.as_parent(),
prefix = "set-state",
id = invocation_id,
name = format!("set-state {key:?}"),
tags = (rpc.service = invocation_metadata
Expand Down Expand Up @@ -1824,7 +1824,6 @@ impl<Codec: RawEntryCodec> StateMachine<Codec> {
.journal_metadata
.span_context
.as_parent(),
prefix = "clear-state",
id = invocation_id,
name = "clear-state",
tags = (rpc.service = invocation_metadata
Expand All @@ -1850,7 +1849,6 @@ impl<Codec: RawEntryCodec> StateMachine<Codec> {
.journal_metadata
.span_context
.as_parent(),
prefix = "clear-all-state",
id = invocation_id,
name = "clear-all-state",
tags = (rpc.service = invocation_metadata
Expand Down Expand Up @@ -2106,7 +2104,6 @@ impl<Codec: RawEntryCodec> StateMachine<Codec> {
.journal_metadata
.span_context
.as_parent(),
prefix = "sleep",
id = invocation_id,
name = "sleep",
tags = (rpc.service = invocation_metadata
Expand Down Expand Up @@ -2284,7 +2281,26 @@ impl<Codec: RawEntryCodec> StateMachine<Codec> {
)
.await?;
}
EnrichedEntryHeader::Run { .. } | EnrichedEntryHeader::Custom { .. } => {
EnrichedEntryHeader::Run { .. } => {
let _span = instrumentation::info_invocation_span!(
relation = invocation_metadata
.journal_metadata
.span_context
.as_parent(),
id = invocation_id,
name = match journal_entry.deserialize_name::<Codec>()?.as_deref() {
None | Some("") => Cow::Borrowed("run"),
Some(name) => Cow::Owned(format!("run {}", name)),
},
tags = (rpc.service = invocation_metadata
.invocation_target
.service_name()
.to_string())
);

// We just store it
}
EnrichedEntryHeader::Custom { .. } => {
// We just store it
}
EntryHeader::CancelInvocation => {
Expand Down Expand Up @@ -2760,8 +2776,8 @@ impl<Codec: RawEntryCodec> StateMachine<Codec> {

#[tracing::instrument(
skip_all,
level="info",
name="suspend",
level="info",
name="suspend",
fields(
metadata.journal.length = metadata.journal_metadata.length,
restate.invocation.id = %invocation_id)
Expand Down Expand Up @@ -2925,8 +2941,8 @@ impl<Codec: RawEntryCodec> StateMachine<Codec> {

#[tracing::instrument(
skip_all,
level="info",
name="set_state",
level="info",
name="set_state",
fields(
restate.invocation.id = %invocation_id,
restate.state.key = ?key,
Expand All @@ -2951,8 +2967,8 @@ impl<Codec: RawEntryCodec> StateMachine<Codec> {

#[tracing::instrument(
skip_all,
level="info",
name="clear_state",
level="info",
name="clear_state",
fields(
restate.invocation.id = %invocation_id,
restate.state.key = ?key,
Expand All @@ -2976,8 +2992,8 @@ impl<Codec: RawEntryCodec> StateMachine<Codec> {

#[tracing::instrument(
skip_all,
level="info",
name="clear_all_state",
level="info",
name="clear_all_state",
fields(
restate.invocation.id = %invocation_id,
rpc.service = %service_id.service_name
Expand Down
Loading