fixing unit test

aws · Dec 17, 2024 · 3770c81 · 3770c81
1 parent 60435eb
commit 3770c81
Show file tree

Hide file tree

Showing 34 changed files with 273 additions and 254 deletions.
diff --git a/internal/tls/testdata/server.crt b/internal/tls/testdata/server.crt
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+FoAUJ7W+0hs39tvjv+OfwHBrCNIUFtYwDwYDVR0RBAgwBocEfwAAATANBgkqhkiG
+9w0BAQsFAAOCAgEAktwRxzWO9d9fPy34bK2u/Nnfl9kBriOdoQ6FoN1n8HCp7AyW
+6p2eq8j9IQ1N0Qe6e1nk7OTtImR5XH19Jtw7RRxA3k3kpFT94OqBBxNGCds3BLaI
+kgPD2ETe/SXHOQyWZ1dyd8y1ChxhZB5FCvqU4zwlVudyvIOx0BvnllxTvKP9pbEP
+qioJD1LrgMHLdS8j5Us1UK80RVeHYP2yc6iGxP6W5wI1EaHRUFfxX9+2cmwho9yT
+ZyI0D2lJJyqk4OBGTySC639HO4AMH5eK7YDyVS8n8fir32vVhQ5sY8A20gOamKoq
+tn1wBQVy1GMLKiXKWaB8i6qqVTLX6NLW9ECI73ZP2Dh7CwxsL2w3YqJ/mf/2nQqx
+zCjUSL7Q7hfKXi7x1PsyST4vV1r5cQaNn+jRuyZ+/uGtsg/lTrP/gnuCR9s9TfNO
+O949QczYyu4GzzqLk0blWQm/J34OQUrNlEhXiJKiWViDpLGwHJNp+aupgYDxpD2w
+x9p3dCTHCAQZ+q/BvxIJ8fXCcBn967T/NBrHijchUUSDnUFr3nwzlnShddToRE0e
+hubO5E/SJeilEZq80NOaCrfF7H8nMSOrbXWPGqZ8qAffvJSyvZFhEYB9k3xu7yD7
+MPs/B1RsxJRasFxtJ/cRbKc+l+yx6xQ3pGJjDAtphWedAmi+FwV0rn51Jcg=
 -----END CERTIFICATE-----
