fix(tracing): fix utils to handle undefined span (#60)

MapColonies · Jan 2, 2024 · 7c3a69c · 7c3a69c
1 parent 982900e
commit 7c3a69c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/metrics/index.ts b/src/metrics/index.ts
@@ -1,2 +1,2 @@
 export { Metrics } from './metrics';
-export { defaultMetricsMiddleware, collectMetricsExpressMiddleware } from './middleware/metrics';
+export { metricsMiddleware, defaultMetricsMiddleware, collectMetricsExpressMiddleware } from './middleware/metrics';
diff --git a/src/tracing/utils/tracing.ts b/src/tracing/utils/tracing.ts
@@ -70,7 +70,11 @@ export const callWithSpan = <T>(fn: (span?: Span) => T, tracer: Tracer, spanName
  * Ends the given span with status OK
  * @param span span to be ended
  */
-export const handleSpanOnSuccess = (span: Span): void => {
+export const handleSpanOnSuccess = (span: Span | undefined): void => {
+  if (!span) {
+    return;
+  }
+
   span.setStatus({ code: SpanStatusCode.OK });
   span.end();
 };
@@ -80,7 +84,11 @@ export const handleSpanOnSuccess = (span: Span): void => {
  * @param span span to be ended
  * @param error error to be recorded
  */
-export const handleSpanOnError = (span: Span, error?: unknown): void => {
+export const handleSpanOnError = (span: Span | undefined, error?: unknown): void => {
+  if (!span) {
+    return;
+  }
+
   span.setStatus({ code: SpanStatusCode.ERROR });
 
   if (error instanceof Error) {