Merge branch 'main' into docs/avoid-embedded-structs-in-configs

Author: ANAMASGARD

.chloggen/14331.yaml

@@ -12,12 +12,13 @@ components:
     - cmd/mdatagen
     - connector/forward
     - connector/sample
+    - consumer/consumererror/xconsumererror
     - consumer/xconsumer
     - docs/rfcs
     - exporter/debug
     - exporter/nop
-    - exporter/otlp
-    - exporter/otlphttp
+    - exporter/otlp_grpc
+    - exporter/otlp_http
     - extension/memory_limiter
     - extension/xextension
     - extension/xextension
@@ -36,6 +37,7 @@ components:
     - pkg/config/configtelemetry
     - pkg/config/configtls
     - pkg/confmap
+    - pkg/consumer/consumertest
     - pkg/exporterhelper
     - pkg/otelcol
     - pkg/pdata
@@ -51,6 +53,7 @@ components:
     - pkg/xprocessor
     - pkg/xreceiver
     - pkg/xscraper
+    - pkg/xscraperhelper
     - processor/batch
     - processor/memory_limiter
     - processor/sample

.chloggen/config.yaml

@@ -1,21 +1,22 @@
 # Use this changelog template to create an entry for release notes.
 
 # One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
-change_type: enhancement
+change_type: 'bug_fix'
 
 # The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
-component: all
+component: pkg/confmap
 
 # A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Update semconv import to 1.38.0
+note: 'Fix an issue where configs could fail to decode when using interpolated values in string fields.'
 
 # One or more tracking issues or pull requests related to the change
-issues: [14305]
+issues: [14413]
 
 # (Optional) One or more lines of additional information to render under the primary note.
 # These lines will be padded with 2 spaces and then inserted directly into the document.
 # Use pipe (|) for multiline entries.
-subtext:
+subtext: |
+   For example, a header can be set via an environment variable to a string that is parseable as a number, e.g. `1234`
 
 # Optional: The change log or logs in which this entry should be included.
 # e.g. '[user]' or '[user, api]'

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

@@ -25,6 +25,17 @@ cmd/mdatagen/internal/samplefactoryreceiver/ @open-telemetry/collector-approvers
 cmd/mdatagen/internal/sampleprocessor/       @open-telemetry/collector-approvers
 cmd/mdatagen/internal/samplereceiver/        @open-telemetry/collector-approvers @dmitryax
 cmd/mdatagen/internal/samplescraper/         @open-telemetry/collector-approvers @dmitryax
+config/configauth/                           @open-telemetry/collector-approvers
+config/configcompression/                    @open-telemetry/collector-approvers
+config/configgrpc/                           @open-telemetry/collector-approvers
+config/confighttp/                           @open-telemetry/collector-approvers
+config/configmiddleware/                     @open-telemetry/collector-approvers
+config/confignet/                            @open-telemetry/collector-approvers
+config/configopaque/                         @open-telemetry/collector-approvers
+config/configoptional/                       @open-telemetry/collector-approvers
+config/configretry/                          @open-telemetry/collector-approvers
+config/configtelemetry/                      @open-telemetry/collector-approvers
+config/configtls/                            @open-telemetry/collector-approvers
 confmap/                                     @open-telemetry/collector-approvers @mx-psi @evan-bradley
 confmap/provider/envprovider/                @open-telemetry/collector-approvers
 confmap/provider/fileprovider/               @open-telemetry/collector-approvers
@@ -33,6 +44,7 @@ confmap/provider/httpsprovider/              @open-telemetry/collector-approvers
 confmap/provider/yamlprovider/               @open-telemetry/collector-approvers
 connector/forwardconnector/                  @open-telemetry/collector-approvers
 connector/xconnector/                        @open-telemetry/collector-approvers @mx-psi @dmathieu
+consumer/consumererror/xconsumererror/       @open-telemetry/collector-approvers
 consumer/xconsumer/                          @open-telemetry/collector-approvers @mx-psi @dmathieu
 docs/rfcs/                                   @open-telemetry/collector-approvers @codeboten @bogdandrutu @dmitryax @mx-psi
 exporter/debugexporter/                      @open-telemetry/collector-approvers @andrzej-stencel
@@ -62,6 +74,7 @@ receiver/xreceiver/                          @open-telemetry/collector-approvers
 scraper/                                     @open-telemetry/collector-approvers
 scraper/xscraper                             @open-telemetry/collector-approvers
 scraper/scraperhelper/                       @open-telemetry/collector-approvers
+scraper/scraperhelper/xscraperhelper         @open-telemetry/collector-approvers
 service/                                     @open-telemetry/collector-approvers
 service/internal/graph/                      @open-telemetry/collector-approvers
 

.github/CODEOWNERS

@@ -25,6 +25,17 @@ body:
       - cmd/mdatagen/internal/sampleprocessor
       - cmd/mdatagen/internal/samplereceiver
       - cmd/mdatagen/internal/samplescraper
