add missing await and move metrics block

DataDog · May 7, 2024 · 050662c · 050662c
1 parent 02e9ae7
commit 050662c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/handler.mjs b/src/handler.mjs
@@ -37,7 +37,7 @@ let wrapped_handler;
 try {
   wrapped_handler = datadog(await load(taskRootEnv, handlerEnv), { traceExtractor });
 } catch (error) {
-  emitTelemetryOnErrorOutsideHandler(error, handlerEnv, Date.now());
+  await emitTelemetryOnErrorOutsideHandler(error, handlerEnv, Date.now());
   throw error;
 }
 

diff --git a/src/index.ts b/src/index.ts
@@ -424,13 +424,6 @@ export async function emitTelemetryOnErrorOutsideHandler(
   functionName: string,
   startTime: number,
 ): Promise<void> {
-  const config = getConfig();
-  const metricsListener = new MetricsListener(new KMSService(), config);
-  await metricsListener.onStartInvocation(undefined);
-  if (config.enhancedMetrics) {
-    incrementErrorsMetric(metricsListener);
-  }
-
   if (getEnvValue("DD_TRACE_ENABLED", "true").toLowerCase() === "true") {
     const options: SpanOptions = {
       tags: {
@@ -451,5 +444,11 @@ export async function emitTelemetryOnErrorOutsideHandler(
     span.finish();
   }
 
+  const config = getConfig();
+  const metricsListener = new MetricsListener(new KMSService(), config);
+  await metricsListener.onStartInvocation(undefined);
+  if (config.enhancedMetrics) {
+    incrementErrorsMetric(metricsListener);
+  }
   await metricsListener.onCompleteInvocation();
 }