Skip to content

Commit f2d182a

Browse files
authored
Merge branch 'main' into fix-redis-multi-spans
2 parents fb985e3 + 79d7415 commit f2d182a

File tree

196 files changed

+10156
-9085
lines changed

Some content is hidden

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

196 files changed

+10156
-9085
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: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ components:
7272
- blumamir
7373
packages/instrumentation-socket.io:
7474
- mottibec
75+
packages/instrumentation-sequelize:
76+
- seemk
77+
- t2t2
78+
- mhennoch
7579
packages/instrumentation-tedious: []
7680
# Unmaintained
7781
packages/instrumentation-typeorm:
@@ -156,6 +160,10 @@ components:
156160
- t2t2
157161
packages/instrumentation-user-interaction:
158162
- obecny
163+
packages/instrumentation-web-exception:
164+
- martinkuba
165+
- pkanal
166+
- wolfgangcodes
159167
packages/plugin-react-load:
160168
- martinkuba
161169
packages/propagator-instana:

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ permissions:
1010
contents: read
1111

1212
jobs:
13-
build:
13+
lint:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v5
1717
- uses: actions/setup-node@v6
1818
with:
1919
node-version: 18
20-
cache: 'npm'
20+
cache: npm
2121
- run: npm ci --ignore-scripts
2222
- name: Lint
2323
run: |

.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

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
node-version: 18
3535
- name: Install
3636
run: npm ci --ignore-scripts
37+
timeout-minutes: 10
3738
- name: Build
3839
run: npm run compile
3940
- name: Upload Build Artifacts
@@ -57,14 +58,14 @@ jobs:
5758
mongo:
5859
image: mongo
5960
ports:
60-
- 27017:27017
61+
- 27017:27017
6162
mssql:
6263
image: mcr.microsoft.com/mssql/server:2022-latest
6364
env:
6465
MSSQL_SA_PASSWORD: mssql_passw0rd
6566
ACCEPT_EULA: Y
6667
ports:
67-
- 1433:1433
68+
- 1433:1433
6869
options: >-
6970
--health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $MSSQL_SA_PASSWORD -C -Q 'select 1' -b -o /dev/null"
7071
--health-interval 1s
@@ -79,7 +80,7 @@ jobs:
7980
MYSQL_DATABASE: otel_mysql_database
8081
MYSQL_ROOT_PASSWORD: rootpw
8182
ports:
82-
- 3306:3306
83+
- 3306:3306
8384
options: >-
8485
--health-cmd="mysqladmin ping"
8586
--health-interval 10s
@@ -105,7 +106,7 @@ jobs:
105106
POSTGRES_DB: otel_pg_database
106107
POSTGRES_PASSWORD: postgres
107108
ports:
108-
- 5432:5432
109+
- 5432:5432
109110
options: >-
110111
--health-cmd pg_isready
111112
--health-interval 10s
@@ -114,14 +115,14 @@ jobs:
114115
rabbitmq:
115116
image: rabbitmq:3
116117
ports:
117-
- 22221:5672
118+
- 22221:5672
118119
env:
119120
RABBITMQ_DEFAULT_USER: username
120121
RABBITMQ_DEFAULT_PASS: password
121122
redis:
122123
image: redis
123124
ports:
124-
- 6379:6379
125+
- 6379:6379
125126
options: >-
126127
--health-cmd "redis-cli ping"
127128
--health-interval 10s
@@ -171,6 +172,7 @@ jobs:
171172
# Post install scripts are required for some deps for successful test
172173
# runs: sqlite3, better-sqlite3, and possibly esbuild.
173174
run: npm ci
175+
timeout-minutes: 10
174176
- name: Download Build Artifacts
175177
uses: actions/download-artifact@v5
176178
with:

