From 853b97a32fae6f82db496847d258f0af30cc21b7 Mon Sep 17 00:00:00 2001 From: Juliano Costa Date: Thu, 25 Aug 2022 23:13:28 +0200 Subject: [PATCH 1/2] Add events to shippingservice --- src/shippingservice/src/shipping_service.rs | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/shippingservice/src/shipping_service.rs b/src/shippingservice/src/shipping_service.rs index 96f10e7bb1..05bee7919f 100644 --- a/src/shippingservice/src/shipping_service.rs +++ b/src/shippingservice/src/shipping_service.rs @@ -1,4 +1,4 @@ -use opentelemetry::trace::{mark_span_as_active, Span, Tracer}; +use opentelemetry::trace::{get_active_span, mark_span_as_active, Span, Tracer}; use opentelemetry::{global, propagation::Extractor, KeyValue}; use shop::shipping_service_server::ShippingService; use shop::{GetQuoteRequest, GetQuoteResponse, Money, ShipOrderRequest, ShipOrderResponse}; @@ -64,6 +64,10 @@ impl ShippingService for ShippingServer { let span = tracer.start_with_context("get-quote", &parent_cx); let _guard = mark_span_as_active(span); + get_active_span(|span| { + span.add_event("Processing get quote request".to_string(), vec![]); + }); + let q = create_quote_from_count(itemct); let reply = GetQuoteResponse { cost_usd: Some(Money { @@ -74,6 +78,13 @@ impl ShippingService for ShippingServer { }; info!("Sending Quote: {}", q); + get_active_span(|span| { + span.add_event( + "Get quote request completed, response sent back".to_string(), + vec![], + ); + }); + Ok(Response::new(reply)) } async fn ship_order( @@ -89,10 +100,17 @@ impl ShippingService for ShippingServer { let mut span = global::tracer("shippingservice/ship-order") .start_with_context("ship-order", &parent_cx); + span.add_event("Processing shipping order request".to_string(), vec![]); + let tid = create_tracking_id(); span.set_attribute(KeyValue::new("app.shipping.tracking.id", tid.clone())); info!("Tracking ID Created: {}", tid); + span.add_event( + "Shipping tracking id created, response sent back".to_string(), + vec![], + ); + Ok(Response::new(ShipOrderResponse { tracking_id: tid })) } } From 9470496417624bc2c0a566d616278b74098aeb88 Mon Sep 17 00:00:00 2001 From: Juliano Costa Date: Thu, 25 Aug 2022 23:18:54 +0200 Subject: [PATCH 2/2] Add changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a45390b37b..dd495561b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -87,3 +87,5 @@ significant modifications will be credited to OpenTelemetry Authors. ([#332](https://github.com/open-telemetry/opentelemetry-demo/pull/332)) * Add `synthetic_request=true` baggage to load generator requests ([#331](https://github.com/open-telemetry/opentelemetry-demo/pull/331)) +* Add span events to shipping service +([#344](https://github.com/open-telemetry/opentelemetry-demo/pull/344))