Skip to content

fix: don't pass special properties to otel span attributes #144

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

Merged
andylokandy merged 2 commits into from
Nov 28, 2025
Merged

fix: don't pass special properties to otel span attributes #144

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab87ba2
fix: don't pass special properties to otel span attributes
fedosiq Nov 27, 2025
0dc72c6
fmt
fedosiq Nov 27, 2025
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
21 changes: 17 additions & 4 deletions fastrace-opentelemetry/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@
#![doc = include_str!("../README.md")]

use std::borrow::Cow;
use std::collections::HashSet;
use std::fmt::Debug;
use std::future::Future;
use std::pin::Pin;
use std::sync::LazyLock;
use std::time::Duration;
use std::time::SystemTime;

Expand Down Expand Up @@ -67,6 +69,13 @@ pub struct OpenTelemetryReporter {
instrumentation_scope: InstrumentationScope,
}

pub const SPAN_KIND: &str = "span.kind";
pub const SPAN_STATUS_CODE: &str = "span.status_code";
pub const SPAN_STATUS_DESCRIPTION: &str = "span.status_description";

static OTEL_PROPERTIES: LazyLock<HashSet<&str>> =
LazyLock::new(|| HashSet::from([SPAN_KIND, SPAN_STATUS_CODE, SPAN_STATUS_DESCRIPTION]));

/// Convert a list of properties to a list of key-value pairs.
fn map_props_to_kvs(props: Vec<(Cow<'static, str>, Cow<'static, str>)>) -> Vec<KeyValue> {
props
Expand Down Expand Up @@ -152,7 +161,11 @@ impl OpenTelemetryReporter {
SystemTime::UNIX_EPOCH + Duration::from_nanos(begin_time_unix_ns);
let end_time = SystemTime::UNIX_EPOCH
+ Duration::from_nanos(begin_time_unix_ns + duration_ns);
let attributes = map_props_to_kvs(properties);
let attributes = properties
.into_iter()
.filter(|(k, _)| !OTEL_PROPERTIES.contains(k.as_ref()))
Copy link
Collaborator

@andylokandy andylokandy Nov 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe move the filter into map_props_to_kvs?

Copy link
Collaborator

@andylokandy andylokandy Nov 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in #145

.map(|(k, v)| KeyValue::new(k, v))
.collect();
let events = map_events(events);
SpanData {
span_context,
Expand Down Expand Up @@ -196,7 +209,7 @@ impl Reporter for OpenTelemetryReporter {
fn span_kind(properties: &[(Cow<'static, str>, Cow<'static, str>)]) -> SpanKind {
properties
.iter()
.find(|(k, _)| k == "span.kind")
.find(|(k, _)| k == SPAN_KIND)
.and_then(|(_, v)| match v.to_lowercase().as_str() {
"client" => Some(SpanKind::Client),
"server" => Some(SpanKind::Server),
Expand All @@ -211,12 +224,12 @@ fn span_kind(properties: &[(Cow<'static, str>, Cow<'static, str>)]) -> SpanKind
fn span_status(properties: &[(Cow<'static, str>, Cow<'static, str>)]) -> Status {
let status_description = properties
.iter()
.find(|(k, _)| k == "span.status_description")
.find(|(k, _)| k == SPAN_STATUS_DESCRIPTION)
.map(|(_, v)| v.to_string())
.unwrap_or_default();
properties
.iter()
.find(|(k, _)| k == "span.status_code")
.find(|(k, _)| k == SPAN_STATUS_CODE)
.and_then(|(_, v)| match v.to_lowercase().as_str() {
"unset" => Some(Status::Unset),
"ok" => Some(Status::Ok),
Expand Down