Merge pull request #10 from budougumi0617/use_struct_name

✨ use struct name in segment name
budougumi0617 · Jan 12, 2021 · 00ad0f3 · 00ad0f3
2 parents 7dacf04 + 7d968e3
commit 00ad0f3
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -33,9 +33,9 @@ import (
   "net/http"
 )
 
-type S struct{}
+type FooBar struct{}
 
-func (s *S) SampleMethod(ctx context.Context) {
+func (f *FooBar) SampleMethod(ctx context.Context) {
   fmt.Println("Hello, playground")
   fmt.Println("end function")
 }
@@ -68,10 +68,10 @@ import (
   "github.com/newrelic/go-agent/v3/newrelic"
 )
 
-type S struct{}
+type FooBar struct{}
 
-func (s *S) SampleMethod(ctx context.Context) {
-  defer newrelic.FromContext(ctx).StartSegment("sample_method").End()
+func (f *FooBar) SampleMethod(ctx context.Context) {
+  defer newrelic.FromContext(ctx).StartSegment("foo_bar_sample_method").End()
   fmt.Println("Hello, playground")
   fmt.Println("end function")
 }

diff --git a/process.go b/process.go
@@ -40,7 +40,20 @@ func Process(filename string, src []byte) ([]byte, error) {
 				return false
 			}
 			if fd.Body != nil {
+				var prefix string
+				if fd.Recv != nil && len(fd.Recv.List) > 0 {
+					if rn, ok := fd.Recv.List[0].Type.(*ast.StarExpr); ok {
+						if idt, ok := rn.X.(*ast.Ident); ok {
+							prefix = genSegName(idt.Name)
+						}
+					} else if idt, ok := fd.Recv.List[0].Type.(*ast.Ident); ok {
+						prefix = genSegName(idt.Name)
+					}
+				}
 				sn := genSegName(fd.Name.Name)
+				if len(prefix) != 0 {
+					sn = prefix + "_" + sn
+				}
 				vn, t := parseParams(fd.Type)
 				var ds ast.Stmt
 				switch t {

diff --git a/process_test.go b/process_test.go
@@ -24,9 +24,16 @@ import (
 	"net/http"
 )
 
-type S struct{}
+type Foo struct{}
 
-func (s *S) SampleMethod(ctx context.Context) {
+func (f *Foo) SampleMethod(ctx context.Context) {
+	fmt.Println("Hello, playground")
+	fmt.Println("end function")
+}
+
+type BarBar struct{}
+
+func (b BarBar) BazMethod(ctx context.Context) {
 	fmt.Println("Hello, playground")
 	fmt.Println("end function")
 }
@@ -54,10 +61,18 @@ import (
 	"github.com/newrelic/go-agent/v3/newrelic"
 )
 
-type S struct{}
+type Foo struct{}
 
-func (s *S) SampleMethod(ctx context.Context) {
-	defer newrelic.FromContext(ctx).StartSegment("sample_method").End()
+func (f *Foo) SampleMethod(ctx context.Context) {
+	defer newrelic.FromContext(ctx).StartSegment("foo_sample_method").End()
+	fmt.Println("Hello, playground")
+	fmt.Println("end function")
+}
+
+type BarBar struct{}
+
+func (b BarBar) BazMethod(ctx context.Context) {
+	defer newrelic.FromContext(ctx).StartSegment("bar_bar_baz_method").End()
 	fmt.Println("Hello, playground")
 	fmt.Println("end function")
 }
@@ -117,7 +132,7 @@ import (
 type S struct{}
 
 func (s *S) SampleMethod(ctx context.Context) {
-	defer newrelic.FromContext(ctx).StartSegment("sample_method").End()
+	defer newrelic.FromContext(ctx).StartSegment("s_sample_method").End()
 	fmt.Println("Hello, playground")
 }
 

diff --git a/testdata/want/basic.go b/testdata/want/basic.go
@@ -11,7 +11,7 @@ import (
 type S struct{}
 
 func (s *S) SampleMethod(ctx context.Context) {
-	defer newrelic.FromContext(ctx).StartSegment("sample_method").End()
+	defer newrelic.FromContext(ctx).StartSegment("s_sample_method").End()
 	fmt.Println("Hello, playground")
 	fmt.Println("end function")
 }