Skip to content

Ensure we handle the scenario the payment service code expects there to be an active span but finds none #2129

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
puckpuck merged 6 commits into from
Apr 20, 2025
Merged

Ensure we handle the scenario the payment service code expects there to be an active span but finds none #2129

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2f9eb59
Ensure we handle the scenario where there is currently no active span…
keyoke Mar 20, 2025
28e0d1a
Mark this new span as active
keyoke Mar 20, 2025
29eb717
incorporate review comments
keyoke Mar 27, 2025
e1f72f3
revert var def change
keyoke Mar 27, 2025
2d4be41
Merge branch 'main' into users/gareth
julianocosta89 Apr 9, 2025
7f1bed4
Merge branch 'main' into users/gareth
puckpuck Apr 20, 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
17 changes: 15 additions & 2 deletions src/payment/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,22 @@ const grpc = require('@grpc/grpc-js')
const protoLoader = require('@grpc/proto-loader')
const health = require('grpc-js-health-check')
const opentelemetry = require('@opentelemetry/api')
const tracer = opentelemetry.trace.getTracer(process.env.OTEL_SERVICE_NAME);

const charge = require('./charge')
const logger = require('./logger')

async function chargeServiceHandler(call, callback) {
const span = opentelemetry.trace.getActiveSpan();
// Check if we have an active span if not start a new one
let span = opentelemetry.trace.getActiveSpan();
let startedSpan = false;
if (!span)
{
span = tracer.startSpan('chargeServiceHandler');
// Mark this new span as active
tracer.setSpan(tracer.context.active(), span)
startedSpan = true;
}

try {
const amount = call.request.amount
Expand All @@ -26,7 +36,10 @@ async function chargeServiceHandler(call, callback) {

span.recordException(err)
span.setStatus({ code: opentelemetry.SpanStatusCode.ERROR })

// Make sure we cleanup by closing the span if we started it.
if (startedSpan) {
span.end();
}
callback(err)
}
}
Expand Down