@@ -7,8 +7,8 @@ namespace Elastic.CommonSchema.NLog
7
7
/// </summary>
8
8
internal static class ActivityExtensions
9
9
{
10
- private static readonly ActivitySpanId EmptySpanId = default ;
11
- private static readonly ActivityTraceId EmptyTraceId = default ;
10
+ private static readonly string EmptySpanIdToHexString = default ( System . Diagnostics . ActivitySpanId ) . ToHexString ( ) ;
11
+ private static readonly string EmptyTraceIdToHexString = default ( System . Diagnostics . ActivityTraceId ) . ToHexString ( ) ;
12
12
13
13
public static string GetSpanId ( this Activity activity ) =>
14
14
activity . IdFormat == ActivityIdFormat . W3C ?
@@ -27,25 +27,20 @@ public static string GetParentId(this Activity activity) =>
27
27
28
28
private static string SpanIdToHexString ( ActivitySpanId spanId )
29
29
{
30
- if ( EmptySpanId . Equals ( spanId ) )
30
+ var spanIdString = spanId . ToHexString ( ) ;
31
+ if ( ReferenceEquals ( EmptySpanIdToHexString , spanIdString ) )
31
32
return string . Empty ;
32
-
33
- var spanHexString = spanId . ToHexString ( ) ;
34
- if ( ReferenceEquals ( spanHexString , EmptySpanId . ToHexString ( ) ) )
35
- return string . Empty ;
36
-
37
- return spanHexString ;
33
+ else
34
+ return spanIdString ;
38
35
}
39
36
40
37
private static string TraceIdToHexString ( ActivityTraceId traceId )
41
38
{
42
- if ( EmptyTraceId . Equals ( traceId ) )
39
+ var traceIdString = traceId . ToHexString ( ) ;
40
+ if ( ReferenceEquals ( EmptyTraceIdToHexString , traceIdString ) )
43
41
return string . Empty ;
44
-
45
- var traceHexString = traceId . ToHexString ( ) ;
46
- return ReferenceEquals ( traceHexString , EmptyTraceId . ToHexString ( ) )
47
- ? string . Empty
48
- : traceHexString ;
42
+ else
43
+ return traceIdString ;
49
44
}
50
45
}
51
46
}
0 commit comments