Skip to content

Commit

Permalink
Only import tracer dependencies when we need it
Browse files Browse the repository at this point in the history
  • Loading branch information
nhulston committed Nov 22, 2024
1 parent d30e722 commit b50916d
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 4 deletions.
7 changes: 5 additions & 2 deletions src/utils/span-pointers.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { getSpanPointerAttributes } from "./span-pointers";
import { eventTypes } from "../trace/trigger";
import { S3_PTR_KIND, SPAN_POINTER_DIRECTION } from "dd-trace/packages/dd-trace/src/constants";
import * as util from "dd-trace/packages/dd-trace/src/util";

// tslint:disable-next-line:no-var-requires
const { S3_PTR_KIND, SPAN_POINTER_DIRECTION } = require("dd-trace/packages/dd-trace/src/constants");
// tslint:disable-next-line:no-var-requires
const util = require("dd-trace/packages/dd-trace/src/util");

// Mock the external dependencies
jest.mock("./log", () => ({
Expand Down
18 changes: 16 additions & 2 deletions src/utils/span-pointers.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { eventTypes } from "../trace/trigger";
import { logDebug } from "./log";
import { S3_PTR_KIND, SPAN_POINTER_DIRECTION } from "dd-trace/packages/dd-trace/src/constants";
import { generatePointerHash } from "dd-trace/packages/dd-trace/src/util";

interface SpanPointerAttributes {
pointerKind: string;
Expand Down Expand Up @@ -37,6 +35,22 @@ function processS3Event(event: any): SpanPointerAttributes[] {
const records = event.Records || [];
const spanPointerAttributesList: SpanPointerAttributes[] = [];

// Get dependencies from tracer only when needed
let constants;
let util;
try {
constants = require("dd-trace/packages/dd-trace/src/constants");
util = require("dd-trace/packages/dd-trace/src/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.startsWith("ObjectCreated")) {
Expand Down

0 comments on commit b50916d

Please sign in to comment.