chore: fix tests

Author: jensneuse

router-tests/prometheus_test.go

@@ -4509,7 +4509,7 @@ func TestFlakyPrometheusRouterConnectionMetrics(t *testing.T) {
 
 				connectionTotal := metrics[0]
 
-				require.Equal(t, 1024, *connectionTotal.Gauge.Value)
+				require.Equal(t, float64(1024), *connectionTotal.Gauge.Value)
 
 				expected := []*io_prometheus_client.LabelPair{
 					{
@@ -4689,7 +4689,7 @@ func TestFlakyPrometheusRouterConnectionMetrics(t *testing.T) {
 				require.Len(t, metrics, 2)
 
 				metricDataPoint1 := metrics[0]
-				require.Equal(t, 1024, *metricDataPoint1.Gauge.Value)
+				require.Equal(t, float64(1024), *metricDataPoint1.Gauge.Value)
 				expected1 := []*io_prometheus_client.LabelPair{
 					{
 						Name:  PointerOf("otel_scope_name"),
@@ -4918,7 +4918,7 @@ func TestFlakyPrometheusRouterConnectionMetrics(t *testing.T) {
 
 				connectionTotal := metrics[0]
 
-				require.Equal(t, 1024, *connectionTotal.Gauge.Value)
+				require.Equal(t, float64(1024), *connectionTotal.Gauge.Value)
 
 				expected := []*io_prometheus_client.LabelPair{
 					{

router/core/graphql_handler.go

@@ -199,7 +199,6 @@ func (h *GraphQLHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			h.WriteError(resolveCtx, err, p.Response, w)
 			return
 		}
-
 		graphqlExecutionSpan.SetAttributes(rotel.WgAcquireResolverWaitTimeMs.Int64(info.ResolveAcquireWaitTime.Milliseconds()))
 	case *plan.SubscriptionResponsePlan:
 		var (

router/pkg/grpcconnector/grpcpluginoci/image_unpack.go

@@ -46,7 +46,9 @@ func sanitizePathWithinDestDir(destDir, path string) (string, error) {
 
 // UnpackImageToDir unpacks a v1.Image to destDir.
 func UnpackImageToDir(img v1.Image, destDir string) error {
-	_ = os.MkdirAll(destDir, 0700)
+	if err := os.MkdirAll(destDir, 0700); err != nil {
+		return fmt.Errorf("failed to create destDir %s: %w", destDir, err)
+	}
 
 	reader := mutate.Extract(img)
 	defer func() {
@@ -84,11 +86,16 @@ func UnpackImageToDir(img v1.Image, destDir string) error {
 			}
 
 			if _, err := io.Copy(f, tr); err != nil {
-				_ = f.Close()
+				closeErr := f.Close()
+				if closeErr != nil {
+					return fmt.Errorf("write file %s: %w (also failed to close file: %w)", target, err, closeErr)
+				}
 				return fmt.Errorf("write file %s: %w", target, err)
 			}
 
-			_ = f.Close()
+			if err := f.Close(); err != nil {
+				return fmt.Errorf("closing file %s: %w", target, err)
+			}
 		case tar.TypeSymlink:
 			// Validate symlink target
 			symlinkTarget, err := sanitizePathWithinDestDir(destDir, hdr.Linkname)