Post merge fixes for 7fae456

amazon-contributing · Jul 23, 2024 · dbe7f30 · dbe7f30
1 parent 7fae456
commit dbe7f30
Show file tree

Hide file tree

Showing 596 changed files with 3,397 additions and 8,591 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -84,6 +84,7 @@ exporter/zipkinexporter/                                            @open-teleme
 
 extension/ackextension/                                             @open-telemetry/collector-contrib-approvers @zpzhuSplunk @splunkericl
 extension/asapauthextension/                                        @open-telemetry/collector-contrib-approvers @jamesmoessis @MovieStoreGuy
+extension/awsmiddleware/                                            @open-telemetry/collector-contrib-approvers @jefchien @sky333999
 extension/awsproxy/                                                 @open-telemetry/collector-contrib-approvers @Aneurysm9 @mxiamxia
 extension/basicauthextension/                                       @open-telemetry/collector-contrib-approvers @jpkrohling @frzifus
 extension/bearertokenauthextension/                                 @open-telemetry/collector-contrib-approvers @jpkrohling @frzifus
@@ -136,6 +137,8 @@ internal/splunk/                                                    @open-teleme
 internal/sqlquery/                                                  @open-telemetry/collector-contrib-approvers @crobert-1 @dmitryax
 internal/tools/                                                     @open-telemetry/collector-contrib-approvers
 
+override/aws/                                                       @open-telemetry/collector-contrib-approvers @jefchien @sky333999
+
 pkg/batchperresourceattr/                                           @open-telemetry/collector-contrib-approvers @atoulme @dmitryax
 pkg/batchpersignal/                                                 @open-telemetry/collector-contrib-approvers @jpkrohling
 pkg/experimentalmetricmetadata/                                     @open-telemetry/collector-contrib-approvers @rmfitzpatrick

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -58,6 +58,8 @@ body:
       - exporter/honeycombmarker
       - exporter/influxdb
       - exporter/instana
+      - exporter/jaeger
+      - exporter/jaegerthrifthttp
       - exporter/kafka
       - exporter/kinetica
       - exporter/loadbalancing
@@ -83,7 +85,6 @@ body:
       - exporter/zipkin
       - extension/ack
       - extension/asapauth
-      - extension/awsmiddleware
       - extension/awsproxy
       - extension/basicauth
       - extension/bearertokenauth
@@ -134,7 +135,6 @@ body:
       - internal/splunk
       - internal/sqlquery
       - internal/tools
-      - override/aws
       - pkg/batchperresourceattr
       - pkg/batchpersignal
       - pkg/experimentalmetricmetadata

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -52,6 +52,8 @@ body:
       - exporter/honeycombmarker
       - exporter/influxdb
       - exporter/instana
+      - exporter/jaeger
+      - exporter/jaegerthrifthttp
       - exporter/kafka
       - exporter/kinetica
       - exporter/loadbalancing
@@ -77,7 +79,6 @@ body:
       - exporter/zipkin
       - extension/ack
       - extension/asapauth
-      - extension/awsmiddleware
       - extension/awsproxy
       - extension/basicauth
       - extension/bearertokenauth
@@ -128,7 +129,6 @@ body:
       - internal/splunk
       - internal/sqlquery
       - internal/tools
-      - override/aws
       - pkg/batchperresourceattr
       - pkg/batchpersignal
       - pkg/experimentalmetricmetadata

diff --git a/.github/ISSUE_TEMPLATE/other.yaml b/.github/ISSUE_TEMPLATE/other.yaml
@@ -52,6 +52,8 @@ body:
       - exporter/honeycombmarker
       - exporter/influxdb
       - exporter/instana
+      - exporter/jaeger
+      - exporter/jaegerthrifthttp
       - exporter/kafka
       - exporter/kinetica
       - exporter/loadbalancing
@@ -77,7 +79,6 @@ body:
       - exporter/zipkin
       - extension/ack
       - extension/asapauth
-      - extension/awsmiddleware
       - extension/awsproxy
       - extension/basicauth
       - extension/bearertokenauth
@@ -128,7 +129,6 @@ body:
       - internal/splunk
       - internal/sqlquery
       - internal/tools
-      - override/aws
       - pkg/batchperresourceattr
       - pkg/batchpersignal
       - pkg/experimentalmetricmetadata

diff --git a/.github/ISSUE_TEMPLATE/unmaintained.yaml b/.github/ISSUE_TEMPLATE/unmaintained.yaml
@@ -57,6 +57,8 @@ body:
       - exporter/honeycombmarker
       - exporter/influxdb
       - exporter/instana
+      - exporter/jaeger
+      - exporter/jaegerthrifthttp
       - exporter/kafka
       - exporter/kinetica
       - exporter/loadbalancing

diff --git a/.github/workflows/build-and-test-arm.yml b/.github/workflows/build-and-test-arm.yml
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "~1.22.4"
+          go-version: "~1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache

diff --git a/.github/workflows/build-and-test-windows.yml b/.github/workflows/build-and-test-windows.yml
@@ -58,7 +58,7 @@ jobs:
         run: Install-WindowsFeature -name Web-Server -IncludeManagementTools
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Cache Go
         id: go-mod-cache

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -93,7 +93,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -162,7 +162,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -185,7 +185,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -254,7 +254,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: ["1.22.4", "1.21.11"] # 1.20 is interpreted as 1.2 without quotes
+        go-version: ["1.22.5", "1.21.11"] # 1.20 is interpreted as 1.2 without quotes
         runner: [ubuntu-latest]
         group:
           - receiver-0
@@ -370,7 +370,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -408,7 +408,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -434,7 +434,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -504,7 +504,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -605,7 +605,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Mkdir bin and dist
         run: |

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -33,7 +33,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
 
       # Initializes the CodeQL tools for scanning.

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -55,7 +55,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -87,7 +87,7 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -133,7 +133,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache

diff --git a/.github/workflows/load-tests.yml b/.github/workflows/load-tests.yml
@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -66,7 +66,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache

diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
@@ -26,7 +26,7 @@ jobs:
           path: opentelemetry-collector-contrib
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Prepare release for contrib
         working-directory: opentelemetry-collector-contrib

diff --git a/.github/workflows/prometheus-compliance-tests.yml b/.github/workflows/prometheus-compliance-tests.yml
@@ -31,7 +31,7 @@ jobs:
           path: opentelemetry-collector-contrib
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache

diff --git a/.github/workflows/telemetrygen.yml b/.github/workflows/telemetrygen.yml
@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -69,7 +69,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -114,7 +114,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache

diff --git a/.github/workflows/tidy-dependencies.yml b/.github/workflows/tidy-dependencies.yml
@@ -21,7 +21,7 @@ jobs:
           ref: ${{ github.head_ref }}
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.11"
+          go-version: "1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache