Skip to content

Commit fb985e3

Browse files
authored
Merge branch 'main' into fix-redis-multi-spans
2 parents c7f6386 + 6fbbd6c commit fb985e3

File tree

134 files changed

+2231
-912
lines changed

Some content is hidden

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

134 files changed

+2231
-912
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v5
17-
- uses: actions/setup-node@v5
17+
- uses: actions/setup-node@v6
1818
with:
1919
node-version: 18
2020
cache: 'npm'

.github/workflows/pr-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
pull-requests: write
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2121

2222
- name: Run add-labels-to-reviewed-pr.sh
2323
run: |

.github/workflows/release-please.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
fetch-depth: 0
2121

2222
- name: Setup Node
23-
uses: actions/setup-node@v5
23+
uses: actions/setup-node@v6
2424
with:
2525
node-version: 18
2626
registry-url: 'https://registry.npmjs.org'
@@ -63,7 +63,7 @@ jobs:
6363
environment: npm-publish-environment
6464
steps:
6565
- uses: actions/checkout@v5
66-
- uses: actions/setup-node@v5
66+
- uses: actions/setup-node@v6
6767
with:
6868
# Require npm 11.5.1 or later for https://docs.npmjs.com/trusted-publishers.
6969
node-version: 24

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
fetch-depth: 0
3131
# Use the same Node.js version used for `release-please` workflow.
32-
- uses: actions/setup-node@v5
32+
- uses: actions/setup-node@v6
3333
with:
3434
node-version: 18
3535
- name: Install
@@ -164,7 +164,7 @@ jobs:
164164
uses: actions/checkout@v5
165165
with:
166166
fetch-depth: 0
167-
- uses: actions/setup-node@v5
167+
- uses: actions/setup-node@v6
168168
with:
169169
node-version: ${{ matrix.node }}
170170
- name: Install

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
fetch-depth: 0
2424
# Use the same Node.js version used for `release-please` workflow.
25-
- uses: actions/setup-node@v5
25+
- uses: actions/setup-node@v6
2626
with:
2727
node-version: 18
2828
- name: Install
@@ -193,7 +193,7 @@ jobs:
193193
uses: actions/checkout@v5
194194
with:
195195
fetch-depth: 0
196-
- uses: actions/setup-node@v5
196+
- uses: actions/setup-node@v6
197197
with:
198198
node-version: ${{ matrix.node }}
199199
- name: Install
@@ -238,7 +238,7 @@ jobs:
238238
- uses: actions/checkout@v5
239239
with:
240240
fetch-depth: 0
241-
- uses: actions/setup-node@v5
241+
- uses: actions/setup-node@v6
242242
with:
243243
node-version: ${{ matrix.node }}
244244
- run: npm ci
@@ -281,7 +281,7 @@ jobs:
281281
uses: actions/checkout@v5
282282
with:
283283
fetch-depth: 0
284-
- uses: actions/setup-node@v5
284+
- uses: actions/setup-node@v6
285285
with:
286286
node-version: 18
287287
- name: Install

.github/workflows/update-otel-deps.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
token: ${{ steps.otelbot-token.outputs.token }}
2323

24-
- uses: actions/setup-node@v5
24+
- uses: actions/setup-node@v6
2525
with:
2626
cache: 'npm'
2727
cache-dependency-path: package-lock.json

.release-please-manifest.json

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
11
{
2-
"packages/resource-detector-alibaba-cloud": "0.31.9",
3-
"packages/resource-detector-aws": "2.6.0",
4-
"packages/resource-detector-azure": "0.14.0",
5-
"packages/resource-detector-container": "0.7.9",
6-
"packages/resource-detector-gcp": "0.41.0",
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",
77
"packages/resource-detector-github": "0.31.2",
8-
"packages/resource-detector-instana": "0.25.0",
8+
"packages/resource-detector-instana": "0.26.0",
99
"packages/auto-configuration-propagators": "0.4.4",
10-
"packages/auto-instrumentations-node": "0.65.0",
11-
"packages/auto-instrumentations-web": "0.52.0",
10+
"packages/auto-instrumentations-node": "0.66.0",
11+
"packages/auto-instrumentations-web": "0.53.0",
1212
"packages/baggage-span-processor": "0.4.2",
13-
"packages/baggage-log-record-processor": "0.7.0",
13+
"packages/baggage-log-record-processor": "0.8.0",
1414
"packages/host-metrics": "0.36.2",
1515
"packages/id-generator-aws-xray": "2.0.3",
16-
"packages/propagation-utils": "0.31.9",
16+
"packages/propagation-utils": "0.31.10",
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.53.0",
21-
"packages/winston-transport": "0.17.0",
22-
"packages/instrumentation-amqplib": "0.53.0",
23-
"packages/instrumentation-cucumber": "0.22.0",
24-
"packages/instrumentation-dataloader": "0.24.0",
25-
"packages/instrumentation-fs": "0.26.0",
26-
"packages/instrumentation-kafkajs": "0.16.0",
27-
"packages/instrumentation-lru-memoizer": "0.51.0",
28-
"packages/instrumentation-mongoose": "0.53.0",
29-
"packages/instrumentation-runtime-node": "0.20.0",
30-
"packages/instrumentation-socket.io": "0.53.0",
31-
"packages/instrumentation-tedious": "0.25.0",
32-
"packages/instrumentation-typeorm": "0.7.0",
33-
"packages/instrumentation-undici": "0.17.0",
34-
"packages/instrumentation-aws-lambda": "0.58.0",
35-
"packages/instrumentation-aws-sdk": "0.62.0",
36-
"packages/instrumentation-bunyan": "0.52.0",
37-
"packages/instrumentation-cassandra-driver": "0.52.0",
38-
"packages/instrumentation-connect": "0.50.0",
39-
"packages/instrumentation-dns": "0.50.0",
40-
"packages/instrumentation-express": "0.55.0",
41-
"packages/instrumentation-fastify": "0.51.0",
42-
"packages/instrumentation-generic-pool": "0.50.0",
43-
"packages/instrumentation-graphql": "0.54.0",
44-
"packages/instrumentation-hapi": "0.53.0",
45-
"packages/instrumentation-ioredis": "0.54.0",
46-
"packages/instrumentation-knex": "0.51.0",
47-
"packages/instrumentation-koa": "0.55.0",
48-
"packages/instrumentation-memcached": "0.50.0",
49-
"packages/instrumentation-mongodb": "0.59.0",
50-
"packages/instrumentation-mysql": "0.52.0",
51-
"packages/instrumentation-mysql2": "0.53.0",
52-
"packages/instrumentation-nestjs-core": "0.53.0",
53-
"packages/instrumentation-net": "0.50.0",
54-
"packages/instrumentation-openai": "0.4.0",
55-
"packages/instrumentation-oracledb": "0.32.0",
56-
"packages/instrumentation-pg": "0.59.0",
57-
"packages/instrumentation-pino": "0.53.0",
58-
"packages/instrumentation-redis": "0.55.0",
59-
"packages/instrumentation-restify": "0.52.0",
60-
"packages/instrumentation-router": "0.51.0",
61-
"packages/instrumentation-winston": "0.51.0",
62-
"packages/instrumentation-document-load": "0.52.0",
63-
"packages/instrumentation-long-task": "0.51.0",
64-
"packages/instrumentation-user-interaction": "0.51.0",
65-
"packages/plugin-react-load": "0.38.0",
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",
6666
"packages/propagator-instana": "0.4.3",
6767
"packages/propagator-ot-trace": "0.28.3",
6868
"packages/propagator-aws-xray": "2.1.3",

0 commit comments

Comments
 (0)