Skip to content

Commit e472a0d

Browse files
authored
Merge branch 'main' into docs/avoid-embedded-structs-in-configs
2 parents 5caeadf + 0c5a4ff commit e472a0d

File tree

505 files changed

+11991
-4889
lines changed

Some content is hidden

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

505 files changed

+11991
-4889
lines changed

.chloggen/14331.yaml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.chloggen/config.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ components:
1212
- cmd/mdatagen
1313
- connector/forward
1414
- connector/sample
15+
- consumer/consumererror/xconsumererror
1516
- consumer/xconsumer
1617
- docs/rfcs
1718
- exporter/debug
1819
- exporter/nop
19-
- exporter/otlp
20-
- exporter/otlphttp
20+
- exporter/otlp_grpc
21+
- exporter/otlp_http
2122
- extension/memory_limiter
2223
- extension/xextension
2324
- extension/xextension
@@ -36,6 +37,7 @@ components:
3637
- pkg/config/configtelemetry
3738
- pkg/config/configtls
3839
- pkg/confmap
40+
- pkg/consumer/consumertest
3941
- pkg/exporterhelper
4042
- pkg/otelcol
4143
- pkg/pdata
@@ -51,6 +53,7 @@ components:
5153
- pkg/xprocessor
5254
- pkg/xreceiver
5355
- pkg/xscraper
56+
- pkg/xscraperhelper
5457
- processor/batch
5558
- processor/memory_limiter
5659
- processor/sample

.chloggen/codeboten_update-semconv.yaml renamed to .chloggen/fix-expandedvalue-sanitization-on-struct-collection.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
# Use this changelog template to create an entry for release notes.
22

33
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4-
change_type: enhancement
4+
change_type: 'bug_fix'
55

66
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
7-
component: all
7+
component: pkg/confmap
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Update semconv import to 1.38.0
10+
note: 'Fix an issue where configs could fail to decode when using interpolated values in string fields.'
1111

1212
# One or more tracking issues or pull requests related to the change
13-
issues: [14305]
13+
issues: [14413]
1414

1515
# (Optional) One or more lines of additional information to render under the primary note.
1616
# These lines will be padded with 2 spaces and then inserted directly into the document.
1717
# Use pipe (|) for multiline entries.
18-
subtext:
18+
subtext: |
19+
For example, a header can be set via an environment variable to a string that is parseable as a number, e.g. `1234`
1920
2021
# Optional: The change log or logs in which this entry should be included.
2122
# e.g. '[user]' or '[user, api]'

.github/CODEOWNERS

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,17 @@ cmd/mdatagen/internal/samplefactoryreceiver/ @open-telemetry/collector-approvers
2525
cmd/mdatagen/internal/sampleprocessor/ @open-telemetry/collector-approvers
2626
cmd/mdatagen/internal/samplereceiver/ @open-telemetry/collector-approvers @dmitryax
2727
cmd/mdatagen/internal/samplescraper/ @open-telemetry/collector-approvers @dmitryax
28+
config/configauth/ @open-telemetry/collector-approvers
29+
config/configcompression/ @open-telemetry/collector-approvers
30+
config/configgrpc/ @open-telemetry/collector-approvers
31+
config/confighttp/ @open-telemetry/collector-approvers
32+
config/configmiddleware/ @open-telemetry/collector-approvers
33+
config/confignet/ @open-telemetry/collector-approvers
34+
config/configopaque/ @open-telemetry/collector-approvers
35+
config/configoptional/ @open-telemetry/collector-approvers
36+
config/configretry/ @open-telemetry/collector-approvers
37+
config/configtelemetry/ @open-telemetry/collector-approvers
38+
config/configtls/ @open-telemetry/collector-approvers
2839
confmap/ @open-telemetry/collector-approvers @mx-psi @evan-bradley
2940
confmap/provider/envprovider/ @open-telemetry/collector-approvers
3041
confmap/provider/fileprovider/ @open-telemetry/collector-approvers
@@ -33,6 +44,7 @@ confmap/provider/httpsprovider/ @open-telemetry/collector-approvers
3344
confmap/provider/yamlprovider/ @open-telemetry/collector-approvers
3445
connector/forwardconnector/ @open-telemetry/collector-approvers
3546
connector/xconnector/ @open-telemetry/collector-approvers @mx-psi @dmathieu
47+
consumer/consumererror/xconsumererror/ @open-telemetry/collector-approvers
3648
consumer/xconsumer/ @open-telemetry/collector-approvers @mx-psi @dmathieu
3749
docs/rfcs/ @open-telemetry/collector-approvers @codeboten @bogdandrutu @dmitryax @mx-psi
3850
exporter/debugexporter/ @open-telemetry/collector-approvers @andrzej-stencel
@@ -62,6 +74,7 @@ receiver/xreceiver/ @open-telemetry/collector-approvers
6274
scraper/ @open-telemetry/collector-approvers
6375
scraper/xscraper @open-telemetry/collector-approvers
6476
scraper/scraperhelper/ @open-telemetry/collector-approvers
77+
scraper/scraperhelper/xscraperhelper @open-telemetry/collector-approvers
6578
service/ @open-telemetry/collector-approvers
6679
service/internal/graph/ @open-telemetry/collector-approvers
6780

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,17 @@ body:
2525
- cmd/mdatagen/internal/sampleprocessor
2626
- cmd/mdatagen/internal/samplereceiver
2727
- cmd/mdatagen/internal/samplescraper
28+
- config/configauth
29+
- config/configcompression
30+
- config/configgrpc
31+
- config/confighttp
32+
- config/configmiddleware
33+
- config/confignet
34+
- config/configopaque
35+
- config/configoptional
36+
- config/configretry
37+
- config/configtelemetry
38+
- config/configtls
2839
- confmap
2940
- confmap/provider/envprovider
3041
- confmap/provider/fileprovider
@@ -33,6 +44,7 @@ body:
3344
- confmap/provider/yamlprovider
3445
- connector/forward
3546
- connector/x
47+
- consumer/consumererror/xconsumererror
3648
- consumer/xconsumer
3749
- docs/rfcs
3850
- exporter/debug
@@ -41,7 +53,7 @@ body:
4153
- exporter/exporterhelper/xexporterhelper
4254
- exporter/nop
4355
- exporter/otlp
44-
- exporter/otlphttp
56+
- exporter/otlp_http
4557
- exporter/x
4658
- extension/memorylimiter
4759
- extension/x
@@ -61,6 +73,8 @@ body:
6173
- receiver/x
6274
- scraper
6375
- scraper/scraperhelper
76+
- scraper/scraperhelper/xscraperhelper
77+
- scraper/xscraper
6478
- service
6579
- service/internal/graph
6680
# End components list

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,17 @@ body:
1919
- cmd/mdatagen/internal/sampleprocessor
2020
- cmd/mdatagen/internal/samplereceiver
2121
- cmd/mdatagen/internal/samplescraper
22+
- config/configauth
23+
- config/configcompression
24+
- config/configgrpc
25+
- config/confighttp
26+
- config/configmiddleware
27+
- config/confignet
28+
- config/configopaque
29+
- config/configoptional
30+
- config/configretry
31+
- config/configtelemetry
32+
- config/configtls
2233
- confmap
2334
- confmap/provider/envprovider
2435
- confmap/provider/fileprovider
@@ -27,15 +38,16 @@ body:
2738
- confmap/provider/yamlprovider
2839
- connector/forward
2940
- connector/x
41+
- consumer/consumererror/xconsumererror
3042
- consumer/xconsumer
3143
- docs/rfcs
3244
- exporter/debug
3345
- exporter/exporterhelper
3446
- exporter/exporterhelper/internal/queuebatch
3547
- exporter/exporterhelper/xexporterhelper
3648
- exporter/nop
37-
- exporter/otlp
38-
- exporter/otlphttp
49+
- exporter/otlp_grpc
50+
- exporter/otlp_http
3951
- exporter/x
4052
- extension/memorylimiter
4153
- extension/x
@@ -55,6 +67,8 @@ body:
5567
- receiver/x
5668
- scraper
5769
- scraper/scraperhelper
70+
- scraper/scraperhelper/xscraperhelper
71+
- scraper/xscraper
5872
- service
5973
- service/internal/graph
6074
# End components list

.github/ISSUE_TEMPLATE/other.yaml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,17 @@ body:
1818
- cmd/mdatagen/internal/sampleprocessor
1919
- cmd/mdatagen/internal/samplereceiver
2020
- cmd/mdatagen/internal/samplescraper
21+
- config/configauth
22+
- config/configcompression
23+
- config/configgrpc
24+
- config/confighttp
25+
- config/configmiddleware
26+
- config/confignet
27+
- config/configopaque
28+
- config/configoptional
29+
- config/configretry
30+
- config/configtelemetry
31+
- config/configtls
2132
- confmap
2233
- confmap/provider/envprovider
2334
- confmap/provider/fileprovider
@@ -26,15 +37,16 @@ body:
2637
- confmap/provider/yamlprovider
2738
- connector/forward
2839
- connector/x
40+
- consumer/consumererror/xconsumererror
2941
- consumer/xconsumer
3042
- docs/rfcs
3143
- exporter/debug
3244
- exporter/exporterhelper
3345
- exporter/exporterhelper/internal/queuebatch
3446
- exporter/exporterhelper/xexporterhelper
3547
- exporter/nop
36-
- exporter/otlp
37-
- exporter/otlphttp
48+
- exporter/otlp_grpc
49+
- exporter/otlp_http
3850
- exporter/x
3951
- extension/memorylimiter
4052
- extension/x
@@ -54,6 +66,8 @@ body:
5466
- receiver/x
5567
- scraper
5668
- scraper/scraperhelper
69+
- scraper/scraperhelper/xscraperhelper
70+
- scraper/xscraper
5771
- service
5872
- service/internal/graph
5973
# End components list

.github/workflows/api-compatibility.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ jobs:
3131
path: ${{ github.head_ref }}
3232

3333
- name: Setup Go
34-
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
34+
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
3535
with:
3636
go-version: oldstable
3737
cache: false
3838

3939
- name: Cache Go
4040
id: go-cache
41-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
41+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
4242
with:
4343
path: |
4444
~/go/bin

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ jobs:
2929
runs-on: ${{ matrix.os }}
3030
steps:
3131
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
32-
- uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
32+
- uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
3333
with:
3434
go-version: oldstable
3535
cache: false
3636
- name: Cache Go
3737
id: go-cache
3838
timeout-minutes: 5
39-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
39+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
4040
with:
4141
path: |
4242
~/go/bin

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ jobs:
2525
- name: Checkout Repo
2626
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2727
- name: Setup Go
28-
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
28+
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
2929
with:
3030
go-version: oldstable
3131
cache: false
3232
- name: Cache Go
33-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
33+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
3434
env:
3535
cache-name: cache-go-modules
3636
with:
@@ -54,12 +54,12 @@ jobs:
5454
- name: Checkout Repo
5555
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5656
- name: Setup Go
57-
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
57+
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
5858
with:
5959
go-version: oldstable
6060
cache: false
6161
- name: Cache Go
62-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
62+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
6363
env:
6464
cache-name: cache-go-modules
6565
with:

0 commit comments

Comments
 (0)