feat: fix ignored handlers

internal/injector/aspect/join/function.go

@@ -88,18 +88,29 @@ func (s *functionDeclaration) FileMayMatch(ctx *may.FileContext) may.MatchType {
 }
 
 func (s *functionDeclaration) Matches(ctx context.AspectContext) bool {
+	node := ctx.Node()
+
+	// Check if this function is being used as an argument to a function call
+	// and has an ignore directive
+	chain := ctx.Chain()
+	if chain.PropertyName() == "Args" {
+		if hasIgnoreDirective(node) {
+			return false
+		}
+	}
+
 	info := functionInformation{
 		ImportPath:   ctx.ImportPath(),
 		typeResolver: ctx,
 	}
 
-	if decl, ok := ctx.Node().(*dst.FuncDecl); ok {
+	if decl, ok := node.(*dst.FuncDecl); ok {
 		if decl.Recv != nil && len(decl.Recv.List) == 1 {
 			info.Receiver = decl.Recv.List[0].Type
 		}
 		info.Name = decl.Name.Name
 		info.Type = decl.Type
-	} else if lit, ok := ctx.Node().(*dst.FuncLit); ok {
+	} else if lit, ok := node.(*dst.FuncLit); ok {
 		info.Type = lit.Type
 	} else {
 		return false
@@ -677,3 +688,21 @@ func (o *unmarshalFuncDeclOption) UnmarshalYAML(ctx gocontext.Context, node ast.
 
 	return nil
 }
+
+// isIgnored returns true if the node is prefixed by an `//orchestrion:ignore` (or the legacy `//dd:ignore`) directive.
+func hasIgnoreDirective(node dst.Node) bool {
+	const (
+		orchestrionIgnore = "//orchestrion:ignore"
+		ddIgnore          = "//dd:ignore"
+	)
+
+	for _, cmt := range node.Decorations().Start.All() {
+		if cmt == orchestrionIgnore || strings.HasPrefix(cmt, orchestrionIgnore+" ") {
+			return true
+		}
+		if cmt == ddIgnore || strings.HasPrefix(cmt, ddIgnore+" ") {
+			return true
+		}
+	}
+	return false
+}

internal/injector/aspect/join/function_test.go

@@ -6,9 +6,12 @@
 package join
 
 import (
+	"go/parser"
+	"go/token"
 	"testing"
 
 	"github.com/dave/dst"
+	"github.com/dave/dst/decorator"
 	"github.com/goccy/go-yaml"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -234,3 +237,71 @@ signature-contains:
 	require.Len(t, signatureContains.Results, 1, "Expected 1 result")
 	assert.Equal(t, "bool", signatureContains.Results[0].Name, "Result should be bool")
 }
+
+func TestHasIgnoreDirective(t *testing.T) {
+	tests := []struct {
+		name        string
+		source      string
+		shouldMatch bool
+	}{
+		{
+			name: "without ignore directive",
+			source: `package main
+import "net/http"
+func myHandler (w http.ResponseWriter, r *http.Request) {}
+
+func main() {
+	http.HandleFunc("/", handler)
+}`,
+			shouldMatch: false,
+		},
+		{
+			name: "with ignore directive -- net/http",
+			source: `package main
+import "net/http"
+//orchestrion:ignore
+func myHandler(w http.ResponseWriter, r *http.Request) {}
+
+func main() {
+	http.HandleFunc("/", myHandler)
+}`,
+			shouldMatch: true,
+		},
+		{
+			name: "with ignore directive -- echo",
+			source: `package main
+import "labstack/echo"
+//orchestrion:ignore
+func myHandler(c echo.Context) error {return c.String(http.StatusOK, "testing")}
+
+func main() {
+	e := echo.New()
+	e.GET("/", myHandler)
+}`,
+			shouldMatch: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			fset := token.NewFileSet()
+			parsedFile, err := parser.ParseFile(fset, "test.go", tt.source, parser.ParseComments)
+			require.NoError(t, err)
+
+			// Create the decorator.
+			dec := decorator.NewDecorator(fset)
+			f, err := dec.DecorateFile(parsedFile)
+			require.NoError(t, err)
+
+			var funcDecl *dst.FuncDecl
+			for _, decl := range f.Decls {
+				if fd, ok := decl.(*dst.FuncDecl); ok && fd.Name.Name == "myHandler" {
+					funcDecl = fd
+					break
+				}
+			}
+			assert.NotNil(t, funcDecl)
+			assert.Equal(t, tt.shouldMatch, hasIgnoreDirective(funcDecl))
+		})
+	}
+}