+      - config/configauth
+      - config/configcompression
+      - config/configgrpc
+      - config/confighttp
+      - config/configmiddleware
+      - config/confignet
+      - config/configopaque
+      - config/configoptional
+      - config/configretry
+      - config/configtelemetry
+      - config/configtls
       - confmap
       - confmap/provider/envprovider
       - confmap/provider/fileprovider
@@ -33,6 +44,7 @@ body:
       - confmap/provider/yamlprovider
       - connector/forward
       - connector/x
+      - consumer/consumererror/xconsumererror
       - consumer/xconsumer
       - docs/rfcs
       - exporter/debug
@@ -41,7 +53,7 @@ body:
       - exporter/exporterhelper/xexporterhelper
       - exporter/nop
       - exporter/otlp
-      - exporter/otlphttp
+      - exporter/otlp_http
       - exporter/x
       - extension/memorylimiter
       - extension/x
@@ -61,6 +73,8 @@ body:
       - receiver/x
       - scraper
       - scraper/scraperhelper
+      - scraper/scraperhelper/xscraperhelper
+      - scraper/xscraper
       - service
       - service/internal/graph
       # End components list

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -19,6 +19,17 @@ body:
       - cmd/mdatagen/internal/sampleprocessor
       - cmd/mdatagen/internal/samplereceiver
       - cmd/mdatagen/internal/samplescraper
+      - config/configauth
+      - config/configcompression
+      - config/configgrpc
+      - config/confighttp
+      - config/configmiddleware
+      - config/confignet
+      - config/configopaque
+      - config/configoptional
+      - config/configretry
+      - config/configtelemetry
+      - config/configtls
       - confmap
       - confmap/provider/envprovider
       - confmap/provider/fileprovider
@@ -27,15 +38,16 @@ body:
       - confmap/provider/yamlprovider
       - connector/forward
       - connector/x
+      - consumer/consumererror/xconsumererror
       - consumer/xconsumer
       - docs/rfcs
       - exporter/debug
       - exporter/exporterhelper
       - exporter/exporterhelper/internal/queuebatch
       - exporter/exporterhelper/xexporterhelper
       - exporter/nop
-      - exporter/otlp
-      - exporter/otlphttp
+      - exporter/otlp_grpc
+      - exporter/otlp_http
       - exporter/x
       - extension/memorylimiter
       - extension/x
@@ -55,6 +67,8 @@ body:
       - receiver/x
       - scraper
       - scraper/scraperhelper
+      - scraper/scraperhelper/xscraperhelper
+      - scraper/xscraper
       - service
       - service/internal/graph
       # End components list

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -18,6 +18,17 @@ body:
       - cmd/mdatagen/internal/sampleprocessor
       - cmd/mdatagen/internal/samplereceiver
       - cmd/mdatagen/internal/samplescraper
+      - config/configauth
+      - config/configcompression
+      - config/configgrpc
+      - config/confighttp
+      - config/configmiddleware
+      - config/confignet
+      - config/configopaque
+      - config/configoptional
+      - config/configretry
+      - config/configtelemetry
+      - config/configtls
       - confmap
       - confmap/provider/envprovider
       - confmap/provider/fileprovider
@@ -26,15 +37,16 @@ body:
       - confmap/provider/yamlprovider
       - connector/forward
       - connector/x
+      - consumer/consumererror/xconsumererror
       - consumer/xconsumer
       - docs/rfcs
       - exporter/debug
       - exporter/exporterhelper
       - exporter/exporterhelper/internal/queuebatch
       - exporter/exporterhelper/xexporterhelper
       - exporter/nop
-      - exporter/otlp
-      - exporter/otlphttp
+      - exporter/otlp_grpc
+      - exporter/otlp_http
       - exporter/x
       - extension/memorylimiter
       - extension/x
@@ -54,6 +66,8 @@ body:
       - receiver/x
       - scraper
       - scraper/scraperhelper
+      - scraper/scraperhelper/xscraperhelper
+      - scraper/xscraper
       - service
       - service/internal/graph
       # End components list

.github/ISSUE_TEMPLATE/other.yaml

@@ -31,14 +31,14 @@ jobs:
           path: ${{ github.head_ref }}
 
       - name: Setup Go
-        uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
+        uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
         with:
           go-version: oldstable
           cache: false
 
       - name: Cache Go
         id: go-cache
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         with:
           path: |
             ~/go/bin

.github/workflows/api-compatibility.yml

@@ -29,14 +29,14 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
+      - uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
         with:
           go-version: oldstable
           cache: false
       - name: Cache Go
         id: go-cache
         timeout-minutes: 5
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         with:
           path: |
             ~/go/bin

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

@@ -25,12 +25,12 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - name: Setup Go
-        uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
+        uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
         with:
           go-version: oldstable
           cache: false
       - name: Cache Go
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         env:
           cache-name: cache-go-modules
         with:
@@ -54,12 +54,12 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - name: Setup Go
-        uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
+        uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
         with:
           go-version: oldstable
           cache: false
       - name: Cache Go
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         env:
           cache-name: cache-go-modules
         with: