fix merge conflicts

dreamorosi · dreamorosi · commit 712676a7935a · 2022-10-11T12:16:02.000+02:00
diff --git a/packages/tracer/src/Tracer.ts b/packages/tracer/src/Tracer.ts
@@ -437,7 +437,7 @@ class Tracer extends Utility implements TracerInterface {
         }
 
         const methodName = String(propertyKey);
-        const subsegmentName = options?.subSegmentName ? options.subSegmentName : `### ${propertyKey}`;
+        const subsegmentName = options?.subSegmentName ? options.subSegmentName : `### ${methodName}`;
 
         return tracerRef.provider.captureAsyncFunc(subsegmentName, async subsegment => {
           let result;

Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,7 @@ class Tracer extends Utility implements TracerInterface {`
`437`	`437`	`}`
`438`	`438`
`439`	`439`	`const methodName = String(propertyKey);`
`440`		- const subsegmentName = options?.subSegmentName ? options.subSegmentName : `### ${propertyKey}`;
	`440`	+ const subsegmentName = options?.subSegmentName ? options.subSegmentName : `### ${methodName}`;
`441`	`441`
`442`	`442`	`return tracerRef.provider.captureAsyncFunc(subsegmentName, async subsegment => {`
`443`	`443`	`let result;`