@@ -148,21 +148,21 @@ function createWrapCreateHandler(tracer: api.Tracer, moduleVersion?: string) {
148
148
) {
149
149
arguments [ 1 ] = createWrapHandler ( tracer , moduleVersion , callback ) ;
150
150
const handler = original . apply ( this , arguments as any ) ;
151
+ const callbackName = callback . name ;
152
+ const instanceName =
153
+ instance . constructor && instance . constructor . name
154
+ ? instance . constructor . name
155
+ : 'UnnamedInstance' ;
156
+ const spanName = callbackName
157
+ ? `${ instanceName } .${ callbackName } `
158
+ : instanceName ;
159
+
151
160
return function (
152
161
this : any ,
153
162
req : any ,
154
163
res : any ,
155
164
next : ( ...args : any [ ] ) => unknown
156
165
) {
157
- const callbackName = callback . name ;
158
- const instanceName =
159
- instance . constructor && instance . constructor . name
160
- ? instance . constructor . name
161
- : 'UnnamedInstance' ;
162
- const spanName = callbackName
163
- ? `${ instanceName } .${ callbackName } `
164
- : instanceName ;
165
-
166
166
const span = tracer . startSpan ( spanName , {
167
167
attributes : {
168
168
...Instrumentation . COMMON_ATTRIBUTES ,
@@ -197,15 +197,17 @@ function createWrapHandler(
197
197
moduleVersion : string | undefined ,
198
198
handler : Function
199
199
) {
200
+ const spanName = handler . name || 'anonymous nest handler' ;
201
+ const options = {
202
+ attributes : {
203
+ ...Instrumentation . COMMON_ATTRIBUTES ,
204
+ [ AttributeNames . VERSION ] : moduleVersion ,
205
+ [ AttributeNames . TYPE ] : NestType . REQUEST_HANDLER ,
206
+ [ AttributeNames . CALLBACK ] : handler . name ,
207
+ } ,
208
+ } ;
200
209
const wrappedHandler = function ( this : RouterExecutionContext ) {
201
- const span = tracer . startSpan ( handler . name || 'anonymous nest handler' , {
202
- attributes : {
203
- ...Instrumentation . COMMON_ATTRIBUTES ,
204
- [ AttributeNames . VERSION ] : moduleVersion ,
205
- [ AttributeNames . TYPE ] : NestType . REQUEST_HANDLER ,
206
- [ AttributeNames . CALLBACK ] : handler . name ,
207
- } ,
208
- } ) ;
210
+ const span = tracer . startSpan ( spanName , options ) ;
209
211
const spanContext = api . trace . setSpan ( api . context . active ( ) , span ) ;
210
212
211
213
return api . context . with ( spanContext , async ( ) => {
0 commit comments