Skip to content

Commit 943ef18

Browse files
committed
Merge branch 'main' into sqs-batch-receive
2 parents d18c87e + 4723a55 commit 943ef18

File tree

72 files changed

+10408
-2532
lines changed

Some content is hidden

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

72 files changed

+10408
-2532
lines changed

.github/component-label-map.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,6 @@ pkg:propagation-utils:
253253
- any-glob-to-any-file:
254254
- packages/propagation-utils/**
255255
- packages/contrib-test-utils/**
256-
pkg:propagator-grpc-census-binary:
257-
- changed-files:
258-
- any-glob-to-any-file:
259-
- propagators/opentelemetry-propagator-grpc-census-binary/**
260256
pkg:propagator-instana:
261257
- changed-files:
262258
- any-glob-to-any-file:

.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
strategy:
5252
fail-fast: false
5353
matrix:
54-
node: ["18", "20", "22"]
54+
node: ["18", "20", "22", "24"]
5555
runs-on: ubuntu-latest
5656
services:
5757
mongo:
@@ -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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ jobs:
4848
- "20.6.0"
4949
- "20"
5050
- "22"
51+
- "24"
5152
include:
5253
- node: 18
5354
code-coverage: true
@@ -182,7 +183,7 @@ jobs:
182183
- name: Install
183184
run: npm ci
184185
- name: Download Build Artifacts
185-
uses: actions/download-artifact@v4
186+
uses: actions/download-artifact@v5
186187
with:
187188
name: tests-build-cache-${{ github.run_number }}
188189
path: .nx
@@ -223,7 +224,7 @@ jobs:
223224
- name: Install
224225
run: npm ci
225226
- name: Download Build Artifacts
226-
uses: actions/download-artifact@v4
227+
uses: actions/download-artifact@v5
227228
with:
228229
name: tests-build-cache-${{ github.run_number }}
229230
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;

examples/grpc-census-prop/.npmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

examples/grpc-census-prop/README.md

Lines changed: 0 additions & 131 deletions
This file was deleted.

examples/grpc-census-prop/capitalize_client.js

Lines changed: 0 additions & 107 deletions
This file was deleted.

0 commit comments

Comments
 (0)