Skip to content

Commit a3970a3

Browse files
committed
chore: merge main and resolve conflicts
2 parents f876861 + cf80246 commit a3970a3

File tree

541 files changed

+18075
-14919
lines changed

Some content is hidden

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

541 files changed

+18075
-14919
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/ISSUE_TEMPLATE/bug_report.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ about: Create a report to help us improve
44
labels: bug
55
---
66

7-
<!--
7+
<!--
88
Please answer these questions before submitting a bug report.
99
-->
1010

@@ -15,7 +15,7 @@ Please answer these questions before submitting a bug report.
1515

1616

1717
### What did you do?
18-
<!--
18+
<!--
1919
If possible, provide a recipe for reproducing the error.
2020
-->
2121

@@ -27,8 +27,8 @@ If possible, provide a recipe for reproducing the error.
2727

2828

2929
### Additional context
30-
<!--
30+
<!--
3131
Add any other context about the problem here.
3232
-->
3333

34-
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
34+
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. [Learn more here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>

.github/ISSUE_TEMPLATE/discussion.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ labels: discussion
1111
- [ ] This only affects the JavaScript OpenTelemetry library
1212
- [ ] This may affect other libraries, but I would like to get opinions here first
1313

14-
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
14+
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. [Learn more here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
1515

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ A clear and concise description of what the problem is. Ex. I'm always frustrate
1515

1616

1717
### Describe the solution you'd like to see
18-
<!--
18+
<!--
1919
A clear and concise description of what you want to happen.
2020
-->
2121

2222

2323
### Describe alternatives you've considered
24-
<!--
24+
<!--
2525
A clear and concise description of any alternative solutions or features you've considered.
2626
-->
2727

2828

2929
### Additional context
30-
<!--
30+
<!--
3131
Add any other context or screenshots about the feature request here.
3232
-->
3333

34-
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
34+
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. [Learn more here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
3535

.github/ISSUE_TEMPLATE/instrumentation_request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ Any code-owners listed MUST fulfill all criteria laid out in the checklist below
3535
Add any other context or screenshots about the instrumentation request here. Is there a reference you could point for the well-defined lifecycle methods?
3636
-->
3737

38-
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
38+
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. [Learn more here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>

.github/ISSUE_TEMPLATE/ownership_request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ Examples:
3939
Add any other context that does not fit any of the above sections
4040
-->
4141

42-
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
42+
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. [Learn more here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>

.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:
@@ -159,6 +163,10 @@ components:
159163
- t2t2
160164
packages/instrumentation-user-interaction:
161165
- obecny
166+
packages/instrumentation-web-exception:
167+
- martinkuba
168+
- pkanal
169+
- wolfgangcodes
162170
packages/plugin-react-load:
163171
- martinkuba
164172
packages/propagator-instana:

.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ 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

17-
- uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
17+
- uses: fossas/fossa-action@3ebcea1862c6ffbd5cf1b4d0bd6b3fe7bd6f2cac # v1.7.0
1818
with:
1919
api-key: ${{secrets.FOSSA_API_KEY}}
2020
team: OpenTelemetry

0 commit comments

Comments
 (0)