Skip to content

Commit 0614e3b

Browse files
steves-canvasteves-canva
committed
Merge remote-tracking branch 'refs/remotes/open-telemetry/release/v0.102.x' into upstream-merge-0.102.1
# Conflicts: # config/confighttp/confighttp.go # config/confighttp/go.mod
2 parents c12e1f6 + 7218b4c commit 0614e3b

File tree

392 files changed

+22547
-5228
lines changed

Some content is hidden

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

392 files changed

+22547
-5228
lines changed

‎.chloggen/jpkroehling-configgrpc-use-own-compressors-for-zstd.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: 'bug_fix'
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: Use own compressors for zstd
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Before this change, the zstd compressor we used didn't respect the max message size.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [10323]

‎.github/workflows/api-compatibility.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ jobs:
2222
steps:
2323

2424
- name: Checkout-Main
25-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
25+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
2626
with:
2727
ref: ${{ github.base_ref }}
2828
path: ${{ github.base_ref }}
2929

3030
- name: Checkout-HEAD
31-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
31+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
3232
with:
3333
path: ${{ github.head_ref }}
3434

3535
- name: Setup Go
36-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
36+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
3737
with:
3838
go-version: ~1.21.5
3939

‎.github/workflows/build-and-test-arm.yml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: build-and-test-arm
2+
on:
3+
push:
4+
branches: [ main ]
5+
tags:
6+
- 'v[0-9]+.[0-9]+.[0-9]+*'
7+
merge_group:
8+
pull_request:
9+
env:
10+
TEST_RESULTS: testbed/tests/results/junit/results.xml
11+
# Make sure to exit early if cache segment download times out after 2 minutes.
12+
# We limit cache download as a whole to 5 minutes.
13+
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
14+
GOPROXY: https://goproxy1.cncf.selfactuated.dev,direct
15+
16+
permissions:
17+
contents: read
18+
19+
# Do not cancel this workflow on main. See https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/16616
20+
concurrency:
21+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
22+
cancel-in-progress: true
23+
24+
jobs:
25+
arm-unittest-matrix:
26+
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run ARM') || github.event_name == 'push' || github.event_name == 'merge_group') }}
27+
runs-on: actuated-arm64-4cpu-4gb
28+
steps:
29+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
30+
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
31+
with:
32+
go-version: "~1.22.4"
33+
cache: false
34+
- name: Cache Go
35+
id: go-cache
36+
timeout-minutes: 5
37+
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
38+
with:
39+
path: |
40+
~/go/bin
41+
~/go/pkg/mod
42+
key: go-build-cache-${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
43+
- name: Install dependencies
44+
if: steps.go-cache.outputs.cache-hit != 'true'
45+
run: make gomoddownload
46+
- name: Install Tools
47+
if: steps.go-cache.outputs.cache-hit != 'true'
48+
run: make install-tools
49+
- name: Run Unit Tests
50+
run: make -j4 gotest
51+
arm-unittest:
52+
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run ARM') || github.event_name == 'push' || github.event_name == 'merge_group') }}
53+
runs-on: actuated-arm64-4cpu-4gb
54+
needs: [arm-unittest-matrix]
55+
steps:
56+
- name: Print result
57+
run: echo ${{ needs.arm-unittest-matrix.result }}
58+
- name: Interpret result
59+
run: |
60+
if [[ success == ${{ needs.arm-unittest-matrix.result }} ]]
61+
then
62+
echo "All matrix jobs passed!"
63+
else
64+
echo "One or more matrix jobs failed."
65+
false
66+
fi

‎.github/workflows/build-and-test-windows.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
runs-on: windows-latest
1919
steps:
2020
- name: Checkout Repo
21-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
21+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
2222
- name: Setup Go
23-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
23+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
2424
with:
2525
go-version: ~1.21.5
2626
cache: false
@@ -40,9 +40,9 @@ jobs:
4040
runs-on: windows-latest
4141
steps:
4242
- name: Checkout Repo
43-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
43+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
4444
- name: Setup Go
45-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
45+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
4646
with:
4747
go-version: ~1.21.5
4848
cache: false

‎.github/workflows/build-and-test.yml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
- "v[0-9]+.[0-9]+.[0-9]+*"
77
pull_request:
88

9+
permissions:
10+
contents: read
11+
912
concurrency:
1013
group: ${{ github.workflow }}-${{ github.head_ref }}
1114
cancel-in-progress: true
@@ -15,11 +18,11 @@ jobs:
1518
runs-on: ubuntu-latest
1619
steps:
1720
- name: Checkout Repo
18-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
21+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
1922
- name: Setup Go
20-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
23+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
2124
with:
22-
go-version: ~1.21.9
25+
go-version: ~1.21.11
2326
cache: false
2427
- name: Cache Go
2528
id: go-cache
@@ -38,11 +41,11 @@ jobs:
3841
needs: [setup-environment]
3942
steps:
4043
- name: Checkout Repo
41-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
44+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
4245
- name: Setup Go
43-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
46+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
4447
with:
45-
go-version: ~1.21.9
48+
go-version: ~1.21.11
4649
cache: false
4750
- name: Cache Go
4851
id: go-cache
@@ -62,11 +65,11 @@ jobs:
6265
timeout-minutes: 30
6366
steps:
6467
- name: Checkout Repo
65-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
68+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
6669
- name: Setup Go
67-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
70+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
6871
with:
69-
go-version: ~1.21.9
72+
go-version: ~1.21.11
7073
cache: false
7174
- name: Cache Go
7275
id: go-cache
@@ -87,11 +90,11 @@ jobs:
8790
needs: [setup-environment]
8891
steps:
8992
- name: Checkout Repo
90-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
93+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
9194
- name: Setup Go
92-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
95+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
9396
with:
94-
go-version: ~1.21.9
97+
go-version: ~1.21.11
9598
cache: false
9699
- name: Cache Go
97100
id: go-cache
@@ -137,25 +140,22 @@ jobs:
137140
unittest-matrix:
138141
strategy:
139142
matrix:
140-
runner: [ubuntu-latest, actuated-arm64-4cpu-4gb]
141-
exclude:
142-
- go-version: "~1.21.9"
143-
runner: actuated-arm64-4cpu-4gb
144-
go-version: ["~1.22", "~1.21.9"] # 1.20 needs quotes otherwise it's interpreted as 1.2
143+
runner: [ubuntu-latest]
144+
go-version: ["~1.22", "~1.21.11"] # 1.20 needs quotes otherwise it's interpreted as 1.2
145145
runs-on: ${{ matrix.runner }}
146146
needs: [setup-environment]
147147
steps:
148148
- name: Set up arkade
149-
uses: alexellis/setup-arkade@v3
149+
uses: alexellis/setup-arkade@b1816384b2260cfd2c023c6798d26075786cfc7f # v3
150150
- name: Install vmmeter
151151
run: |
152152
sudo -E arkade oci install ghcr.io/openfaasltd/vmmeter:latest --path /usr/local/bin/
153153
- name: Run vmmeter
154-
uses: self-actuated/vmmeter-action@v1
154+
uses: self-actuated/vmmeter-action@c7e2162e39294a810cab647cacc215ecd68a44f6 # v1
155155
- name: Checkout Repo
156-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
156+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
157157
- name: Setup Go
158-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
158+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
159159
with:
160160
go-version: ${{ matrix.go-version }}
161161
cache: false
@@ -197,11 +197,11 @@ jobs:
197197
needs: [setup-environment]
198198
steps:
199199
- name: Checkout Repo
200-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
200+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
201201
- name: Setup Go
202-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
202+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
203203
with:
204-
go-version: ~1.21.9
204+
go-version: ~1.21.11
205205
cache: false
206206
- name: Cache Go
207207
id: go-cache
@@ -219,7 +219,7 @@ jobs:
219219
- name: Run Unit Tests With Coverage
220220
run: make gotest-with-cover
221221
- name: Upload coverage report
222-
uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # 4.3.1
222+
uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # 4.4.1
223223
env:
224224
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
225225

@@ -259,11 +259,11 @@ jobs:
259259

260260
steps:
261261
- name: Checkout Repo
262-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
262+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
263263
- name: Setup Go
264-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
264+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
265265
with:
266-
go-version: ~1.21.9
266+
go-version: ~1.21.11
267267
cache: false
268268
- name: Cache Go
269269
id: go-cache

‎.github/workflows/builder-integration-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ jobs:
2929
runs-on: ubuntu-latest
3030
steps:
3131
- name: Checkout Repo
32-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
32+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
3333
- name: Setup Go
34-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
34+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
3535
with:
3636
go-version: ~1.21.5
3737
- name: Test

‎.github/workflows/builder-release.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout Repo
13-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
13+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
1414
with:
1515
fetch-depth: 0
1616
- name: Setup Go
17-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
17+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
1818
with:
1919
go-version: ~1.21.5
2020
- name: Run GoReleaser
21-
uses: goreleaser/goreleaser-action@7ec5c2b0c6cdda6e8bbb49444bc797dd33d74dd8 # v5.0.0
21+
uses: goreleaser/goreleaser-action@5742e2a039330cbb23ebf35f046f814d4c6ff811 # v5.1.0
2222
with:
2323
distribution: goreleaser-pro
2424
version: latest

‎.github/workflows/changelog.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
PR_HEAD: ${{ github.event.pull_request.head.sha }}
2727
steps:
2828
- name: Checkout Repo
29-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
29+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
3030
with:
3131
fetch-depth: 0
3232
- name: Setup Go
33-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
33+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
3434
with:
3535
go-version: ~1.21.5
3636
- name: Cache Go

‎.github/workflows/check-links.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
md: ${{ steps.changes.outputs.md }}
2222
steps:
2323
- name: Checkout Repo
24-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
24+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
2525
with:
2626
fetch-depth: 0
2727
- name: Get changed files
@@ -34,7 +34,7 @@ jobs:
3434
if: ${{needs.changedfiles.outputs.md}}
3535
steps:
3636
- name: Checkout Repo
37-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
37+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
3838
with:
3939
fetch-depth: 0
4040

‎.github/workflows/codeql-analysis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@ jobs:
2121

2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
24+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
2525

2626
- name: Setup Go
27-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
27+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
2828
with:
2929
go-version: ~1.21.5
3030

3131
# Initializes the CodeQL tools for scanning.
3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
33+
uses: github/codeql-action/init@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
3434
with:
3535
languages: go
3636

3737
- name: Autobuild
38-
uses: github/codeql-action/autobuild@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
38+
uses: github/codeql-action/autobuild@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
3939

4040
- name: Perform CodeQL Analysis
41-
uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
41+
uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6

‎.github/workflows/contrib-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ jobs:
3838
- other
3939
steps:
4040
- name: Checkout Repo
41-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
41+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
4242
- name: Setup Go
43-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
43+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
4444
with:
4545
go-version: ~1.21.5
4646
cache: false

0 commit comments

Comments
 (0)