Merge branch 'master' into trace-context

undefinedlabs · Mar 24, 2020 · 357af70 · 357af70
2 parents d624e51 + cd8fc09
commit 357af70
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 1 deletion.
diff --git a/agent/agent.go b/agent/agent.go
@@ -60,7 +60,7 @@ type (
 )
 
 var (
-	version = "0.1.14-pre1"
+	version = "0.1.15-pre1"
 
 	testingModeFrequency    = time.Second
 	nonTestingModeFrequency = time.Minute

diff --git a/instrumentation/testing/logger.go b/instrumentation/testing/logger.go
@@ -53,13 +53,15 @@ func UnpatchTestingLogger() {
 
 func patchError() {
 	patch("Error", func(test *Test, argsValues []reflect.Value) {
+		test.t.Helper()
 		args := getArgs(argsValues[0])
 		test.Error(args...)
 	})
 }
 
 func patchErrorf() {
 	patch("Errorf", func(test *Test, argsValues []reflect.Value) {
+		test.t.Helper()
 		format := argsValues[0].String()
 		args := getArgs(argsValues[1])
 		test.Errorf(format, args...)
@@ -68,13 +70,15 @@ func patchErrorf() {
 
 func patchFatal() {
 	patch("Fatal", func(test *Test, argsValues []reflect.Value) {
+		test.t.Helper()
 		args := getArgs(argsValues[0])
 		test.Fatal(args...)
 	})
 }
 
 func patchFatalf() {
 	patch("Fatalf", func(test *Test, argsValues []reflect.Value) {
+		test.t.Helper()
 		format := argsValues[0].String()
 		args := getArgs(argsValues[1])
 		test.Fatalf(format, args...)
@@ -83,13 +87,15 @@ func patchFatalf() {
 
 func patchLog() {
 	patch("Log", func(test *Test, argsValues []reflect.Value) {
+		test.t.Helper()
 		args := getArgs(argsValues[0])
 		test.Log(args...)
 	})
 }
 
 func patchLogf() {
 	patch("Logf", func(test *Test, argsValues []reflect.Value) {
+		test.t.Helper()
 		format := argsValues[0].String()
 		args := getArgs(argsValues[1])
 		test.Logf(format, args...)
@@ -98,13 +104,15 @@ func patchLogf() {
 
 func patchSkip() {
 	patch("Skip", func(test *Test, argsValues []reflect.Value) {
+		test.t.Helper()
 		args := getArgs(argsValues[0])
 		test.Skip(args...)
 	})
 }
 
 func patchSkipf() {
 	patch("Skipf", func(test *Test, argsValues []reflect.Value) {
+		test.t.Helper()
 		format := argsValues[0].String()
 		args := getArgs(argsValues[1])
 		test.Skipf(format, args...)
@@ -141,6 +149,13 @@ func patch(methodName string, methodBody func(test *Test, argsValues []reflect.V
 			instrumentation.Logger().Println("testing.T is nil")
 			return nil
 		}
+
+		t.Helper()
+		reflection.AddToHelpersMap(t, []string{
+			"reflect.callReflect",
+			"reflect.makeFuncStub",
+		})
+
 		test := GetTest(t)
 		if test == nil {
 			instrumentation.Logger().Printf("test struct for %v doesn't exist\n", t.Name())

diff --git a/reflection/reflect.go b/reflection/reflect.go
@@ -35,6 +35,25 @@ func GetTestMutex(t *testing.T) *sync.RWMutex {
 	return nil
 }
 
+func AddToHelpersMap(t *testing.T, frameFnNames []string) {
+	t.Helper()
+	mu := GetTestMutex(t)
+	if mu != nil {
+		mu.Lock()
+		defer mu.Unlock()
+	}
+
+	pointer, err := GetFieldPointerOf(t, "helpers")
+	if err != nil {
+		return
+	}
+
+	helpers := *(*map[string]struct{})(pointer)
+	for _, fnName := range frameFnNames {
+		helpers[fnName] = struct{}{}
+	}
+}
+
 func GetIsParallel(t *testing.T) bool {
 	mu := GetTestMutex(t)
 	if mu != nil {