diff --git a/internal/tls/testdata/server.key b/internal/tls/testdata/server.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD9zHhy7+7K2oJM
-w/Ijo++WAibzqMrOCMvhFcGYSwHbcfivPSDia+hCpJ6CNPxWaMIOcbs+LBN7CvLk
-FQI7TdLuDLuqEJveLkgeUcRr5AVer5/tycVHQvn4/iok4NMfqRKA8VV0qy94Bdmb
-b3zXQtOfhQpN/aXRD3ubW54fiD7XF0qlprVhAS4hz4UlNBzeSVrH0GdlZAfKxUrU
-PAsBRtA1vYuhklbDdc5psy0HVTwMj+FM8vPOOP3HmbJpZCHurpNwYkUTU4VHCSpR
-SSa6AgSfMuwCQPLN7Xi1rJES4pPtMYp7ZHnes3zGkEYMzkjw3NOtkEzgxwdiJEoV
-WQHi4eznAgMBAAECggEAGv7z1O32jXc+ouG40NewNVmXQRW0NMQ0w4Vn6UYZNXlj
-BWjQJaVquCQAhEMUkDBma9jnHM7dZ5obie0+Joa5p/6Mu6M2oSR1IVx7Myq284Jk
-1Ys/w7u5ESYf33pWmqiGQlbpSxamXvLoWaM7OT5veilRlkgjqiAmerj9EceRP5mR
-aheVE5ctY5oZmdnvA9OcN6B8Oxk59EWEOECs8qAF/ChYfC8pWKOp4U0RILQ/9jXD
-lu4p0C2XyadrJReer3whudUADWa/WSxgVCrx85/g/RTKs38KTPy7W4g3bv8KBRhc
-bjLzoYTl6esRAi8nMG5Fc/85t07hkVv+j5a1NccxgQKBgQD/y/tdH90C8CrAn9y5
-mgr+1QcqJeJWaBpNf+yBqtLbybl6uLY2OzbZtzllU+TDUVlKZB36t2GnG6EIRUcd
-WTHUVq8zEIRtDBa12SZlJ08FrNFyKfBByehEOvMazTxb7rdGbiv5+XztCrcPUn1f
-cu30v5nBRjqDxtiAbKccFcZPpwKBgQD+ABUQ0h3aX5qDqzhvSLNuqy+hOZPLsqva
-VxsDsIlzzzGwmdf+m2Dn9JR/xJNMPf717LJs8IYIqW4KX/HW0pC3Y8fu/6h4fFM9
-ZpJkM2hjRu0uLxDWLc+AombMavFtkZ1tffKxv6mG7Ud163ulBIt24b701XfhR5UX
-RWvWI50gwQKBgQCFa1i9luwJJ0m1VOyk5kML7gMhqcbneL8XYzzx2S7IMuyKpSNt
-H++ZGWdXga2Vbq3bDmNQrSvDJLcWgEP6e9ZwwZH6WYgo9KA3036iTiF6fUx1doh5
-WB3M0M6SUTBFZzqzAq3vYYEWhns7A7Se/2w8N1+0HrRQnXu5aHK1RGo+iwKBgEST
-hRx7fi/dK/xsl9oDyN4SPdPLlcmjPZ6/cb23RgUMZaAGiThmfu1hLU6pphMpkdKX
-yzx6W9Wu2NTYPpT/WK8Ks4olYDjXaCnlrZR8BKz5E0Qq1OLej21ta0+5d+FbNSPA
-o2u2EXEqUubVYxaUeYrpPAMiNzGNgAU+avTvvJaBAoGBAKely84irwZicpex79T/
-KYV3VOMYs6wETNSLdKkR9G2WEI4OsEw0qGm9pZXzS6lKOSXxW6fOzwI0/vhnmT4O
-hBxeR+PriPFqD80ASXeVeVOEjMXQEjZ8Po+FfUvVu8zMNIPDwJ+hy94FE5kkDBte
-vy6FnjMquTvekIsRwo/OOdz3
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDQqmxD8XWchAYF
+5pguTGPks8c9wpY2sFkVoXncwLefBXUkSzKgB30TXBtfa3L4yVXT7nQ4OZOnAwlA
+IoLFF7+6lebtIRpxLZTHwgIW7lz+LxVStxVwyY4uCudKRojvuDcwhLCZMesAGfwR
+4VycP1RnCWrMDri9IdYlMIr+0TXBy+oxxJL5bRa3Tchhh2ezVnrI/qNmtE0P2QOK
+URUlfOuf1Oc28y8DhDktsoy6lb3vUihZRFV1xT5nAi/MZ727oOO6c6dNEnNz+cAi
+91dBrdr9WEkxI5iBoJ/hN+Nrgj7cp8cusWGnGFKfGgU5p6bcdR03fHq8568dmi4M
+Ojf6rAUXAgMBAAECggEAH9EsqvuBbHkxFetAXybkwHWtNryZ/QLMwqCZnVCBbyz8
+3KjeskoSB0avIdCXelnwzVz5ua0F15x955qbiAQEByZeTOAUURebLQ5nFSoJYfS5
+8p/aFBWXqWueMtQogyz6tVo2N1XGOIC9z9gmL+j0LLXh4/WGs8gaCBerygkKgl8X
+7k1MRwuQjfLB4v9F8s37Xby94GvDT54BWrZh348rOlGWyct4uy3z6qtWO+oNF1F/
+AtViy+JBbb/xdsQWd6Yf1Ma49pIvJT32M6E1fE4yDyYd7DZ+CPWzaamu6kk6MRsy
+WlOhZ3HO5fSm8utghWgLU5HdqjC1z6MVXysQITKIsQKBgQDw5bGgCcpkpZGbOlIs
+orkMaSHv0Y8pL9xmFhXwi5s1s812sceNQE1+CtGcJwx1GxrSvCOmFYOm1XBXgLsc
+s+Hq4NwcHwFVLn93JxLHhcDTeStJWxGRAtYjKiFaFPPbxTPBVNp8uusMyB6BWuku
+5uCmuKrdHVSYvkqk85vC0vz/fwKBgQDdv2z7LR9jaLm/NRApuDWSWWdUfBMI/fOf
+tzP7BlJBc0vjTefpA9SPhMIftPXaZ/2vhjcPGnIuaClel54L46+3k/lO8dXYeivH
+xw7hG+ypT3MWk5TNbvdB/VR3QKzB+M3g+Survc2OMNyYwnqligV4bTbgnOAEnDUL
+3ogwIjXGaQKBgETLk/p8UUyE7BxEf4s3vVkJ/SMb2aKNhIey7vkPJXgkrRykkLSK
+FJdWR54smKYo43QjPpsDseFHOxoCLW15AZ+uL63oPN0ytjw08GwCipraE76TP2UG
+RlksgvHS4gF1Q96GeQ794np3/B489DLsxGNYgZM7+RjV30NUPrtYvd/JAoGBAM+u
+rZ9Bz5gHSZBvXkf0oxgCa+iQnDNbxYTczO5aKUfreDPXj1CJqdcQ+88+aNS5eLuf
+9IlMt4wHOlfBoOB5yuUgzerGTQaGxeJB6QmkYa7hHmUSq9cMCr/fR/C4vhSdthTy
+yZf8GD0IPlNEMiJAdocnorITuywWMQiAzwRlxf+hAoGBALqeiiC8KqZgNodAG6jD
+Z+MwbjgMxIa9zIoUXE6czQ3tmU+PFy5P8y+a18F3Y+Uv3AuFdYAtnbi/xx45SuF6
+kt5ilLJx1lunjoWNZbMaaJKGBjuFr3v0BisI9Y8TF+A0Q27+KdEJwRMmAXJtJR7O
+qisE0PaKIVNp1nxtv/Ix60b3
 -----END PRIVATE KEY-----
