chore(tool): format generated debugging files (#191)

Author: y1yang0

pkg/instrumentation/helloworld/helloworld_hook.go

@@ -65,6 +65,11 @@ func MyHookAfter(ictx inst.HookContext) {
 
 func MyHook1Before(ictx inst.HookContext, recv interface{}) {
 	println("Before MyStruct.Example()")
+	fmt.Printf("funcName:%s\n", ictx.GetFuncName())
+	fmt.Printf("packageName:%s\n", ictx.GetPackageName())
+	fmt.Printf("paramCount:%d\n", ictx.GetParamCount())
+	fmt.Printf("returnValCount:%d\n", ictx.GetReturnValCount())
+	fmt.Printf("isSkipCall:%t\n", ictx.IsSkipCall())
 }
 
 func MyHook1After(ictx inst.HookContext) {

test/integration/basic_test.go

@@ -27,6 +27,11 @@ func TestBasic(t *testing.T) {
 		"[MyHook]",
 		"=setupOpenTelemetry=",
 		"RawCode",
+		"funcName:Example",
+		"packageName:main",
+		"paramCount:1",
+		"returnValCount:0",
+		"isSkipCall:false",
 	}
 	for _, e := range expect {
 		require.Contains(t, output, e)

tool/internal/ast/primitives.go

@@ -127,7 +127,9 @@ func BoolFalse() *dst.BasicLit {
 }
 
 func InterfaceType() *dst.InterfaceType {
-	return &dst.InterfaceType{Methods: &dst.FieldList{List: nil}}
+	return &dst.InterfaceType{
+		Methods: &dst.FieldList{Opening: true, Closing: true},
+	}
 }
 
 func ArrayType(elem dst.Expr) *dst.ArrayType {

tool/internal/instrument/optimize.go

@@ -139,8 +139,8 @@ func newHookContextImpl(tjump *TJump) dst.Expr {
 	// Build the struct literal: &HookContextImpl{params:..., returnVals:...}
 	return ast.StructLit(
 		structName,
-		ast.KeyValueExpr("params", paramsSlice),
-		ast.KeyValueExpr("returnVals", returnValsSlice),
+		ast.KeyValueExpr(trampolineParamsIdentifier, paramsSlice),
+		ast.KeyValueExpr(trampolineReturnValsIdentifier, returnValsSlice),
 	)
 }
 
@@ -316,7 +316,7 @@ func flattenTJump(tjump *TJump, removedOnExit bool) error {
 
 func stripTJumpLabel(tjump *TJump) {
 	ifStmt := tjump.ifStmt
-	ifStmt.Decs.If = ifStmt.Decs.If[1:]
+	ifStmt.Decs.If = nil
 }
 
 func (ip *InstrumentPhase) optimizeTJumps() error {

tool/internal/instrument/optimize_test.go

@@ -277,23 +277,20 @@ func TestStripTJumpLabel(t *testing.T) {
 		name             string
 		source           string
 		extraDecorations []string
-		expectedAfter    int
 	}{
 		{
 			name: "strips single label",
 			source: `if condition {
 				// do something
 			}`,
 			extraDecorations: []string{"other-decoration"},
-			expectedAfter:    1,
 		},
 		{
 			name: "strips label from multiple decorations",
 			source: `if condition {
 				// do something
 			}`,
 			extraDecorations: []string{"decoration1", "decoration2"},
-			expectedAfter:    2,
 		},
 	}
 
@@ -305,12 +302,8 @@ func TestStripTJumpLabel(t *testing.T) {
 
 			tjump := &TJump{ifStmt: ifStmt}
 
-			initialCount := len(ifStmt.Decs.If)
 			stripTJumpLabel(tjump)
-			finalCount := len(ifStmt.Decs.If)
-
-			assert.Equal(t, tt.expectedAfter, finalCount)
-			assert.Equal(t, initialCount-1, finalCount, "should remove exactly one decoration")
+			assert.Empty(t, ifStmt.Decs.If)
 		})
 	}
 }

tool/internal/instrument/testdata/golden/after-only/after_only.main.go.golden

@@ -15,9 +15,7 @@ func Func1(p1 string, p2 int) (_unnamedRetVal0 float32, _unnamedRetVal1 error) {
 	//line <generated>:1
 	if false {
 	} else {
-		defer OtelAfterTrampoline_Func13335793671(&HookContextImpl3335793671{params: []interface {
-		}{&p1, &p2}, returnVals: []interface {
-		}{&_unnamedRetVal0, &_unnamedRetVal1}}, &_unnamedRetVal0, &_unnamedRetVal1)
+		defer OtelAfterTrampoline_Func13335793671(&HookContextImpl3335793671{params: []interface{}{&p1, &p2}, returnVals: []interface{}{&_unnamedRetVal0, &_unnamedRetVal1}}, &_unnamedRetVal0, &_unnamedRetVal1)
 	}
 	//line main.go:13:2
 	println("Hello, World!")

tool/internal/instrument/testdata/golden/method-receiver/method_receiver.main.go.golden

@@ -164,8 +164,7 @@ func OtelAfterTrampoline_Func12501994857(hookContext HookContext, arg0 *float32,
 }
 
 //go:linkname H3Before testdata.H3Before
-func H3Before(hookContext HookContext, recv0 interface {
-}, param1 string, param2 int)
+func H3Before(hookContext HookContext, recv0 interface{}, param1 string, param2 int)
 
 //go:linkname H3After testdata.H3After
 func H3After(hookContext HookContext, arg0 float32, arg1 error)

tool/internal/setup/setup.go

@@ -81,7 +81,6 @@ func Setup(ctx context.Context, args []string) error {
 	if err != nil {
 		return err
 	}
-	sp.Info("Setup completed successfully")
 	return nil
 }
 
@@ -143,9 +142,12 @@ func GoBuild(ctx context.Context, args []string) error {
 	if err != nil {
 		return err
 	}
+	logger.InfoContext(ctx, "Setup completed successfully")
+
 	err = BuildWithToolexec(ctx, args)
 	if err != nil {
 		return err
 	}
+	logger.InfoContext(ctx, "Instrumentation completed successfully")
 	return nil
 }