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

Feature/otel span kind support #946

Merged
merged 5 commits into from
Dec 12, 2024
Merged

Feature/otel span kind support #946

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
6a9754f
feat(otel): add span kind support to Lambda invocation tracing
alessandrobologna Nov 30, 2024
c19bc25
fix fmt
alessandrobologna Nov 30, 2024
62a87d8
docs(example): demonstrate OpenTelemetry span kind usage
alessandrobologna Dec 1, 2024
534b248
fix fmt
alessandrobologna Dec 1, 2024
0e48a80
Merge remote-tracking branch 'upstream/main' into feature/otel-span-k…
alessandrobologna Dec 9, 2024
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
3 changes: 3 additions & 0 deletions examples/opentelemetry-tracing/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use lambda_runtime::{
layers::{OpenTelemetryFaasTrigger, OpenTelemetryLayer as OtelLayer},
tracing::Span,
LambdaEvent, Runtime,
};
use opentelemetry::trace::TracerProvider;
Expand All @@ -8,6 +9,8 @@ use tower::{service_fn, BoxError};
use tracing_subscriber::prelude::*;

async fn echo(event: LambdaEvent<serde_json::Value>) -> Result<serde_json::Value, &'static str> {
let span = Span::current();
span.record("otel.kind", "SERVER");
Ok(event.payload)
}

Expand Down
3 changes: 2 additions & 1 deletion lambda-runtime/src/layers/otel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use crate::LambdaInvocation;
use opentelemetry_semantic_conventions::trace as traceconv;
use pin_project::pin_project;
use tower::{Layer, Service};
use tracing::{instrument::Instrumented, Instrument};
use tracing::{field, instrument::Instrumented, Instrument};

/// Tower layer to add OpenTelemetry tracing to a Lambda function invocation. The layer accepts
/// a function to flush OpenTelemetry after the end of the invocation.
Expand Down Expand Up @@ -75,6 +75,7 @@ where
let span = tracing::info_span!(
"Lambda function invocation",
"otel.name" = req.context.env_config.function_name,
"otel.kind" = field::Empty,
{ traceconv::FAAS_TRIGGER } = &self.otel_attribute_trigger,
{ traceconv::FAAS_INVOCATION_ID } = req.context.request_id,
{ traceconv::FAAS_COLDSTART } = self.coldstart
Expand Down
Loading