diff --git a/internal/tls/testdata/tls-ca.crt b/internal/tls/testdata/tls-ca.crt
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
 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
-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
+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
-BBSWf0MJGMR6k7iAcZMQBOIFr+DoGjANBgkqhkiG9w0BAQsFAAOCAgEAHQib14b2
-y1b9Xa+lvvpyho887AF5LJMvcAaFA2qrZTgsct9YAUyP4jwHSMa82F34GF5zWm96
-wKGa2V7rykKPLtL2o0ilfnz3bJndL2MUjgVqK7GzkOGIhhXreG6/4WZ+oNReMzjw
-uZ6zWKhUrTKfvt5J70Nzk+aPrwEzOOcb078QfrFvxElrkoyBz5LGF6HVdIVYUO94
-1DW1egaduIZCcmavO/CJ5QvzXMyiHkpuT0SoltvVFskoP9aS0OxnaQIrmNx+vajT
-9zd/WMroxBh+z4Y6sQmy6zZF+rAPItgZNHncMt8AJBGUlAhjgtiP37v/+w5zKpOD
-nXPKVf9mOPNdIDUBpzWxRXwkE1GI8kFjQsuiBD0RGNj1Db/m9lnxOX2B1vKOHRtg
-Q3LQURMd3oNj2L4dnJG4SbfXi6CdxRPPtvAb2TJh8qIsL7WxDRey1uhmQWknYXso
-kiQ1VgEBVwOXR3NGqlDboWYma/wDOtbaMSd0dl2m2PP7FXJNakUmrATNdwrWjuto
-onSHblkkDI5NvA+xUPXm4n7os3DHl6upvToVRTIDaWDBJLGyWEVw87y8+VPR0l5g
-XpYDatVLlgC/Nz3Ggn3vepGPV25d7COORXI1EXfjn2PUx7lEK0MbaPfkqPC43Q1g
-qubuxdWE+FRLgfs3Ywv1JckNAec7Jg0FA2w=
+BBR2nl6nicHcwptE/7uH17SuNUFN5DANBgkqhkiG9w0BAQsFAAOCAgEAWyVWcMPu
+suBRj2dwxR54CwfBAsO7UQPrxi6fJYEFHXeyptT/rWL9DVZ9T+OFJZFkXFk0ipJ4
+Zq0etsVMz1PNAIKXhdOIcRE4xrqvtT9nLs618PaOM/Rt1l0VKojBtkm4V9rit9RA
+Xi2iDfMsG5OojQTKyMYRCeUE7ROUAV3XEm7qbWyiQx2rTPiTZrMkJAP/uVhvi+xm
+1LmHvrcJ8XUqT92jlxUXHD55K3zgzzS9yRtfi9D0R3JroeySBIuYUnDsnxKqI9pI
+zkJpDwcyeYGRaWFmW2B9QdE3tT1IP8wlpj6SmKDMksmnEZNHsi5mfMLnCbABZIqh
+C+SECHd8XAhvkmsPc2crQE0fzCjxoegkxlSCBLDhyaYCa83FQ5qP07r92f8lVgFH
+kmmyC3ZLH+1mnL498tNCik7ryLFXgBwVj/PMqnxfegBEqzdQnokC41j4tQAvWUWB
+2EiA7/v2bZO9HDLEsCzPVZt0+LHcjex2P50xMxX00RELutU+21s0dincwDYOGZbf
+aKpNW3yivfIsICc4d5bQvuhgE9uqQpjBswF9+Ort/WWejdmgCshRPV/aemjI0xkE
+dMBEpyZy1Zf+yqODQwZxGC6EVD90ZjJq5dMS7W9jNvwvhcS7XPhiEQ0/wkEnzeDD
+nNu63LIrdw5iY+g2LDV2KfUyswan/R3s1Zo=
 -----END CERTIFICATE-----
