Merge pull request #6083 from jdevillard/enh/tenants/otel-props

[Feat: OTEL + Tenants] : Add TenantId Property to Span
elsa-workflows · Dec 11, 2024 · 06b7ba4 · 06b7ba4
2 parents 9d00466 + 5c3770d
commit 06b7ba4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/modules/Elsa.OpenTelemetry/Middleware/OpenTelemetryTracingActivityExecutionMiddleware.cs b/src/modules/Elsa.OpenTelemetry/Middleware/OpenTelemetryTracingActivityExecutionMiddleware.cs
@@ -29,7 +29,8 @@ public async ValueTask InvokeAsync(ActivityExecutionContext context)
         span.SetTag("activity.type", activity.Type);
         span.SetTag("activity.name", activity.Name);
         span.SetTag("activityInstance.id", context.Id);
-        span.SetTag("activityExecution.startTimeUtc", span.StartTimeUtc);
+        span.SetTag("activityExecution.startTimeUtc", span.StartTimeUtc);
+        span.SetTag("tenantId", context.WorkflowExecutionContext.Workflow.Identity.TenantId);
 
         span.AddEvent(new ActivityEvent("Executing", tags: CreateStatusTags(context)));
 

diff --git a/src/modules/Elsa.OpenTelemetry/Middleware/OpenTelemetryTracingWorkflowExecutionMiddleware.cs b/src/modules/Elsa.OpenTelemetry/Middleware/OpenTelemetryTracingWorkflowExecutionMiddleware.cs
@@ -38,7 +38,8 @@ public override async ValueTask InvokeAsync(WorkflowExecutionContext context)
         span.SetTag("workflowDefinition.definitionId", workflow.Identity.DefinitionId);
         span.SetTag("workflowDefinition.version", workflow.Identity.Version);
         span.SetTag("workflowDefinition.name", workflow.WorkflowMetadata.Name);
-        span.SetTag("workflowExecution.startTimeUtc", span.StartTimeUtc);
+        span.SetTag("workflowExecution.startTimeUtc", span.StartTimeUtc);
+        span.SetTag("tenantId", workflow.Identity.TenantId);
 
         if(context.TriggerActivityId != null)
         {