Skip to content

Commit 46a6fe5

Browse files
Merge branch 'main' into maxday/fix-vulnerabilities
2 parents b00f385 + d9194d9 commit 46a6fe5

Some content is hidden

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

72 files changed

+6382
-5424
lines changed

.github/workflows/check-links.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
- name: Link Checker
4747
id: lychee
48-
uses: lycheeverse/lychee-action@f613c4a64e50d792e0b31ec34bbcbba12263c6a6
48+
uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332
4949
with:
5050
args: "--verbose --no-progress ${{needs.changedfiles.outputs.files}} --config .github/lychee.toml"
5151
failIfEmpty: false

.github/workflows/ci-collector.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ jobs:
2121
test:
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v4
25-
- uses: actions/setup-go@v5
24+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
25+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
2626
with:
27-
go-version: '~1.21.9'
28-
- uses: actions/cache@v4
27+
go-version-file: collector/go.mod
28+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
2929
with:
3030
path: ~/go/pkg/mod
3131
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -44,11 +44,11 @@ jobs:
4444
matrix:
4545
architecture: [ amd64, arm64 ]
4646
steps:
47-
- uses: actions/checkout@v4
48-
- uses: actions/setup-go@v5
47+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
48+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
4949
with:
50-
go-version: '~1.21.9'
51-
- uses: actions/cache@v4
50+
go-version-file: collector/go.mod
51+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
5252
with:
5353
path: ~/go/pkg/mod
5454
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}

.github/workflows/ci-java.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,23 @@ on:
1515
- main
1616

1717
permissions:
18-
pull-requests: write
18+
contents: read
1919

2020
jobs:
2121
build:
22+
permissions:
23+
pull-requests: write
2224
runs-on: ubuntu-latest
2325
steps:
24-
- uses: actions/checkout@v4
26+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2527

26-
- uses: actions/setup-java@v4
28+
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
2729
with:
2830
distribution: corretto
2931
java-version: 17
3032

3133
- name: Setup Gradle
32-
uses: gradle/actions/setup-gradle@v4
34+
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
3335
with:
3436
add-job-summary-as-pr-comment: on-failure # Valid values are 'never' (default), 'always', and 'on-failure'
3537

.github/workflows/ci-nodejs.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ jobs:
2121
build:
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v4
25-
- uses: actions/setup-node@v4
24+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
25+
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
2626
with:
2727
node-version: 18
28-
- uses: actions/cache@v4
28+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
2929
with:
3030
path: ~/.npm
3131
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -37,3 +37,6 @@ jobs:
3737
working-directory: nodejs
3838
- run: npm test
3939
working-directory: nodejs
40+
- name: Build AWS SDK Sample
41+
run: npm run build
42+
working-directory: nodejs/sample-apps/aws-sdk

.github/workflows/ci-python.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ jobs:
3131
matrix:
3232
# If you add a python version here, please make sure that the collector/Makefile publish and publish-layer targets
3333
# get updated as well
34-
python: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
34+
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
3535

3636
steps:
3737
- name: Checkout this repo
38-
uses: actions/checkout@v4
38+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3939
- name: Setup Python for OTel Python SDK
40-
uses: actions/setup-python@v5
40+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
4141
with:
4242
python-version: ${{ matrix.python }}
4343
- name: Install tox testing package
@@ -46,7 +46,7 @@ jobs:
4646
pip install tox
4747
tox
4848
- name: Set up Go for ADOT Collector
49-
uses: actions/setup-go@v5
49+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
5050
with:
5151
go-version: '^1.20.8'
5252
- name: Build Python Layer which includes ADOT Collector

.github/workflows/ci-shellcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
shellcheck:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1313

1414
- name: Install shell check
1515
run: sudo apt update && sudo apt install --assume-yes shellcheck

.github/workflows/ci-terraform.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ jobs:
2121
check-terraform-syntax:
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v4
25-
- uses: hashicorp/setup-terraform@v3
24+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
25+
- uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
2626
- run: terraform fmt -check -recursive

.github/workflows/close-stale.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@ on:
44
- cron: "40 3 * * *" # Run daily at 3:40 AM
55

66
permissions:
7-
issues: write
8-
pull-requests: write
7+
contents: read
98

109
jobs:
1110
stale:
11+
permissions:
12+
issues: write
13+
pull-requests: write
1214
runs-on: ubuntu-latest
1315
steps:
14-
- uses: actions/stale@v9
16+
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
1517
with:
1618
repo-token: ${{ secrets.GITHUB_TOKEN }}
1719
stale-issue-message: 'This issue was marked stale. It will be closed in 30 days without additional activity.'

.github/workflows/codeql.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ jobs:
6464

6565
steps:
6666
- name: Checkout repository
67-
uses: actions/checkout@v4
67+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6868

6969
# Initializes the CodeQL tools for scanning.
7070
- name: Initialize CodeQL
71-
uses: github/codeql-action/init@v3
71+
uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
7272
with:
7373
languages: ${{ matrix.target.language }}
7474
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -82,7 +82,7 @@ jobs:
8282
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
8383
# If this step fails, then you should remove it and run the build manually (see below)
8484
- name: Autobuild
85-
uses: github/codeql-action/autobuild@v3
85+
uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
8686
with:
8787
working-directory: ${{ matrix.target.directory }}
8888
# There are no array literals in GHA that is why we need to use fromJson.
@@ -99,22 +99,22 @@ jobs:
9999
# ./location_of_script_within_repo/buildscript.sh
100100

101101
- name: Set up Java
102-
uses: actions/setup-java@v4
102+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
103103
with:
104104
distribution: corretto
105105
java-version: '11'
106106
if: ${{ matrix.target.language == 'java' }}
107107

108108
- name: Setup Gradle
109-
uses: gradle/actions/setup-gradle@v4
109+
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
110110

111111
- name: build Java
112112
run: ./gradlew build --no-build-cache
113113
working-directory: ${{ matrix.target.directory }}
114114
if: ${{ matrix.target.language == 'java' }}
115115

116116
- name: setup dotnet
117-
uses: actions/setup-dotnet@v4
117+
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
118118
with:
119119
dotnet-version: 6.x
120120
if: ${{ matrix.target.language == 'csharp' }}
@@ -126,6 +126,6 @@ jobs:
126126
if: ${{ matrix.target.language == 'csharp' }}
127127

128128
- name: Perform CodeQL Analysis
129-
uses: github/codeql-action/analyze@v3
129+
uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
130130
with:
131131
category: "/language:${{matrix.target.language}}"

.github/workflows/fossa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1616

17-
- uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
17+
- uses: fossas/fossa-action@3ebcea1862c6ffbd5cf1b4d0bd6b3fe7bd6f2cac # v1.7.0
1818
with:
1919
api-key: ${{secrets.FOSSA_API_KEY}}
2020
team: OpenTelemetry

0 commit comments

Comments
 (0)