Merge branch 'aws:main' into main

zhihonl · Sep 26, 2023 · c4c675b · c4c675b
2 parents 807ccc9 + 2be7788
commit c4c675b
Show file tree

Hide file tree

Showing 69 changed files with 910 additions and 4,293 deletions.
diff --git a/.github/workflows/PR-build.yml b/.github/workflows/PR-build.yml
@@ -47,7 +47,7 @@ jobs:
         if: needs.changes.outputs.lint == 'true'
         uses: actions/setup-go@v4
         with:
-          go-version: ~1.19.6
+          go-version: ~1.20.7
           cache: false
 
       - name: Check out code
@@ -102,7 +102,7 @@ jobs:
         if: needs.changes.outputs.build == 'true'
         uses: actions/setup-go@v4
         with:
-          go-version: ~1.19.6
+          go-version: ~1.20.7
           cache: false
 
       - name: Check out code

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -76,7 +76,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v4
         with:
-          go-version: ~1.19.6
+          go-version: ~1.20.7
 
       - name: Generate matrix
         id: set-matrix
@@ -327,7 +327,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v4
         with:
-          go-version: ~1.19.6
+          go-version: ~1.20.7
 
       - name: SetOutputs
         id: set-outputs

diff --git a/.github/workflows/otel-fork-replace.yml b/.github/workflows/otel-fork-replace.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v4
         with:
-          go-version: ~1.19.6
+          go-version: ~1.20.7
           cache: false
       - name: Update OTel fork components version
         id: set-matrix
@@ -64,6 +64,8 @@ jobs:
           go mod tidy
           go mod edit -replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws=github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws@${{ steps.get-latest-commit.outputs.sha }}
           go mod tidy
+          go mod edit -replace github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza=github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza@${{ steps.get-latest-commit.outputs.sha }}
+          go mod tidy
           git commit -am "Update OTel fork components to https://github.com/amazon-contributing/opentelemetry-collector-contrib/commit/${{ steps.get-latest-commit.outputs.sha }}"
           git push -u origin HEAD
           git config --global --unset user.name

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -63,7 +63,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v4
         with:
-          go-version: ~1.19.6
+          go-version: ~1.20.7
           cache: false
 
       - name: Install rpm
@@ -161,7 +161,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v4
         with:
-          go-version: ~1.19.6
+          go-version: ~1.20.7
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v2
@@ -226,7 +226,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v4
         with:
-          go-version: ~1.19.6
+          go-version: ~1.20.7
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v2

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/plugins/inputs/cadvisor/cadvisor.go b/plugins/inputs/cadvisor/cadvisor.go
diff --git a/plugins/inputs/cadvisor/cadvisor_windows.go b/plugins/inputs/cadvisor/cadvisor_windows.go