From cd78e5ec3d6ea584cafe28c70f78d7b8e5eb7df6 Mon Sep 17 00:00:00 2001 From: Paramadon Date: Wed, 4 Dec 2024 03:35:11 -0500 Subject: [PATCH] fixing issue --- .golangci.yml | 2 +- .../agenthealth/handler/stats/agent/agent.go | 2 +- internal/tls/testdata/server.crt | 44 ++++++++-------- internal/tls/testdata/server.key | 52 +++++++++---------- internal/tls/testdata/tls-ca.crt | 50 +++++++++--------- 5 files changed, 75 insertions(+), 75 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index f4fbed2f51..88f10bb240 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -59,4 +59,4 @@ linters: - nonamedreturns issues: - new-from-rev: 3221f76 \ No newline at end of file + new-from-rev: 9af4477 \ No newline at end of file diff --git a/extension/agenthealth/handler/stats/agent/agent.go b/extension/agenthealth/handler/stats/agent/agent.go index 9190dd2e03..5bc84133db 100644 --- a/extension/agenthealth/handler/stats/agent/agent.go +++ b/extension/agenthealth/handler/stats/agent/agent.go @@ -15,7 +15,7 @@ const ( ) type Stats struct { - CPUPercent *float64 `json:"cpu,omitempty"` + CpuPercent *float64 `json:"cpu,omitempty"` MemoryBytes *uint64 `json:"mem,omitempty"` FileDescriptorCount *int32 `json:"fd,omitempty"` ThreadCount *int32 `json:"th,omitempty"` diff --git a/internal/tls/testdata/server.crt b/internal/tls/testdata/server.crt index 9ec52f236c..12424f7b27 100644 --- a/internal/tls/testdata/server.crt +++ b/internal/tls/testdata/server.crt @@ -1,24 +1,24 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/internal/tls/testdata/server.key b/internal/tls/testdata/server.key index 8e96664b42..0efcb40bb3 100644 --- a/internal/tls/testdata/server.key +++ b/internal/tls/testdata/server.key @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC8T8FGMSQm82Mc -UNXH+U8NfCeC2weWPk9O+WVswxLzosJSBIldakSu1jbsi1Q/Pt3g4C7NI2k4B2Kn -aanezG216oivI4W0XkDNOC0Bcyw+2k+CSsYEDnRuLiqwS6JgaM7Q3tdxBDQYwiaa -qEeH3ceVh3c4liYbG0ykIYEd1fVA/QxEz4sRJxKoTacNCO3RkRExL1S19o6v4vZd -cPuVsXUHFCqP0/bcGxLLx4DeWu9WbtyLPuWZ0ZAC9dutwhMo/89pGkEcQeg3HzCC -IknN7eCOWqKF9BhfFLptAMlrj2/A4+2Pj3Wxmpj+vROe0FuZfwBSNMdzJxIKUij3 -l/L+qMKVAgMBAAECgf9ywCcGnuto0OeUWa3sLf/+N6ncE5yL8Wxis5car8TcslG3 -qQwL4LX51I+jlUPBRo3ueq4KU4nKmrWDTuA05F32fPTNxNe1EbprU9AZEhXkNyQ8 -QVRpJGXOvlNFGtHX7gYZQbIHLIiSjbz4gZMVOBBnDiWYVebincAWRFRp2feZoY34 -i7XPCtA7qsEsMpANNkRVNT287pmIqCJAkUqOB1P5hxLXi9xMdYOCre/eJtevwnhp -jAtrtrHDC1xCTSxoJjMZOhYN+3GDOjqKRmfux1Nd5cO7Tj0LCPv5WYf0ZuehivD7 -EiSJk6JAi04XHG01KTxC6wZ5J7wkpZls6ERriQECgYEA5eIyEq0S+1bAm5Cpp4JO -RrckIIOtK1GtHeVQSKvBFnpC1N4vFvecqARywssuMFGc0eAwkbbXa7WBeGPIT5ik -bT8D0P7x0PoMyims+giw0K3wEBb7cp7WO5PrEUHdnlvpCpSvhsugekj93+shbq+9 -P1de5i3XjHNe3BNXowNf3GUCgYEA0bSAdIbyP+R0cyIxwp5mXup+xlYa4pqB4NLf -zpxJLVBWLbPopRHrCF39CKoA6fNsCmLSgD9FcKZ/rKMlXKhxXNWyCESV1m0zpRX9 -muqt3mhBVK7bKHXy9qC96oj75QhZIHrazrh9Hv2o9E1BxQFoaU/qvirCDU4eY79R -Ohxt8nECgYEAp+RjnbA5xMa/NN6aiXRppsvq3rRMrO6h+MuZrvmBs+DnHoCG88cz -6qIVDp9FxJRWbBHIZyOagVe2jy6RBVD+BauYJfOMuItm+98kLhhayo2+XoHqcvP+ -ktSdQaVRLm8B7HBbIZ9mPOlCQV+As042cSRmcsXYPwOjrCeUQcIdKOECgYEAkL1X -FBa4SaUzQuxNEBkoa0bK7bYspE8kabriwsZYM7CJas4MOzLc2E+XAE3mh5N99MU0 -qVQCZ7hj0xJgDU4twHe2g8Ji8Tc6OC2vdyeXjjTDMuHlXk3avqM/sguOYQycB7EE -KT5pDeTiooxYYtOP73A7g7obafeLPimktMk+keECgYBrsh+jOm99B8oMEFftQrrM -IHFmxz3R0yvLiZUfMl9vnysc0IDi6RUKjvV/oZAFyP9l++yGVKMyfXqNLQyyJfMJ -PvVLZb56t51Z0E+XzO0sLactIUg7iJWE1RPn7ryK1aqQqcUpimCE7t1AsNFfy5w6 -WwX9RR4xhXJcL6yO77D58w== +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 -----END PRIVATE KEY----- diff --git a/internal/tls/testdata/tls-ca.crt b/internal/tls/testdata/tls-ca.crt index 9220263fc0..4b861f4f40 100644 --- a/internal/tls/testdata/tls-ca.crt +++ b/internal/tls/testdata/tls-ca.crt @@ -1,29 +1,29 @@ -----BEGIN CERTIFICATE----- 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 -n2OwLW67dIPTfXyxgv+cnMZ/KqhY0Nnd2Pg= +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= -----END CERTIFICATE-----