From 3f6f7d00c18afe5724e20414527acd0689417350 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 27 Apr 2025 11:11:05 +0000
Subject: [PATCH 1/4] build(deps): bump github.com/sonatard/noctx from 0.1.0 to
 0.3.0

Bumps [github.com/sonatard/noctx](https://github.com/sonatard/noctx) from 0.1.0 to 0.3.0.
- [Release notes](https://github.com/sonatard/noctx/releases)
- [Changelog](https://github.com/sonatard/noctx/blob/master/.goreleaser.yml)
- [Commits](https://github.com/sonatard/noctx/compare/v0.1.0...v0.3.0)

---
updated-dependencies:
- dependency-name: github.com/sonatard/noctx
  dependency-version: 0.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index ec68a6153c50..2230dcc347d2 100644
--- a/go.mod
+++ b/go.mod
@@ -100,7 +100,7 @@ require (
 	github.com/shirou/gopsutil/v4 v4.25.3
 	github.com/sirupsen/logrus v1.9.3
 	github.com/sivchari/containedctx v1.0.3
-	github.com/sonatard/noctx v0.1.0
+	github.com/sonatard/noctx v0.3.0
 	github.com/sourcegraph/go-diff v0.7.0
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.6
diff --git a/go.sum b/go.sum
index f1d4e0d34ecf..3fc74f8f62f9 100644
--- a/go.sum
+++ b/go.sum
@@ -530,8 +530,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/sivchari/containedctx v1.0.3 h1:x+etemjbsh2fB5ewm5FeLNi5bUjK0V8n0RB+Wwfd0XE=
 github.com/sivchari/containedctx v1.0.3/go.mod h1:c1RDvCbnJLtH4lLcYD/GqwiBSSf4F5Qk0xld2rBqzJ4=
-github.com/sonatard/noctx v0.1.0 h1:JjqOc2WN16ISWAjAk8M5ej0RfExEXtkEyExl2hLW+OM=
-github.com/sonatard/noctx v0.1.0/go.mod h1:0RvBxqY8D4j9cTTTWE8ylt2vqj2EPI8fHmrxHdsaZ2c=
+github.com/sonatard/noctx v0.3.0 h1:hByDz/5PoCISxRmONdiAQipHopMo74e1VFihrZjFP14=
+github.com/sonatard/noctx v0.3.0/go.mod h1:64XdbzFb18XL4LporKXp8poqZtPKbCrqQ402CV+kJas=
 github.com/sourcegraph/go-diff v0.7.0 h1:9uLlrd5T46OXs5qpp8L/MTltk0zikUGi0sNNyCpA8G0=
 github.com/sourcegraph/go-diff v0.7.0/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs=
 github.com/spf13/afero v1.14.0 h1:9tH6MapGnn/j0eb0yIXiLjERO8RB6xIVZRDCX7PtqWA=

From 61c0e0c0eb80f99fe4f24fc0e061f9cfcb7bf7b7 Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <ldez@users.noreply.github.com>
Date: Sun, 27 Apr 2025 13:54:09 +0200
Subject: [PATCH 2/4] chore: update tests

---
 pkg/golinters/noctx/noctx.go              |   2 +-
 pkg/golinters/noctx/testdata/noctx.go     | 152 ++++++++++++++--------
 pkg/golinters/noctx/testdata/noctx_cgo.go | 151 ++++++++++++++-------
 3 files changed, 203 insertions(+), 102 deletions(-)

diff --git a/pkg/golinters/noctx/noctx.go b/pkg/golinters/noctx/noctx.go
index b0c5f9b50040..18391d4b5581 100644
--- a/pkg/golinters/noctx/noctx.go
+++ b/pkg/golinters/noctx/noctx.go
@@ -12,7 +12,7 @@ func New() *goanalysis.Linter {
 
 	return goanalysis.NewLinter(
 		a.Name,
-		"Finds sending http request without context.Context",
+		"Detects function and method with missing usage of context.Context",
 		[]*analysis.Analyzer{a},
 		nil,
 	).WithLoadMode(goanalysis.LoadModeTypesInfo)
diff --git a/pkg/golinters/noctx/testdata/noctx.go b/pkg/golinters/noctx/testdata/noctx.go
index 8b077a566206..27627755675d 100644
--- a/pkg/golinters/noctx/testdata/noctx.go
+++ b/pkg/golinters/noctx/testdata/noctx.go
@@ -3,97 +3,82 @@ package testdata
 
 import (
 	"context"
+	"database/sql"
 	"net/http"
 )
 
 var newRequestPkg = http.NewRequest
 
-func Noctx() {
-	const url = "http://example.com"
+func _() {
+	const url = "https://example.com"
+
 	cli := &http.Client{}
 
 	ctx := context.Background()
-	http.Get(url) // want `net/http\.Get must not be called`
-	_ = http.Get  // OK
-	f := http.Get // OK
-	f(url)        // want `net/http\.Get must not be called`
-
-	http.Head(url)          // want `net/http\.Head must not be called`
-	http.Post(url, "", nil) // want `net/http\.Post must not be called`
-	http.PostForm(url, nil) // want `net/http\.PostForm must not be called`
-
-	cli.Get(url) // want `\(\*net/http\.Client\)\.Get must not be called`
-	_ = cli.Get  // OK
-	m := cli.Get // OK
-	m(url)       // want `\(\*net/http\.Client\)\.Get must not be called`
-
-	cli.Head(url)          // want `\(\*net/http\.Client\)\.Head must not be called`
-	cli.Post(url, "", nil) // want `\(\*net/http\.Client\)\.Post must not be called`
-	cli.PostForm(url, nil) // want `\(\*net/http\.Client\)\.PostForm must not be called`
 
-	req, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
+	req, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	cli.Do(req)
 
 	req2, _ := http.NewRequestWithContext(ctx, http.MethodPost, url, nil) // OK
 	cli.Do(req2)
 
-	req3, _ := http.NewRequest(http.MethodPost, url, nil) // OK
-	req3 = req3.WithContext(ctx)
+	req3, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+	req3 = req3.WithContext(ctx)                          // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
 	cli.Do(req3)
 
 	f2 := func(req *http.Request, ctx context.Context) *http.Request {
 		return req
 	}
-	req4, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
+	req4, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	req4 = f2(req4, ctx)
 
-	req41, _ := http.NewRequest(http.MethodPost, url, nil) // OK
-	req41 = req41.WithContext(ctx)
+	req41, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+	req41 = req41.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
 	req41 = f2(req41, ctx)
 
 	newRequest := http.NewRequest
-	req5, _ := newRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
+	req5, _ := newRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	cli.Do(req5)
 
-	req51, _ := newRequest(http.MethodPost, url, nil) // OK
-	req51 = req51.WithContext(ctx)
+	req51, _ := newRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+	req51 = req51.WithContext(ctx)                    // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
 	cli.Do(req51)
 
-	req52, _ := newRequestPkg(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
+	req52, _ := newRequestPkg(http.MethodPost, url, nil) // TODO: false negative `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	cli.Do(req52)
 
 	type MyRequest = http.Request
 	f3 := func(req *MyRequest, ctx context.Context) *MyRequest {
 		return req
 	}
-	req6, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
+	req6, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	req6 = f3(req6, ctx)
 
-	req61, _ := http.NewRequest(http.MethodPost, url, nil) // OK
-	req61 = req61.WithContext(ctx)
+	req61, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+	req61 = req61.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
 	req61 = f3(req61, ctx)
 
 	type MyRequest2 http.Request
 	f4 := func(req *MyRequest2, ctx context.Context) *MyRequest2 {
 		return req
 	}
-	req7, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
+	req7, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	req71 := MyRequest2(*req7)
 	f4(&req71, ctx)
 
-	req72, _ := http.NewRequest(http.MethodPost, url, nil) // OK
-	req72 = req72.WithContext(ctx)
+	req72, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+	req72 = req72.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
 	req73 := MyRequest2(*req7)
 	f4(&req73, ctx)
 
 	req8, _ := func() (*http.Request, error) {
-		return http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
+		return http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	}()
 	cli.Do(req8)
 
 	req82, _ := func() (*http.Request, error) {
-		req82, _ := http.NewRequest(http.MethodPost, url, nil) // OK
-		req82 = req82.WithContext(ctx)
+		req82, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+		req82 = req82.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
 		return req82, nil
 	}()
 	cli.Do(req82)
@@ -101,34 +86,99 @@ func Noctx() {
 	f5 := func(req, req2 *http.Request, ctx context.Context) (*http.Request, *http.Request) {
 		return req, req2
 	}
-	req9, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
+	req9, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	req9, _ = f5(req9, req9, ctx)
 
-	req91, _ := http.NewRequest(http.MethodPost, url, nil) // OK
-	req91 = req91.WithContext(ctx)
+	req91, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+	req91 = req91.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
 	req9, _ = f5(req91, req91, ctx)
 
-	req10, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
-	req11, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
+	req10, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+	req11, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	req10, req11 = f5(req10, req11, ctx)
 
-	req101, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
-	req111, _ := http.NewRequest(http.MethodPost, url, nil) // OK
-	req111 = req111.WithContext(ctx)
+	req101, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+	req111, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+	req111 = req111.WithContext(ctx)                        // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
 	req101, req111 = f5(req101, req111, ctx)
 
 	func() (*http.Request, *http.Request) {
-		req12, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
-		req13, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
+		req12, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+		req13, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 		return req12, req13
 	}()
 
 	func() (*http.Request, *http.Request) {
-		req14, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
-		req15, _ := http.NewRequest(http.MethodPost, url, nil) // OK
-		req15 = req15.WithContext(ctx)
+		req14, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+		req15, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+		req15 = req15.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
 
 		return req14, req15
 	}()
+
+	req121, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+	req121.AddCookie(&http.Cookie{Name: "k", Value: "v"})
+	req121 = req121.WithContext(context.WithValue(req121.Context(), struct{}{}, 0)) // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	cli.Do(req121)
+}
+
+func _() {
+	const url = "http://example.com"
+	cli := &http.Client{}
+
+	http.Get(url) // want `net/http\.Get must not be called. use net/http\.NewRequestWithContext and \(\*net/http.Client\)\.Do\(\*http.Request\)`
+	_ = http.Get  // OK
+	f := http.Get // OK
+	f(url)        // want `net/http\.Get must not be called. use net/http\.NewRequestWithContext and \(\*net/http.Client\)\.Do\(\*http.Request\)`
+
+	http.Head(url)          // want `net/http\.Head must not be called. use net/http\.NewRequestWithContext and \(\*net/http.Client\)\.Do\(\*http.Request\)`
+	http.Post(url, "", nil) // want `net/http\.Post must not be called. use net/http\.NewRequestWithContext and \(\*net/http.Client\)\.Do\(\*http.Request\)`
+	http.PostForm(url, nil) // want `net/http\.PostForm must not be called. use net/http\.NewRequestWithContext and \(\*net/http.Client\)\.Do\(\*http.Request\)`
+
+	cli.Get(url) // want `\(\*net/http\.Client\)\.Get must not be called. use \(\*net/http.Client\)\.Do\(\*http.Request\)`
+	_ = cli.Get  // OK
+	m := cli.Get // OK
+	m(url)       // want `\(\*net/http\.Client\)\.Get must not be called. use \(\*net/http.Client\)\.Do\(\*http.Request\)`
+
+	cli.Head(url)          // want `\(\*net/http\.Client\)\.Head must not be called. use \(\*net/http.Client\)\.Do\(\*http.Request\)`
+	cli.Post(url, "", nil) // want `\(\*net/http\.Client\)\.Post must not be called. use \(\*net/http.Client\)\.Do\(\*http.Request\)`
+	cli.PostForm(url, nil) // want `\(\*net/http\.Client\)\.PostForm must not be called. use \(\*net/http.Client\)\.Do\(\*http.Request\)`
 }
 
+func _() {
+	ctx := context.Background()
+
+	db, _ := sql.Open("noctx", "noctx://")
+
+	db.Exec("select * from testdata") // want `\(\*database/sql\.DB\)\.Exec must not be called. use \(\*database/sql\.DB\)\.ExecContext`
+	db.ExecContext(ctx, "select * from testdata")
+
+	db.Ping() // want `\(\*database/sql\.DB\)\.Ping must not be called. use \(\*database/sql\.DB\)\.PingContext`
+	db.PingContext(ctx)
+
+	db.Prepare("select * from testdata") // want `\(\*database/sql\.DB\)\.Prepare must not be called. use \(\*database/sql\.DB\)\.PrepareContext`
+	db.PrepareContext(ctx, "select * from testdata")
+
+	db.Query("select * from testdata") // want `\(\*database/sql\.DB\)\.Query must not be called. use \(\*database/sql\.DB\)\.QueryContext`
+	db.QueryContext(ctx, "select * from testdata")
+
+	db.QueryRow("select * from testdata") // want `\(\*database/sql\.DB\)\.QueryRow must not be called. use \(\*database/sql\.DB\)\.QueryRowContext`
+	db.QueryRowContext(ctx, "select * from testdata")
+
+	// transactions
+
+	tx, _ := db.Begin()
+	tx.Exec("select * from testdata") // want `\(\*database/sql\.Tx\)\.Exec must not be called. use \(\*database/sql\.Tx\)\.ExecContext`
+	tx.ExecContext(ctx, "select * from testdata")
+
+	tx.Prepare("select * from testdata") // want `\(\*database/sql\.Tx\)\.Prepare must not be called. use \(\*database/sql\.Tx\)\.PrepareContext`
+	tx.PrepareContext(ctx, "select * from testdata")
+
+	tx.Query("select * from testdata") // want `\(\*database/sql\.Tx\)\.Query must not be called. use \(\*database/sql\.Tx\)\.QueryContext`
+	tx.QueryContext(ctx, "select * from testdata")
+
+	tx.QueryRow("select * from testdata") // want `\(\*database/sql\.Tx\)\.QueryRow must not be called. use \(\*database/sql\.Tx\)\.QueryRowContext`
+	tx.QueryRowContext(ctx, "select * from testdata")
+
+	_ = tx.Commit()
+}
diff --git a/pkg/golinters/noctx/testdata/noctx_cgo.go b/pkg/golinters/noctx/testdata/noctx_cgo.go
index 64f5ea6c0d49..bed90a6e4f30 100644
--- a/pkg/golinters/noctx/testdata/noctx_cgo.go
+++ b/pkg/golinters/noctx/testdata/noctx_cgo.go
@@ -13,6 +13,7 @@ import "C"
 
 import (
 	"context"
+	"database/sql"
 	"net/http"
 	"unsafe"
 )
@@ -26,91 +27,75 @@ func _() {
 var newRequestPkg = http.NewRequest
 
 func _() {
-	const url = "http://example.com"
+	const url = "https://example.com"
+
 	cli := &http.Client{}
 
 	ctx := context.Background()
-	http.Get(url) // want `net/http\.Get must not be called`
-	_ = http.Get  // OK
-	f := http.Get // OK
-	f(url)        // want `net/http\.Get must not be called`
-
-	http.Head(url)          // want `net/http\.Head must not be called`
-	http.Post(url, "", nil) // want `net/http\.Post must not be called`
-	http.PostForm(url, nil) // want `net/http\.PostForm must not be called`
 
-	cli.Get(url) // want `\(\*net/http\.Client\)\.Get must not be called`
-	_ = cli.Get  // OK
-	m := cli.Get // OK
-	m(url)       // want `\(\*net/http\.Client\)\.Get must not be called`
-
-	cli.Head(url)          // want `\(\*net/http\.Client\)\.Head must not be called`
-	cli.Post(url, "", nil) // want `\(\*net/http\.Client\)\.Post must not be called`
-	cli.PostForm(url, nil) // want `\(\*net/http\.Client\)\.PostForm must not be called`
-
-	req, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
+	req, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	cli.Do(req)
 
 	req2, _ := http.NewRequestWithContext(ctx, http.MethodPost, url, nil) // OK
 	cli.Do(req2)
 
-	req3, _ := http.NewRequest(http.MethodPost, url, nil) // OK
-	req3 = req3.WithContext(ctx)
+	req3, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+	req3 = req3.WithContext(ctx)                          // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
 	cli.Do(req3)
 
 	f2 := func(req *http.Request, ctx context.Context) *http.Request {
 		return req
 	}
-	req4, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
+	req4, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	req4 = f2(req4, ctx)
 
-	req41, _ := http.NewRequest(http.MethodPost, url, nil) // OK
-	req41 = req41.WithContext(ctx)
+	req41, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+	req41 = req41.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
 	req41 = f2(req41, ctx)
 
 	newRequest := http.NewRequest
-	req5, _ := newRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
+	req5, _ := newRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	cli.Do(req5)
 
-	req51, _ := newRequest(http.MethodPost, url, nil) // OK
-	req51 = req51.WithContext(ctx)
+	req51, _ := newRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+	req51 = req51.WithContext(ctx)                    // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
 	cli.Do(req51)
 
-	req52, _ := newRequestPkg(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
+	req52, _ := newRequestPkg(http.MethodPost, url, nil) // TODO: false negative `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	cli.Do(req52)
 
 	type MyRequest = http.Request
 	f3 := func(req *MyRequest, ctx context.Context) *MyRequest {
 		return req
 	}
-	req6, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
+	req6, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	req6 = f3(req6, ctx)
 
-	req61, _ := http.NewRequest(http.MethodPost, url, nil) // OK
-	req61 = req61.WithContext(ctx)
+	req61, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+	req61 = req61.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
 	req61 = f3(req61, ctx)
 
 	type MyRequest2 http.Request
 	f4 := func(req *MyRequest2, ctx context.Context) *MyRequest2 {
 		return req
 	}
-	req7, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
+	req7, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	req71 := MyRequest2(*req7)
 	f4(&req71, ctx)
 
-	req72, _ := http.NewRequest(http.MethodPost, url, nil) // OK
-	req72 = req72.WithContext(ctx)
+	req72, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+	req72 = req72.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
 	req73 := MyRequest2(*req7)
 	f4(&req73, ctx)
 
 	req8, _ := func() (*http.Request, error) {
-		return http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
+		return http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	}()
 	cli.Do(req8)
 
 	req82, _ := func() (*http.Request, error) {
-		req82, _ := http.NewRequest(http.MethodPost, url, nil) // OK
-		req82 = req82.WithContext(ctx)
+		req82, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+		req82 = req82.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
 		return req82, nil
 	}()
 	cli.Do(req82)
@@ -118,33 +103,99 @@ func _() {
 	f5 := func(req, req2 *http.Request, ctx context.Context) (*http.Request, *http.Request) {
 		return req, req2
 	}
-	req9, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
+	req9, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	req9, _ = f5(req9, req9, ctx)
 
-	req91, _ := http.NewRequest(http.MethodPost, url, nil) // OK
-	req91 = req91.WithContext(ctx)
+	req91, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+	req91 = req91.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
 	req9, _ = f5(req91, req91, ctx)
 
-	req10, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
-	req11, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
+	req10, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+	req11, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	req10, req11 = f5(req10, req11, ctx)
 
-	req101, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
-	req111, _ := http.NewRequest(http.MethodPost, url, nil) // OK
-	req111 = req111.WithContext(ctx)
+	req101, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+	req111, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+	req111 = req111.WithContext(ctx)                        // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
 	req101, req111 = f5(req101, req111, ctx)
 
 	func() (*http.Request, *http.Request) {
-		req12, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
-		req13, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
+		req12, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+		req13, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 		return req12, req13
 	}()
 
 	func() (*http.Request, *http.Request) {
-		req14, _ := http.NewRequest(http.MethodPost, url, nil) // want `should rewrite http.NewRequestWithContext or add \(\*Request\).WithContext`
-		req15, _ := http.NewRequest(http.MethodPost, url, nil) // OK
-		req15 = req15.WithContext(ctx)
+		req14, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+		req15, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+		req15 = req15.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
 
 		return req14, req15
 	}()
+
+	req121, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
+	req121.AddCookie(&http.Cookie{Name: "k", Value: "v"})
+	req121 = req121.WithContext(context.WithValue(req121.Context(), struct{}{}, 0)) // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	cli.Do(req121)
+}
+
+func _() {
+	const url = "http://example.com"
+	cli := &http.Client{}
+
+	http.Get(url) // want `net/http\.Get must not be called. use net/http\.NewRequestWithContext and \(\*net/http.Client\)\.Do\(\*http.Request\)`
+	_ = http.Get  // OK
+	f := http.Get // OK
+	f(url)        // want `net/http\.Get must not be called. use net/http\.NewRequestWithContext and \(\*net/http.Client\)\.Do\(\*http.Request\)`
+
+	http.Head(url)          // want `net/http\.Head must not be called. use net/http\.NewRequestWithContext and \(\*net/http.Client\)\.Do\(\*http.Request\)`
+	http.Post(url, "", nil) // want `net/http\.Post must not be called. use net/http\.NewRequestWithContext and \(\*net/http.Client\)\.Do\(\*http.Request\)`
+	http.PostForm(url, nil) // want `net/http\.PostForm must not be called. use net/http\.NewRequestWithContext and \(\*net/http.Client\)\.Do\(\*http.Request\)`
+
+	cli.Get(url) // want `\(\*net/http\.Client\)\.Get must not be called. use \(\*net/http.Client\)\.Do\(\*http.Request\)`
+	_ = cli.Get  // OK
+	m := cli.Get // OK
+	m(url)       // want `\(\*net/http\.Client\)\.Get must not be called. use \(\*net/http.Client\)\.Do\(\*http.Request\)`
+
+	cli.Head(url)          // want `\(\*net/http\.Client\)\.Head must not be called. use \(\*net/http.Client\)\.Do\(\*http.Request\)`
+	cli.Post(url, "", nil) // want `\(\*net/http\.Client\)\.Post must not be called. use \(\*net/http.Client\)\.Do\(\*http.Request\)`
+	cli.PostForm(url, nil) // want `\(\*net/http\.Client\)\.PostForm must not be called. use \(\*net/http.Client\)\.Do\(\*http.Request\)`
+}
+
+func _() {
+	ctx := context.Background()
+
+	db, _ := sql.Open("noctx", "noctx://")
+
+	db.Exec("select * from testdata") // want `\(\*database/sql\.DB\)\.Exec must not be called. use \(\*database/sql\.DB\)\.ExecContext`
+	db.ExecContext(ctx, "select * from testdata")
+
+	db.Ping() // want `\(\*database/sql\.DB\)\.Ping must not be called. use \(\*database/sql\.DB\)\.PingContext`
+	db.PingContext(ctx)
+
+	db.Prepare("select * from testdata") // want `\(\*database/sql\.DB\)\.Prepare must not be called. use \(\*database/sql\.DB\)\.PrepareContext`
+	db.PrepareContext(ctx, "select * from testdata")
+
+	db.Query("select * from testdata") // want `\(\*database/sql\.DB\)\.Query must not be called. use \(\*database/sql\.DB\)\.QueryContext`
+	db.QueryContext(ctx, "select * from testdata")
+
+	db.QueryRow("select * from testdata") // want `\(\*database/sql\.DB\)\.QueryRow must not be called. use \(\*database/sql\.DB\)\.QueryRowContext`
+	db.QueryRowContext(ctx, "select * from testdata")
+
+	// transactions
+
+	tx, _ := db.Begin()
+	tx.Exec("select * from testdata") // want `\(\*database/sql\.Tx\)\.Exec must not be called. use \(\*database/sql\.Tx\)\.ExecContext`
+	tx.ExecContext(ctx, "select * from testdata")
+
+	tx.Prepare("select * from testdata") // want `\(\*database/sql\.Tx\)\.Prepare must not be called. use \(\*database/sql\.Tx\)\.PrepareContext`
+	tx.PrepareContext(ctx, "select * from testdata")
+
+	tx.Query("select * from testdata") // want `\(\*database/sql\.Tx\)\.Query must not be called. use \(\*database/sql\.Tx\)\.QueryContext`
+	tx.QueryContext(ctx, "select * from testdata")
+
+	tx.QueryRow("select * from testdata") // want `\(\*database/sql\.Tx\)\.QueryRow must not be called. use \(\*database/sql\.Tx\)\.QueryRowContext`
+	tx.QueryRowContext(ctx, "select * from testdata")
+
+	_ = tx.Commit()
 }

From 873220c53c0e2a3e57dd43e5442eef361955dc54 Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <ldez@users.noreply.github.com>
Date: Mon, 28 Apr 2025 17:16:46 +0200
Subject: [PATCH 3/4] chore: update to v0.3.2

---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 2230dcc347d2..48f117bf90d8 100644
--- a/go.mod
+++ b/go.mod
@@ -100,7 +100,7 @@ require (
 	github.com/shirou/gopsutil/v4 v4.25.3
 	github.com/sirupsen/logrus v1.9.3
 	github.com/sivchari/containedctx v1.0.3
-	github.com/sonatard/noctx v0.3.0
+	github.com/sonatard/noctx v0.3.2
 	github.com/sourcegraph/go-diff v0.7.0
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.6
diff --git a/go.sum b/go.sum
index 3fc74f8f62f9..b9d53ebc79b1 100644
--- a/go.sum
+++ b/go.sum
@@ -530,8 +530,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/sivchari/containedctx v1.0.3 h1:x+etemjbsh2fB5ewm5FeLNi5bUjK0V8n0RB+Wwfd0XE=
 github.com/sivchari/containedctx v1.0.3/go.mod h1:c1RDvCbnJLtH4lLcYD/GqwiBSSf4F5Qk0xld2rBqzJ4=
-github.com/sonatard/noctx v0.3.0 h1:hByDz/5PoCISxRmONdiAQipHopMo74e1VFihrZjFP14=
-github.com/sonatard/noctx v0.3.0/go.mod h1:64XdbzFb18XL4LporKXp8poqZtPKbCrqQ402CV+kJas=
+github.com/sonatard/noctx v0.3.2 h1:ntVy5RbjYEqEqNl3CpRu5dAg5zgA+4XPf4o0pkXWVxU=
+github.com/sonatard/noctx v0.3.2/go.mod h1:64XdbzFb18XL4LporKXp8poqZtPKbCrqQ402CV+kJas=
 github.com/sourcegraph/go-diff v0.7.0 h1:9uLlrd5T46OXs5qpp8L/MTltk0zikUGi0sNNyCpA8G0=
 github.com/sourcegraph/go-diff v0.7.0/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs=
 github.com/spf13/afero v1.14.0 h1:9tH6MapGnn/j0eb0yIXiLjERO8RB6xIVZRDCX7PtqWA=

From 4bd8626b88cb212a3211157ae3814972c6c0955f Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <ldez@users.noreply.github.com>
Date: Wed, 30 Apr 2025 03:46:00 +0200
Subject: [PATCH 4/4] chore: update to v0.3.3

---
 go.mod                                    |  2 +-
 go.sum                                    |  4 ++--
 pkg/golinters/noctx/testdata/noctx.go     | 20 ++++++++++----------
 pkg/golinters/noctx/testdata/noctx_cgo.go | 20 ++++++++++----------
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/go.mod b/go.mod
index 48f117bf90d8..ee06a39dd079 100644
--- a/go.mod
+++ b/go.mod
@@ -100,7 +100,7 @@ require (
 	github.com/shirou/gopsutil/v4 v4.25.3
 	github.com/sirupsen/logrus v1.9.3
 	github.com/sivchari/containedctx v1.0.3
-	github.com/sonatard/noctx v0.3.2
+	github.com/sonatard/noctx v0.3.3
 	github.com/sourcegraph/go-diff v0.7.0
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.6
diff --git a/go.sum b/go.sum
index b9d53ebc79b1..95463b12ec8e 100644
--- a/go.sum
+++ b/go.sum
@@ -530,8 +530,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/sivchari/containedctx v1.0.3 h1:x+etemjbsh2fB5ewm5FeLNi5bUjK0V8n0RB+Wwfd0XE=
 github.com/sivchari/containedctx v1.0.3/go.mod h1:c1RDvCbnJLtH4lLcYD/GqwiBSSf4F5Qk0xld2rBqzJ4=
-github.com/sonatard/noctx v0.3.2 h1:ntVy5RbjYEqEqNl3CpRu5dAg5zgA+4XPf4o0pkXWVxU=
-github.com/sonatard/noctx v0.3.2/go.mod h1:64XdbzFb18XL4LporKXp8poqZtPKbCrqQ402CV+kJas=
+github.com/sonatard/noctx v0.3.3 h1:9+wFUxZfjiCdNadFaGH55sa7Y1r6yKZiAsUVmCP+tjw=
+github.com/sonatard/noctx v0.3.3/go.mod h1:64XdbzFb18XL4LporKXp8poqZtPKbCrqQ402CV+kJas=
 github.com/sourcegraph/go-diff v0.7.0 h1:9uLlrd5T46OXs5qpp8L/MTltk0zikUGi0sNNyCpA8G0=
 github.com/sourcegraph/go-diff v0.7.0/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs=
 github.com/spf13/afero v1.14.0 h1:9tH6MapGnn/j0eb0yIXiLjERO8RB6xIVZRDCX7PtqWA=
diff --git a/pkg/golinters/noctx/testdata/noctx.go b/pkg/golinters/noctx/testdata/noctx.go
index 27627755675d..8a34443e2029 100644
--- a/pkg/golinters/noctx/testdata/noctx.go
+++ b/pkg/golinters/noctx/testdata/noctx.go
@@ -23,7 +23,7 @@ func _() {
 	cli.Do(req2)
 
 	req3, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req3 = req3.WithContext(ctx)                          // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req3 = req3.WithContext(ctx)
 	cli.Do(req3)
 
 	f2 := func(req *http.Request, ctx context.Context) *http.Request {
@@ -33,7 +33,7 @@ func _() {
 	req4 = f2(req4, ctx)
 
 	req41, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req41 = req41.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req41 = req41.WithContext(ctx)
 	req41 = f2(req41, ctx)
 
 	newRequest := http.NewRequest
@@ -41,7 +41,7 @@ func _() {
 	cli.Do(req5)
 
 	req51, _ := newRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req51 = req51.WithContext(ctx)                    // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req51 = req51.WithContext(ctx)
 	cli.Do(req51)
 
 	req52, _ := newRequestPkg(http.MethodPost, url, nil) // TODO: false negative `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
@@ -55,7 +55,7 @@ func _() {
 	req6 = f3(req6, ctx)
 
 	req61, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req61 = req61.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req61 = req61.WithContext(ctx)
 	req61 = f3(req61, ctx)
 
 	type MyRequest2 http.Request
@@ -67,7 +67,7 @@ func _() {
 	f4(&req71, ctx)
 
 	req72, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req72 = req72.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req72 = req72.WithContext(ctx)
 	req73 := MyRequest2(*req7)
 	f4(&req73, ctx)
 
@@ -78,7 +78,7 @@ func _() {
 
 	req82, _ := func() (*http.Request, error) {
 		req82, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-		req82 = req82.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+		req82 = req82.WithContext(ctx)
 		return req82, nil
 	}()
 	cli.Do(req82)
@@ -90,7 +90,7 @@ func _() {
 	req9, _ = f5(req9, req9, ctx)
 
 	req91, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req91 = req91.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req91 = req91.WithContext(ctx)
 	req9, _ = f5(req91, req91, ctx)
 
 	req10, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
@@ -99,7 +99,7 @@ func _() {
 
 	req101, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	req111, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req111 = req111.WithContext(ctx)                        // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req111 = req111.WithContext(ctx)
 	req101, req111 = f5(req101, req111, ctx)
 
 	func() (*http.Request, *http.Request) {
@@ -111,14 +111,14 @@ func _() {
 	func() (*http.Request, *http.Request) {
 		req14, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 		req15, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-		req15 = req15.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+		req15 = req15.WithContext(ctx)
 
 		return req14, req15
 	}()
 
 	req121, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	req121.AddCookie(&http.Cookie{Name: "k", Value: "v"})
-	req121 = req121.WithContext(context.WithValue(req121.Context(), struct{}{}, 0)) // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req121 = req121.WithContext(context.WithValue(req121.Context(), struct{}{}, 0))
 	cli.Do(req121)
 }
 
diff --git a/pkg/golinters/noctx/testdata/noctx_cgo.go b/pkg/golinters/noctx/testdata/noctx_cgo.go
index bed90a6e4f30..63b15477d8c3 100644
--- a/pkg/golinters/noctx/testdata/noctx_cgo.go
+++ b/pkg/golinters/noctx/testdata/noctx_cgo.go
@@ -40,7 +40,7 @@ func _() {
 	cli.Do(req2)
 
 	req3, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req3 = req3.WithContext(ctx)                          // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req3 = req3.WithContext(ctx)
 	cli.Do(req3)
 
 	f2 := func(req *http.Request, ctx context.Context) *http.Request {
@@ -50,7 +50,7 @@ func _() {
 	req4 = f2(req4, ctx)
 
 	req41, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req41 = req41.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req41 = req41.WithContext(ctx)
 	req41 = f2(req41, ctx)
 
 	newRequest := http.NewRequest
@@ -58,7 +58,7 @@ func _() {
 	cli.Do(req5)
 
 	req51, _ := newRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req51 = req51.WithContext(ctx)                    // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req51 = req51.WithContext(ctx)
 	cli.Do(req51)
 
 	req52, _ := newRequestPkg(http.MethodPost, url, nil) // TODO: false negative `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
@@ -72,7 +72,7 @@ func _() {
 	req6 = f3(req6, ctx)
 
 	req61, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req61 = req61.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req61 = req61.WithContext(ctx)
 	req61 = f3(req61, ctx)
 
 	type MyRequest2 http.Request
@@ -84,7 +84,7 @@ func _() {
 	f4(&req71, ctx)
 
 	req72, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req72 = req72.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req72 = req72.WithContext(ctx)
 	req73 := MyRequest2(*req7)
 	f4(&req73, ctx)
 
@@ -95,7 +95,7 @@ func _() {
 
 	req82, _ := func() (*http.Request, error) {
 		req82, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-		req82 = req82.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+		req82 = req82.WithContext(ctx)
 		return req82, nil
 	}()
 	cli.Do(req82)
@@ -107,7 +107,7 @@ func _() {
 	req9, _ = f5(req9, req9, ctx)
 
 	req91, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req91 = req91.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req91 = req91.WithContext(ctx)
 	req9, _ = f5(req91, req91, ctx)
 
 	req10, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
@@ -116,7 +116,7 @@ func _() {
 
 	req101, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	req111, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-	req111 = req111.WithContext(ctx)                        // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req111 = req111.WithContext(ctx)
 	req101, req111 = f5(req101, req111, ctx)
 
 	func() (*http.Request, *http.Request) {
@@ -128,14 +128,14 @@ func _() {
 	func() (*http.Request, *http.Request) {
 		req14, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 		req15, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
-		req15 = req15.WithContext(ctx)                         // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+		req15 = req15.WithContext(ctx)
 
 		return req14, req15
 	}()
 
 	req121, _ := http.NewRequest(http.MethodPost, url, nil) // want `net/http\.NewRequest must not be called. use net/http\.NewRequestWithContext`
 	req121.AddCookie(&http.Cookie{Name: "k", Value: "v"})
-	req121 = req121.WithContext(context.WithValue(req121.Context(), struct{}{}, 0)) // want `\(\*net/http\.Request\)\.WithContext must not be called. use net/http\.NewRequestWithContext`
+	req121 = req121.WithContext(context.WithValue(req121.Context(), struct{}{}, 0))
 	cli.Do(req121)
 }