Skip to content

Commit 451c95d

Browse files
Merge branch 'main' into bedrock-invoke-model-stream
2 parents 945df2c + c7a91fc commit 451c95d

File tree

89 files changed

+12771
-727
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+12771
-727
lines changed

.github/component_owners.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ components:
128128
- sharadraju
129129
packages/instrumentation-runtime-node:
130130
- d4nyll
131+
packages/instrumentation-openai:
132+
- trentm
133+
- seemk
131134
packages/instrumentation-pg:
132135
- maryliag
133136
packages/instrumentation-pino:

.github/workflows/test-all-versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ jobs:
169169
- name: Install
170170
run: npm ci
171171
- name: Download Build Artifacts
172-
uses: actions/download-artifact@v4
172+
uses: actions/download-artifact@v5
173173
with:
174174
name: tav-build-cache-${{ github.run_number }}
175175
path: .nx

.github/workflows/unit-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
runs-on: ubuntu-latest
5656
services:
5757
memcached:
58-
image: memcached:1.6.38-alpine
58+
image: memcached:1.6.39-alpine
5959
ports:
6060
- 11211:11211
6161
mongo:
@@ -183,7 +183,7 @@ jobs:
183183
- name: Install
184184
run: npm ci
185185
- name: Download Build Artifacts
186-
uses: actions/download-artifact@v4
186+
uses: actions/download-artifact@v5
187187
with:
188188
name: tests-build-cache-${{ github.run_number }}
189189
path: .nx
@@ -224,7 +224,7 @@ jobs:
224224
- name: Install
225225
run: npm ci
226226
- name: Download Build Artifacts
227-
uses: actions/download-artifact@v4
227+
uses: actions/download-artifact@v5
228228
with:
229229
name: tests-build-cache-${{ github.run_number }}
230230
path: .nx

.release-please-manifest.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
"packages/instrumentation-mysql2": "0.50.0",
5151
"packages/instrumentation-nestjs-core": "0.49.0",
5252
"packages/instrumentation-net": "0.47.0",
53+
"packages/instrumentation-openai": "0.0.1",
5354
"packages/instrumentation-oracledb": "0.29.0",
5455
"packages/instrumentation-pg": "0.56.0",
5556
"packages/instrumentation-pino": "0.50.0",

examples/express/src/client.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616

1717
import { setupTracing } from './tracer';
1818

19+
// Initialize tracing before importing other moduless
20+
const tracer = setupTracing('example-express-client');
21+
1922
import * as api from '@opentelemetry/api';
2023
import * as axios from 'axios';
2124

22-
const tracer = setupTracing('example-express-client');
23-
2425
async function makeRequest() {
2526
const span = tracer.startSpan('client.makeRequest()', {
2627
kind: api.SpanKind.CLIENT,

examples/express/src/server.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@
1616

1717
import { setupTracing } from './tracer';
1818

19+
// Initialize tracing before importing other modules
20+
setupTracing('example-express-server');
21+
1922
// Require in rest of modules
2023
import * as express from 'express';
2124
import * as axios from 'axios';
2225
import { RequestHandler } from 'express';
2326

24-
setupTracing('example-express-server');
25-
2627
// Setup express
2728
const app = express();
2829
const PORT = 8080;

0 commit comments

Comments
 (0)