Merge branch 'master' into darcy.rayner/upgrade-dd-trace

DataDog · Mar 13, 2020 · ca373f6 · ca373f6
2 parents 04f877a + 9fe7ced
commit ca373f6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/src/metrics/enhanced-metrics.spec.ts b/src/metrics/enhanced-metrics.spec.ts
@@ -12,6 +12,10 @@ const mockContext = ({
   invokedFunctionArn: mockARN,
   memoryLimitInMB: "128",
 } as any) as Context;
+const mockContextLocal = ({
+  functionName: "my-test-lambda",
+  memoryLimitInMB: "128",
+} as any) as Context;
 
 describe("getRuntimeTag", () => {
   it("returns a null runtime tag when version is not recognized", () => {
@@ -55,6 +59,16 @@ describe("getEnhancedMetricTags", () => {
     ]);
   });
 
+  it("generates tag list with local runtime", () => {
+    mockedGetProcessVersion.mockReturnValue("v8.10.0");
+    expect(getEnhancedMetricTags(mockContextLocal)).toStrictEqual([
+      "functionname:my-test-lambda",
+      "cold_start:true",
+      "memorysize:128",
+      "runtime:nodejs8.10",
+    ]);
+  });
+
   it("doesn't add runtime tag if version is unrecognized", () => {
     mockedGetProcessVersion.mockReturnValue("v6.3.2");
     expect(getEnhancedMetricTags(mockContext)).toStrictEqual([

diff --git a/src/metrics/enhanced-metrics.ts b/src/metrics/enhanced-metrics.ts
@@ -44,11 +44,11 @@ export function getRuntimeTag(): string | null {
 }
 
 export function getEnhancedMetricTags(context: Context): string[] {
-  const tags = [
-    ...parseTagsFromARN(context.invokedFunctionArn),
-    getColdStartTag(),
-    `memorysize:${context.memoryLimitInMB}`,
-  ];
+  let arnTags = [`functionname:${context.functionName}`];
+  if (context.invokedFunctionArn) {
+    arnTags = parseTagsFromARN(context.invokedFunctionArn);
+  }
+  const tags = [...arnTags, getColdStartTag(), `memorysize:${context.memoryLimitInMB}`];
 
   const runtimeTag = getRuntimeTag();
   if (runtimeTag) {