Skip to content

Commit f46fc53

Browse files
authoredDec 12, 2024··
[CI] Ensure auto update processes all files (#5769)
1 parent 1d2a6fa commit f46fc53

File tree

3 files changed

+48
-23
lines changed

3 files changed

+48
-23
lines changed
 

‎content/en/docs/zero-code/java/_index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ aliases:
66
- /docs/languages/java/automatic_instrumentation
77
cascade:
88
vers:
9-
instrumentation: 2.6.0
10-
otel: 1.40.0
9+
instrumentation: 2.10.0
10+
otel: 1.45.0
1111
---
1212

1313
Zero-code instrumentation with Java uses a Java agent JAR or Spring Boot

‎scripts/auto-update/all-versions.sh

+28-13
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,36 @@
22

33
function auto_update_versions() {
44
local cmd="./scripts/auto-update/version-in-file.sh"
5-
local updates=(
6-
"opentelemetry-collector-releases vers content/en/docs/collector/_index.md"
7-
"opentelemetry-collector-releases collector_vers content/en/docs/security/_index.md"
8-
"opentelemetry-java otel content/en/docs/languages/java/_index.md"
9-
"opentelemetry-java otel content/en/docs/zero-code/java/_index.md"
10-
"opentelemetry-java-instrumentation instrumentation content/en/docs/languages/java/_index.md"
11-
"opentelemetry-java-instrumentation instrumentation content/en/docs/zero-code/java/_index.md"
12-
"opentelemetry-java-contrib contrib content/en/docs/languages/java/_index.md"
13-
"opentelemetry-specification spec scripts/content-modules/adjust-pages.pl .gitmodules"
14-
"opentelemetry-proto otlp scripts/content-modules/adjust-pages.pl .gitmodules"
15-
"semantic-conventions semconv scripts/content-modules/adjust-pages.pl .gitmodules"
16-
"semantic-conventions-java semconv content/en/docs/languages/java/_index.md"
5+
local repo_and_files_to_update=(
6+
7+
# Format of an entry is
8+
# "repo-name regex file-name [regex file-name...]"
9+
10+
"opentelemetry-collector-releases
11+
vers content/en/docs/collector/_index.md
12+
collector_vers content/en/docs/security/_index.md"
13+
"opentelemetry-java
14+
otel content/en/docs/languages/java/_index.md
15+
otel content/en/docs/zero-code/java/_index.md"
16+
"opentelemetry-java-instrumentation
17+
instrumentation content/en/docs/languages/java/_index.md
18+
instrumentation content/en/docs/zero-code/java/_index.md"
19+
"opentelemetry-java-contrib
20+
contrib content/en/docs/languages/java/_index.md"
21+
"opentelemetry-specification
22+
spec scripts/content-modules/adjust-pages.pl
23+
spec .gitmodules"
24+
"opentelemetry-proto
25+
otlp scripts/content-modules/adjust-pages.pl
26+
otlp .gitmodules"
27+
"semantic-conventions
28+
semconv scripts/content-modules/adjust-pages.pl
29+
semconv .gitmodules"
30+
"semantic-conventions-java
31+
semconv content/en/docs/languages/java/_index.md"
1732
)
1833

19-
for args in "${updates[@]}"; do
34+
for args in "${repo_and_files_to_update[@]}"; do
2035
echo "> $cmd $args"
2136
$cmd $args
2237
echo

‎scripts/auto-update/version-in-file.sh

+18-8
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,22 @@ else
1717
shift
1818
fi
1919

20-
repo=$1
21-
variable_name=$2
22-
file_names=("${@:3}") # remaining args
23-
20+
repo=$1; shift;
2421
latest_version=$(gh api -q .tag_name "repos/open-telemetry/$repo/releases/latest")
2522
latest_vers_no_v="${latest_version#v}" # Remove leading 'v'
2623

2724
echo "REPO: $repo"
2825
echo "LATEST VERSION: $latest_version"
2926

30-
for file_name in "${file_names[@]}"
31-
do
27+
function process_file() {
28+
local name="$1"
29+
local file_path="$2"
30+
31+
if [[ -z "$file_path" ]]; then
32+
echo "ERROR: Missing name or file path for processing." >&2
33+
return 1
34+
fi
35+
3236
# Version line regex `vers_match_regex` to match version specifier -- works under Linux and macOS.
3337
if [[ $file_name == ".gitmodules" ]]; then
3438
vers_match_regex="$variable_name-pin ="
@@ -50,6 +54,12 @@ do
5054
if [[ -e "$file_name".bak ]]; then
5155
rm "$file_name".bak
5256
fi
57+
}
58+
59+
while [[ $# -gt 0 ]]; do
60+
variable_name=$1; shift;
61+
file_name=$1; shift;
62+
process_file $variable_name $file_name
5363
done
5464

5565
if git diff --quiet "${file_names[@]}"; then
@@ -76,8 +86,8 @@ if [ "$existing_pr_count" -gt 0 ]; then
7686
fi
7787

7888
if [[ "$repo" == "opentelemetry-specification"
79-
|| "$repo" == "opentelemetry-proto"
80-
|| "$repo" == "semantic-conventions" ]]; then
89+
|| "$repo" == "opentelemetry-proto"
90+
|| "$repo" == "semantic-conventions" ]]; then
8191
echo "Switching to $repo at tag $latest_version"
8292
( set -x;
8393
npm run get:submodule -- content-modules/$repo &&

0 commit comments

Comments
 (0)
Please sign in to comment.