Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: continue with origin trace info when pub/sub retry #507

Merged
merged 1 commit into from
Sep 15, 2022
Merged

fix: continue with origin trace info when pub/sub retry #507

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 31 additions & 6 deletions src/SkyApm.Diagnostics.CAP/CapDiagnosticProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,24 @@ public void ErrorPublishStore([Object] CapEventDataPubStore eventData)
[DiagnosticName(CapEvents.BeforePublish)]
public void BeforePublish([Object] CapEventDataPubSend eventData)
{
_localSegmentContextAccessor.Context = _contexts[eventData.TransportMessage.GetId()];

SegmentContext context = null;
var host = eventData.BrokerAddress.Endpoint.Replace("-1", "5672");
var context = _tracingContext.CreateExitSegmentContext(OperateNamePrefix + eventData.Operation + ProducerOperateNameSuffix,
host, new CapCarrierHeaderCollection(eventData.TransportMessage));
if (_contexts.TryGetValue(eventData.TransportMessage.GetId(),out var ctx))
{
_localSegmentContextAccessor.Context = ctx;
context = _tracingContext.CreateExitSegmentContext(OperateNamePrefix + eventData.Operation + ProducerOperateNameSuffix,
host, new CapCarrierHeaderCollection(eventData.TransportMessage));

}
else
{
// may be come from retry loop
var carrierHeader = new CapCarrierHeaderCollection(eventData.TransportMessage);
var eventName = OperateNamePrefix + eventData.Operation + ProducerOperateNameSuffix;
var operationName = OperateNamePrefix + eventName + ConsumerOperateNameSuffix;
context = _tracingContext.CreateEntrySegmentContext(operationName, carrierHeader);
}


context.Span.SpanLayer = SpanLayer.MQ;
context.Span.Component = GetComponent(eventData.BrokerAddress, true);
Expand Down Expand Up @@ -205,9 +218,21 @@ public void CapErrorConsume([Object] CapEventDataSubStore eventData)
[DiagnosticName(CapEvents.BeforeSubscriberInvoke)]
public void CapBeforeSubscriberInvoke([Object] CapEventDataSubExecute eventData)
{
_entrySegmentContextAccessor.Context = _contexts[eventData.Message.GetId() + eventData.Message.GetGroup()];
SegmentContext context = null;
if (_contexts.TryGetValue(eventData.Message.GetId() + eventData.Message.GetGroup(),out var ctx))
{
_entrySegmentContextAccessor.Context = ctx;
context = _tracingContext.CreateLocalSegmentContext("Subscriber Invoke: " + eventData.MethodInfo.Name);
}
else
{
// may be come from retry loop
var carrierHeader = new CapCarrierHeaderCollection(eventData.Message);
var eventName = eventData.Message.GetGroup() + "/" + eventData.Operation;
var operationName = OperateNamePrefix + eventName + ConsumerOperateNameSuffix;
context = _tracingContext.CreateEntrySegmentContext(operationName, carrierHeader);
}

var context = _tracingContext.CreateLocalSegmentContext("Subscriber Invoke: " + eventData.MethodInfo.Name);
context.Span.SpanLayer = SpanLayer.MQ;
context.Span.Component = Components.CAP;
context.Span.AddLog(LogEvent.Event("Subscriber Invoke Start"));
Expand Down