diff --git a/translator/tocwconfig/sampleConfig/advanced_config_darwin.yaml b/translator/tocwconfig/sampleConfig/advanced_config_darwin.yaml
@@ -45,9 +45,9 @@ processors:
         ec2_instance_tag_keys:
             - AutoScalingGroupName
         ec2_metadata_tags:
+            - ImageId
             - InstanceId
             - InstanceType
-            - ImageId
         imds_retries: 1
         middleware: agenthealth/statuscode
         refresh_interval_seconds: 0s
@@ -89,11 +89,11 @@ service:
                 - awsentity/resource
                 - ec2tagger
             receivers:
+                - telegraf_netstat
                 - telegraf_swap
                 - telegraf_cpu
                 - telegraf_disk
                 - telegraf_mem
-                - telegraf_netstat
         metrics/hostDeltaMetrics:
             exporters:
                 - awscloudwatch

diff --git a/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml b/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml
@@ -97,13 +97,13 @@ service:
                 - awsentity/resource
                 - ec2tagger
             receivers:
+                - telegraf_ethtool
                 - telegraf_nvidia_smi
                 - telegraf_cpu
                 - telegraf_disk
                 - telegraf_mem
                 - telegraf_netstat
                 - telegraf_swap
-                - telegraf_ethtool
         metrics/hostDeltaMetrics:
             exporters:
                 - awscloudwatch

diff --git a/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml b/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml
@@ -35,9 +35,9 @@ processors:
         ec2_instance_tag_keys:
             - AutoScalingGroupName
         ec2_metadata_tags:
+            - InstanceType
             - ImageId
             - InstanceId
-            - InstanceType
         imds_retries: 1
         middleware: agenthealth/statuscode
         refresh_interval_seconds: 0s

