Skip to content

Commit 745d874

Browse files
committed
Merge remote-tracking branch 'origin/main' into config-provider-callback
# Conflicts: # api/incubator/src/test/java/io/opentelemetry/api/incubator/config/InstrumentationConfigUtilTest.java # sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfiguration.java # sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/YamlDeclarativeConfigProperties.java # sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/YamlDeclarativeConfigPropertiesTest.java # sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/YamlDeclarativeConfigProperties.java # sdk/all/src/main/java/io/opentelemetry/sdk/internal/YamlDeclarativeConfigProperties.java
2 parents f45b2bb + c6a6358 commit 745d874

421 files changed

Lines changed: 5602 additions & 2656 deletions

File tree

Some content is hidden

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

.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 github bot
3030
run: .github/scripts/use-cla-approved-bot.sh
3131

32-
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
32+
- uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
3333
id: otelbot-token
3434
with:
3535
app-id: ${{ vars.OTELBOT_APP_ID }}

.github/workflows/benchmark-tags.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: Benchmark SDK
1414
runs-on: oracle-bare-metal-64cpu-1024gb-x86-64-ubuntu-24
1515
container:
16-
image: ubuntu:24.04@sha256:84e77dee7d1bc93fb029a45e3c6cb9d8aa4831ccfcc7103d36e876938d28895b
16+
image: ubuntu:26.04@sha256:5e275723f82c67e387ba9e3c24baa0abdcb268917f276a0561c97bef9450d0b4
1717
timeout-minutes: 20 # since there is only a single bare metal runner across all repos
1818
strategy:
1919
fail-fast: false

.github/workflows/benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: Benchmark SDK
1616
runs-on: oracle-bare-metal-64cpu-1024gb-x86-64-ubuntu-24
1717
container:
18-
image: ubuntu:24.04@sha256:84e77dee7d1bc93fb029a45e3c6cb9d8aa4831ccfcc7103d36e876938d28895b
18+
image: ubuntu:26.04@sha256:5e275723f82c67e387ba9e3c24baa0abdcb268917f276a0561c97bef9450d0b4
1919
timeout-minutes: 20 # since there is only a single bare metal runner across all repos
2020
steps:
2121
- name: Install Git

.github/workflows/build-tracecontext-testsuite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
password: ${{ secrets.GITHUB_TOKEN }}
3030

3131
- name: Build and push
32-
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
32+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
3333
with:
3434
context: integration-tests/tracecontext/docker
3535
push: true

.github/workflows/build.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
env:
9494
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
9595

96-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
96+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
9797
if: ${{ matrix.coverage }}
9898
with:
9999
name: coverage-report
@@ -127,7 +127,11 @@ jobs:
127127
echo "JAVA_HOME: $JAVA_HOME"
128128
java --version
129129
native-image --version
130-
./gradlew nativeTest
130+
# Both flags required due to https://github.com/graalvm/native-build-tools/issues/477:
131+
# --no-parallel prevents a race where the plugin's shared build service creates project-scoped
132+
# detached configurations that are concurrently accessed during task fingerprinting.
133+
# --no-configuration-cache prevents the cache store phase from adding additional concurrency.
134+
./gradlew nativeTest --no-configuration-cache --no-parallel
131135
env:
132136
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
133137

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
4646

4747
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
48+
uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
4949
with:
5050
languages: ${{ matrix.language }}
5151
# using "linked" helps to keep up with the latest Kotlin support
@@ -62,6 +62,6 @@ jobs:
6262
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
6363

