Skip to content

Commit 200a45b

Browse files
committed
Merge branch 'main' into lambda-remove-hardcoded-propagator
2 parents 61476e1 + 9a20e15 commit 200a45b

File tree

351 files changed

+46925
-95738
lines changed

Some content is hidden

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

351 files changed

+46925
-95738
lines changed

.github/component-label-map.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,20 +274,35 @@ pkg:sql-common:
274274
- changed-files:
275275
- any-glob-to-any-file:
276276
- packages/opentelemetry-sql-common/**
277+
pkg:propagator-aws-xray:
278+
- changed-files:
279+
- any-glob-to-any-file:
280+
- propagators/propagator-aws-xray/**
281+
pkg:propagator-aws-xray-lambda:
282+
- changed-files:
283+
- any-glob-to-any-file:
284+
- propagators/propagator-aws-xray-lambda/**
277285
pkg-status:unmaintained:
278286
- changed-files:
279287
- any-glob-to-any-file:
280288
- detectors/node/opentelemetry-resource-detector-github/**
289+
- packages/opentelemetry-redis-common/**
281290
- plugins/node/instrumentation-fs/**
282291
- plugins/node/instrumentation-tedious/**
283292
- plugins/node/opentelemetry-instrumentation-connect/**
284293
- plugins/node/opentelemetry-instrumentation-dns/**
294+
- plugins/node/opentelemetry-instrumentation-fastify/**
285295
- plugins/node/opentelemetry-instrumentation-generic-pool/**
286296
- plugins/node/opentelemetry-instrumentation-hapi/**
287297
- plugins/node/opentelemetry-instrumentation-knex/**
288298
- plugins/node/opentelemetry-instrumentation-koa/**
289299
- plugins/node/opentelemetry-instrumentation-memcached/**
300+
- plugins/node/opentelemetry-instrumentation-mongodb/**
301+
- plugins/node/opentelemetry-instrumentation-mysql/**
302+
- plugins/node/opentelemetry-instrumentation-mysql2/**
290303
- plugins/node/opentelemetry-instrumentation-nestjs-core/**
291304
- plugins/node/opentelemetry-instrumentation-restify/**
292305
- plugins/node/opentelemetry-instrumentation-router/**
293306
- propagators/opentelemetry-propagator-ot-trace/**
307+
- propagators/propagator-aws-xray/**
308+
- propagators/propagator-aws-xray-lambda/**

.github/component_owners.yml

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
components:
33
detectors/node/opentelemetry-resource-detector-alibaba-cloud:
44
- legendecas
5-
detectors/node/opentelemetry-resource-detector-aws:
6-
- carolabadeer
5+
detectors/node/opentelemetry-resource-detector-aws: []
6+
# Unmaintained
77
detectors/node/opentelemetry-resource-detector-azure:
88
- jacksonweber
99
- hectorhdzg
@@ -15,10 +15,9 @@ components:
1515
detectors/node/opentelemetry-resource-detector-github: []
1616
# Unmaintained
1717
detectors/node/opentelemetry-resource-detector-instana:
18-
- basti1302
1918
- kirrg001
20-
incubator/opentelemetry-sampler-aws-xray:
21-
- carolabadeer
19+
incubator/opentelemetry-sampler-aws-xray: []
20+
# Unmaintained
2221
metapackages/auto-configuration-propagators:
2322
- pichlermarc
2423
metapackages/auto-instrumentations-node:
@@ -36,15 +35,15 @@ components:
3635
- jamiedanielson
3736
packages/opentelemetry-host-metrics:
3837
- legendecas
39-
packages/opentelemetry-id-generator-aws-xray:
40-
- carolabadeer
38+
packages/opentelemetry-id-generator-aws-xray: []
39+
# Unmaintained
4140
packages/opentelemetry-propagation-utils:
4241
- dyladan
4342
- pichlermarc
4443
- legendecas
4544
- blumamir
46-
packages/opentelemetry-redis-common:
47-
- haddasbronfman
45+
packages/opentelemetry-redis-common: []
46+
# Unmaintained
4847
packages/opentelemetry-test-utils:
4948
- dyladan
5049
- pichlermarc
@@ -70,10 +69,9 @@ components:
7069
- mottibec
7170
plugins/node/instrumentation-tedious: []
7271
# Unmaintained
73-
plugins/node/opentelemetry-instrumentation-aws-lambda:
74-
- carolabadeer
72+
plugins/node/opentelemetry-instrumentation-aws-lambda: []
73+
# Unmaintained
7574
plugins/node/opentelemetry-instrumentation-aws-sdk:
76-
- carolabadeer
7775
- blumamir
7876
plugins/node/opentelemetry-instrumentation-bunyan:
7977
- seemk
@@ -87,8 +85,8 @@ components:
8785
plugins/node/opentelemetry-instrumentation-express:
8886
- JamieDanielson
8987
- pkanal
90-
plugins/node/opentelemetry-instrumentation-fastify:
91-
- pichlermarc
88+
plugins/node/opentelemetry-instrumentation-fastify: []
89+
# Unmaintained
9290
plugins/node/opentelemetry-instrumentation-generic-pool: []
9391
# Unmaintained
9492
plugins/node/opentelemetry-instrumentation-graphql:
@@ -104,12 +102,12 @@ components:
104102
# Unmaintained
105103
plugins/node/opentelemetry-instrumentation-memcached: []
106104
# Unmaintained
107-
plugins/node/opentelemetry-instrumentation-mongodb:
108-
- osherv
109-
plugins/node/opentelemetry-instrumentation-mysql:
110-
- haddasbronfman
111-
plugins/node/opentelemetry-instrumentation-mysql2:
112-
- haddasbronfman
105+
plugins/node/opentelemetry-instrumentation-mongodb: []
106+
# Unmaintained
107+
plugins/node/opentelemetry-instrumentation-mysql: []
108+
# Unmaintained
109+
plugins/node/opentelemetry-instrumentation-mysql2: []
110+
# Unmaintained
113111
plugins/node/opentelemetry-instrumentation-nestjs-core: []
114112
# Unmaintained
115113
plugins/node/opentelemetry-instrumentation-net:
@@ -144,10 +142,13 @@ components:
144142
plugins/web/opentelemetry-plugin-react-load:
145143
- martinkuba
146144
propagators/opentelemetry-propagator-instana:
147-
- basti1302
148145
- kirrg001
149146
propagators/opentelemetry-propagator-ot-trace: []
150147
# Unmaintained
148+
propagators/propagator-aws-xray: [ ]
149+
# Unmaintained
150+
propagators/propagator-aws-xray-lambda: [ ]
151+
# Unmaintained
151152

152153
ignored-authors:
153154
- renovate-bot

.github/workflows/close-stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ jobs:
4242
close-pr-message: 'This issue was closed because no owner or sponsor has been found after 14 days'
4343
stale-pr-label: pkg-status:unmaintained:autoclose-scheduled
4444
only-labels: pkg-status:unmaintained
45-
exempt-pr-labels: bug,has:sponsor,type:semconv-update,dependencies,autorelease:pending
45+
exempt-pr-labels: 'bug,has:sponsor,type:semconv-update,dependencies,autorelease: pending'
4646
remove-stale-when-updated: false

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,9 @@ name: "CodeQL Analysis"
22

33
on:
44
workflow_dispatch:
5-
schedule:
6-
# ┌───────────── minute (0 - 59)
7-
# │ ┌───────────── hour (0 - 23)
8-
# │ │ ┌───────────── day of the month (1 - 31)
9-
# │ │ │ ┌───────────── month (1 - 12 or JAN-DEC)
10-
# │ │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
11-
# │ │ │ │ │
12-
# │ │ │ │ │
13-
# │ │ │ │ │
14-
# * * * * *
15-
- cron: '30 1 * * *'
5+
push:
6+
branches: [ main ]
7+
pull_request:
168

179
jobs:
1810
CodeQL-Build:

.github/workflows/lint.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,3 @@ jobs:
1919
- name: Lint
2020
run: |
2121
npm run lint
22-
npm run lint:markdown
23-
npm run lint:readme

.github/workflows/peer-api.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
peer-api-check:
1111
runs-on: ubuntu-latest
1212
container:
13-
image: node:18
13+
image: node:20
1414
steps:
1515
- name: Checkout
1616
uses: actions/checkout@v4

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
rp-validate:
1111
runs-on: ubuntu-latest
1212
container:
13-
image: node:14
13+
image: node:20
1414
steps:
1515
- name: Checkout
1616
uses: actions/checkout@v4

.github/workflows/release-please.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
run: |
2727
npm ci
2828
29-
- uses: googleapis/release-please-action@f3969c04a4ec81d7a9aa4010d84ae6a7602f86a7 # v4.1.1
29+
- uses: googleapis/release-please-action@7987652d64b4581673a76e33ad5e98e3dd56832f # v4.1.3
3030
id: release
3131
with:
3232
token: ${{secrets.RELEASE_PR_TOKEN}}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
parse-labels:
1313
runs-on: ubuntu-latest
1414
container:
15-
image: node:16
15+
image: node:20
1616
env:
1717
PR_LABELS: ${{ toJSON(github.event.pull_request.labels.*.name) }}
1818
outputs:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ jobs:
2626
ports:
2727
- 27017:27017
2828
mssql:
29-
image: mcr.microsoft.com/mssql/server:2017-latest
29+
image: mcr.microsoft.com/mssql/server:2022-latest
3030
env:
31-
SA_PASSWORD: mssql_passw0rd
31+
MSSQL_SA_PASSWORD: mssql_passw0rd
3232
ACCEPT_EULA: Y
3333
ports:
3434
- 1433:1433
3535
options: >-
36-
--health-cmd "/opt/mssql-tools/bin/sqlcmd -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null"
36+
--health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $MSSQL_SA_PASSWORD -C -Q 'select 1' -b -o /dev/null"
3737
--health-interval 1s
3838
--health-timeout 30s
3939
--health-start-period 10s

0 commit comments

Comments
 (0)