Skip to content

Commit 24e12f4

Browse files
committed
Merge branch 'main' into renovate/errorprone-packages
2 parents b527a92 + 7a645ed commit 24e12f4

File tree

15 files changed

+116
-18
lines changed

15 files changed

+116
-18
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,10 @@ body:
5757
attributes:
5858
label: Additional context
5959
description: Any additional information you think may be relevant to this issue.
60+
- type: dropdown
61+
attributes:
62+
label: Tip
63+
description: This element is static, used to render a helpful sub-heading for end-users and community members to help prioritize issues. Please leave as is.
64+
options:
65+
- <sub>[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>
66+
default: 0

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,10 @@ body:
4848
attributes:
4949
label: Additional context
5050
description: Add any other context or screenshots about the feature request here.
51+
- type: dropdown
52+
attributes:
53+
label: Tip
54+
description: This element is static, used to render a helpful sub-heading for end-users and community members to help prioritize issues. Please leave as is.
55+
options:
56+
- <sub>[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>
57+
default: 0

.github/component_owners.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# this file is used by .github/workflows/assign-reviewers.yml
1+
# this file is used by .github/workflows/assign-reviewers.yml and .github/workflows/assign-issue-owners.yml
22
#
33
# NOTE component owners must be members of the GitHub OpenTelemetry organization
44
# so that they can be added to @open-telemetry/java-contrib-triagers
5-
# which in turn is required for them to be auto-assigned as reviewers by the automation
5+
# which in turn is required for them to be auto-assigned as reviewers and issue assignees by the automation
66
#
77
# NOTE when updating this file, don't forget to update the README.md files in the associated
88
# components also
99
#
1010
# NOTE when adding/updating one of the component names, don't forget to update the associated
11-
# `comp:*` labels
11+
# `component:*` labels (used for both PR reviews and issue assignment)
1212
components:
1313
aws-resources:
1414
- wangzlei
@@ -65,7 +65,7 @@ components:
6565
- LikeTheSalad
6666
- breedx-splk
6767
- jack-berg
68-
prometheus-collector:
68+
prometheus-client-bridge:
6969
- jkwatson
7070
resource-providers:
7171
- breedx-splk
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
---
2+
name: Assign issue owners
3+
4+
on:
5+
issues:
6+
types: [labeled]
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
assign-owners:
13+
permissions:
14+
contents: read
15+
issues: write
16+
runs-on: ubuntu-latest
17+
if: startsWith(github.event.label.name, 'component:')
18+
steps:
19+
- name: Checkout repository
20+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
21+
22+
- name: Install js-yaml
23+
run: npm install js-yaml
24+
25+
- name: Parse component label and assign owners
26+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
27+
with:
28+
script: |
29+
const fs = require('fs');
30+
const yaml = require('js-yaml');
31+
32+
// Extract component name from label
33+
const labelName = context.payload.label.name;
34+
35+
if (!labelName.startsWith('component:')) {
36+
core.setFailed('Label does not match expected pattern');
37+
return;
38+
}
39+
40+
const componentName = labelName.replace('component:', '');
41+
console.log(`Processing component: ${componentName}`);
42+
43+
// Read and parse component_owners.yml
44+
const yamlContent = fs.readFileSync('.github/component_owners.yml', 'utf8');
45+
const data = yaml.load(yamlContent);
46+
47+
if (!data || !data.components) {
48+
core.setFailed('Invalid component_owners.yml structure');
49+
return;
50+
}
51+
52+
const components = data.components;
53+
54+
if (!(componentName in components)) {
55+
core.setFailed(`Component '${componentName}' not found in component_owners.yml`);
56+
return;
57+
}
58+
59+
const owners = components[componentName];
60+
61+
if (!owners || owners.length === 0) {
62+
core.setFailed(`No owners found for component '${componentName}'`);
63+
return;
64+
}
65+
66+
console.log(`Found owners: ${owners.join(', ')}`);
67+
68+
// Assign the issue to the owners
69+
const issueNumber = context.payload.issue.number;
70+
71+
await github.rest.issues.addAssignees({
72+
owner: context.repo.owner,
73+
repo: context.repo.repo,
74+
issue_number: issueNumber,
75+
assignees: owners
76+
});
77+
78+
console.log(`Successfully assigned issue #${issueNumber} to ${owners.join(', ')}`);

.github/workflows/assign-reviewers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
pull-requests: write # for assigning reviewers
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: open-telemetry/assign-reviewers-action@fcd27c5381c10288b23d423ab85473710a33389e # main
21+
- uses: open-telemetry/assign-reviewers-action@2f4f06ccc561740d5094d9ca5e66dc2392d13e8f # main
2222
with:
2323
config-file: .github/component_owners.yml

.github/workflows/auto-spotless-apply.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
pull-requests: write
1818
steps:
1919
- name: Download patch
20-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
20+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
2121
with:
2222
run-id: ${{ github.event.workflow_run.id }}
2323
path: ${{ runner.temp }}
@@ -32,7 +32,7 @@ jobs:
3232
echo "exists=true" >> $GITHUB_OUTPUT
3333
fi
3434
35-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
35+
- uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
3636
if: steps.unzip-patch.outputs.exists == 'true'
3737
id: otelbot-token
3838
with:

.github/workflows/backport.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Use CLA approved bot
3030
run: .github/scripts/use-cla-approved-bot.sh
3131

32-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
32+
- uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
3333
id: otelbot-token
3434
with:
3535
app-id: ${{ vars.OTELBOT_APP_ID }}

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
5151

5252
- name: Initialize CodeQL
53-
uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
53+
uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
5454
with:
5555
languages: ${{ matrix.language }}
5656
# using "latest" helps to keep up with the latest Kotlin support
@@ -65,6 +65,6 @@ jobs:
6565
run: ./gradlew assemble --no-build-cache --no-daemon
6666

6767
- name: Perform CodeQL analysis
68-
uses: github/codeql-action/analyze@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
68+
uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
6969
with:
7070
category: "/language:${{matrix.language}}"

.github/workflows/ossf-scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
persist-credentials: false
2525

26-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
26+
- uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
2727
id: create-token
2828
with:
2929
# analyzing classic branch protections requires a token with admin read permissions
@@ -52,6 +52,6 @@ jobs:
5252
# Upload the results to GitHub's code scanning dashboard (optional).
5353
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
5454
- name: "Upload to code-scanning"
55-
uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
55+
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
5656
with:
5757
sarif_file: results.sarif

.github/workflows/prepare-patch-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Use CLA approved bot
4848
run: .github/scripts/use-cla-approved-bot.sh
4949

50-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
50+
- uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
5151
id: otelbot-token
5252
with:
5353
app-id: ${{ vars.OTELBOT_APP_ID }}

0 commit comments

Comments
 (0)