fix: resolve context leak, unseeded jitter, and broken test utility

.github/workflows/cla.yml

@@ -34,4 +34,4 @@ jobs:
           custom-notsigned-prcomment: |
             Thank you for your submission, we really appreciate it. This open-source project (“Projects”) made available by Shinkly Private Limited (SPL). We ask that you sign our [Contributor License Agreement](https://github.com/codecarrotlabs/cla-document/blob/main/readme.md) before we can accept your contribution. You can sign the CLA by just posting a Pull Request comment same as the below format. If you have any questions respecting this Agreement, please contact [opensource@codecarrot.net](mailto:opensource@codecarrot.net).
           signed-commit-message: |
-            $contributorName has signed the CLA in $pullRequestNo
+            $contributorName has signed the CLA in $pullRequestNo

internal/requestconfig/requestconfig.go

@@ -407,7 +407,8 @@ func retryDelay(res *http.Response, retryCount int) time.Duration {
 		delay = maxDelay
 	}
 
-	jitter := rand.Int63n(int64(delay / 4))
+	r := rand.New(rand.NewSource(time.Now().UnixNano()))
+	jitter := r.Int63n(int64(delay / 4))
 	delay -= time.Duration(jitter)
 	return delay
 }
@@ -466,12 +467,6 @@ func (cfg *RequestConfig) Execute() (err error) {
 		ctx := cfg.Request.Context()
 		if cfg.RequestTimeout != time.Duration(0) && isBeforeContextDeadline(time.Now().Add(cfg.RequestTimeout), ctx) {
 			ctx, cancel = context.WithTimeout(ctx, cfg.RequestTimeout)
-			defer func() {
-				// The cancel function is nil if it was handed off to be handled in a different scope.
-				if cancel != nil {
-					cancel()
-				}
-			}()
 		}
 
 		req := cfg.Request.Clone(ctx)
@@ -480,6 +475,12 @@ func (cfg *RequestConfig) Execute() (err error) {
 		}
 
 		res, err = handler(req)
+
+		// Close the timeout context for this attempt if one was created
+		if cancel != nil {
+			cancel()
+			cancel = nil
+		}
 		if ctx != nil && ctx.Err() != nil {
 			return ctx.Err()
 		}

internal/testutil/testutil.go

@@ -19,9 +19,9 @@ func CheckTestServer(t *testing.T, url string) bool {
 				t.Skip("The test will not run without a mock Prism server running against your OpenAPI spec")
 				return false
 			}
-			t.Errorf("The test will not run without a mock Prism server running against your OpenAPI spec. You can set the environment variable %s to true to skip running any tests that require the mock server", SKIP_MOCK_TESTS)
-			return false
 		}
+		t.Errorf("The test will not run without a mock Prism server running against your OpenAPI spec. You can set the environment variable %s to true to skip running any tests that require the mock server. Error: %s", SKIP_MOCK_TESTS, err)
+		return false
 	}
 	return true
 }