Skip to content

Commit 199c66e

Browse files
committed
Updated tests, only set baggage if it's in use
1 parent cb3050b commit 199c66e

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/Proto.OpenTelemetry/OpenTelemetryDecorators.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,8 @@ internal static async Task Receive(string source, MessageEnvelope envelope, Acti
313313

314314
var propagationContext = envelope.Header.ExtractPropagationContext();
315315

316-
if (propagationContext.Baggage.Count > 0)
316+
bool hasBaggage = propagationContext.Baggage.Count > 0 || Baggage.Current.Count > 0;
317+
if (hasBaggage)
317318
{
318319
Baggage.Current = propagationContext.Baggage;
319320
}

tests/Proto.OpenTelemetry.Tests/OpenTelemetryTracingTests.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,10 @@ await VerifyTrace(async (tracedRoot, target) =>
188188
await next(context, target, updatedEnvelope);
189189
});
190190
var future = new FutureProcess(middleContext.System);
191+
Baggage.Current = TestBaggage;
191192
middleContext.Request(target, new TraceMe(SendAs.Request), future.Pid);
192193
var response = (MessageEnvelope)await future.Task;
193-
response.Message.Should().Be(new TraceResponse());
194+
response.Message.Should().Be(new TraceResponse(TestBaggage));
194195
}
195196
);
196197

0 commit comments

Comments
 (0)