Skip to content

Commit b50916d

Browse files
committed
Only import tracer dependencies when we need it
1 parent d30e722 commit b50916d

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

src/utils/span-pointers.spec.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import { getSpanPointerAttributes } from "./span-pointers";
22
import { eventTypes } from "../trace/trigger";
3-
import { S3_PTR_KIND, SPAN_POINTER_DIRECTION } from "dd-trace/packages/dd-trace/src/constants";
4-
import * as util from "dd-trace/packages/dd-trace/src/util";
3+
4+
// tslint:disable-next-line:no-var-requires
5+
const { S3_PTR_KIND, SPAN_POINTER_DIRECTION } = require("dd-trace/packages/dd-trace/src/constants");
6+
// tslint:disable-next-line:no-var-requires
7+
const util = require("dd-trace/packages/dd-trace/src/util");
58

69
// Mock the external dependencies
710
jest.mock("./log", () => ({

src/utils/span-pointers.ts

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { eventTypes } from "../trace/trigger";
22
import { logDebug } from "./log";
3-
import { S3_PTR_KIND, SPAN_POINTER_DIRECTION } from "dd-trace/packages/dd-trace/src/constants";
4-
import { generatePointerHash } from "dd-trace/packages/dd-trace/src/util";
53

64
interface SpanPointerAttributes {
75
pointerKind: string;
@@ -37,6 +35,22 @@ function processS3Event(event: any): SpanPointerAttributes[] {
3735
const records = event.Records || [];
3836
const spanPointerAttributesList: SpanPointerAttributes[] = [];
3937

38+
// Get dependencies from tracer only when needed
39+
let constants;
40+
let util;
41+
try {
42+
constants = require("dd-trace/packages/dd-trace/src/constants");
43+
util = require("dd-trace/packages/dd-trace/src/util");
44+
} catch (err) {
45+
if (err instanceof Error) {
46+
logDebug("Failed to load dd-trace span pointer dependencies", err);
47+
}
48+
return spanPointerAttributesList;
49+
}
50+
51+
const { S3_PTR_KIND, SPAN_POINTER_DIRECTION } = constants;
52+
const { generatePointerHash } = util;
53+
4054
for (const record of records) {
4155
const eventName = record.eventName;
4256
if (!eventName.startsWith("ObjectCreated")) {

0 commit comments

Comments
 (0)