From 2c2a9dd884b668742337e166c5537070470acb65 Mon Sep 17 00:00:00 2001 From: Seth L <81644108+sethAmazon@users.noreply.github.com> Date: Mon, 2 Oct 2023 16:25:20 -0400 Subject: [PATCH 1/2] Upgrade Golang Version (#884) --- .github/workflows/PR-build.yml | 4 ++-- .github/workflows/integration-test.yml | 6 +++--- .github/workflows/otel-fork-replace.yml | 2 +- .github/workflows/test-build.yml | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/PR-build.yml b/.github/workflows/PR-build.yml index 9aca3ef1a1..8d178b2a4f 100644 --- 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 index fb2d8e2a19..ef27fe34d5 100644 --- 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 index 15ecbcef7f..eb56e137d7 100644 --- 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 index cc9e89ded3..def7f549b8 100644 --- 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 From 66f1a8cdb5d85d2778e2979c749e93e0cea81415 Mon Sep 17 00:00:00 2001 From: Chad Patel Date: Mon, 2 Oct 2023 17:35:53 -0500 Subject: [PATCH 2/2] fix apiserver_storage_db_total_size_in_bytes (#886) --- .../tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml | 2 +- .../tocwconfig/sampleConfig/kubernetes_on_prem_config.yaml | 2 +- .../tocwconfig/sampleConfig/logs_and_kubernetes_config.yaml | 2 +- translator/translate/otel/exporter/awsemf/kubernetes.go | 2 +- translator/translate/otel/exporter/awsemf/translator_test.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml index b0f233bef0..72e0e72ccd 100644 --- 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 index 69af6a05f5..6c57b41bc5 100644 --- 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 index b460f21958..888495f51b 100644 --- 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 index d9ae7a7674..342cd985a4 100644 --- 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 index e935dcb231..3029d4b03c 100644 --- 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"}},