diff --git a/translator/tocwconfig/sampleConfig/appsignals_and_ecs_config.yaml b/translator/tocwconfig/sampleConfig/appsignals_and_ecs_config.yaml
@@ -999,6 +999,7 @@ processors:
                 faas.version:
                     enabled: true
         max_idle_conns: 100
+        middleware: agenthealth/statuscode
         openshift:
             address: ""
             resource_attributes:

diff --git a/translator/tocwconfig/sampleConfig/appsignals_and_eks_config.yaml b/translator/tocwconfig/sampleConfig/appsignals_and_eks_config.yaml
@@ -1128,6 +1128,7 @@ processors:
                 faas.version:
                     enabled: true
         max_idle_conns: 100
+        middleware: agenthealth/statuscode
         openshift:
             address: ""
             resource_attributes:
@@ -1215,6 +1216,7 @@ receivers:
         leader_lock_using_config_map_only: true
         local_mode: false
         max_retries: 0
+        middleware: agenthealth/statuscode
         no_verify_ssl: false
         num_workers: 0
         prefer_full_pod_name: false

diff --git a/translator/tocwconfig/sampleConfig/appsignals_and_k8s_config.yaml b/translator/tocwconfig/sampleConfig/appsignals_and_k8s_config.yaml
@@ -1129,6 +1129,7 @@ processors:
                 faas.version:
                     enabled: true
         max_idle_conns: 100
+        middleware: agenthealth/statuscode
         openshift:
             address: ""
             resource_attributes:
@@ -1216,6 +1217,7 @@ receivers:
         leader_lock_using_config_map_only: true
         local_mode: false
         max_retries: 0
+        middleware: agenthealth/statuscode
         no_verify_ssl: false
         num_workers: 0
         prefer_full_pod_name: false

diff --git a/translator/tocwconfig/sampleConfig/appsignals_fallback_and_eks_config.yaml b/translator/tocwconfig/sampleConfig/appsignals_fallback_and_eks_config.yaml
@@ -1128,6 +1128,7 @@ processors:
                 faas.version:
                     enabled: true
         max_idle_conns: 100
+        middleware: agenthealth/statuscode
         openshift:
             address: ""
             resource_attributes:
@@ -1215,6 +1216,7 @@ receivers:
         leader_lock_using_config_map_only: true
         local_mode: false
         max_retries: 0
+        middleware: agenthealth/statuscode
         no_verify_ssl: false
         num_workers: 0
         prefer_full_pod_name: false

diff --git a/translator/tocwconfig/sampleConfig/appsignals_over_fallback_config.yaml b/translator/tocwconfig/sampleConfig/appsignals_over_fallback_config.yaml
@@ -1128,6 +1128,7 @@ processors:
                 faas.version:
                     enabled: true
         max_idle_conns: 100
+        middleware: agenthealth/statuscode
         openshift:
             address: ""
             resource_attributes:
@@ -1215,6 +1216,7 @@ receivers:
         leader_lock_using_config_map_only: true
         local_mode: false
         max_retries: 0
+        middleware: agenthealth/statuscode
         no_verify_ssl: false
         num_workers: 0
         prefer_full_pod_name: false

diff --git a/translator/tocwconfig/sampleConfig/base_appsignals_config.yaml b/translator/tocwconfig/sampleConfig/base_appsignals_config.yaml
@@ -1009,6 +1009,7 @@ processors:
                 faas.version:
                     enabled: true
         max_idle_conns: 100
+        middleware: agenthealth/statuscode
         openshift:
             address: ""
             resource_attributes:

diff --git a/translator/tocwconfig/sampleConfig/base_appsignals_fallback_config.yaml b/translator/tocwconfig/sampleConfig/base_appsignals_fallback_config.yaml
@@ -1005,6 +1005,7 @@ processors:
                 faas.version:
                     enabled: true
         max_idle_conns: 100
