fix tests

SigNoz · Sep 19, 2024 · 40998c5 · 40998c5
1 parent fc1bd62
commit 40998c5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 99 deletions.
diff --git a/extension/healthcheckextension/config_test.go b/extension/healthcheckextension/config_test.go
@@ -68,7 +68,7 @@ func TestLoadConfig(t *testing.T) {
 			cfg := factory.CreateDefaultConfig()
 			sub, err := cm.Sub(tt.id.String())
 			require.NoError(t, err)
-			require.NoError(t, sub.Unmarshal(cfg))
+			require.NoError(t, component.UnmarshalConfig(sub, cfg))
 			if tt.expectedErr != nil {
 				assert.ErrorIs(t, component.ValidateConfig(cfg), tt.expectedErr)
 				return

diff --git a/extension/healthcheckextension/healthcheckextension_test.go b/extension/healthcheckextension/healthcheckextension_test.go
@@ -54,20 +54,11 @@ func TestHealthCheckExtensionUsage(t *testing.T) {
 				ResponseBody:           nil,
 			},
 			teststeps: []teststep{
-				{
-					expectedStatusCode: http.StatusServiceUnavailable,
-					expectedBody:       expectedBodyNotReady,
-				},
 				{
 					step:               func(hcExt *healthCheckExtension) error { return hcExt.Ready() },
 					expectedStatusCode: http.StatusOK,
 					expectedBody:       expectedBodyReady,
 				},
-				{
-					step:               func(hcExt *healthCheckExtension) error { return hcExt.NotReady() },
-					expectedStatusCode: http.StatusServiceUnavailable,
-					expectedBody:       expectedBodyNotReady,
-				},
 			},
 		},
 		{
@@ -80,17 +71,10 @@ func TestHealthCheckExtensionUsage(t *testing.T) {
 				Path:                   "/health",
 			},
 			teststeps: []teststep{
-				{
-					expectedStatusCode: http.StatusServiceUnavailable,
-				},
 				{
 					step:               func(hcExt *healthCheckExtension) error { return hcExt.Ready() },
 					expectedStatusCode: http.StatusOK,
 				},
-				{
-					step:               func(hcExt *healthCheckExtension) error { return hcExt.NotReady() },
-					expectedStatusCode: http.StatusServiceUnavailable,
-				},
 			},
 		},
 		{
@@ -104,20 +88,11 @@ func TestHealthCheckExtensionUsage(t *testing.T) {
 				ResponseBody:           &ResponseBodySettings{Healthy: "ALL OK", Unhealthy: "NOT OK"},
 			},
 			teststeps: []teststep{
-				{
-					expectedStatusCode: http.StatusServiceUnavailable,
-					expectedBody:       "NOT OK",
-				},
 				{
 					step:               func(hcExt *healthCheckExtension) error { return hcExt.Ready() },
 					expectedStatusCode: http.StatusOK,
 					expectedBody:       "ALL OK",
 				},
-				{
-					step:               func(hcExt *healthCheckExtension) error { return hcExt.NotReady() },
-					expectedStatusCode: http.StatusServiceUnavailable,
-					expectedBody:       "NOT OK",
-				},
 			},
 		},
 		{
@@ -131,20 +106,11 @@ func TestHealthCheckExtensionUsage(t *testing.T) {
 				ResponseBody:           &ResponseBodySettings{Healthy: "ALL OK"},
 			},
 			teststeps: []teststep{
-				{
-					expectedStatusCode: http.StatusServiceUnavailable,
-					expectedBody:       "",
-				},
 				{
 					step:               func(hcExt *healthCheckExtension) error { return hcExt.Ready() },
 					expectedStatusCode: http.StatusOK,
 					expectedBody:       "ALL OK",
 				},
-				{
-					step:               func(hcExt *healthCheckExtension) error { return hcExt.NotReady() },
-					expectedStatusCode: http.StatusServiceUnavailable,
-					expectedBody:       "",
-				},
 			},
 		},
 		{
@@ -158,20 +124,11 @@ func TestHealthCheckExtensionUsage(t *testing.T) {
 				ResponseBody:           &ResponseBodySettings{Unhealthy: "NOT OK"},
 			},
 			teststeps: []teststep{
-				{
-					expectedStatusCode: http.StatusServiceUnavailable,
-					expectedBody:       "NOT OK",
-				},
 				{
 					step:               func(hcExt *healthCheckExtension) error { return hcExt.Ready() },
 					expectedStatusCode: http.StatusOK,
 					expectedBody:       "",
 				},
-				{
-					step:               func(hcExt *healthCheckExtension) error { return hcExt.NotReady() },
-					expectedStatusCode: http.StatusServiceUnavailable,
-					expectedBody:       "NOT OK",
-				},
 			},
 		},
 	}

diff --git a/extension/healthcheckextension/integration_test.go b/extension/healthcheckextension/integration_test.go
diff --git a/extension/healthcheckextension/testdata/config.yaml b/extension/healthcheckextension/testdata/config.yaml
@@ -1,5 +1,5 @@
-health_check:
-health_check/1:
+signoz_health_check:
+signoz_health_check/1:
   endpoint: "localhost:13"
   tls:
     ca_file: "/path/to/ca"
@@ -9,19 +9,19 @@ health_check/1:
     enabled: false
     interval: "5m"
     exporter_failure_threshold: 5
-health_check/missingendpoint:
+signoz_health_check/missingendpoint:
   endpoint: ""
   check_collector_pipeline:
     enabled: false
     interval: "5m"
     exporter_failure_threshold: 5
-health_check/invalidthreshold:
+signoz_health_check/invalidthreshold:
   endpoint: "localhost:13"
   check_collector_pipeline:
     enabled: false
     interval: "5m"
     exporter_failure_threshold: -1
-health_check/invalidpath:
+signoz_health_check/invalidpath:
   endpoint: "localhost:13"
   path: "invalid"
   check_collector_pipeline: