reorders the defer to execute the close

Signed-off-by: Afzal Ansari <afzal442@gmail.com>

plugin/metrics/prometheus/metricsstore/reader_test.go

@@ -83,9 +83,9 @@ func TestNewMetricsReaderValidAddress(t *testing.T) {
 		ServerURL:      "http://localhost:1234",
 		ConnectTimeout: defaultTimeout,
 	}, logger, tracer)
+	defer closer()
 	require.NoError(t, err)
 	assert.NotNil(t, reader)
-	defer closer()
 }
 
 func TestNewMetricsReaderInvalidAddress(t *testing.T) {
@@ -95,10 +95,10 @@ func TestNewMetricsReaderInvalidAddress(t *testing.T) {
 		ServerURL:      "\n",
 		ConnectTimeout: defaultTimeout,
 	}, logger, tracer)
+	defer closer()
 	require.Error(t, err)
 	assert.Contains(t, err.Error(), "failed to initialize prometheus client")
 	assert.Nil(t, reader)
-	defer closer()
 }
 
 func TestGetMinStepDuration(t *testing.T) {
@@ -113,12 +113,12 @@ func TestGetMinStepDuration(t *testing.T) {
 		ServerURL:      "http://" + listener.Addr().String(),
 		ConnectTimeout: defaultTimeout,
 	}, logger, tracer)
+	defer closer()
 	require.NoError(t, err)
 
 	minStep, err := reader.GetMinStepDuration(context.Background(), &params)
 	require.NoError(t, err)
 	assert.Equal(t, time.Millisecond, minStep)
-	defer closer()
 }
 
 func TestMetricsServerError(t *testing.T) {
@@ -148,6 +148,7 @@ func TestMetricsServerError(t *testing.T) {
 		ServerURL:      "http://" + address,
 		ConnectTimeout: defaultTimeout,
 	}, logger, tracer)
+	defer closer()
 	require.NoError(t, err)
 
 	m, err := reader.GetCallRates(context.Background(), &params)
@@ -156,7 +157,6 @@ func TestMetricsServerError(t *testing.T) {
 	assert.Contains(t, err.Error(), "failed executing metrics query")
 	assert.NotEmpty(t, exp.GetSpans(), "Expected spans are recorded")
 	assert.Len(t, exp.GetSpans(), 1, "HTTP request was traced and span reported")
-	defer closer()
 }
 
 func TestGetLatencies(t *testing.T) {
@@ -254,11 +254,12 @@ func TestGetLatencies(t *testing.T) {
 			defer mockPrometheus.Close()
 
 			m, err := reader.GetLatencies(context.Background(), &params)
+			defer closer()
 			require.NoError(t, err)
 			assert.NotEmpty(t, exp.GetSpans(), "Spans recorded during the test.")
 			assert.Len(t, exp.GetSpans(), 1, "HTTP request was traced and span reported")
 			assertMetrics(t, m, tc.wantLabels, tc.wantName, tc.wantDescription)
-			defer closer()
+
 		})
 	}
 }
@@ -355,11 +356,11 @@ func TestGetCallRates(t *testing.T) {
 			defer mockPrometheus.Close()
 
 			m, err := reader.GetCallRates(context.Background(), &params)
+			defer closer()
 			require.NoError(t, err)
 			assert.NotEmpty(t, exp.GetSpans(), "Spans recorded during the test.")
 			assert.Len(t, exp.GetSpans(), 1, "HTTP request was traced and span reported")
 			assertMetrics(t, m, tc.wantLabels, tc.wantName, tc.wantDescription)
-			defer closer()
 		})
 	}
 }
@@ -481,11 +482,11 @@ func TestGetErrorRates(t *testing.T) {
 			defer mockPrometheus.Close()
 
 			m, err := reader.GetErrorRates(context.Background(), &params)
+			defer closer()
 			require.NoError(t, err)
 			assert.NotEmpty(t, exp.GetSpans(), "Spans recorded during the test.")
 			assert.Len(t, exp.GetSpans(), 1, "HTTP request was traced and span reported")
 			assertMetrics(t, m, tc.wantLabels, tc.wantName, tc.wantDescription)
-			defer closer()
 		})
 	}
 }
@@ -515,11 +516,11 @@ func TestWarningResponse(t *testing.T) {
 	defer mockPrometheus.Close()
 
 	m, err := reader.GetErrorRates(context.Background(), &params)
+	defer closer()
 	require.NoError(t, err)
 	assert.NotEmpty(t, exp.GetSpans(), "Spans recorded during the test.")
 	assert.Len(t, exp.GetSpans(), 1, "HTTP request was traced and span reported")
 	assert.NotNil(t, m)
-	defer closer()
 }
 
 func TestGetRoundTripperTLSConfig(t *testing.T) {
@@ -622,9 +623,9 @@ func TestInvalidCertFile(t *testing.T) {
 			CAPath:  "foo",
 		},
 	}, logger, tracer)
+	defer closer()
 	require.Error(t, err)
 	assert.Nil(t, reader)
-	defer closer()
 }
 
 func startMockPrometheusServer(t *testing.T, wantPromQlQuery string, wantWarnings []string) *httptest.Server {