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

[checkout] - add manual tracing instrumentation #164

Merged
merged 10 commits into from
Jul 19, 2022
+46 −1
Merged

[checkout] - add manual tracing instrumentation #164

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ada8380
add manual spans and attributes
puckpuck Jun 23, 2022
61ebdf6
Update src/checkoutservice/main.go
puckpuck Jun 30, 2022
012ee19
Update src/checkoutservice/main.go
puckpuck Jun 30, 2022
b92faa5
Update src/checkoutservice/main.go
puckpuck Jun 30, 2022
c8606e9
add error event to span
puckpuck Jun 30, 2022
78239fd
reuse common attribute
puckpuck Jun 30, 2022
daab66a
Merge branch 'main' into puckpuck.checkout-manual-instrumentation
puckpuck Jun 30, 2022
a7a2dec
Merge branch 'main' into puckpuck.checkout-manual-instrumentation
puckpuck Jul 1, 2022
b9387c9
Merge branch 'main' into puckpuck.checkout-manual-instrumentation
puckpuck Jul 18, 2022
bd9aa71
reuse common attribute name
puckpuck Jul 18, 2022
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
39 changes: 38 additions & 1 deletion src/checkoutservice/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,12 @@ import (
"context"
"encoding/json"
"fmt"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/trace"
"net"
"net/http"
"os"
"strconv"
"time"

"github.com/google/uuid"
Expand All @@ -48,6 +51,7 @@ const (
)

var log *logrus.Logger
var tracer trace.Tracer

func init() {
log = logrus.New()
Expand Down Expand Up @@ -99,6 +103,8 @@ func main() {
}
}()

tracer = tp.Tracer("checkoutservice")

svc := new(checkoutService)
mustMapEnv(&svc.shippingSvcAddr, "SHIPPING_SERVICE_ADDR")
mustMapEnv(&svc.productCatalogSvcAddr, "PRODUCT_CATALOG_SERVICE_ADDR")
Expand Down Expand Up @@ -142,6 +148,11 @@ func (cs *checkoutService) Watch(req *healthpb.HealthCheckRequest, ws healthpb.H
}

func (cs *checkoutService) PlaceOrder(ctx context.Context, req *pb.PlaceOrderRequest) (*pb.PlaceOrderResponse, error) {
span := trace.SpanFromContext(ctx)
span.SetAttributes(
attribute.String("app.user.id", req.UserId),
attribute.String("app.user.currency", req.UserCurrency),
)
log.Infof("[PlaceOrder] user_id=%q user_currency=%q", req.UserId, req.UserCurrency)

orderID, err := uuid.NewUUID()
Expand All @@ -153,6 +164,7 @@ func (cs *checkoutService) PlaceOrder(ctx context.Context, req *pb.PlaceOrderReq
if err != nil {
return nil, status.Errorf(codes.Internal, err.Error())
}
span.AddEvent("prepared")
puckpuck marked this conversation as resolved.
Show resolved Hide resolved

total := &pb.Money{CurrencyCode: req.UserCurrency,
Units: 0,
Expand All @@ -168,11 +180,13 @@ func (cs *checkoutService) PlaceOrder(ctx context.Context, req *pb.PlaceOrderReq
return nil, status.Errorf(codes.Internal, "failed to charge card: %+v", err)
}
log.Infof("payment went through (transaction_id: %s)", txID)
span.AddEvent("charged", trace.WithAttributes(attribute.String("app.order.transaction.id", txID)))

shippingTrackingID, err := cs.shipOrder(ctx, req.Address, prep.cartItems)
if err != nil {
return nil, status.Errorf(codes.Unavailable, "shipping error: %+v", err)
}
span.AddEvent("shipped", trace.WithAttributes(attribute.String("app.order.tracking.id", shippingTrackingID)))

_ = cs.emptyUserCart(ctx, req.UserId)

Expand All @@ -184,6 +198,17 @@ func (cs *checkoutService) PlaceOrder(ctx context.Context, req *pb.PlaceOrderReq
Items: prep.orderItems,
}

shippingCostFloat, _ := strconv.ParseFloat(fmt.Sprintf("%d.%02d", prep.shippingCostLocalized.GetUnits(), prep.shippingCostLocalized.GetNanos()/10000000), 64)
puckpuck marked this conversation as resolved.
Show resolved Hide resolved
totalPriceFloat, _ := strconv.ParseFloat(fmt.Sprintf("%d.%02d", total.GetUnits(), total.GetNanos()/10000000), 64)
puckpuck marked this conversation as resolved.
Show resolved Hide resolved

span.SetAttributes(
attribute.String("app.order.id", orderID.String()),
attribute.String("app.order.tracking.id", shippingTrackingID),
attribute.Float64("app.order.shipping.cost", shippingCostFloat),
puckpuck marked this conversation as resolved.
Show resolved Hide resolved
attribute.Float64("app.order.total.cost", totalPriceFloat),
puckpuck marked this conversation as resolved.
Show resolved Hide resolved
attribute.Int("app.order.items.count", len(prep.orderItems)),
)

if err := cs.sendOrderConfirmation(ctx, req.Email, orderResult); err != nil {
log.Warnf("failed to send order confirmation to %q: %+v", req.Email, err)
} else {
Expand All @@ -200,6 +225,10 @@ type orderPrep struct {
}

func (cs *checkoutService) prepareOrderItemsAndShippingQuoteFromCart(ctx context.Context, userID, userCurrency string, address *pb.Address) (orderPrep, error) {

ctx, span := tracer.Start(ctx, "prepareOrderItemsAndShippingQuoteFromCart")
defer span.End()

var out orderPrep
cartItems, err := cs.getUserCart(ctx, userID)
if err != nil {
Expand All @@ -221,6 +250,14 @@ func (cs *checkoutService) prepareOrderItemsAndShippingQuoteFromCart(ctx context
out.shippingCostLocalized = shippingPrice
out.cartItems = cartItems
out.orderItems = orderItems

shippingCostFloat, _ := strconv.ParseFloat(fmt.Sprintf("%d.%02d", shippingPrice.GetUnits(), shippingPrice.GetNanos()/10000000), 64)
puckpuck marked this conversation as resolved.
Show resolved Hide resolved

span.SetAttributes(
attribute.Float64("app.order.shipping.cost", shippingCostFloat),
attribute.Int("app.cart.items.count", len(cartItems)),
attribute.Int("app.order.items.count", len(orderItems)),
)
return out, nil
}

Expand Down Expand Up @@ -308,7 +345,7 @@ func (cs *checkoutService) convertCurrency(ctx context.Context, from *pb.Money,
return nil, fmt.Errorf("could not connect currency service: %+v", err)
}
defer conn.Close()
result, err := pb.NewCurrencyServiceClient(conn).Convert(context.TODO(), &pb.CurrencyConversionRequest{
result, err := pb.NewCurrencyServiceClient(conn).Convert(ctx, &pb.CurrencyConversionRequest{
From: from,
ToCode: toCurrency})
if err != nil {
Expand Down