Skip to content

Commit c875fa8

Browse files
authored
Merge branch 'main' into main
2 parents 5b434e6 + 86eef0d commit c875fa8

File tree

183 files changed

+6561
-7612
lines changed

Some content is hidden

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

183 files changed

+6561
-7612
lines changed

.github/component-label-map.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,10 @@ pkg:instrumentation-user-interaction:
245245
- changed-files:
246246
- any-glob-to-any-file:
247247
- packages/instrumentation-user-interaction/**
248+
pkg:instrumentation-web-exception:
249+
- changed-files:
250+
- any-glob-to-any-file:
251+
- packages/instrumentation-web-exception/**
248252
pkg:instrumentation-winston:
249253
- changed-files:
250254
- any-glob-to-any-file:

.github/component_owners.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,10 @@ components:
160160
- t2t2
161161
packages/instrumentation-user-interaction:
162162
- obecny
163+
packages/instrumentation-web-exception:
164+
- martinkuba
165+
- pkanal
166+
- wolfgangcodes
163167
packages/plugin-react-load:
164168
- martinkuba
165169
packages/propagator-instana:

.github/workflows/release-please-validate.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,10 @@ jobs:
1313
rp-validate:
1414
runs-on: ubuntu-latest
1515
container:
16-
image: node:20
16+
image: node:22
1717
steps:
1818
- name: Checkout
1919
uses: actions/checkout@v5
2020

21-
- name: Install glob
22-
run: npm install glob
23-
2421
- name: Ensure Release Please Config and Manifest are in sync with the repository
2522
run: node scripts/check-release-please.mjs

.mocharc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"require": ["ts-node/register/transpile-only"]
3+
}

.mocharc.yml

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

.release-please-manifest.json

Lines changed: 59 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,70 @@
11
{
2-
"packages/resource-detector-alibaba-cloud": "0.31.10",
3-
"packages/resource-detector-aws": "2.7.0",
4-
"packages/resource-detector-azure": "0.15.0",
5-
"packages/resource-detector-container": "0.7.10",
6-
"packages/resource-detector-gcp": "0.42.0",
2+
"packages/resource-detector-alibaba-cloud": "0.31.11",
3+
"packages/resource-detector-aws": "2.8.0",
4+
"packages/resource-detector-azure": "0.16.0",
5+
"packages/resource-detector-container": "0.7.11",
6+
"packages/resource-detector-gcp": "0.43.0",
77
"packages/resource-detector-github": "0.31.2",
8-
"packages/resource-detector-instana": "0.26.0",
8+
"packages/resource-detector-instana": "0.27.0",
99
"packages/auto-configuration-propagators": "0.4.4",
10-
"packages/auto-instrumentations-node": "0.66.0",
11-
"packages/auto-instrumentations-web": "0.53.0",
10+
"packages/auto-instrumentations-node": "0.67.0",
11+
"packages/auto-instrumentations-web": "0.54.0",
1212
"packages/baggage-span-processor": "0.4.2",
13-
"packages/baggage-log-record-processor": "0.8.0",
14-
"packages/host-metrics": "0.36.2",
13+
"packages/baggage-log-record-processor": "0.9.0",
14+
"packages/host-metrics": "0.37.0",
1515
"packages/id-generator-aws-xray": "2.0.3",
16-
"packages/propagation-utils": "0.31.10",
16+
"packages/propagation-utils": "0.31.11",
1717
"packages/redis-common": "0.38.2",
1818
"packages/sampler-aws-xray": "0.1.2",
1919
"packages/sql-common": "0.41.2",
20-
"packages/contrib-test-utils": "0.54.0",
21-
"packages/winston-transport": "0.18.0",
22-
"packages/instrumentation-amqplib": "0.54.0",
23-
"packages/instrumentation-cucumber": "0.23.0",
24-
"packages/instrumentation-dataloader": "0.25.0",
25-
"packages/instrumentation-fs": "0.27.0",
26-
"packages/instrumentation-kafkajs": "0.17.0",
27-
"packages/instrumentation-lru-memoizer": "0.52.0",
28-
"packages/instrumentation-mongoose": "0.54.0",
29-
"packages/instrumentation-runtime-node": "0.21.0",
30-
"packages/instrumentation-sequelize": "0.1.0",
31-
"packages/instrumentation-socket.io": "0.54.0",
32-
"packages/instrumentation-tedious": "0.26.0",
33-
"packages/instrumentation-typeorm": "0.8.0",
34-
"packages/instrumentation-undici": "0.18.0",
35-
"packages/instrumentation-aws-lambda": "0.59.0",
36-
"packages/instrumentation-aws-sdk": "0.63.0",
37-
"packages/instrumentation-bunyan": "0.53.0",
38-
"packages/instrumentation-cassandra-driver": "0.53.0",
39-
"packages/instrumentation-connect": "0.51.0",
40-
"packages/instrumentation-dns": "0.51.0",
41-
"packages/instrumentation-express": "0.56.0",
42-
"packages/instrumentation-fastify": "0.52.0",
43-
"packages/instrumentation-generic-pool": "0.51.0",
44-
"packages/instrumentation-graphql": "0.55.0",
45-
"packages/instrumentation-hapi": "0.54.0",
46-
"packages/instrumentation-ioredis": "0.55.0",
47-
"packages/instrumentation-knex": "0.52.0",
48-
"packages/instrumentation-koa": "0.56.0",
49-
"packages/instrumentation-memcached": "0.51.0",
50-
"packages/instrumentation-mongodb": "0.60.0",
51-
"packages/instrumentation-mysql": "0.53.0",
52-
"packages/instrumentation-mysql2": "0.54.0",
53-
"packages/instrumentation-nestjs-core": "0.54.0",
54-
"packages/instrumentation-net": "0.51.0",
55-
"packages/instrumentation-openai": "0.5.0",
56-
"packages/instrumentation-oracledb": "0.33.0",
57-
"packages/instrumentation-pg": "0.60.0",
58-
"packages/instrumentation-pino": "0.54.0",
59-
"packages/instrumentation-redis": "0.56.0",
60-
"packages/instrumentation-restify": "0.53.0",
61-
"packages/instrumentation-router": "0.52.0",
62-
"packages/instrumentation-winston": "0.52.0",
63-
"packages/instrumentation-document-load": "0.53.0",
64-
"packages/instrumentation-long-task": "0.52.0",
65-
"packages/instrumentation-user-interaction": "0.52.0",
66-
"packages/plugin-react-load": "0.39.0",
20+
"packages/contrib-test-utils": "0.55.0",
21+
"packages/winston-transport": "0.19.0",
22+
"packages/instrumentation-amqplib": "0.55.0",
23+
"packages/instrumentation-cucumber": "0.24.0",
24+
"packages/instrumentation-dataloader": "0.26.0",
25+
"packages/instrumentation-fs": "0.28.0",
26+
"packages/instrumentation-kafkajs": "0.18.0",
27+
"packages/instrumentation-lru-memoizer": "0.53.0",
28+
"packages/instrumentation-mongoose": "0.55.0",
29+
"packages/instrumentation-runtime-node": "0.22.0",
30+
"packages/instrumentation-sequelize": "0.2.0",
31+
"packages/instrumentation-socket.io": "0.55.0",
32+
"packages/instrumentation-tedious": "0.27.0",
33+
"packages/instrumentation-typeorm": "0.9.0",
34+
"packages/instrumentation-undici": "0.19.0",
35+
"packages/instrumentation-aws-lambda": "0.60.0",
36+
"packages/instrumentation-aws-sdk": "0.64.0",
37+
"packages/instrumentation-bunyan": "0.54.0",
38+
"packages/instrumentation-cassandra-driver": "0.54.0",
39+
"packages/instrumentation-connect": "0.52.0",
40+
"packages/instrumentation-dns": "0.52.0",
41+
"packages/instrumentation-express": "0.57.0",
42+
"packages/instrumentation-fastify": "0.53.0",
43+
"packages/instrumentation-generic-pool": "0.52.0",
44+
"packages/instrumentation-graphql": "0.56.0",
45+
"packages/instrumentation-hapi": "0.55.0",
46+
"packages/instrumentation-ioredis": "0.56.0",
47+
"packages/instrumentation-knex": "0.53.0",
48+
"packages/instrumentation-koa": "0.57.0",
49+
"packages/instrumentation-memcached": "0.52.0",
50+
"packages/instrumentation-mongodb": "0.61.0",
51+
"packages/instrumentation-mysql": "0.54.0",
52+
"packages/instrumentation-mysql2": "0.55.0",
53+
"packages/instrumentation-nestjs-core": "0.55.0",
54+
"packages/instrumentation-net": "0.52.0",
55+
"packages/instrumentation-openai": "0.6.0",
56+
"packages/instrumentation-oracledb": "0.34.0",
57+
"packages/instrumentation-pg": "0.61.0",
58+
"packages/instrumentation-pino": "0.55.0",
59+
"packages/instrumentation-redis": "0.57.0",
60+
"packages/instrumentation-restify": "0.54.0",
61+
"packages/instrumentation-router": "0.53.0",
62+
"packages/instrumentation-winston": "0.53.0",
63+
"packages/instrumentation-document-load": "0.54.0",
64+
"packages/instrumentation-web-exception": "0.1.0",
65+
"packages/instrumentation-long-task": "0.53.0",
66+
"packages/instrumentation-user-interaction": "0.53.0",
67+
"packages/plugin-react-load": "0.40.0",
6768
"packages/propagator-instana": "0.4.3",
6869
"packages/propagator-ot-trace": "0.28.3",
6970
"packages/propagator-aws-xray": "2.1.3",

examples/express/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"tracing"
2020
],
2121
"engines": {
22-
"node": ">=14"
22+
"node": "^18.19.0 || >=20.6.0"
2323
},
2424
"author": "OpenTelemetry Authors",
2525
"license": "Apache-2.0",

examples/express/src/server.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,19 @@ setupTracing('example-express-server');
2121

2222
// Require in rest of modules
2323
import * as express from 'express';
24-
import * as axios from 'axios';
24+
import axios from 'axios';
2525
import { RequestHandler } from 'express';
26-
import type { Resource } from '@opentelemetry/resources';
2726

2827
// Setup express
2928
const app = express();
3029
const PORT = 8080;
3130

3231
const getCrudController = () => {
3332
const router = express.Router();
34-
const resources: Resource[] = [];
35-
router.get('/', (req, res) => res.send(resources));
33+
const things: unknown[] = [];
34+
router.get('/', (req, res) => res.send(things));
3635
router.post('/', (req, res) => {
37-
resources.push(req.body);
36+
things.push(req.body);
3837
return res.status(201).send(req.body);
3938
});
4039
return router;

karma.webpack.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ module.exports = {
3636
// because the `util` package expects there to be a global variable named `process`.
3737
// Thanks to https://stackoverflow.com/a/65018686/14239942
3838
// NOTE: I wish there was a better way as this pollutes the tests with a defined 'process' global.
39-
process: 'process/browser',
40-
}),
39+
process: 'process/browser.js'
40+
})
4141
],
4242
module: {
4343
rules: [

0 commit comments

Comments
 (0)