Skip to content

Commit a5d054b

Browse files
antonjim-teantonjim-te
authored
Merge branch 'main' into develop/sampledLoggedCfg
2 parents 70f05d8 + ab3d6c5 commit a5d054b

File tree

95 files changed

+1159
-1078
lines changed

Some content is hidden

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

95 files changed

+1159
-1078
lines changed

‎.chloggen/disable_keep_alives.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: confighttp
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add option to disable HTTP keep-alives
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [8260]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: []

‎.chloggen/exporterhelper-avoid-messages.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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: exporterhelper
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Stop logging error messages suggesting user to enable `retry_on_failure` or `sending_queue` when they are not available.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [8369]
14+
15+
# Optional: The change log or logs in which this entry should be included.
16+
# e.g. '[user]' or '[user, api]'
17+
# Include 'user' if the change is relevant to end users.
18+
# Include 'api' if there is a change to a library API.
19+
# Default: '[user]'
20+
change_logs: [user]

‎.github/workflows/api-compatibility.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ jobs:
2121
steps:
2222

2323
- name: Checkout-Main
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2525
with:
2626
ref: ${{ github.base_ref }}
2727
path: ${{ github.base_ref }}
2828

2929
- name: Checkout-HEAD
30-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
3131
with:
3232
path: ${{ github.head_ref }}
3333

3434
- name: Setup Go
3535
uses: actions/setup-go@v4
3636
with:
37-
go-version: ~1.20.7
37+
go-version: ~1.20.8
3838

3939
# Generate apidiff states of Main
4040
- name: Generate-States

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
runs-on: windows-latest
1616
steps:
1717
- name: Checkout Repo
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
- name: Setup Go
2020
uses: actions/setup-go@v4
2121
with:
22-
go-version: ~1.20.7
22+
go-version: ~1.20.8
2323
- name: Cache Go
2424
uses: actions/cache@v3
2525
env:

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout Repo
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
- name: Setup Go
2020
uses: actions/setup-go@v4
2121
with:
22-
go-version: ~1.20.7
22+
go-version: ~1.20.8
2323
- name: Cache Go
2424
id: go-cache
2525
uses: actions/cache@v3
@@ -37,11 +37,11 @@ jobs:
3737
needs: [setup-environment]
3838
steps:
3939
- name: Checkout Repo
40-
uses: actions/checkout@v3
40+
uses: actions/checkout@v4
4141
- name: Setup Go
4242
uses: actions/setup-go@v4
4343
with:
44-
go-version: ~1.20.7
44+
go-version: ~1.20.8
4545
- name: Cache Go
4646
id: go-cache
4747
uses: actions/cache@v3
@@ -60,11 +60,11 @@ jobs:
6060
timeout-minutes: 30
6161
steps:
6262
- name: Checkout Repo
63-
uses: actions/checkout@v3
63+
uses: actions/checkout@v4
6464
- name: Setup Go
6565
uses: actions/setup-go@v4
6666
with:
67-
go-version: ~1.20.7
67+
go-version: ~1.20.8
6868
- name: Cache Go
6969
id: go-cache
7070
uses: actions/cache@v3
@@ -84,11 +84,11 @@ jobs:
8484
needs: [setup-environment]
8585
steps:
8686
- name: Checkout Repo
87-
uses: actions/checkout@v3
87+
uses: actions/checkout@v4
8888
- name: Setup Go
8989
uses: actions/setup-go@v4
9090
with:
91-
go-version: ~1.20.7
91+
go-version: ~1.20.8
9292
- name: Cache Go
9393
id: go-cache
9494
uses: actions/cache@v3
@@ -133,12 +133,12 @@ jobs:
133133
unittest-matrix:
134134
strategy:
135135
matrix:
136-
go-version: ["1.21", "1.20"] # 1.20 needs quotes otherwise it's interpreted as 1.2
136+
go-version: ["~1.21.1", "~1.20.8"] # 1.20 needs quotes otherwise it's interpreted as 1.2
137137
runs-on: ubuntu-latest
138138
needs: [setup-environment]
139139
steps:
140140
- name: Checkout Repo
141-
uses: actions/checkout@v3
141+
uses: actions/checkout@v4
142142
- name: Setup Go
143143
uses: actions/setup-go@v4
144144
with:
@@ -180,7 +180,7 @@ jobs:
180180
needs: [setup-environment]
181181
steps:
182182
- name: Checkout Repo
183-
uses: actions/checkout@v3
183+
uses: actions/checkout@v4
184184
- name: Setup Go
185185
uses: actions/setup-go@v4
186186
with:
@@ -245,11 +245,11 @@ jobs:
245245

246246
steps:
247247
- name: Checkout Repo
248-
uses: actions/checkout@v3
248+
uses: actions/checkout@v4
249249
- name: Setup Go
250250
uses: actions/setup-go@v4
251251
with:
252-
go-version: ~1.20.7
252+
go-version: ~1.20.8
253253
- name: Cache Go
254254
id: go-cache
255255
uses: actions/cache@v3

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Checkout Repo
29-
uses: actions/checkout@v3
29+
uses: actions/checkout@v4
3030
- name: Setup Go
3131
uses: actions/setup-go@v4
3232
with:
33-
go-version: ~1.20.7
33+
go-version: ~1.20.8
3434
- name: Test
3535
run: make builder-integration-test

