Merge branch 'refactor/opus-cleanup-v2'

Author: mpyw

README.md

@@ -40,7 +40,7 @@ go run github.com/mpyw/goroutinectx/cmd/goroutinectx@latest ./...
 ```
 
 > [!CAUTION]
-> To prevent supply chain attacks, pin to a specific version tag instead of `@latest` in CI/CD pipelines (e.g., `@v0.7.3`).
+> To prevent supply chain attacks, pin to a specific version tag instead of `@latest` in CI/CD pipelines (e.g., `@v0.7.4`).
 
 ### As a Library
 

analyzer.go

@@ -169,11 +169,11 @@ func buildCheckers(derivers *deriver.Matcher, spawners *spawner.Map) ([]internal
 
 	// Goroutine checkers
 	if enableGoroutine {
-		goStmtCheckers = append(goStmtCheckers, &checkers.Goroutine{Derivers: derivers})
+		goStmtCheckers = append(goStmtCheckers, &checkers.Goroutine{})
 	}
 
 	if derivers != nil {
-		goStmtCheckers = append(goStmtCheckers, &checkers.GoroutineDerive{Derivers: derivers})
+		goStmtCheckers = append(goStmtCheckers, checkers.NewGoroutineDerive(derivers))
 	}
 
 	// Call checkers

analyzer_test.go

@@ -18,6 +18,21 @@ func TestErrgroup(t *testing.T) {
 	analysistest.Run(t, testdata, goroutinectx.Analyzer, "errgroup")
 }
 
+func TestErrgroupDerive(t *testing.T) {
+	testdata := analysistest.TestData()
+
+	deriveFunc := "github.com/my-example-app/telemetry/apm.NewGoroutineContext"
+	if err := goroutinectx.Analyzer.Flags.Set("goroutine-deriver", deriveFunc); err != nil {
+		t.Fatal(err)
+	}
+
+	defer func() {
+		_ = goroutinectx.Analyzer.Flags.Set("goroutine-deriver", "")
+	}()
+
+	analysistest.Run(t, testdata, goroutinectx.Analyzer, "errgroupderive")
+}
+
 func TestConc(t *testing.T) {
 	testdata := analysistest.TestData()
 	analysistest.Run(t, testdata, goroutinectx.Analyzer, "conc")
@@ -107,6 +122,21 @@ func TestCarrierDerive(t *testing.T) {
 	analysistest.Run(t, testdata, goroutinectx.Analyzer, "carrierderive")
 }
 
+func TestSpawnerDerive(t *testing.T) {
+	testdata := analysistest.TestData()
+
+	deriveFunc := "github.com/my-example-app/telemetry/apm.NewGoroutineContext"
+	if err := goroutinectx.Analyzer.Flags.Set("goroutine-deriver", deriveFunc); err != nil {
+		t.Fatal(err)
+	}
+
+	defer func() {
+		_ = goroutinectx.Analyzer.Flags.Set("goroutine-deriver", "")
+	}()
+
+	analysistest.Run(t, testdata, goroutinectx.Analyzer, "spawnerderive")
+}
+
 func TestSpawner(t *testing.T) {
 	testdata := analysistest.TestData()
 	analysistest.Run(t, testdata, goroutinectx.Analyzer, "spawner")

go.mod

@@ -7,6 +7,11 @@ go 1.24.0
 // - v0.1.0-v0.4.0: -test flag conflicted with singlechecker's built-in flag
 retract [v0.1.0, v0.4.0]
 
+// Retract v0.7.2-v0.7.3 due to:
+// - -goroutine-deriver flag didn't work with errgroup/waitgroup/conc/spawner checkers
+//   (deriver checking logic was lost during refactoring)
+retract [v0.7.2, v0.7.3]
+
 require golang.org/x/tools v0.40.0
 
 require (

internal/checkers/goroutine.go

@@ -10,9 +10,7 @@ import (
 )
 
 // Goroutine checks that go statements propagate context.
-type Goroutine struct {
-	Derivers *deriver.Matcher
-}
+type Goroutine struct{}
 
 // Name returns the checker name for ignore directive matching.
 func (*Goroutine) Name() ignore.CheckerName {
@@ -83,7 +81,12 @@ func (*Goroutine) checkFromAST(cctx *probe.Context, stmt *ast.GoStmt) bool {
 
 // GoroutineDerive checks that go statements call a deriver function.
 type GoroutineDerive struct {
-	Derivers *deriver.Matcher
+	derivers *deriver.Matcher
+}
+
+// NewGoroutineDerive creates a new GoroutineDerive checker.
+func NewGoroutineDerive(derivers *deriver.Matcher) *GoroutineDerive {
+	return &GoroutineDerive{derivers: derivers}
 }
 
 // Name returns the checker name for ignore directive matching.
@@ -93,7 +96,7 @@ func (*GoroutineDerive) Name() ignore.CheckerName {
 
 // CheckGoStmt checks a go statement for deriver function calls.
 func (c *GoroutineDerive) CheckGoStmt(cctx *probe.Context, stmt *ast.GoStmt) *internal.Result {
-	if c.Derivers == nil || c.Derivers.IsEmpty() {
+	if c.derivers == nil || c.derivers.IsEmpty() {
 		return internal.OK()
 	}
 
@@ -108,7 +111,7 @@ func (c *GoroutineDerive) CheckGoStmt(cctx *probe.Context, stmt *ast.GoStmt) *in
 			return result
 		}
 
-		if c.Derivers.SatisfiesAnyGroup(cctx.Pass, lit.Body) {
+		if c.derivers.SatisfiesAnyGroup(cctx.Pass, lit.Body) {
 			return internal.OK()
 		}
 		return internal.Fail(c.message())
@@ -132,11 +135,11 @@ func (c *GoroutineDerive) CheckGoStmt(cctx *probe.Context, stmt *ast.GoStmt) *in
 }
 
 func (c *GoroutineDerive) message() string {
-	return "goroutine should call " + c.Derivers.Original + " to derive context"
+	return "goroutine should call " + c.derivers.Original + " to derive context"
 }
 
 func (c *GoroutineDerive) deferMessage() string {
-	return "goroutine calls " + c.Derivers.Original + " in defer, but it should be called at goroutine start"
+	return "goroutine calls " + c.derivers.Original + " in defer, but it should be called at goroutine start"
 }
 
 func (c *GoroutineDerive) checkFromSSA(cctx *probe.Context, lit *ast.FuncLit) (*internal.Result, bool) {
@@ -149,7 +152,7 @@ func (c *GoroutineDerive) checkFromSSA(cctx *probe.Context, lit *ast.FuncLit) (*
 		return nil, false
 	}
 
-	result := cctx.Tracer.ClosureCallsDeriver(ssaFn, c.Derivers)
+	result := cctx.Tracer.ClosureCallsDeriver(ssaFn, c.derivers)
 
 	if result.FoundAtStart {
 		return internal.OK(), true
@@ -172,7 +175,7 @@ func (c *GoroutineDerive) checkIdent(cctx *probe.Context, ident *ast.Ident) bool
 		return true
 	}
 
-	return c.Derivers.SatisfiesAnyGroup(cctx.Pass, funcLit.Body)
+	return c.derivers.SatisfiesAnyGroup(cctx.Pass, funcLit.Body)
 }
 
 func (c *GoroutineDerive) checkHigherOrder(cctx *probe.Context, innerCall *ast.CallExpr) bool {
@@ -214,7 +217,7 @@ func (c *GoroutineDerive) factoryReturnsCallingFunc(cctx *probe.Context, factory
 				callsDeriver = true
 				return false
 			}
-			if c.Derivers.SatisfiesAnyGroup(cctx.Pass, fl.Body) {
+			if c.derivers.SatisfiesAnyGroup(cctx.Pass, fl.Body) {
 				callsDeriver = true
 				return false
 			}
@@ -243,7 +246,7 @@ func (c *GoroutineDerive) returnedValueCalls(cctx *probe.Context, result ast.Exp
 		if cctx.FuncLitHasContextParam(innerFuncLit) {
 			return true
 		}
-		return c.Derivers.SatisfiesAnyGroup(cctx.Pass, innerFuncLit.Body)
+		return c.derivers.SatisfiesAnyGroup(cctx.Pass, innerFuncLit.Body)
 	}
 
 	ident, ok := result.(*ast.Ident)
@@ -259,5 +262,5 @@ func (c *GoroutineDerive) returnedValueCalls(cctx *probe.Context, result ast.Exp
 	if cctx.FuncLitHasContextParam(innerFuncLit) {
 		return true
 	}
-	return c.Derivers.SatisfiesAnyGroup(cctx.Pass, innerFuncLit.Body)
+	return c.derivers.SatisfiesAnyGroup(cctx.Pass, innerFuncLit.Body)
 }