Merge branch 'main' into container-insights-sll

aws · Oct 3, 2023 · c74d8aa · c74d8aa
2 parents d00375c + 66f1a8c
commit c74d8aa
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 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.20.7
+          go-version: ~1.21.1
           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.20.7
+          go-version: ~1.21.1
           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.20.7
+          go-version: ~1.21.1
 
       - name: Generate matrix
         id: set-matrix
@@ -129,7 +129,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: ~1.19.2
+          go-version: ~1.21.1
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v2
@@ -327,7 +327,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v4
         with:
-          go-version: ~1.20.7
+          go-version: ~1.21.1
 
       - 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.20.7
+          go-version: ~1.21.1
           cache: false
       - name: Update OTel fork components version
         id: set-matrix

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.20.7
+          go-version: ~1.21.1
           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.20.7
+          go-version: ~1.21.1
 
       - 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.20.7
+          go-version: ~1.21.1
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v2

diff --git a/translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml
@@ -172,7 +172,7 @@ exporters:
         label_matchers: [ ]
         metric_name_selectors:
           - apiserver_storage_size_bytes
-          - apiserver_storage_size_bytes
+          - apiserver_storage_db_total_size_in_bytes
           - etcd_db_total_size_in_bytes
           - etcd_request_duration_seconds
       - dimensions: [ [ClusterName, resource], [ ClusterName ] ]

diff --git a/translator/tocwconfig/sampleConfig/kubernetes_on_prem_config.yaml b/translator/tocwconfig/sampleConfig/kubernetes_on_prem_config.yaml
@@ -143,7 +143,7 @@ exporters:
         label_matchers: [ ]
         metric_name_selectors:
           - apiserver_storage_size_bytes
-          - apiserver_storage_size_bytes
+          - apiserver_storage_db_total_size_in_bytes
           - etcd_db_total_size_in_bytes
           - etcd_request_duration_seconds
       - dimensions: [ [ ClusterName, resource ], [ ClusterName ] ]

diff --git a/translator/tocwconfig/sampleConfig/logs_and_kubernetes_config.yaml b/translator/tocwconfig/sampleConfig/logs_and_kubernetes_config.yaml
@@ -172,7 +172,7 @@ exporters:
         label_matchers: [ ]
         metric_name_selectors:
           - apiserver_storage_size_bytes
-          - apiserver_storage_size_bytes
+          - apiserver_storage_db_total_size_in_bytes
           - etcd_db_total_size_in_bytes
           - etcd_request_duration_seconds
       - dimensions: [ [ ClusterName, resource ], [ ClusterName ] ]

diff --git a/translator/translate/otel/exporter/awsemf/kubernetes.go b/translator/translate/otel/exporter/awsemf/kubernetes.go
@@ -270,7 +270,7 @@ func getControlPlaneMetricDeclarations(conf *confmap.Conf) []*awsemfexporter.Met
 				Dimensions: [][]string{{"ClusterName", "endpoint"}, {"ClusterName"}},
 				MetricNameSelectors: []string{
 					"apiserver_storage_size_bytes",
-					"apiserver_storage_size_bytes",
+					"apiserver_storage_db_total_size_in_bytes",
 					"etcd_db_total_size_in_bytes",
 					"etcd_request_duration_seconds",
 				},

diff --git a/translator/translate/otel/exporter/awsemf/translator_test.go b/translator/translate/otel/exporter/awsemf/translator_test.go
@@ -341,7 +341,7 @@ func TestTranslator(t *testing.T) {
 					},
 					{
 						Dimensions:          [][]string{{"ClusterName", "endpoint"}, {"ClusterName"}},
-						MetricNameSelectors: []string{"apiserver_storage_size_bytes", "apiserver_storage_size_bytes", "etcd_db_total_size_in_bytes", "etcd_request_duration_seconds"},
+						MetricNameSelectors: []string{"apiserver_storage_size_bytes", "apiserver_storage_db_total_size_in_bytes", "etcd_db_total_size_in_bytes", "etcd_request_duration_seconds"},
 					},
 					{
 						Dimensions:          [][]string{{"ClusterName", "resource"}, {"ClusterName"}},