Skip to content

Commit eb9cf8a

Browse files
authored
Merge branch 'main' into add_ibm_mq
2 parents 0953fe4 + 40ca061 commit eb9cf8a

File tree

131 files changed

+4650
-487
lines changed

Some content is hidden

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

131 files changed

+4650
-487
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

.github/renovate.json5

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
],
77
ignorePresets: [
88
':ignoreModulesAndTests', // needed to keep maven-extension test pom files up-to-date
9+
'workarounds:javaLTSVersions', // Allow all Java major versions, not just LTS
910
],
1011
prHourlyLimit: 5, // we have a large number of parallel runners
1112
labels: [
@@ -170,11 +171,22 @@
170171
customType: 'regex',
171172
datasourceTemplate: 'npm',
172173
managerFilePatterns: [
173-
'/^.github/workflows//',
174+
'.github/workflows/**'
174175
],
175176
matchStrings: [
176177
'npx (?<depName>[^@]+)@(?<currentValue>[^\\s]+)',
177178
],
178179
},
180+
{
181+
customType: 'regex',
182+
datasourceTemplate: 'java-version',
183+
managerFilePatterns: [
184+
'.github/workflows/**'
185+
],
186+
matchStrings: [
187+
'(?<currentValue>\\d+) # renovate: datasource=java-version',
188+
],
189+
depNameTemplate: 'java',
190+
},
179191
],
180192
}

.github/scripts/.lychee-relative.toml

Lines changed: 0 additions & 7 deletions
This file was deleted.
File renamed without changes.

.github/scripts/link-check.sh

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ export MSYS_NO_PATHCONV=1 # for Git Bash on Windows
66

77
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
88
ROOT_DIR="$SCRIPT_DIR/../.."
9-
DEPENDENCIES_DOCKERFILE="$SCRIPT_DIR/dependencies.dockerfile"
9+
DEPENDENCIES_DOCKERFILE="$SCRIPT_DIR/dependencies.Dockerfile"
1010

1111
# Parse command line arguments
12-
RELATIVE_ONLY=false
13-
MODIFIED_FILES=""
12+
LOCAL_LINKS_ONLY=false
13+
TARGET=""
1414

1515
while [[ $# -gt 0 ]]; do
1616
case $1 in
17-
--relative-only)
18-
RELATIVE_ONLY=true
17+
--local-links-only)
18+
LOCAL_LINKS_ONLY=true
1919
shift
2020
;;
2121
*)
2222
# Treat any other arguments as file paths
23-
MODIFIED_FILES="$MODIFIED_FILES $1"
23+
TARGET="$TARGET $1"
2424
shift
2525
;;
2626
esac
@@ -29,26 +29,24 @@ done
2929
# Extract lychee version from dependencies.dockerfile
3030
LYCHEE_VERSION=$(grep "FROM lycheeverse/lychee:" "$DEPENDENCIES_DOCKERFILE" | sed 's/.*FROM lycheeverse\/lychee:\([^ ]*\).*/\1/')
3131

32-
# Determine target files/directories and config file
33-
TARGET="."
34-
LYCHEE_CONFIG=".github/scripts/.lychee.toml"
35-
36-
if [[ "$RELATIVE_ONLY" == "true" ]]; then
37-
LYCHEE_CONFIG=".github/scripts/.lychee-relative.toml"
38-
fi
39-
40-
if [[ -n "$MODIFIED_FILES" ]]; then
41-
TARGET="$MODIFIED_FILES"
32+
if [[ -z "$TARGET" ]]; then
33+
TARGET="."
4234
fi
4335

4436
# Build the lychee command with optional GitHub token
45-
CMD="lycheeverse/lychee:$LYCHEE_VERSION --verbose --config $LYCHEE_CONFIG"
37+
CMD="lycheeverse/lychee:$LYCHEE_VERSION --verbose --root-dir /data"
4638

4739
# Add GitHub token if available
4840
if [[ -n "$GITHUB_TOKEN" ]]; then
4941
CMD="$CMD --github-token $GITHUB_TOKEN"
5042
fi
5143

44+
if [[ "$LOCAL_LINKS_ONLY" == "true" ]]; then
45+
CMD="$CMD --scheme file --include-fragments"
46+
else
47+
CMD="$CMD --config .github/scripts/lychee-config.toml"
48+
fi
49+
5250
CMD="$CMD $TARGET"
5351

5452
# Determine if we should allocate a TTY
File renamed without changes.
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@cb42e3ee14a59c01abccd401f126a0f4c3991cb3 # main
21+
- uses: open-telemetry/assign-reviewers-action@2f4f06ccc561740d5094d9ca5e66dc2392d13e8f # main
2222
with:
2323
config-file: .github/component_owners.yml

0 commit comments

Comments
 (0)