Skip to content

Commit d430427

Browse files
nirganirga
committed
feat(otel): general bump to v2
1 parent 3f32542 commit d430427

File tree

34 files changed

+435
-359
lines changed

34 files changed

+435
-359
lines changed

‎package-lock.json

Lines changed: 297 additions & 256 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/instrumentation-anthropic/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
"access": "public"
3939
},
4040
"dependencies": {
41-
"@opentelemetry/core": "^1.29.0",
42-
"@opentelemetry/instrumentation": "^0.56.0",
43-
"@opentelemetry/semantic-conventions": "^1.28.0",
41+
"@opentelemetry/core": "^2.0.1",
42+
"@opentelemetry/instrumentation": "^0.202.0",
43+
"@opentelemetry/semantic-conventions": "^1.34.0",
4444
"@traceloop/ai-semantic-conventions": "^0.13.0",
4545
"tslib": "^2.8.1"
4646
},

‎packages/instrumentation-anthropic/test/instrumentation.test.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import * as assert from "assert";
1919
import { context } from "@opentelemetry/api";
2020
import { AsyncHooksContextManager } from "@opentelemetry/context-async-hooks";
2121
import {
22-
BasicTracerProvider,
2322
InMemorySpanExporter,
2423
SimpleSpanProcessor,
2524
} from "@opentelemetry/sdk-trace-base";
25+
import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
2626

2727
import * as AnthropicModule from "@anthropic-ai/sdk";
2828

@@ -39,7 +39,7 @@ Polly.register(NodeHttpAdapter);
3939
Polly.register(FSPersister);
4040