+        middleware: agenthealth/statuscode
         openshift:
             address: ""
             resource_attributes:

diff --git a/translator/tocwconfig/sampleConfig/base_container_insights_config.yaml b/translator/tocwconfig/sampleConfig/base_container_insights_config.yaml
@@ -189,6 +189,7 @@ receivers:
         leader_lock_using_config_map_only: true
         local_mode: false
         max_retries: 0
+        middleware: agenthealth/statuscode
         no_verify_ssl: false
         num_workers: 0
         prefer_full_pod_name: true

diff --git a/translator/tocwconfig/sampleConfig/basic_config_linux.yaml b/translator/tocwconfig/sampleConfig/basic_config_linux.yaml
@@ -63,8 +63,8 @@ service:
                 - awsentity/resource
                 - ec2tagger
             receivers:
-                - telegraf_disk
                 - telegraf_mem
+                - telegraf_disk
     telemetry:
         logs:
             development: false

diff --git a/translator/tocwconfig/sampleConfig/basic_config_windows.yaml b/translator/tocwconfig/sampleConfig/basic_config_windows.yaml
@@ -35,9 +35,9 @@ processors:
         ec2_instance_tag_keys:
             - AutoScalingGroupName
         ec2_metadata_tags:
-            - InstanceType
             - ImageId
             - InstanceId
+            - InstanceType
         imds_retries: 1
         middleware: agenthealth/statuscode
         refresh_interval_seconds: 0s

diff --git a/translator/tocwconfig/sampleConfig/compass_linux_config.yaml b/translator/tocwconfig/sampleConfig/compass_linux_config.yaml
@@ -47,9 +47,9 @@ processors:
         ec2_instance_tag_keys:
             - AutoScalingGroupName
         ec2_metadata_tags:
+            - ImageId
             - InstanceId
             - InstanceType
-            - ImageId
         imds_retries: 1
         middleware: agenthealth/statuscode
         refresh_interval_seconds: 0s

diff --git a/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml b/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml
@@ -133,9 +133,9 @@ processors:
         ec2_instance_tag_keys:
             - AutoScalingGroupName
         ec2_metadata_tags:
-            - ImageId
             - InstanceId
             - InstanceType
+            - ImageId
         imds_retries: 1
         middleware: agenthealth/statuscode
         refresh_interval_seconds: 0s
@@ -146,11 +146,11 @@ processors:
         metric_statements:
             - context: metric
               statements:
-                - set(unit, "unit") where name == "disk_free"
-                - set(name, "DISK_FREE") where name == "disk_free"
                 - set(unit, "unit") where name == "cpu_usage_idle"
                 - set(name, "CPU_USAGE_IDLE") where name == "cpu_usage_idle"
                 - set(unit, "unit") where name == "cpu_usage_nice"
+                - set(unit, "unit") where name == "disk_free"
+                - set(name, "DISK_FREE") where name == "disk_free"
         trace_statements: []
 receivers:
     awsxray:
@@ -284,13 +284,13 @@ service:
                 - ec2tagger
                 - transform
             receivers:
-                - telegraf_swap
-                - telegraf_netstat
                 - telegraf_disk
+                - telegraf_swap
                 - telegraf_mem
+                - telegraf_cpu
                 - telegraf_processes
+                - telegraf_netstat
                 - telegraf_procstat/1917393364
-                - telegraf_cpu
         metrics/hostCustomMetrics:
             exporters:
                 - awscloudwatch
@@ -299,8 +299,8 @@ service:
                 - ec2tagger
                 - transform
             receivers:
-                - telegraf_statsd
                 - telegraf_socket_listener
+                - telegraf_statsd
         metrics/hostDeltaMetrics:
             exporters:
                 - awscloudwatch
@@ -310,8 +310,8 @@ service:
                 - ec2tagger
                 - transform
             receivers:
-                - telegraf_net
                 - telegraf_diskio
+                - telegraf_net
         traces/xray:
             exporters:
                 - awsxray