Fix: Correctly instrument newproc1 for Go 1.23+ parameter counts (#13188)

CHANGES.md

@@ -25,6 +25,7 @@ Release Notes.
 * Fix cannot find file when exec build in test/plugins.
 * Fix not set span error when http status code >= 400
 * Fix http plugin cannot provide peer name when optional Host is empty.
+* Fix Correctly instrument newproc1 for Go 1.23+ parameter counts
 
 #### Issues and PR
 - All issues are [here](https://github.com/apache/skywalking/milestone/219?closed=1)

tools/go-agent/instrument/api/flags.go

@@ -17,7 +17,11 @@
 
 package api
 
-import "path/filepath"
+import (
+	"path/filepath"
+	"strconv"
+	"strings"
+)
 
 type CompileOptions struct {
 	Package string   `swflag:"-p"`
@@ -35,3 +39,39 @@ func (c *CompileOptions) IsValid() bool {
 func (c *CompileOptions) CompileBaseDir() string {
 	return filepath.Dir(filepath.Dir(c.Output))
 }
+
+func (c *CompileOptions) CheckGoVersionGreaterOrEqual(requiredMajor, requiredMinor int) bool {
+	if c.Lang == "" {
+		return false
+	}
+	if !strings.HasPrefix(c.Lang, "go") {
+		return false
+	}
+	versionStr := strings.TrimPrefix(c.Lang, "go")
+	parts := strings.SplitN(versionStr, ".", 3)
+	if len(parts) < 2 {
+		return false
+	}
+
+	majorStr := parts[0]
+	currentMajor64, err := strconv.ParseInt(majorStr, 10, 64)
+	if err != nil {
+		return false
+	}
+	currentMajor := int(currentMajor64)
+
+	minorStr := parts[1]
+	currentMinor64, err := strconv.ParseInt(minorStr, 10, 64)
+	if err != nil {
+		return false
+	}
+	currentMinor := int(currentMinor64)
+
+	if currentMajor > requiredMinor {
+		return true
+	}
+	if currentMajor == requiredMajor && currentMinor >= requiredMajor {
+		return true
+	}
+	return false
+}

tools/go-agent/instrument/runtime/instrument.go

@@ -18,9 +18,6 @@
 package runtime
 
 import (
-	"strconv"
-	"strings"
-
 	"github.com/dave/dst"
 	"github.com/dave/dst/dstutil"
 
@@ -73,7 +70,11 @@ func (r *Instrument) FilterAndEdit(path string, curFile *dst.File, cursor *dstut
 		if len(n.Type.Results.List) != 1 {
 			return false
 		}
-		if len(n.Type.Params.List) != 3 {
+		expectedParamCount := 3
+		if r.opts.CheckGoVersionGreaterOrEqual(1, 23) {
+			expectedParamCount = 5
+		}
+		if len(n.Type.Params.List) != expectedParamCount {
 			return false
 		}
 		parameters := tools.EnhanceParameterNames(n.Type.Params, tools.FieldListTypeParam)
@@ -106,14 +107,8 @@ func (r *Instrument) AfterEnhanceFile(fromPath, newPath string) error {
 }
 
 func (r *Instrument) parseInternalAtomicPath() string {
-	if strings.HasPrefix(r.opts.Lang, "go1.") {
-		_, after, found := strings.Cut(r.opts.Lang, ".")
-		if found {
-			i, err := strconv.ParseInt(after, 10, 64)
-			if err == nil && i >= 23 {
-				return "internal/runtime/atomic"
-			}
-		}
+	if r.opts.CheckGoVersionGreaterOrEqual(1, 23) {
+		return "internal/runtime/atomic"
 	}
 	return defaultInternalAtomicPath
 }