.github/workflows/test.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
node-version: 18
2828
- name: Install
2929
run: npm ci --ignore-scripts
30+
timeout-minutes: 10
3031
# Note: when pushing to main we want to test only what changed in
3132
# last commit. Otherwise we want to test all changes from origin/main.
3233
# So we set the right values for base and head commits depending
@@ -71,18 +72,18 @@ jobs:
7172
memcached:
7273
image: memcached:1.6.39-alpine
7374
ports:
74-
- 11211:11211
75+
- 11211:11211
7576
mongo:
7677
image: mongo
7778
ports:
78-
- 27017:27017
79+
- 27017:27017
7980
mssql:
8081
image: mcr.microsoft.com/mssql/server:2022-latest
8182
env:
8283
MSSQL_SA_PASSWORD: mssql_passw0rd
8384
ACCEPT_EULA: Y
8485
ports:
85-
- 1433:1433
86+
- 1433:1433
8687
options: >-
8788
--health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $MSSQL_SA_PASSWORD -C -Q 'select 1' -b -o /dev/null"
8889
--health-interval 1s
@@ -97,7 +98,7 @@ jobs:
9798
MYSQL_DATABASE: otel_mysql_database
9899
MYSQL_ROOT_PASSWORD: rootpw
99100
ports:
100-
- 3306:3306
101+
- 3306:3306
101102
options: >-
102103
--health-cmd="mysqladmin ping"
103104
--health-interval 10s
@@ -123,7 +124,7 @@ jobs:
123124
POSTGRES_DB: otel_pg_database
124125
POSTGRES_PASSWORD: postgres
125126
ports:
126-
- 5432:5432
127+
- 5432:5432
127128
options: >-
128129
--health-cmd pg_isready
129130
--health-interval 10s
@@ -132,7 +133,7 @@ jobs:
132133
redis:
133134
image: redis
134135
ports:
135-
- 6379:6379
136+
- 6379:6379
136137
options: >-
137138
--health-cmd "redis-cli ping"
138139
--health-interval 10s
@@ -141,11 +142,11 @@ jobs:
141142
cassandra:
142143
image: cassandra:3
143144
ports:
144-
- 9042:9042
145+
- 9042:9042
145146
rabbitmq:
146147
image: rabbitmq:3
147148
ports:
148-
- 22221:5672
149+
- 22221:5672
149150
env:
150151
RABBITMQ_DEFAULT_USER: username
151152
RABBITMQ_DEFAULT_PASS: password
@@ -198,6 +199,7 @@ jobs:
198199
node-version: ${{ matrix.node }}
199200
- name: Install
200201
run: npm ci
202+
timeout-minutes: 10
201203
- name: Download Build Artifacts
202204
uses: actions/download-artifact@v5
203205
with:
@@ -242,6 +244,7 @@ jobs:
242244
with:
243245
node-version: ${{ matrix.node }}
244246
- run: npm ci
247+
timeout-minutes: 10
245248
- name: Download Build Artifacts
246249
uses: actions/download-artifact@v5
247250
with:
@@ -286,6 +289,7 @@ jobs:
286289
node-version: 18
287290
- name: Install
288291
run: npm ci --ignore-scripts
292+
timeout-minutes: 10
289293
# Note: Keep this in sync with the node versions from `test-all-versions` job.
290294
- name: Download Test Artifacts (18)
291295
uses: actions/download-artifact@v5
@@ -312,4 +316,3 @@ jobs:
312316
env:
313317
COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
314318
PR_BRANCH_NAME: ${{ github.event.pull_request.head.label }}
315-

.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 & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +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-socket.io": "0.54.0",
31-
"packages/instrumentation-tedious": "0.26.0",
32-
"packages/instrumentation-typeorm": "0.8.0",
33-
"packages/instrumentation-undici": "0.18.0",
34-
"packages/instrumentation-aws-lambda": "0.59.0",
35-
"packages/instrumentation-aws-sdk": "0.63.0",
36-
"packages/instrumentation-bunyan": "0.53.0",
37-
"packages/instrumentation-cassandra-driver": "0.53.0",
38-
"packages/instrumentation-connect": "0.51.0",
39-
"packages/instrumentation-dns": "0.51.0",
40-
"packages/instrumentation-express": "0.56.0",
41-
"packages/instrumentation-fastify": "0.52.0",
42-
"packages/instrumentation-generic-pool": "0.51.0",
43-
"packages/instrumentation-graphql": "0.55.0",
44-
"packages/instrumentation-hapi": "0.54.0",
45-
"packages/instrumentation-ioredis": "0.55.0",
46-
"packages/instrumentation-knex": "0.52.0",
47-
"packages/instrumentation-koa": "0.56.0",
48-
"packages/instrumentation-memcached": "0.51.0",
49-
"packages/instrumentation-mongodb": "0.60.0",
50-
"packages/instrumentation-mysql": "0.53.0",
51-
"packages/instrumentation-mysql2": "0.54.0",
52-
"packages/instrumentation-nestjs-core": "0.54.0",
53-
"packages/instrumentation-net": "0.51.0",
54-
"packages/instrumentation-openai": "0.5.0",
55-
"packages/instrumentation-oracledb": "0.33.0",
56-
"packages/instrumentation-pg": "0.60.0",
57-
"packages/instrumentation-pino": "0.54.0",
58-
"packages/instrumentation-redis": "0.56.0",
59-
"packages/instrumentation-restify": "0.53.0",
60-
"packages/instrumentation-router": "0.52.0",
61-
"packages/instrumentation-winston": "0.52.0",
62-
"packages/instrumentation-document-load": "0.53.0",
63-
"packages/instrumentation-long-task": "0.52.0",
64-
"packages/instrumentation-user-interaction": "0.52.0",
65-
"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",
6668
"packages/propagator-instana": "0.4.3",
6769
"packages/propagator-ot-trace": "0.28.3",
6870
"packages/propagator-aws-xray": "2.1.3",

0 commit comments

Comments
 (0)