‎.github/workflows/builder-release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout Repo
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414
with:
1515
fetch-depth: 0
1616
- name: Setup Go
1717
uses: actions/setup-go@v4
1818
with:
19-
go-version: ~1.20.7
19+
go-version: ~1.20.8
2020
- name: Run GoReleaser
2121
uses: goreleaser/goreleaser-action@v4
2222
with:

‎.github/workflows/changelog.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ jobs:
2323
PR_HEAD: ${{ github.event.pull_request.head.sha }}
2424
steps:
2525
- name: Checkout Repo
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2727
with:
2828
fetch-depth: 0
2929
- name: Setup Go
3030
uses: actions/setup-go@v4
3131
with:
32-
go-version: ~1.20.7
32+
go-version: ~1.20.8
3333
- name: Cache Go
3434
id: go-cache
3535
uses: actions/cache@v3

‎.github/workflows/check-links.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
md: ${{ steps.changes.outputs.md }}
2323
steps:
2424
- name: Checkout Repo
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626
with:
2727
fetch-depth: 0
2828
- name: Get changed files
@@ -35,7 +35,7 @@ jobs:
3535
if: ${{needs.changedfiles.outputs.md}}
3636
steps:
3737
- name: Checkout Repo
38-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
3939
with:
4040
fetch-depth: 0
4141

‎.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ jobs:
1414

1515
steps:
1616
- name: Checkout repository
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818

1919
- name: Setup Go
2020
uses: actions/setup-go@v4
2121
with:
22-
go-version: ~1.20.7
22+
go-version: ~1.20.8
2323

2424
# Initializes the CodeQL tools for scanning.
2525
- name: Initialize CodeQL

‎.github/workflows/contrib-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919

2020
steps:
2121
- name: Checkout Repo
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323
- name: Setup Go
2424
uses: actions/setup-go@v4
2525
with:
26-
go-version: ~1.20.7
26+
go-version: ~1.20.8
2727
- name: Run Contrib Tests
2828
run: |
2929
contrib_path=/tmp/opentelemetry-collector-contrib

‎.github/workflows/create-dependabot-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ jobs:
77
create-pr:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v4
1111
- name: Setup Go
1212
uses: actions/setup-go@v4
1313
with:
14-
go-version: ~1.20.7
14+
go-version: ~1.20.8
1515
- name: Run dependabot-pr.sh
1616
run: ./.github/workflows/scripts/dependabot-pr.sh
1717
env:

‎.github/workflows/perf.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ jobs:
88
runperf:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212

1313
- name: Setup Go
1414
uses: actions/setup-go@v4
1515
with:
16-
go-version: ~1.20.7
16+
go-version: ~1.20.8
1717

1818
- name: Run benchmark
1919
run: make gobenchmark

‎.github/workflows/prepare-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
prepare-release:
2424
runs-on: ubuntu-latest
2525
steps:
26-
- uses: actions/checkout@v3
26+
- uses: actions/checkout@v4
2727
with:
2828
fetch-depth: 0
2929
# Make sure that there are no open issues with release:blocker label in Core. The release has to be delayed until they are resolved.
@@ -53,7 +53,7 @@ jobs:
5353
- name: Setup Go
5454
uses: actions/setup-go@v4
5555
with:
56-
go-version: ~1.20.7
56+
go-version: ~1.20.8
5757
# Prepare Core for release.
5858
# - Update CHANGELOG.md file, this is done via chloggen
5959
# - Run make prepare-release PREVIOUS_VERSION=1.0.0 RELEASE_CANDIDATE=1.1.0 MODSET=stable

‎.github/workflows/shellcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ jobs:
1010
name: Shellcheck
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- name: Run ShellCheck
1515
uses: ludeeus/[email protected]

‎.github/workflows/tidy-dependencies.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jobs:
1111
runs-on: ubuntu-latest
1212
if: ${{ contains(github.event.pull_request.labels.*.name, 'dependencies') }}
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
with:
1616
repository: "renovate-bot/open-telemetry-_-opentelemetry-collector"
1717
ref: ${{ github.head_ref }}
1818
token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
1919
- uses: actions/setup-go@v4
2020
with:
21-
go-version: ~1.20.7
21+
go-version: ~1.20.8
2222
cache: false
2323
- name: Cache Go
2424
id: go-cache

‎cmd/builder/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
github.com/mitchellh/reflectwalk v1.0.2 // indirect
3131
github.com/pmezard/go-difflib v1.0.0 // indirect
3232
github.com/rogpeppe/go-internal v1.10.0 // indirect
33-
golang.org/x/sys v0.11.0 // indirect
33+
golang.org/x/sys v0.12.0 // indirect
3434
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
3535
gopkg.in/yaml.v3 v3.0.1 // indirect
3636
)

‎cmd/builder/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8
5252
go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c=
5353
go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk=
5454
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
55-
golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
56-
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
55+
golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
56+
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
5757
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
5858
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
5959
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

0 commit comments

Comments
 (0)