github-actions[bot]
commented
1 week ago Snapshots difference summary
The following differences have been observed in committed snapshots. It is meant to help the reviewer. The diff is simplistic, so please check some files anyway while we improve it.
1 occurrences of :
+ },
+ {
+ TraceId: Id_60,
+ SpanId: Id_61,
+ Name: internal,
+ Resource: TimeParent,
+ Service: Samples.NetActivitySdk,
+ Type: custom,
+ Tags: {
+ env: integration_tests,
+ language: dotnet,
+ otel.status_code: STATUS_CODE_UNSET,
+ runtime-id: Guid_2,
+ span.kind: internal,
+ version: 1.0.0
+ },
+ Metrics: {
+ process_id: 0,
+ _dd.top_level: 1.0,
+ _dd.tracer_kr: 1.0,
+ _sampling_priority_v1: 1.0
+ }
+ },
+ {
+ TraceId: Id_60,
+ SpanId: Id_62,
+ Name: internal,
+ Resource: TimeTrigger,
+ Service: Samples.NetActivitySdk,
+ Type: custom,
+ ParentId: Id_61,
+ Tags: {
+ env: integration_tests,
+ language: dotnet,
+ otel.status_code: STATUS_CODE_UNSET,
+ span.kind: internal,
+ version: 1.0.0
+ }
+ },
+ {
+ TraceId: Id_60,
+ SpanId: Id_63,
+ Name: internal,
+ Resource: TimeChild,
+ Service: Samples.NetActivitySdk,
+ Type: custom,
+ ParentId: Id_62,
+ Tags: {
+ env: integration_tests,
+ language: dotnet,
+ otel.status_code: STATUS_CODE_UNSET,
+ span.kind: internal,
+ version: 1.0.0
+ }
datadog-ddstaging[bot]
andrewlock
bouwkast
Summary of changes
This makes it so that we validate that the
Activityobject is in W3C format (by checking that theActivityhas a SpanID and TraceID after it stars) if we are updating the SpanId and TraceId.Note that for this to happen the
Activityneeds to be a non-W3C format and it's start time must be less than the Datadog Active Span start time. This start time issue can happen as anActivitycan modify its start time after it is started and we don't update the created Datadog span with that new information.Reason for change
T fixes an edge case where an
Activityobject could be in a non-W3C format and hit this code resulting in itsIdbeing erroneously set tonullcausing aNullReferenceExceptionfor us (workaround in #5690), but could have also thrown if anyone accessed thatIdand attempted to make a call on it.Implementation details
Check to ensure that the
Activityis in W3C format - this is done by just checking that it already has a Span Id and Trace Id.Test coverage
Added tests to
Samples.NetActivitySdk, theRunManuallyUpdatedStartTime()would fail and throw an exception.Other details
Should consider handling instances where users update the start time of the
Activityand update the DatadogSpanaccordingly.