add Body.Close() to bridgeServer.makeRequest + some test names cleanup

Author: pawbana

internal/integrationtest/apidump_test.go

@@ -76,7 +76,6 @@ func TestAPIDump(t *testing.T) {
 
 			resp := bridgeServer.makeRequest(t, http.MethodPost, tc.path, fix.Request())
 			require.Equal(t, http.StatusOK, resp.StatusCode)
-			defer resp.Body.Close()
 			_, _ = io.ReadAll(resp.Body)
 
 			// Verify dump files were created.
@@ -196,8 +195,7 @@ func TestAPIDumpPassthrough(t *testing.T) {
 				withCustomProvider(tc.providerFunc(upstream.URL, dumpDir)),
 			)
 
-			resp := bridgeServer.makeRequest(t, http.MethodGet, tc.requestPath, nil)
-			defer resp.Body.Close()
+			bridgeServer.makeRequest(t, http.MethodGet, tc.requestPath, nil)
 
 			// Find dump files in the passthrough directory.
 			passthroughDir := filepath.Join(dumpDir, tc.name, "passthrough")

internal/integrationtest/bridge_test.go

@@ -80,7 +80,6 @@ func TestAnthropicMessages(t *testing.T) {
 				require.NoError(t, err)
 				resp := bridgeServer.makeRequest(t, http.MethodPost, pathAnthropicMessages, reqBody)
 				require.Equal(t, http.StatusOK, resp.StatusCode)
-				defer resp.Body.Close()
 
 				// Response-specific checks.
 				if tc.streaming {
@@ -146,7 +145,6 @@ func TestAWSBedrockIntegration(t *testing.T) {
 		)
 
 		resp := bridgeServer.makeRequest(t, http.MethodPost, pathAnthropicMessages, fixtures.Request(t, fixtures.AntSingleBuiltinTool))
-		defer resp.Body.Close()
 
 		require.Equal(t, http.StatusInternalServerError, resp.StatusCode)
 		body, err := io.ReadAll(resp.Body)
@@ -185,7 +183,6 @@ func TestAWSBedrockIntegration(t *testing.T) {
 				reqBody, err := sjson.SetBytes(fix.Request(), "stream", streaming)
 				require.NoError(t, err)
 				resp := bridgeServer.makeRequest(t, http.MethodPost, pathAnthropicMessages, reqBody)
-				defer resp.Body.Close()
 
 				// For streaming responses, consume the body to allow the stream to complete.
 				if streaming {
@@ -259,7 +256,6 @@ func TestOpenAIChatCompletions(t *testing.T) {
 				require.NoError(t, err)
 				resp := bridgeServer.makeRequest(t, http.MethodPost, pathOpenAIChatCompletions, reqBody)
 				require.Equal(t, http.StatusOK, resp.StatusCode)
-				defer resp.Body.Close()
 
 				// Response-specific checks.
 				if tc.streaming {
@@ -350,7 +346,6 @@ func TestOpenAIChatCompletions(t *testing.T) {
 				// Consume the full response body to ensure the interception completes
 				_, err = io.ReadAll(resp.Body)
 				require.NoError(t, err)
-				resp.Body.Close()
 
 				// Verify the MCP tool was actually invoked
 				invocations := mockMCP.getCallsByTool(mockToolName)
@@ -515,7 +510,6 @@ func TestSimple(t *testing.T) {
 					require.NoError(t, err)
 					resp := bridgeServer.makeRequest(t, http.MethodPost, tc.path, reqBody, http.Header{"User-Agent": {tc.userAgent}})
 					require.Equal(t, http.StatusOK, resp.StatusCode)
-					defer resp.Body.Close()
 
 					// Then: I expect the upstream request to have the correct path.
 					received := upstream.receivedRequests()
@@ -629,7 +623,6 @@ func TestSessionIDTracking(t *testing.T) {
 
 			resp := bridgeServer.makeRequest(t, http.MethodPost, pathAnthropicMessages, reqBody, tc.header)
 			require.Equal(t, http.StatusOK, resp.StatusCode)
-			defer resp.Body.Close()
 
 			// Drain the body to let the stream complete.
 			_, err := io.ReadAll(resp.Body)
@@ -710,7 +703,6 @@ func TestFallthrough(t *testing.T) {
 			bridgeServer := newBridgeTestServer(t, t.Context(), upstream.URL+tc.basePath)
 
 			resp := bridgeServer.makeRequest(t, http.MethodGet, tc.requestPath, nil)
-			defer resp.Body.Close()
 
 			require.Equal(t, http.StatusOK, resp.StatusCode)
 
@@ -1050,7 +1042,6 @@ func TestErrorHandling(t *testing.T) {
 						require.NoError(t, err)
 
 						resp := bridgeServer.makeRequest(t, http.MethodPost, tc.path, reqBody)
-						t.Cleanup(func() { _ = resp.Body.Close() })
 
 						tc.responseHandlerFn(resp)
 						bridgeServer.Recorder.VerifyAllInterceptionsEnded(t)
@@ -1118,7 +1109,6 @@ func TestErrorHandling(t *testing.T) {
 				bridgeServer := newBridgeTestServer(t, ctx, upstream.URL)
 
 				resp := bridgeServer.makeRequest(t, http.MethodPost, tc.path, fix.Request())
-				t.Cleanup(func() { _ = resp.Body.Close() })
 
 				tc.responseHandlerFn(resp)
 				bridgeServer.Recorder.VerifyAllInterceptionsEnded(t)
@@ -1179,7 +1169,6 @@ func TestStableRequestEncoding(t *testing.T) {
 			for range count {
 				resp := bridgeServer.makeRequest(t, http.MethodPost, tc.path, fix.Request())
 				require.Equal(t, http.StatusOK, resp.StatusCode)
-				_ = resp.Body.Close()
 			}
 
 			// All upstream request bodies should be identical.
@@ -1294,7 +1283,6 @@ func TestAnthropicToolChoiceParallelDisabled(t *testing.T) {
 
 			resp := bridgeServer.makeRequest(t, http.MethodPost, pathAnthropicMessages, reqBody)
 			require.Equal(t, http.StatusOK, resp.StatusCode)
-			_ = resp.Body.Close()
 
 			// Verify tool_choice in the upstream request.
 			received := upstream.receivedRequests()
@@ -1352,7 +1340,6 @@ func TestThinkingAdaptiveIsPreserved(t *testing.T) {
 			resp := bridgeServer.makeRequest(t, http.MethodPost, pathAnthropicMessages, reqBody)
 			require.Equal(t, http.StatusOK, resp.StatusCode)
 			_, _ = io.ReadAll(resp.Body)
-			_ = resp.Body.Close()
 
 			// Verify the thinking field was preserved in the upstream request.
 			received := upstream.receivedRequests()
@@ -1414,7 +1401,6 @@ func TestEnvironmentDoNotLeak(t *testing.T) {
 
 			resp := bridgeServer.makeRequest(t, http.MethodPost, tc.path, fix.Request())
 			require.Equal(t, http.StatusOK, resp.StatusCode)
-			defer resp.Body.Close()
 
 			// Verify that environment values did not leak.
 			received := upstream.receivedRequests()
@@ -1536,9 +1522,8 @@ func TestActorHeaders(t *testing.T) {
 				reqBody, err := sjson.SetBytes(fixtures.Request(t, tc.fixture), "stream", tc.streaming)
 				require.NoError(t, err)
 
-				resp := bridgeServer.makeRequest(t, http.MethodPost, tc.path, reqBody)
+				bridgeServer.makeRequest(t, http.MethodPost, tc.path, reqBody)
 				require.NotEmpty(t, receivedHeaders)
-				defer resp.Body.Close()
 
 				// Verify that the actor headers were only received if intended.
 				found := make(map[string][]string)

internal/integrationtest/circuit_breaker_test.go

@@ -139,7 +139,6 @@ func TestCircuitBreaker_FullRecoveryCycle(t *testing.T) {
 				resp := bridgeServer.makeRequest(t, http.MethodPost, tc.path, []byte(tc.requestBody), tc.headers)
 				_, err := io.ReadAll(resp.Body)
 				require.NoError(t, err)
-				resp.Body.Close()
 				return resp
 			}
 
@@ -293,7 +292,6 @@ func TestCircuitBreaker_HalfOpenFailure(t *testing.T) {
 				resp := bridgeServer.makeRequest(t, http.MethodPost, tc.path, []byte(tc.requestBody), tc.headers)
 				_, err := io.ReadAll(resp.Body)
 				require.NoError(t, err)
-				resp.Body.Close()
 				return resp
 			}
 
@@ -440,7 +438,6 @@ func TestCircuitBreaker_HalfOpenMaxRequests(t *testing.T) {
 				resp := bridgeServer.makeRequest(t, http.MethodPost, tc.path, []byte(tc.requestBody), tc.headers)
 				_, err := io.ReadAll(resp.Body)
 				require.NoError(t, err)
-				resp.Body.Close()
 				return resp
 			}
 
@@ -564,7 +561,6 @@ func TestCircuitBreaker_PerModelIsolation(t *testing.T) {
 		})
 		_, err := io.ReadAll(resp.Body)
 		require.NoError(t, err)
-		resp.Body.Close()
 		return resp
 	}
 

internal/integrationtest/metrics_test.go

@@ -126,7 +126,6 @@ func TestMetrics_Interception(t *testing.T) {
 			)
 
 			resp := bridgeServer.makeRequest(t, http.MethodPost, tc.path, fix.Request())
-			defer resp.Body.Close()
 			_, _ = io.ReadAll(resp.Body)
 
 			count := promtest.ToFloat64(m.InterceptionCount.WithLabelValues(
@@ -207,7 +206,6 @@ func TestMetrics_PassthroughCount(t *testing.T) {
 	)
 
 	resp := bridgeServer.makeRequest(t, http.MethodGet, "/openai/v1/models", nil)
-	defer resp.Body.Close()
 	require.Equal(t, http.StatusOK, resp.StatusCode)
 
 	count := promtest.ToFloat64(m.PassthroughCount.WithLabelValues(
@@ -231,7 +229,6 @@ func TestMetrics_PromptCount(t *testing.T) {
 
 	resp := bridgeServer.makeRequest(t, http.MethodPost, pathOpenAIChatCompletions, fix.Request())
 	require.Equal(t, http.StatusOK, resp.StatusCode)
-	defer resp.Body.Close()
 	_, _ = io.ReadAll(resp.Body)
 
 	prompts := promtest.ToFloat64(m.PromptCount.WithLabelValues(
@@ -255,7 +252,6 @@ func TestMetrics_NonInjectedToolUseCount(t *testing.T) {
 
 	resp := bridgeServer.makeRequest(t, http.MethodPost, pathOpenAIChatCompletions, fix.Request())
 	require.Equal(t, http.StatusOK, resp.StatusCode)
-	defer resp.Body.Close()
 	_, _ = io.ReadAll(resp.Body)
 
 	count := promtest.ToFloat64(m.NonInjectedToolUseCount.WithLabelValues(
@@ -285,7 +281,6 @@ func TestMetrics_InjectedToolUseCount(t *testing.T) {
 
 	resp := bridgeServer.makeRequest(t, http.MethodPost, pathAnthropicMessages, fix.Request())
 	require.Equal(t, http.StatusOK, resp.StatusCode)
-	defer resp.Body.Close()
 	_, _ = io.ReadAll(resp.Body)
 
 	// Wait until full roundtrip has completed.

internal/integrationtest/responses_test.go

@@ -337,7 +337,6 @@ func TestResponsesOutputMatchesUpstream(t *testing.T) {
 			bridgeServer := newBridgeTestServer(t, ctx, upstream.URL)
 
 			resp := bridgeServer.makeRequest(t, http.MethodPost, pathOpenAIResponses, fix.Request(), http.Header{"User-Agent": {tc.userAgent}})
-			defer resp.Body.Close()
 			require.Equal(t, http.StatusOK, resp.StatusCode)
 			got, err := io.ReadAll(resp.Body)
 
@@ -425,7 +424,6 @@ func TestResponsesBackgroundModeForbidden(t *testing.T) {
 			// Create a request with background mode enabled
 			reqBytes := responsesRequestBytes(t, tc.streaming, keyVal{"background", true})
 			resp := bridgeServer.makeRequest(t, http.MethodPost, pathOpenAIResponses, reqBytes)
-			defer resp.Body.Close()
 
 			require.Equal(t, "application/json", resp.Header.Get("Content-Type"))
 			require.Equal(t, http.StatusNotImplemented, resp.StatusCode)
@@ -531,7 +529,6 @@ func TestResponsesParallelToolsOverwritten(t *testing.T) {
 			bridgeServer := newBridgeTestServer(t, ctx, upstream.URL)
 
 			resp := bridgeServer.makeRequest(t, http.MethodPost, pathOpenAIResponses, []byte(tc.request))
-			defer resp.Body.Close()
 			_, err := io.ReadAll(resp.Body)
 			require.NoError(t, err)
 		})
@@ -588,7 +585,6 @@ func TestClientAndConnectionError(t *testing.T) {
 
 			reqBytes := responsesRequestBytes(t, tc.streaming)
 			resp := bridgeServer.makeRequest(t, http.MethodPost, pathOpenAIResponses, reqBytes)
-			defer resp.Body.Close()
 
 			require.Equal(t, "application/json", resp.Header.Get("Content-Type"))
 			require.Equal(t, http.StatusInternalServerError, resp.StatusCode)
@@ -666,7 +662,6 @@ func TestUpstreamError(t *testing.T) {
 
 			reqBytes := responsesRequestBytes(t, tc.streaming)
 			resp := bridgeServer.makeRequest(t, http.MethodPost, pathOpenAIResponses, reqBytes)
-			defer resp.Body.Close()
 
 			require.Equal(t, tc.statusCode, resp.StatusCode)
 			require.Equal(t, tc.contentType, resp.Header.Get("Content-Type"))
@@ -843,7 +838,6 @@ func TestResponsesInjectedTool(t *testing.T) {
 			bridgeServer := newBridgeTestServer(t, ctx, upstream.URL, withMCP(mockMCP))
 
 			resp := bridgeServer.makeRequest(t, http.MethodPost, pathOpenAIResponses, fix.Request())
-			defer resp.Body.Close()
 			require.Equal(t, http.StatusOK, resp.StatusCode)
 
 			body, err := io.ReadAll(resp.Body)

internal/integrationtest/setupbridge.go

@@ -48,8 +48,7 @@ type bridgeConfig struct {
 	mcpProxy         mcp.ServerProxier
 	userID           string
 	metadata         recorder.Metadata
-	logger           slog.Logger
-	loggerSet        bool
+	logger slog.Logger
 }
 
 // bridgeTestServer wraps an httptest.Server running a RequestBridge.
@@ -76,6 +75,7 @@ func (s *bridgeTestServer) makeRequest(t *testing.T, method string, path string,
 	}
 	resp, err := http.DefaultClient.Do(req)
 	require.NoError(t, err)
+	t.Cleanup(func() { _ = resp.Body.Close() })
 	return resp
 }
 
@@ -126,7 +126,7 @@ func withActor(id string, md recorder.Metadata) bridgeOption {
 // a RequestBridge with sensible defaults:
 //   - All standard providers (unless withProvider / withCustomProvider)
 //   - NoopMCPManager (unless withMCP)
-//   - slogtest debug logger (unless withLogger)
+//   - slogtest debug logger
 //   - defaultTracer (unless withTracer)
 //   - defaultActorID (unless withActor)
 func newBridgeTestServer(
@@ -146,9 +146,7 @@ func newBridgeTestServer(
 	if cfg.tracer == nil {
 		cfg.tracer = defaultTracer
 	}
-	if !cfg.loggerSet {
-		cfg.logger = newLogger(t)
-	}
+	cfg.logger = newLogger(t)
 	if cfg.mcpProxy == nil {
 		cfg.mcpProxy = newNoopMCPManager()
 	}
@@ -168,8 +166,7 @@ func newBridgeTestServer(
 	}
 
 	mockRec := &testutil.MockRecorder{}
-	var rec aibridge.Recorder = mockRec
-	rec = aibridge.NewRecorder(cfg.logger, cfg.tracer, func() (aibridge.Recorder, error) {
+	rec := aibridge.NewRecorder(cfg.logger, cfg.tracer, func() (aibridge.Recorder, error) {
 		return mockRec, nil
 	})
 
@@ -237,9 +234,6 @@ func setupInjectedToolTest(
 
 	resp := bridgeServer.makeRequest(t, http.MethodPost, path, reqBody)
 	require.Equal(t, http.StatusOK, resp.StatusCode)
-	t.Cleanup(func() {
-		_ = resp.Body.Close()
-	})
 
 	// We must ALWAYS have 2 calls to the bridge for injected tool tests.
 	require.Eventually(t, func() bool {

internal/integrationtest/trace_test.go

@@ -120,7 +120,6 @@ func TestTraceAnthropic(t *testing.T) {
 			require.NoError(t, err)
 			resp := bridgeServer.makeRequest(t, http.MethodPost, pathAnthropicMessages, reqBody)
 			require.Equal(t, http.StatusOK, resp.StatusCode)
-			defer resp.Body.Close()
 			bridgeServer.Close()
 
 			require.Equal(t, 1, len(bridgeServer.Recorder.RecordedInterceptions()))
@@ -235,7 +234,6 @@ func TestTraceAnthropicErr(t *testing.T) {
 			} else {
 				require.Equal(t, tc.expectCode, resp.StatusCode)
 			}
-			defer resp.Body.Close()
 			bridgeServer.Close()
 
 			require.Equal(t, 1, len(bridgeServer.Recorder.RecordedInterceptions()))
@@ -350,11 +348,10 @@ func TestInjectedToolsTrace(t *testing.T) {
 				validatorFn = openaiChatToolResultValidator(t)
 			}
 
-			recorderClient, mockMCP, resp := setupInjectedToolTest(
+			recorderClient, mockMCP, _ := setupInjectedToolTest(
 				t, tc.fixture, tc.streaming, tracer,
 				tc.path, validatorFn, tc.opts...,
 			)
-			defer resp.Body.Close()
 
 			require.Len(t, recorderClient.RecordedInterceptions(), 1)
 			intcID := recorderClient.RecordedInterceptions()[0].ID
@@ -474,7 +471,6 @@ func TestTraceOpenAI(t *testing.T) {
 			require.NoError(t, err)
 			resp := bridgeServer.makeRequest(t, http.MethodPost, tc.path, reqBody)
 			require.Equal(t, http.StatusOK, resp.StatusCode)
-			defer resp.Body.Close()
 			bridgeServer.Close()
 
 			require.Equal(t, 1, len(bridgeServer.Recorder.RecordedInterceptions()))
@@ -631,7 +627,6 @@ func TestTraceOpenAIErr(t *testing.T) {
 			resp := bridgeServer.makeRequest(t, http.MethodPost, tc.path, reqBody)
 
 			require.Equal(t, tc.expectCode, resp.StatusCode)
-			defer resp.Body.Close()
 			bridgeServer.Close()
 
 			require.Equal(t, 1, len(bridgeServer.Recorder.RecordedInterceptions()))
@@ -670,7 +665,6 @@ func TestTracePassthrough(t *testing.T) {
 	)
 
 	resp := bridgeServer.makeRequest(t, http.MethodGet, "/openai/v1/models", nil)
-	defer resp.Body.Close()
 	require.Equal(t, http.StatusOK, resp.StatusCode)
 	bridgeServer.Close()