Fix tracking caller

autometrics-dev · Oct 24, 2023 · 13f067d · 13f067d
1 parent 0af6a6d
commit 13f067d
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 5 deletions.
diff --git a/examples/express/tests/test-utils.ts b/examples/express/tests/test-utils.ts
@@ -25,7 +25,7 @@ export async function stepWithMetricReader(
   registerExporter({ metricReader });
 
   try {
-    t.test(stepName, () => testFn(metricReader));
+    await t.test(stepName, () => testFn(metricReader));
   } finally {
     await metricReader.forceFlush();
   }

diff --git a/examples/hono-bun/tests/callerInfo.test.ts b/examples/hono-bun/tests/callerInfo.test.ts
@@ -4,7 +4,7 @@ import { autometrics } from "@autometrics/autometrics";
 
 import { collectAndSerialize, testWithMetricReader } from "./test-utils.js";
 
-test("Caller info test", async () => {
+test("Caller info test -- synchronous call", async () => {
   await testWithMetricReader(async (metricReader) => {
     const foo = autometrics(function foo() {});
 
@@ -24,3 +24,26 @@ test("Caller info test", async () => {
     );
   });
 });
+
+test("Caller info test -- asynchronous call", async () => {
+  await testWithMetricReader(async (metricReader) => {
+    const foo = autometrics(function foo() {
+      return Promise.resolve();
+    });
+
+    const bar = autometrics(async function bar() {
+      await foo();
+    });
+
+    await bar();
+
+    const serialized = await collectAndSerialize(metricReader);
+
+    expect(serialized).toMatch(
+      /function_calls_total\{\S*function="bar"\S*caller=""\S*\} 1/gm,
+    );
+    expect(serialized).toMatch(
+      /function_calls_total\{\S*function="foo"\S*caller="bar"\S*\} 1/gm,
+    );
+  });
+});
diff --git a/packages/autometrics/src/wrappers.ts b/packages/autometrics/src/wrappers.ts
@@ -279,13 +279,12 @@ export function autometrics<F extends FunctionSig>(
         valueType: ValueType.INT,
       })
     : null;
-  const caller = asyncLocalStorage?.getStore()?.caller;
 
   counter.add(0, {
     function: functionName,
     module: moduleName,
     result: "ok",
-    caller,
+    caller: "",
     ...counterObjectiveAttributes,
   });
 
@@ -296,6 +295,8 @@ export function autometrics<F extends FunctionSig>(
       module: moduleName,
     });
 
+    const caller = asyncLocalStorage?.getStore()?.caller ?? "";
+
     const onSuccess = () => {
       const autometricsDuration = (performance.now() - autometricsStart) / 1000;
 

diff --git a/packages/autometrics/tests/__snapshots__/otlpHttpExporter.test.ts.snap b/packages/autometrics/tests/__snapshots__/otlpHttpExporter.test.ts.snap
@@ -2,7 +2,7 @@ export const snapshot = {};
 
 snapshot[`OTLP/HTTP exporter 1`] = `
 {
-  caller: undefined,
+  caller: "",
   function: "foo",
   module: "/packages/autometrics/tests/otlpHttpExporter.test.ts",
   objective_name: "",