Skip to content

Commit 76bc214

Browse files
authored
Merge branch 'main' into fix/instrumentation-config-priority
2 parents d6aabd1 + 950e9fe commit 76bc214

File tree

679 files changed

+36783
-49291
lines changed

Some content is hidden

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

679 files changed

+36783
-49291
lines changed

.github/CODEOWNERS

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,16 @@
1212
# https://help.github.com/en/articles/about-code-owners
1313
#
1414

15-
* @open-telemetry/javascript-approvers
15+
# Only maintainers can approve changes in .github/ - including this file here, workflows and issue templates
16+
.github/ @open-telemetry/javascript-maintainers
17+
18+
# Any browser-specific code is co-owned by Browser SIG and JS SIG (list more packages here as needed):
19+
packages/instrumentation-document-load/ @open-telemetry/browser-maintainers @open-telemetry/javascript-approvers
20+
packages/instrumentation-long-task/ @open-telemetry/browser-maintainers @open-telemetry/javascript-approvers
21+
packages/instrumentation-user-interaction/ @open-telemetry/browser-maintainers @open-telemetry/javascript-approvers
22+
packages/instrumentation-web-exception/ @open-telemetry/browser-maintainers @open-telemetry/javascript-approvers
23+
packages/plugin-react-load/ @open-telemetry/browser-maintainers @open-telemetry/javascript-approvers
24+
packages/auto-instrumentations-web @open-telemetry/browser-maintainers @open-telemetry/javascript-approvers
25+
26+
# All other files
27+
* @open-telemetry/javascript-approvers

.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: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ components:
1818
# Unmaintained
1919
packages/resource-detector-instana:
2020
- kirrg001
21-
incubator/opentelemetry-sampler-aws-xray:
21+
packages/sampler-aws-xray:
2222
- jj22ee
2323
- yiyuan-he
2424
packages/auto-configuration-propagators:
@@ -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/close-stale.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
pull-requests: write # required for closing stale PRs
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/stale@v9
16+
- uses: actions/stale@v10
1717
with:
1818
days-before-stale: 60
1919
days-before-close: 14
@@ -26,7 +26,7 @@ jobs:
2626
exempt-issue-labels: never-stale
2727
exempt-pr-labels: never-stale
2828
any-of-labels: information-requested
29-
- uses: actions/stale@v9
29+
- uses: actions/stale@v10
3030
with:
3131
days-before-issue-stale: 0
3232
days-before-issue-close: 14
@@ -38,7 +38,7 @@ jobs:
3838
only-labels: pkg-status:unmaintained,feature-request
3939
exempt-issue-labels: bug,has:sponsor,type:semconv-update
4040
remove-stale-when-updated: false
41-
- uses: actions/stale@v9
41+
- uses: actions/stale@v10
4242
with:
4343
days-before-pr-stale: 0
4444
days-before-pr-close: 14

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Checkout repository
20-
uses: actions/checkout@v5
20+
uses: actions/checkout@v6
2121

2222
# Initializes the CodeQL tools for scanning.
2323
- name: Initialize CodeQL

.github/workflows/fossa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fossa:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
15+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
1616

1717
- uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
1818
with:

.github/workflows/label-prs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
pull-requests: write
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v5
17-
- uses: actions/labeler@v5
16+
- uses: actions/checkout@v6
17+
- uses: actions/labeler@v6
1818
with:
1919
configuration-path: '.github/component-label-map.yml'

.github/workflows/lint.yml

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

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

.github/workflows/ossf-scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
# Needed for GitHub OIDC token if publish_results is true
2020
id-token: write
2121
steps:
22-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
22+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2323
with:
2424
persist-credentials: false
2525

26-
- uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
26+
- uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
2727
with:
2828
results_file: results.sarif
2929
results_format: sarif

.github/workflows/peer-api.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
image: node:20
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v5
19+
uses: actions/checkout@v6
2020

2121
- name: Install script dependencies
22-
run: npm ci
22+
run: npm ci --ignore-scripts
2323

2424
- name: Check API dependency semantics
2525
run: node ./scripts/peer-api-check.js

0 commit comments

Comments
 (0)