6464
- name: Perform CodeQL analysis
65-
uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
65+
uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
6666
with:
6767
category: "/language:${{matrix.language}}"
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
name: Detect API Changes
2+
3+
on:
4+
# pull_request_target is used instead of pull_request so that the workflow has write access
5+
# (to post comments and apply labels) even when triggered by fork PRs.
6+
#
7+
# SECURITY: this workflow must never checkout or execute any code from the PR branch.
8+
# Doing so would allow malicious PRs to exfiltrate secrets. All we use from the PR
9+
# is github.event.pull_request.number (an integer), which is safe.
10+
pull_request_target:
11+
types: [opened, synchronize, reopened, ready_for_review]
12+
13+
permissions: {}
14+
15+
jobs:
16+
detect-api-changes:
17+
name: Detect API surface area changes
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
21+
id: otelbot-token
22+
with:
23+
app-id: ${{ vars.OTELBOT_APP_ID }}
24+
private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
25+
26+
- name: Check for API changes and update PR
27+
env:
28+
GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
29+
PR_NUMBER: ${{ github.event.pull_request.number }}
30+
REPO: ${{ github.repository }}
31+
run: |
32+
MARKER="<!-- api-change-detector -->"
33+
34+
# Get list of apidiff files changed in this PR
35+
api_files=$(gh api "repos/${REPO}/pulls/${PR_NUMBER}/files" --paginate \
36+
--jq '.[] | select(.filename | startswith("docs/apidiffs/current_vs_latest/")) | .filename')
37+
38+
# Find existing bot comment (if any)
39+
comment_id=$(gh api "repos/${REPO}/issues/${PR_NUMBER}/comments" --paginate \
40+
--jq ".[] | select(.body | startswith(\"${MARKER}\")) | .id" | head -1)
41+
42+
if [[ -z "$api_files" ]]; then
43+
echo "No API diff files changed."
44+
45+
# Remove label if present (ok to fail if label doesn't exist on PR)
46+
gh pr edit "$PR_NUMBER" --repo "$REPO" --remove-label "api-change" 2>/dev/null || true
47+
48+
# Delete existing comment if present
49+
if [[ -n "$comment_id" ]]; then
50+
gh api --method DELETE "repos/${REPO}/issues/comments/${comment_id}"
51+
echo "Removed stale API change comment."
52+
fi
53+
exit 0
54+
fi
55+
56+
echo "API diff files changed:"
57+
echo "$api_files"
58+
59+
# Add label
60+
gh pr edit "$PR_NUMBER" --repo "$REPO" --add-label "api-change"
61+
62+
# Build bulleted module list
63+
modules=$(echo "$api_files" \
64+
| sed 's|docs/apidiffs/current_vs_latest/||' \
65+
| sed 's|\.txt$||' \
66+
| sort \
67+
| sed 's/^/- /')
68+
69+
BODY=$(cat <<EOF
70+
${MARKER}
71+
## :warning: API changes detected — additional maintainer review required
72+
73+
@jack-berg @jkwatson
74+
75+
This PR modifies the public API surface area of the following module(s):
76+
77+
${modules}
78+
79+
Please review the changes in \`docs/apidiffs/current_vs_latest/\` carefully before approving.
80+
EOF
81+
)
82+
83+
if [[ -n "$comment_id" ]]; then
84+
echo "Updating existing comment ${comment_id}"
85+
gh api --method PATCH "repos/${REPO}/issues/comments/${comment_id}" \
86+
--field body="$BODY"
87+
else
88+
echo "Creating new comment"
89+
gh pr comment "$PR_NUMBER" --repo "$REPO" --body "$BODY"
90+
fi

.github/workflows/ossf-scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# uploads of run results in SARIF format to the repository Actions tab.
3535
# https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
3636
- name: "Upload artifact"
37-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
37+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
3838
with:
3939
name: SARIF file
4040
path: results.sarif
@@ -43,6 +43,6 @@ jobs:
4343
# Upload the results to GitHub's code scanning dashboard (optional).
4444
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4545
- name: "Upload to code-scanning"
46-
uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
46+
uses: github/codeql-action/upload-sarif@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
4747
with:
4848
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 github bot
4848
run: .github/scripts/use-cla-approved-bot.sh
4949

50-
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
50+
- uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
5151
id: otelbot-token
5252
with:
5353
app-id: ${{ vars.OTELBOT_APP_ID }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- name: Use CLA approved github bot
6464
run: .github/scripts/use-cla-approved-bot.sh
6565

66-
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
66+
- uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
6767
id: otelbot-token
6868
with:
6969
app-id: ${{ vars.OTELBOT_APP_ID }}
@@ -119,7 +119,7 @@ jobs:
119119
- name: Use CLA approved github bot
120120
run: .github/scripts/use-cla-approved-bot.sh
121121

122-
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
122+
- uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
123123
id: otelbot-token
124124
with:
125125
app-id: ${{ vars.OTELBOT_APP_ID }}

0 commit comments

Comments
 (0)