4141
describe("Test Anthropic instrumentation", async function () {
42-
const provider = new BasicTracerProvider();
42+
let provider: NodeTracerProvider;
4343
let instrumentation: AnthropicInstrumentation;
4444
let contextManager: AsyncHooksContextManager;
4545
let anthropic: AnthropicModule.Anthropic;
@@ -57,7 +57,9 @@ describe("Test Anthropic instrumentation", async function () {
5757
if (process.env.RECORD_MODE !== "NEW") {
5858
process.env.ANTHROPIC_API_KEY = "test-key";
5959
}
60-
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
60+
provider = new NodeTracerProvider({
61+
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
62+
});
6163
instrumentation = new AnthropicInstrumentation();
6264
instrumentation.setTracerProvider(provider);
6365

‎packages/instrumentation-azure/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
"access": "public"
3939
},
4040
"dependencies": {
41-
"@opentelemetry/core": "^1.29.0",
42-
"@opentelemetry/instrumentation": "^0.56.0",
43-
"@opentelemetry/semantic-conventions": "^1.28.0",
41+
"@opentelemetry/core": "^2.0.1",
42+
"@opentelemetry/instrumentation": "^0.202.0",
43+
"@opentelemetry/semantic-conventions": "^1.34.0",
4444
"@traceloop/ai-semantic-conventions": "^0.13.0",
4545
"tslib": "^2.8.1"
4646
},

‎packages/instrumentation-azure/test/instrumentation.test.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@ import * as assert from "assert";
1919
import { context } from "@opentelemetry/api";
2020
import { AsyncHooksContextManager } from "@opentelemetry/context-async-hooks";
2121
import {
22-
BasicTracerProvider,
2322
InMemorySpanExporter,
2423
SimpleSpanProcessor,
2524
} from "@opentelemetry/sdk-trace-base";
26-
25+
import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
2726
import { AzureKeyCredential } from "@azure/openai";
2827
import type * as AzureOpenAIModule from "@azure/openai";
2928

@@ -40,7 +39,7 @@ Polly.register(NodeHttpAdapter);
4039
Polly.register(FSPersister);
4140

4241
describe("Test OpenAI instrumentation", async function () {
43-
const provider = new BasicTracerProvider();
42+
let provider: NodeTracerProvider;
4443
let instrumentation: AzureOpenAIInstrumentation;
4544
let contextManager: AsyncHooksContextManager;
4645
let azureOpenAi: AzureOpenAIModule.OpenAIClient;
@@ -60,7 +59,9 @@ describe("Test OpenAI instrumentation", async function () {
6059
process.env.AZURE_API_KEY = "test-key";
6160
process.env.AZURE_DEPLOYMENT_ID = "openllmetry-testing";
6261
}
63-
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
62+
provider = new NodeTracerProvider({
63+
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
64+
});
6465
instrumentation = new AzureOpenAIInstrumentation();
6566
instrumentation.setTracerProvider(provider);
6667

‎packages/instrumentation-bedrock/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
"access": "public"
3939
},
4040
"dependencies": {
41-
"@opentelemetry/core": "^1.29.0",
42-
"@opentelemetry/instrumentation": "^0.56.0",
43-
"@opentelemetry/semantic-conventions": "^1.28.0",
41+
"@opentelemetry/core": "^2.0.1",
42+
"@opentelemetry/instrumentation": "^0.202.0",
43+
"@opentelemetry/semantic-conventions": "^1.34.0",
4444
"@traceloop/ai-semantic-conventions": "^0.13.0",
4545
"tslib": "^2.8.1"
4646
},

‎packages/instrumentation-bedrock/tests/ai21.test.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import { AsyncHooksContextManager } from "@opentelemetry/context-async-hooks";
1919
import { BedrockInstrumentation } from "../src/instrumentation";
2020
import * as assert from "assert";
2121
import {
22-
BasicTracerProvider,
2322
InMemorySpanExporter,
2423
SimpleSpanProcessor,
2524
} from "@opentelemetry/sdk-trace-base";
@@ -29,14 +28,15 @@ import { SpanAttributes } from "@traceloop/ai-semantic-conventions";
2928
import { Polly, setupMocha as setupPolly } from "@pollyjs/core";
3029
import NodeHttpAdapter from "@pollyjs/adapter-node-http";
3130
import FSPersister from "@pollyjs/persister-fs";
31+
import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
3232

3333
const memoryExporter = new InMemorySpanExporter();
3434

3535
Polly.register(NodeHttpAdapter);
3636
Polly.register(FSPersister);
3737

3838
describe("Test Ai21 with AWS Bedrock Instrumentation", () => {
39-
const provider = new BasicTracerProvider();
39+
let provider: NodeTracerProvider;
4040
let instrumentation: BedrockInstrumentation;
4141
let contextManager: AsyncHooksContextManager;
4242
let bedrock: typeof bedrockModule;
@@ -50,7 +50,9 @@ describe("Test Ai21 with AWS Bedrock Instrumentation", () => {
5050
});
5151

5252
before(async () => {
53-
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
53+
provider = new NodeTracerProvider({
54+
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
55+
});
5456
instrumentation = new BedrockInstrumentation();
5557
instrumentation.setTracerProvider(provider);
5658
bedrock = await import("@aws-sdk/client-bedrock-runtime");

‎packages/instrumentation-bedrock/tests/amazon.test.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import { AsyncHooksContextManager } from "@opentelemetry/context-async-hooks";
1919
import { BedrockInstrumentation } from "../src/instrumentation";
2020
import * as assert from "assert";
2121
import {
22-
BasicTracerProvider,
2322
InMemorySpanExporter,
2423
SimpleSpanProcessor,
2524
} from "@opentelemetry/sdk-trace-base";
@@ -29,14 +28,15 @@ import { SpanAttributes } from "@traceloop/ai-semantic-conventions";
2928
import { Polly, setupMocha as setupPolly } from "@pollyjs/core";
3029
import NodeHttpAdapter from "@pollyjs/adapter-node-http";
3130
import FSPersister from "@pollyjs/persister-fs";
31+
import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
3232

3333
const memoryExporter = new InMemorySpanExporter();
3434

3535
Polly.register(NodeHttpAdapter);
3636
Polly.register(FSPersister);
3737

3838
describe("Test Amazon Titan with AWS Bedrock Instrumentation", () => {
39-
const provider = new BasicTracerProvider();
39+
let provider: NodeTracerProvider;
4040
let instrumentation: BedrockInstrumentation;
4141
let contextManager: AsyncHooksContextManager;
4242
let bedrock: typeof bedrockModule;
@@ -50,7 +50,9 @@ describe("Test Amazon Titan with AWS Bedrock Instrumentation", () => {
5050
});
5151

5252
before(async () => {
53-
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
53+
provider = new NodeTracerProvider({
54+
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
55+
});
5456
instrumentation = new BedrockInstrumentation();
5557
instrumentation.setTracerProvider(provider);
5658
bedrock = await import("@aws-sdk/client-bedrock-runtime");

‎packages/instrumentation-bedrock/tests/anthropic.test.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import { AsyncHooksContextManager } from "@opentelemetry/context-async-hooks";
1919
import { BedrockInstrumentation } from "../src/instrumentation";
2020
import * as assert from "assert";
2121
import {
22-
BasicTracerProvider,
2322
InMemorySpanExporter,
2423
SimpleSpanProcessor,
2524
} from "@opentelemetry/sdk-trace-base";
@@ -29,14 +28,15 @@ import { SpanAttributes } from "@traceloop/ai-semantic-conventions";
2928
import { Polly, setupMocha as setupPolly } from "@pollyjs/core";
3029
import NodeHttpAdapter from "@pollyjs/adapter-node-http";
3130
import FSPersister from "@pollyjs/persister-fs";
31+
import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
3232

3333
const memoryExporter = new InMemorySpanExporter();
3434

3535
Polly.register(NodeHttpAdapter);
3636
Polly.register(FSPersister);
3737

3838
describe("Test Anthropic with AWS Bedrock Instrumentation", () => {
39-
const provider = new BasicTracerProvider();
39+
let provider: NodeTracerProvider;
4040
let instrumentation: BedrockInstrumentation;
4141
let contextManager: AsyncHooksContextManager;
4242
let bedrock: typeof bedrockModule;
@@ -50,7 +50,9 @@ describe("Test Anthropic with AWS Bedrock Instrumentation", () => {
5050
});
5151

5252
before(async () => {
53-
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
53+
provider = new NodeTracerProvider({
54+
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
55+
});
5456
instrumentation = new BedrockInstrumentation();
5557
instrumentation.setTracerProvider(provider);
5658
bedrock = await import("@aws-sdk/client-bedrock-runtime");

‎packages/instrumentation-bedrock/tests/cohere.test.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import { AsyncHooksContextManager } from "@opentelemetry/context-async-hooks";
1919
import { BedrockInstrumentation } from "../src/instrumentation";
2020
import * as assert from "assert";
2121
import {
22-
BasicTracerProvider,
2322
InMemorySpanExporter,
2423
SimpleSpanProcessor,
2524
} from "@opentelemetry/sdk-trace-base";
@@ -29,14 +28,15 @@ import { SpanAttributes } from "@traceloop/ai-semantic-conventions";
2928
import { Polly, setupMocha as setupPolly } from "@pollyjs/core";
3029
import NodeHttpAdapter from "@pollyjs/adapter-node-http";
3130
import FSPersister from "@pollyjs/persister-fs";
31+
import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
3232

3333
const memoryExporter = new InMemorySpanExporter();
3434

3535
Polly.register(NodeHttpAdapter);
3636
Polly.register(FSPersister);
3737

3838
describe("Test Cohere with AWS Bedrock Instrumentation", () => {
39-
const provider = new BasicTracerProvider();
39+
let provider: NodeTracerProvider;
4040
let instrumentation: BedrockInstrumentation;
4141
let contextManager: AsyncHooksContextManager;
4242
let bedrock: typeof bedrockModule;
@@ -50,7 +50,9 @@ describe("Test Cohere with AWS Bedrock Instrumentation", () => {
5050
});
5151

5252
before(async () => {
53-
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
53+
provider = new NodeTracerProvider({
54+
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
55+
});
5456
instrumentation = new BedrockInstrumentation();
5557
instrumentation.setTracerProvider(provider);
5658
bedrock = await import("@aws-sdk/client-bedrock-runtime");

‎packages/instrumentation-bedrock/tests/meta.test.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import { AsyncHooksContextManager } from "@opentelemetry/context-async-hooks";
1919
import { BedrockInstrumentation } from "../src/instrumentation";
2020
import * as assert from "assert";
2121
import {
22-
BasicTracerProvider,
2322
InMemorySpanExporter,
2423
SimpleSpanProcessor,
2524
} from "@opentelemetry/sdk-trace-base";
@@ -29,14 +28,15 @@ import { SpanAttributes } from "@traceloop/ai-semantic-conventions";
2928
import { Polly, setupMocha as setupPolly } from "@pollyjs/core";
3029
import NodeHttpAdapter from "@pollyjs/adapter-node-http";
3130
import FSPersister from "@pollyjs/persister-fs";
31+
import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
3232

3333
const memoryExporter = new InMemorySpanExporter();
3434

3535
Polly.register(NodeHttpAdapter);
3636
Polly.register(FSPersister);
3737

3838
describe("Test Meta with AWS Bedrock Instrumentation", () => {
39-
const provider = new BasicTracerProvider();
39+
let provider: NodeTracerProvider;
4040
let instrumentation: BedrockInstrumentation;
4141
let contextManager: AsyncHooksContextManager;
4242
let bedrock: typeof bedrockModule;
@@ -50,7 +50,9 @@ describe("Test Meta with AWS Bedrock Instrumentation", () => {
5050
});
5151

5252
before(async () => {
53-
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
53+
provider = new NodeTracerProvider({
54+
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
55+
});
5456
instrumentation = new BedrockInstrumentation();
5557
instrumentation.setTracerProvider(provider);
5658
bedrock = await import("@aws-sdk/client-bedrock-runtime");

‎packages/instrumentation-chromadb/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
"access": "public"
3939
},
4040
"dependencies": {
41-
"@opentelemetry/core": "^1.29.0",
42-
"@opentelemetry/instrumentation": "^0.56.0",
43-
"@opentelemetry/semantic-conventions": "^1.28.0",
41+
"@opentelemetry/core": "^2.0.1",
42+
"@opentelemetry/instrumentation": "^0.202.0",
43+
"@opentelemetry/semantic-conventions": "^1.34.0",
4444
"@traceloop/ai-semantic-conventions": "^0.13.0",
4545
"tslib": "^2.8.1"
4646
},

‎packages/instrumentation-cohere/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
"access": "public"
3939
},
4040
"dependencies": {
41-
"@opentelemetry/core": "^1.29.0",
42-
"@opentelemetry/instrumentation": "^0.56.0",
43-
"@opentelemetry/semantic-conventions": "^1.28.0",
41+
"@opentelemetry/core": "^2.0.1",
42+
"@opentelemetry/instrumentation": "^0.202.0",
43+
"@opentelemetry/semantic-conventions": "^1.34.0",
4444
"@traceloop/ai-semantic-conventions": "^0.13.0",
4545
"tslib": "^2.8.1"
4646
},

‎packages/instrumentation-cohere/tests/chat.test.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import { AsyncHooksContextManager } from "@opentelemetry/context-async-hooks";
1919
import { CohereInstrumentation } from "../src/instrumentation";
2020
import * as assert from "assert";
2121
import {
22-
BasicTracerProvider,
2322
InMemorySpanExporter,
2423
SimpleSpanProcessor,
2524
} from "@opentelemetry/sdk-trace-base";
@@ -29,14 +28,15 @@ import { SpanAttributes } from "@traceloop/ai-semantic-conventions";
2928
import { Polly, setupMocha as setupPolly } from "@pollyjs/core";
3029
import FetchAdapter from "@pollyjs/adapter-fetch";
3130
import FSPersister from "@pollyjs/persister-fs";
31+
import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
3232

3333
const memoryExporter = new InMemorySpanExporter();
3434

3535
Polly.register(FetchAdapter);
3636
Polly.register(FSPersister);
3737

3838
describe.skip("Test Chat with Cohere Instrumentation", () => {
39-
const provider = new BasicTracerProvider();
39+
let provider: NodeTracerProvider;
4040
let instrumentation: CohereInstrumentation;
4141
let contextManager: AsyncHooksContextManager;
4242
let cohere: typeof cohereModule;
@@ -50,7 +50,9 @@ describe.skip("Test Chat with Cohere Instrumentation", () => {
5050
});
5151

5252
before(async () => {
53-
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
53+
provider = new NodeTracerProvider({
54+
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
55+
});
5456
instrumentation = new CohereInstrumentation();
5557
instrumentation.setTracerProvider(provider);
5658
cohere = await import("cohere-ai");

‎packages/instrumentation-cohere/tests/generate.test.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import { AsyncHooksContextManager } from "@opentelemetry/context-async-hooks";
1919
import { CohereInstrumentation } from "../src/instrumentation";
2020
import * as assert from "assert";
2121
import {
22-
BasicTracerProvider,
2322
InMemorySpanExporter,
2423
SimpleSpanProcessor,
2524
} from "@opentelemetry/sdk-trace-base";
@@ -29,14 +28,15 @@ import { SpanAttributes } from "@traceloop/ai-semantic-conventions";
2928
import { Polly, setupMocha as setupPolly } from "@pollyjs/core";
3029
import FetchAdapter from "@pollyjs/adapter-fetch";
3130
import FSPersister from "@pollyjs/persister-fs";
31+
import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
3232

3333
const memoryExporter = new InMemorySpanExporter();
3434

3535
Polly.register(FetchAdapter);
3636
Polly.register(FSPersister);
3737

3838
describe.skip("Test Generate with Cohere Instrumentation", () => {
39-
const provider = new BasicTracerProvider();
39+
let provider: NodeTracerProvider;
4040
let instrumentation: CohereInstrumentation;
4141
let contextManager: AsyncHooksContextManager;
4242
let cohere: typeof cohereModule;
@@ -50,7 +50,9 @@ describe.skip("Test Generate with Cohere Instrumentation", () => {
5050
});
5151

5252
before(async () => {
53-
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
53+
provider = new NodeTracerProvider({
54+
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
55+
});
5456
instrumentation = new CohereInstrumentation();
5557
instrumentation.setTracerProvider(provider);
5658
cohere = await import("cohere-ai");

0 commit comments

Comments
 (0)