Code review improvements

Author: nhulston

src/trace/listener.ts

@@ -17,7 +17,7 @@ import { TraceContext, TraceContextService, TraceSource } from "./trace-context-
 import { StepFunctionContext, StepFunctionContextService } from "./step-function-service";
 import { XrayService } from "./xray-service";
 import { AUTHORIZING_REQUEST_ID_HEADER } from "./context/extractors/http";
-import { getSpanPointerAttributes } from "../utils/span-pointers";
+import { getSpanPointerAttributes, SpanPointerAttributes } from "../utils/span-pointers";
 export type TraceExtractor = (event: any, context: Context) => Promise<TraceContext> | TraceContext;
 
 export interface TraceConfig {
@@ -71,12 +71,6 @@ export interface TraceConfig {
   coldStartTraceSkipLib: string;
 }
 
-interface SpanPointerAttributes {
-  pointerKind: string;
-  pointerDirection: string;
-  pointerHash: string;
-}
-
 export class TraceListener {
   private contextService: TraceContextService;
   private context?: Context;
@@ -145,7 +139,7 @@ export class TraceListener {
 
     const result = getSpanPointerAttributes(eventSource, event);
     if (result) {
-      this.spanPointerAttributesList.push(...result);
+      this.spanPointerAttributesList = result;
     }
   }
 

src/utils/span-pointers.spec.ts

@@ -1,4 +1,4 @@
-import { getSpanPointerAttributes } from "./span-pointers";
+import { getSpanPointerAttributes, SpanPointerAttributes } from "./span-pointers";
 import { eventTypes } from "../trace/trigger";
 
 // tslint:disable-next-line:no-var-requires
@@ -11,12 +11,6 @@ jest.mock("./log", () => ({
   logDebug: jest.fn(),
 }));
 
-interface SpanPointerAttributes {
-  pointerKind: string;
-  pointerDirection: string;
-  pointerHash: string;
-}
-
 describe("span-pointers utils", () => {
   const mockPointerHash = "mock-hash-123";
 

src/utils/span-pointers.ts

@@ -1,7 +1,7 @@
 import { eventTypes } from "../trace/trigger";
 import { logDebug } from "./log";
 
-interface SpanPointerAttributes {
+export interface SpanPointerAttributes {
   pointerKind: string;
   pointerDirection: string;
   pointerHash: string;
@@ -33,21 +33,22 @@ function processS3Event(event: any): SpanPointerAttributes[] {
   const spanPointerAttributesList: SpanPointerAttributes[] = [];
 
   // Get dependencies from tracer only when needed
-  let constants;
-  let util;
+  let S3_PTR_KIND;
+  let SPAN_POINTER_DIRECTION;
+  let generatePointerHash;
   try {
-    constants = require("dd-trace/packages/dd-trace/src/constants");
-    util = require("dd-trace/packages/dd-trace/src/util");
+    const constants = require("dd-trace/packages/dd-trace/src/constants");
+    const util = require("dd-trace/packages/dd-trace/src/util");
+
+    ({ S3_PTR_KIND, SPAN_POINTER_DIRECTION } = constants);
+    ({ generatePointerHash } = util);
   } catch (err) {
     if (err instanceof Error) {
       logDebug("Failed to load dd-trace span pointer dependencies", err);
     }
     return spanPointerAttributesList;
   }
 
-  const { S3_PTR_KIND, SPAN_POINTER_DIRECTION } = constants;
-  const { generatePointerHash } = util;
-
   for (const record of records) {
     const eventName = record.eventName;
     if (!eventName || !eventName.startsWith("ObjectCreated")) {