SemianiakaVY/elsa-core
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Remove obsolete tag settings and correct tag schemas

Browse source 
Eliminated redundant `correlationId` tag setting. Adjusted `workflowInstance` and `activityInstance` tag schemas for better clarity. Simplified the processors list in `otel-collector-config.yaml`.
This commit is contained in:
Sipke Schoorstra 2024-10-05 14:12:00 +02:00
parent 54624aea77
commit 078f34fd79
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker/otel-collector-config.yaml
View file

@ -41,7 +41,7 @@ service:
exporters: [ datadog ] exporters: [ datadog ]
traces: traces:
receivers: [ otlp ] receivers: [ otlp ]
processors: [ batch, tail_sampling ] # Added tail_sampling to the main traces pipeline processors: [ batch ] # Added tail_sampling to the main traces pipeline
exporters: [ debug, datadog ] # Directly exporting to debug and datadog exporters: [ debug, datadog ] # Directly exporting to debug and datadog
logs: logs:
receivers: [ otlp ] receivers: [ otlp ]

2
src/modules/Elsa.OpenTelemetry/Middleware/OpenTelemetryTracingActivityExecutionMiddleware.cs
View file

@ -43,7 +43,7 @@ public class OpenTelemetryTracingActivityExecutionMiddleware(ActivityMiddlewareD
span.AddEvent(new ActivityEvent("Faulted", tags: CreateStatusTags(context))); span.AddEvent(new ActivityEvent("Faulted", tags: CreateStatusTags(context)));
span.SetStatus(ActivityStatusCode.Error); span.SetStatus(ActivityStatusCode.Error);
span.SetTag("error", true); span.SetTag("error", true);
span.SetTag("hasIncidents", true); span.SetTag("activityInstance.hasIncidents", true);
var errorMessage = string.IsNullOrWhiteSpace(context.Exception?.Message) ? "Unknown error" : context.Exception.Message; var errorMessage = string.IsNullOrWhiteSpace(context.Exception?.Message) ? "Unknown error" : context.Exception.Message;
span.SetTag("error.message", errorMessage); span.SetTag("error.message", errorMessage);

7
src/modules/Elsa.OpenTelemetry/Middleware/OpenTelemetryTracingWorkflowExecutionMiddleware.cs
View file

@ -35,9 +35,6 @@ public class OpenTelemetryTracingWorkflowExecutionMiddleware(WorkflowMiddlewareD
return; return;
} }
if (!string.IsNullOrWhiteSpace(context.CorrelationId))
span.SetTag("correlationId", context.CorrelationId);
span.SetTag("workflowInstance.id", workflowInstanceId); span.SetTag("workflowInstance.id", workflowInstanceId);
span.SetTag("workflowDefinition.definitionId", workflow.Identity.DefinitionId); span.SetTag("workflowDefinition.definitionId", workflow.Identity.DefinitionId);
span.SetTag("workflowDefinition.version", workflow.Identity.Version); span.SetTag("workflowDefinition.version", workflow.Identity.Version);
@ -61,7 +58,7 @@ public class OpenTelemetryTracingWorkflowExecutionMiddleware(WorkflowMiddlewareD
if(context.Incidents.Any()) if(context.Incidents.Any())
{ {
span.SetStatus(ActivityStatusCode.Error); span.SetStatus(ActivityStatusCode.Error);
span.SetTag("hasIncidents", true); span.SetTag("workflowInstance.hasIncidents", true);
span.SetTag("error", true); span.SetTag("error", true);
if (context.Incidents.Count > 0) if (context.Incidents.Count > 0)
@ -69,7 +66,7 @@ public class OpenTelemetryTracingWorkflowExecutionMiddleware(WorkflowMiddlewareD
} }
if (!string.IsNullOrWhiteSpace(context.CorrelationId)) if (!string.IsNullOrWhiteSpace(context.CorrelationId))
span.SetTag("correlationId", context.CorrelationId); span.SetTag("workflowInstance.correlationId", context.CorrelationId);
var now = systemClock.UtcNow; var now = systemClock.UtcNow;
span.SetTag("workflowExecution.endTimeUtc", now); span.SetTag("workflowExecution.endTimeUtc", now);