Skip to content

Commit 665cafa

Browse files
refactor: change MutateParentId signature
1 parent 89dca2e commit 665cafa

File tree

4 files changed

+10
-14
lines changed

4 files changed

+10
-14
lines changed

samples/ApiGatewayHttpApiV2Tracing/Voxel.MiddyNet.HttpApiV2TracingSample/ApiGatewayHttpApiV2Tracing.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@ protected override Task<APIGatewayHttpApiV2ProxyResponse> Handle(APIGatewayHttpA
2121

2222
//If you need to call another system, you need to obtain a traceparent based on the original traceparent
2323
//received but with the ParentId changed
24-
var currentTraceparent = context.AdditionalContext["traceparent"].ToString();
25-
var currentTracestate = context.AdditionalContext["tracestate"].ToString();
26-
var newTraceContext = TraceContext.MutateParentId(currentTraceparent, currentTracestate);
27-
24+
var currentTraceContext = (TraceContext)context.AdditionalContext["TraceContext"];
25+
var newTraceContext = TraceContext.MutateParentId(currentTraceContext);
2826

2927
//Now you can use this newTraceContext in your calls
30-
var traceparentForTheCallToAnotherSystem = newTraceContext.TraceParent;
31-
var tracestateForTheCallToAnotherSystem = newTraceContext.TraceState;
28+
var traceparentForCallingAnotherSystem = newTraceContext.TraceParent;
29+
var tracestateForCallingAnotherSystem = newTraceContext.TraceState;
3230

3331
return Task.FromResult(new APIGatewayHttpApiV2ProxyResponse
3432
{

samples/ApiGatewayTracing/Voxel.MiddyNet.ApiGatewayTracingSample/ApiGatewayTracing.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@ protected override Task<APIGatewayProxyResponse> Handle(APIGatewayProxyRequest p
2121

2222
//If you need to call another system, you need to obtain a traceparent based on the original traceparent
2323
//received but with the ParentId changed
24-
var currentTraceparent = context.AdditionalContext["traceparent"].ToString();
25-
var currentTracestate = context.AdditionalContext["tracestate"].ToString();
26-
var newTraceContext = TraceContext.MutateParentId(currentTraceparent, currentTracestate);
24+
var currentTraceContext = (TraceContext)context.AdditionalContext["TraceContext"];
25+
var newTraceContext = TraceContext.MutateParentId(currentTraceContext);
2726

2827
//Now you can use this newTraceContext in your calls
29-
var traceparentForTheCallToAnotherSystem = newTraceContext.TraceParent;
30-
var tracestateForTheCallToAnotherSystem = newTraceContext.TraceState;
28+
var traceparentForCallingAnotherSystem = newTraceContext.TraceParent;
29+
var tracestateForCallingAnotherSystem = newTraceContext.TraceState;
3130

3231
return Task.FromResult(new APIGatewayProxyResponse
3332
{

src/Voxel.MiddyNet.Tracing.Core/TraceContext.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,8 @@ private static string RandomString(int length)
9393
.Select(s => s[random.Next(s.Length)]).ToArray());
9494
}
9595

96-
public static TraceContext MutateParentId(string traceparent, string tracestate)
96+
public static TraceContext MutateParentId(TraceContext traceContext)
9797
{
98-
var traceContext = Handle(traceparent, tracestate);
9998
return new TraceContext(traceContext.version, traceContext.TraceId, RandomString(16), traceContext.traceFlags, traceContext.TraceState);
10099
}
101100
}

test/Voxel.MiddyNet.Tracing.Core.Tests/TraceContextShould.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void ObtainANewTraceContextWithTheParentIdChanged()
7575
{
7676
var traceContext = TraceContext.Handle("00-12345678901234567890123456789012-1234567890123456-00", "a trace state");
7777

78-
var newTraceContext = TraceContext.MutateParentId(traceContext.TraceParent, traceContext.TraceState);
78+
var newTraceContext = TraceContext.MutateParentId(traceContext);
7979

8080
var splitTraceContext = newTraceContext.TraceParent.Split('-');
8181
splitTraceContext[0].Should().Be("00");

0 commit comments

Comments
 (0)