Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ import {
type Mocked,
vi,
} from "vitest";
const memoryExporter = new InMemorySpanExporter();
const tracerProvider = new NodeTracerProvider({
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
});
tracerProvider.register();

describe("OITracer", () => {
let mockTracer: Mocked<Tracer>;
let mockSpan: Mocked<Span>;
let contextManager: ContextManager;
const memoryExporter = new InMemorySpanExporter();
const tracerProvider = new NodeTracerProvider({
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
});
tracerProvider.register();

beforeEach(() => {
contextManager = new AsyncHooksContextManager().enable();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ describe("AnthropicInstrumentation", () => {

beforeEach(() => {
exporter = new InMemorySpanExporter();
provider = new NodeTracerProvider();
provider.addSpanProcessor(new SimpleSpanProcessor(exporter));

provider = new NodeTracerProvider({
spanProcessors: [new SimpleSpanProcessor(exporter)],
});
instrumentation = new AnthropicInstrumentation({
tracerProvider: provider,
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,10 @@ describe("BedrockAgentInstrumentation with a custom tracer provider", () => {
let polly: Polly;

describe("BedrockAgentInstrumentation with custom TracerProvider passed in", () => {
const customTracerProvider = new NodeTracerProvider();
const customMemoryExporter = new InMemorySpanExporter();

// Note: We don't register this provider globally.
customTracerProvider.addSpanProcessor(
new SimpleSpanProcessor(customMemoryExporter),
);

const customTracerProvider = new NodeTracerProvider({
spanProcessors: [new SimpleSpanProcessor(customMemoryExporter)],
});
// Instantiate instrumentation with the custom provider
const instrumentation = new BedrockAgentInstrumentation({
tracerProvider: customTracerProvider,
Expand Down Expand Up @@ -96,13 +92,10 @@ describe("BedrockAgentInstrumentation with a custom tracer provider", () => {
});

describe("BedrockkAgentInstrumentation with custom TracerProvider set", () => {
const customTracerProvider = new NodeTracerProvider();
const customMemoryExporter = new InMemorySpanExporter();

// Note: We don't register this provider globally.
customTracerProvider.addSpanProcessor(
new SimpleSpanProcessor(customMemoryExporter),
);
const customTracerProvider = new NodeTracerProvider({
spanProcessors: [new SimpleSpanProcessor(customMemoryExporter)],
});

// Instantiate instrumentation with the custom provider
const instrumentation = new BedrockAgentInstrumentation({});
Expand Down Expand Up @@ -167,13 +160,10 @@ describe("BedrockAgentInstrumentation with a custom tracer provider", () => {
});

describe("BedrockAgentInstrumentation with custom TracerProvider set via registerInstrumentations", () => {
const customTracerProvider = new NodeTracerProvider();
const customMemoryExporter = new InMemorySpanExporter();

// Note: We don't register this provider globally.
customTracerProvider.addSpanProcessor(
new SimpleSpanProcessor(customMemoryExporter),
);
const customTracerProvider = new NodeTracerProvider({
spanProcessors: [new SimpleSpanProcessor(customMemoryExporter)],
});

// Instantiate instrumentation with the custom provider
const instrumentation = new BedrockAgentInstrumentation();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ describe("BedrockAgentInstrumentation Trace Collector Integration - agent attrib
instrumentation = new BedrockAgentInstrumentation();
instrumentation.disable();
memoryExporter = new InMemorySpanExporter();
provider = new NodeTracerProvider();
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
provider = new NodeTracerProvider({
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
});
provider.register();
instrumentation.setTracerProvider(provider);
// Manually set module exports for testing (following OpenAI pattern)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ describe("BedrockAgentInstrumentation Integration - agent attributes and API rec
instrumentation = new BedrockAgentInstrumentation();
instrumentation.disable();
memoryExporter = new InMemorySpanExporter();
provider = new NodeTracerProvider();
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
provider = new NodeTracerProvider({
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
});
provider.register();
instrumentation.setTracerProvider(provider);
// Manually set module exports for testing (following OpenAI pattern)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ describe("BedrockAgent RAG Instrumentation - attributes and API recording", () =
instrumentation = new BedrockAgentInstrumentation();
instrumentation.disable();
memoryExporter = new InMemorySpanExporter();
provider = new NodeTracerProvider();
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
provider = new NodeTracerProvider({
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
});
provider.register();
instrumentation.setTracerProvider(provider);
// Manually set module exports for testing (following OpenAI pattern)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,6 @@ class ConverseComprehensiveValidator {
}

private setupTracing() {
this.provider = new NodeTracerProvider({
resource: new Resource({
[SEMRESATTRS_PROJECT_NAME]: "bedrock-converse-comprehensive-validation",
}),
});

// Setup exporters
const exporters = [new ConsoleSpanExporter()];

Expand Down Expand Up @@ -136,8 +130,13 @@ class ConverseComprehensiveValidator {
exporters.push(phoenixExporter);
}

exporters.forEach((exporter) => {
this.provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
this.provider = new NodeTracerProvider({
resource: new Resource({
[SEMRESATTRS_PROJECT_NAME]: "bedrock-converse-comprehensive-validation",
}),
spanProcessors: exporters.map(
(exporter) => new SimpleSpanProcessor(exporter),
),
});

this.provider.register();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,6 @@ class ConverseStreamPhoenixValidator {
}

private setupTracing() {
this.provider = new NodeTracerProvider({
resource: new Resource({
[SEMRESATTRS_PROJECT_NAME]:
"bedrock-converse-stream-phoenix-validation",
}),
});

// Setup exporters
const exporters: SpanExporter[] = [new ConsoleSpanExporter()];

Expand Down Expand Up @@ -141,8 +134,14 @@ class ConverseStreamPhoenixValidator {
exporters.push(phoenixExporter);
}

exporters.forEach((exporter) => {
this.provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
this.provider = new NodeTracerProvider({
resource: new Resource({
[SEMRESATTRS_PROJECT_NAME]:
"bedrock-converse-stream-phoenix-validation",
}),
spanProcessors: exporters.map(
(exporter) => new SimpleSpanProcessor(exporter),
),
});

this.provider.register();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,6 @@ class InstrumentationValidator {
}

private setupTracing() {
this.provider = new NodeTracerProvider({
resource: new Resource({
[SEMRESATTRS_PROJECT_NAME]: "bedrock-validation-script",
}),
});

// Setup exporters
const exporters = [new ConsoleSpanExporter()];

Expand Down Expand Up @@ -136,10 +130,14 @@ class InstrumentationValidator {
exporters.push(phoenixExporter);
}

exporters.forEach((exporter) => {
this.provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
this.provider = new NodeTracerProvider({
resource: new Resource({
[SEMRESATTRS_PROJECT_NAME]: "bedrock-validation-script",
}),
spanProcessors: exporters.map(
(exporter) => new SimpleSpanProcessor(exporter),
),
});

this.provider.register();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,10 @@ describe("BedrockInstrumentation", () => {
instrumentation = new BedrockInstrumentation();
instrumentation.disable(); // Initially disabled
spanExporter = new InMemorySpanExporter();
provider = new NodeTracerProvider();
provider = new NodeTracerProvider({
spanProcessors: [new SimpleSpanProcessor(spanExporter)],
});

provider.addSpanProcessor(new SimpleSpanProcessor(spanExporter));
provider.register();
instrumentation.setTracerProvider(provider);

Expand Down Expand Up @@ -3850,8 +3851,9 @@ describe("BedrockInstrumentation - custom tracing", () => {
beforeAll(() => {
// Setup global tracer provider and span exporter for comparison
spanExporter = new InMemorySpanExporter();
provider = new NodeTracerProvider();
provider.addSpanProcessor(new SimpleSpanProcessor(spanExporter));
provider = new NodeTracerProvider({
spanProcessors: [new SimpleSpanProcessor(spanExporter)],
});
provider.register();
});

Expand Down Expand Up @@ -3903,14 +3905,11 @@ describe("BedrockInstrumentation - custom tracing", () => {
});

describe("BedrockInstrumentation with custom TracerProvider passed in", () => {
const customTracerProvider = new NodeTracerProvider();
const customMemoryExporter = new InMemorySpanExporter();
let instrumentation: BedrockInstrumentation;

// Note: We don't register this provider globally.
customTracerProvider.addSpanProcessor(
new SimpleSpanProcessor(customMemoryExporter),
);
const customTracerProvider = new NodeTracerProvider({
spanProcessors: [new SimpleSpanProcessor(customMemoryExporter)],
});

beforeAll(async () => {
// Instantiate instrumentation with the custom provider
Expand Down Expand Up @@ -3975,14 +3974,11 @@ describe("BedrockInstrumentation - custom tracing", () => {
});

describe("BedrockInstrumentation with custom TracerProvider set", () => {
const customTracerProvider = new NodeTracerProvider();
const customMemoryExporter = new InMemorySpanExporter();
let instrumentation: BedrockInstrumentation;

// Note: We don't register this provider globally.
customTracerProvider.addSpanProcessor(
new SimpleSpanProcessor(customMemoryExporter),
);
const customTracerProvider = new NodeTracerProvider({
spanProcessors: [new SimpleSpanProcessor(customMemoryExporter)],
});

beforeAll(async () => {
// Instantiate instrumentation and set the custom provider
Expand Down Expand Up @@ -4046,15 +4042,12 @@ describe("BedrockInstrumentation - custom tracing", () => {
});

describe("BedrockInstrumentation with custom TracerProvider set via registerInstrumentations", () => {
const customTracerProvider = new NodeTracerProvider();
const customMemoryExporter = new InMemorySpanExporter();
const customTracerProvider = new NodeTracerProvider({
spanProcessors: [new SimpleSpanProcessor(customMemoryExporter)],
});
let instrumentation: BedrockInstrumentation;

// Note: We don't register this provider globally.
customTracerProvider.addSpanProcessor(
new SimpleSpanProcessor(customMemoryExporter),
);

beforeAll(async () => {
// Instantiate instrumentation and register with the custom provider
instrumentation = new BedrockInstrumentation();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,16 @@ const provider = new NodeTracerProvider({
[ATTR_SERVICE_NAME]: "langchain-service",
[SEMRESATTRS_PROJECT_NAME]: "langchain-project",
}),
spanProcessors: [
new SimpleSpanProcessor(new ConsoleSpanExporter()),
new SimpleSpanProcessor(
new OTLPTraceExporter({
url: "http://localhost:6006/v1/traces",
}),
),
],
});

provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
provider.addSpanProcessor(
new SimpleSpanProcessor(
new OTLPTraceExporter({
url: "http://localhost:6006/v1/traces",
}),
),
);

const lcInstrumentation = new LangChainInstrumentation();
// LangChain must be manually instrumented as it doesn't have a traditional module structure
lcInstrumentation.manuallyInstrument(CallbackManagerModule);
Expand Down
Loading
Loading