Skip to content

Commit aac2f28

Browse files
AlchemyDingAlchemyDing
authored
Merge branch 'main' into feature-log4j-map-message
2 parents 275183c + 5ff365f commit aac2f28

File tree

490 files changed

+7211
-3868
lines changed

Some content is hidden

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

490 files changed

+7211
-3868
lines changed

‎.fossa.yml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ targets:
44
only:
55
# only scanning the modules which are published
66
# (as opposed to internal testing modules
7+
- type: gradle
8+
path: ./
9+
target: ':declarative-config-bridge'
710
- type: gradle
811
path: ./
912
target: ':instrumentation-annotations'
@@ -88,9 +91,6 @@ targets:
8891
- type: gradle
8992
path: ./
9093
target: ':instrumentation:camel-2.20:javaagent'
91-
- type: gradle
92-
path: ./
93-
target: ':instrumentation:clickhouse-client-0.5:javaagent'
9494
- type: gradle
9595
path: ./
9696
target: ':instrumentation:executors:bootstrap'
@@ -391,6 +391,15 @@ targets:
391391
- type: gradle
392392
path: ./
393393
target: ':instrumentation:cassandra:cassandra-4.4:library'
394+
- type: gradle
395+
path: ./
396+
target: ':instrumentation:clickhouse:clickhouse-client-common:javaagent'
397+
- type: gradle
398+
path: ./
399+
target: ':instrumentation:clickhouse:clickhouse-client-v1-0.5:javaagent'
400+
- type: gradle
401+
path: ./
402+
target: ':instrumentation:clickhouse:clickhouse-client-v2-0.8:javaagent'
394403
- type: gradle
395404
path: ./
396405
target: ':instrumentation:couchbase:couchbase-2-common:javaagent'

‎.github/workflows/build-common.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ jobs:
283283

284284
# vaadin 14 tests fail with node 18
285285
- name: Set up Node
286-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
286+
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
287287
with:
288288
node-version: 16
289289

@@ -336,7 +336,7 @@ jobs:
336336
- name: Get current job url
337337
id: jobs
338338
if: ${{ !cancelled() }}
339-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
339+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
340340
env:
341341
matrix: ${{ toJson(matrix) }}
342342
with:

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
cache-read-only: ${{ github.event_name == 'pull_request' }}
6464

6565
- name: Initialize CodeQL
66-
uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
66+
uses: github/codeql-action/init@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.30.1
6767
with:
6868
languages: ${{ matrix.language }}
6969
# using "linked" helps to keep up with the linked Kotlin support
@@ -84,6 +84,6 @@ jobs:
8484
--no-build-cache --no-daemon
8585
8686
- name: Perform CodeQL analysis
87-
uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
87+
uses: github/codeql-action/analyze@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.30.1
8888
with:
8989
category: "/language:${{matrix.language}}"

‎.github/workflows/dependency-review.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ jobs:
1919
- name: 'Checkout Repository'
2020
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2121
- name: 'Dependency Review'
22-
uses: actions/dependency-review-action@bc41886e18ea39df68b1b1245f4184881938e050 # v4.7.2
22+
uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b # v4.7.3

‎.github/workflows/issue-management-stale-action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
pull-requests: write # for actions/stale to close stale PRs
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
19+
- uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
2020
with:
2121
repo-token: ${{ secrets.GITHUB_TOKEN }}
2222
days-before-stale: 7

‎.github/workflows/label.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ jobs:
1111
contents: read
1212
pull-requests: write
1313
steps:
14-
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
14+
- uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1
1515
with:
1616
repo-token: "${{ secrets.GITHUB_TOKEN }}"

‎.github/workflows/ossf-scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242
# Upload the results to GitHub's code scanning dashboard (optional).
4343
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
45+
uses: github/codeql-action/upload-sarif@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.30.1
4646
with:
4747
sarif_file: results.sarif

‎.github/workflows/reusable-native-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2828
- id: read-java
2929
run: echo "version=$(cat .java-version)" >> "$GITHUB_OUTPUT"
30-
- uses: graalvm/setup-graalvm@7f488cf82a3629ee755e4e97342c01d6bed318fa # v1.3.5.1
30+
- uses: graalvm/setup-graalvm@7a1da54cb7fdef4ea19f6ecdfa9ecf59dc5a48fe # v1.3.6.1
3131
with:
3232
version: "latest"
3333
java-version: ${{ matrix.test-java-version }}

‎.github/workflows/reusable-test-latest-deps.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
- name: Get current job url
8686
id: jobs
8787
if: ${{ !cancelled() }}
88-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
88+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
8989
env:
9090
matrix: ${{ toJson(matrix) }}
9191
with:

‎.github/workflows/survey-on-merged-pr.yml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Survey on Merged PR by Non-Member
2+
3+
on:
4+
pull_request_target:
5+
types: [closed]
6+
7+
permissions:
8+
contents: read
9+
10+
env:
11+
PR_NUM: ${{ github.event.pull_request.number }}
12+
SURVEY_URL: https://docs.google.com/forms/d/e/1FAIpQLSf2FfCsW-DimeWzdQgfl0KDzT2UEAqu69_f7F2BVPSxVae1cQ/viewform?entry.1540511742=${{ github.repository }}
13+
14+
jobs:
15+
comment-on-pr:
16+
name: Add survey to PR if author is not a member
17+
runs-on: ubuntu-latest
18+
if: github.event.pull_request.merged == true
19+
steps:
20+
- uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.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: Add survey comment if author is not a member or bot
27+
run: |
28+
USERNAME="${{ github.event.pull_request.user.login }}"
29+
USER_TYPE="${{ github.event.pull_request.user.type }}"
30+
ORG="${{ github.repository_owner }}"
31+
32+
# Skip if user is a bot
33+
if [[ "$USER_TYPE" == "Bot" ]]; then
34+
echo "Skipping survey for bot user: $USERNAME"
35+
exit 0
36+
fi
37+
38+
# Skip if user is an org member
39+
if gh api "orgs/$ORG/members/$USERNAME" --silent; then
40+
echo "Skipping survey for org member: $USERNAME"
41+
exit 0
42+
fi
43+
44+
# Add survey comment for external contributor
45+
echo "Adding survey comment for external contributor: $USERNAME"
46+
gh pr comment ${PR_NUM} --repo ${{ github.repository }} --body "Thank you for your contribution @${USERNAME}! 🎉 We would like to hear from you about your experience contributing to OpenTelemetry by taking a few minutes to fill out this [survey](${SURVEY_URL})."
47+
env:
48+
GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}

0 commit comments

Comments
 (0)