From 4907b3b96630b547815b2b8c4e7d25f06a60b2a7 Mon Sep 17 00:00:00 2001 From: Curtis Robert Date: Tue, 14 Nov 2023 00:58:18 -0800 Subject: [PATCH] [chore][exporter/signalfx] Update test certs (#29109) **Description:** This re-enables the failing tests and updates the expired certificates. New cert expiration dates: ``` $ openssl x509 -enddate -noout -in testdata/certs/cert.pem notAfter=Mar 13 22:55:27 3023 GMT $ openssl x509 -enddate -noout -in testdata/certs/ca.pem notAfter=Mar 13 22:47:43 3023 GMT ``` **Link to tracking Issue:** Fixes #29099 **Testing:** Tests are now passing. **Documentation:** --- exporter/signalfxexporter/exporter_test.go | 2 - .../signalfxexporter/testdata/certs/ca.pem | 36 ++++++------ .../testdata/certs/cert-key.pem | 55 ++++++++++--------- .../signalfxexporter/testdata/certs/cert.pem | 36 ++++++------ 4 files changed, 65 insertions(+), 64 deletions(-) diff --git a/exporter/signalfxexporter/exporter_test.go b/exporter/signalfxexporter/exporter_test.go index 53e6b7decd68..5d66060a0681 100644 --- a/exporter/signalfxexporter/exporter_test.go +++ b/exporter/signalfxexporter/exporter_test.go @@ -1207,7 +1207,6 @@ func TestTLSExporterInit(t *testing.T) { } func TestTLSIngestConnection(t *testing.T) { - t.Skip("Flaky test see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/29099") metricsPayload := pmetric.NewMetrics() rm := metricsPayload.ResourceMetrics().AppendEmpty() ilm := rm.ScopeMetrics().AppendEmpty() @@ -1319,7 +1318,6 @@ func TestDefaultSystemCPUTimeExcludedAndTranslated(t *testing.T) { } func TestTLSAPIConnection(t *testing.T) { - t.Skip("Flaky test see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/29099") cfg := createDefaultConfig().(*Config) converter, err := translation.NewMetricsConverter( zap.NewNop(), diff --git a/exporter/signalfxexporter/testdata/certs/ca.pem b/exporter/signalfxexporter/testdata/certs/ca.pem index fac69544dad4..b57a64b90a13 100644 --- a/exporter/signalfxexporter/testdata/certs/ca.pem +++ b/exporter/signalfxexporter/testdata/certs/ca.pem @@ -1,19 +1,21 @@ -----BEGIN CERTIFICATE----- -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 +trN2MRYD4hmvAfAqdCbpzWbKJnrHRh9d9B0UXA== -----END CERTIFICATE----- diff --git a/exporter/signalfxexporter/testdata/certs/cert-key.pem b/exporter/signalfxexporter/testdata/certs/cert-key.pem index 8a29c6811050..529ea4609b58 100644 --- a/exporter/signalfxexporter/testdata/certs/cert-key.pem +++ b/exporter/signalfxexporter/testdata/certs/cert-key.pem @@ -1,27 +1,28 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEA7Wnpb2OiVNo6MMsYiGj6rAoDJkVzfFrlXiPHuDdPx3cF4rfv -Gtw4YYyb0w4rC7figIbXtUJvWXaVT2ta8vGes35w8XGYctikp7bIkRr2F0nHO2Uo -M7nJgJSmcoGBQD3Dae+Psph6s2hzKQg7okQBzF9Vw/dSPWLDkJeNOKtIGkZ/eQeW -R7hZaX2LllYLcaS4G8TwTPHltkzSANJMZnLUMyQQfvIF52pTMCZXiHo5USHGKkLU -bdXwoJonC6c2bRKPcE0eal9iQDQiFZP2OrlRH1Dy4uepxQlKEq5k2LqJ0yheDEis -VJS0XT407tFJQ+ASRNIvSvJS/gsUumhkE97iXwIDAQABAoIBAET6TaFYYFSo5tlA -WMthPNt5OTsIWKpbumJkoOVL5Lj+Qs6BRE4Yh6UH9koWxrjr3zoac1etiq6CfpUJ -iu4k90gNR4FO0M0lVomH2LQYEkHn5KPEGy8UHpBmIAoKyGPCziDcQnLQTG4Nvc/B -HZpiiec4F7INDG7bYBiFf7lkQlmnbKJRwtOFxbFsbhOl8vk3CredIEioacr5sJZ3 -3TOBb25SI1D9IqrOeP//vGgdj9g1aHmhutlte2L0wnRukRmKtG4xKHutVLsrIf7z -9lUAL0lj15aVmKw290IdcSweZVxqJDgI0c8lCj3JIwWt6wwC/ZfQZse4/KCiSJnY -2+DPJ8kCgYEA+jT+pijb9Of12iMdNrMGEyiutHTboLL1C+oNHWbYUhB5ZRZgq3PS -9M200TtjlnH9E938BRhhrGt2K8FeNcFi9I4j4BLWCrMC90nbCkqxsgCpH17O3xFA -WUx0wN25JLFGlNV4+MH28Krx3uYt3uppD7BBrC0LoRIAReOplkBRwsUCgYEA8ukW -/8efs1DmJhFwRLyMjHiwTDIaZ4wVBuBvK0TxTtjmzIxB34AzVFk15FyvRix5RIj9 -b5Qn2XN0Y39MFnaHQgdr/LvxnQbhsYmCBfCrDRblcYaHIPdBUVintU2aFGnAHK0f -uetJMTgYL9AhlXsdy+q7QhwyYkEG9apRZRw7ktMCgYEAzbTuO7vSAwsGRR6jcQpE -j1HeOLzuqLMY5n+54pdgeC/VLnf0aGGkaeIJrA/ws4rp8ACMp7/A5dm/4P9srjNd -YQTPl/TEhy1f3eGZtV9tspP6d7Eh0aHETuaeAscH5ZPeHJVZjOMjXACfNIv34JLG -Z8CYba7nJbjAArXHAqHE1qUCgYBoL1tC947irScZWs9pW+l4cmdDNxYmJWn7WhW0 -XEyXgeZ0AxBZ2TWqztyThsFSes7Ee3EgA06YMLHR3w52b/4Rbvd9HetCa2ov6IeR -Hqlu4swkRgv9Mq+cQUclNxSH/td8NTDvYCAzcRjGoSFWaMjd5l7MuyVNCREAGz3v -/Qz8KwKBgQD2TxKcPehNh7I5dqB21m/2V0LdJraJwaQ8+v3dnPKG+0M5Jb31aeZX -efgqCJ2YBncf/8YZ2IDDTray3vKD6ss10cx6O5ykaf3NiEARUlMNaskAYBxdemM/ -ax45GtHjMjmtvAj3HxgZ6X2KH1POOuf5QFv7gnZVyxithDT+mQ4L2w== ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC+L4WbTAXFY5oK +QH/RV/iGlJn+bsuHnVPxXIkrhvqKXuVKy6FWmjft6lgMs/mCw8gZDFAZTkULhtz5 +26DlcemYESh+fEOdGVl7U5ro/1aH/zWo9/b38SnusIck7eTU+PfPuMfENDPrbIPR +pFMqqTuXTWVZKRaholZhpF76h24jr2607aY3N0e13F7mHUZcMDwxS3cQUfXExEMP +iElIPsvPDhUV5Wvf7ABibduzfmPsbYuS0FxaG7YO7eQnf8RVZU6Y/eRYbEBP0TVm +EK1AjUmA70GjPEbNkytGHBlNap2cV0KNhaAQajy3T5SZUn3cZnwzl6mwIHQMF46t +HXyoAW+9AgMBAAECggEAHgVQWMA6VPsw8JdX1crGHzBL0p7Yn9KU0o+h024eFEOA +fDsCf7IeS/7m4TJzm1GeP13zMttpCLXEIeiqUC2YCvoCY1zoK186Ab6jwE218ge2 +B7MEmATIcrYIzyqCKaAXNgHb/ruiynG5qRkAS8ak8nA0JEvZF7CRZB5XI8LG/vjH +ZVtZi4EWERi1q84pD7eB2Hnnnpr84SGiJKK5B19W+wZA1OZhcbMKexm13GKWZi1t +V0W4PyjUio9vb4KU8KHMaHYYacNAWevYXtM/5C7dotEvRi5XLwWwwZFpL9mAMjQT +UNE6AaAk2S4ilRW8suJ4hu8R2NRoDs88ZSTAVHxvvQKBgQDvEgKtQIvSG592V1/L +Q87zJeMPxNViyFitJg3wYVHv0WVYg9abWvJUl8vL+jUaz1XObxqpBG7XkVUR4xW3 +z0T98rIsonJt9aAtkWhVZASjk/vIHOvM6YhJFVZbYrwHFd0n8v3UcmweY4Ed8lnM +vypSJBRughVuUGIiTFQravq3lwKBgQDLp03ivrpErLRD7sjXuTdzQxfTy2jjjo8W +9QNTevK9fpTRxje8f2uMgj7aygdEl0Tv+cnBw8T6t2egO06kyEeJb5HArCjvjHJB +JrNpa6wQg/td0xY25Mm7bnXw9jiyGZYz6/T674cgcpEGP9I3fud/RtSaLuckos6C +0EPABYBdywKBgQCGgvGynWCORTCBm0Ow0GQ+dpC9LJiLTgJm2cR5/afmcUC+ft9e +5dr3Mble+Var0QCMeALeGjprW8ArokNz+lDtOYJ6jqQnrk4DlY7IjM/3YaoGvA8I +alVeGX1PScxViD243oVm5UJkDsR1HwjbpKuhL9+3FcYNHXk5pwysqTKL3QKBgAdi +IWi/EXG78S0lUxK/HEuJeyuqjDrzyCxE5cH5CyPjmvGgBhVHaVbGwhCcknbiJRWu +MKpdtp6AV7lvbQJ8YFuTN+2MUE+e/+VsycRgqvROVKaqKHwE/2tULeJ2iseqNc/c +Fh2i4XtDrA5V8gEhELOEleChIrApVuNXOZ2UlXrRAoGAWGcyg5IOWjELFw5+aLRR +/LBgbDZUQ05UmYrdAaeUO8xB2Mnm5j3uA08PAWoUag5TcMcrufkWk6ikjNphMSE9 +6jp3xn7hzHczig0xbNs6y23i5IerTxxSUaKT3myoLjSQeiab1js/kOuXie4Ss/7Z +91aAg6wAgiyKq/2TwUlThHQ= +-----END PRIVATE KEY----- diff --git a/exporter/signalfxexporter/testdata/certs/cert.pem b/exporter/signalfxexporter/testdata/certs/cert.pem index 2a7b22f3e60b..8cd95ca98239 100644 --- a/exporter/signalfxexporter/testdata/certs/cert.pem +++ b/exporter/signalfxexporter/testdata/certs/cert.pem @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE-----