Skip to content

Commit 5b83daf

Browse files
committed
Fix tests
1 parent a0f354d commit 5b83daf

1 file changed

Lines changed: 5 additions & 31 deletions

File tree

tests/Apitally.Tests/ActivityCollectorTests.cs

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void StartCollection_WhenEnabled_ShouldReturnHandleWithTraceId()
3333
}
3434

3535
[Fact]
36-
public void EndCollection_ShouldCollectActivities()
36+
public void EndCollection_ShouldReturnCollectedActivities()
3737
{
3838
var collector = new ActivityCollector(enabled: true);
3939
var source = new ActivitySource("TestSource");
@@ -69,41 +69,15 @@ public void EndCollection_ShouldCollectActivities()
6969
}
7070

7171
[Fact]
72-
public void EndCollection_ShouldNotCollectUnrelatedActivities()
73-
{
74-
var collector = new ActivityCollector(enabled: true);
75-
var source = new ActivitySource("TestSource");
76-
77-
var handle = collector.StartCollection();
78-
var traceId = handle.TraceId;
79-
80-
handle.EndCollection();
81-
82-
var handle2 = collector.StartCollection();
83-
84-
using (var unrelatedActivity = source.StartActivity("Unrelated"))
85-
{
86-
// This activity is started after the first collection ended
87-
}
88-
89-
var activities = handle2.EndCollection();
90-
91-
Assert.NotNull(activities);
92-
Assert.All(activities, a => Assert.NotEqual(traceId, handle2.TraceId));
93-
94-
collector.Dispose();
95-
source.Dispose();
96-
}
97-
98-
[Fact]
99-
public void ActivityData_ShouldHaveCorrectTimestampFormat()
72+
public void ActivityData_ShouldHaveCorrectTimestamps()
10073
{
10174
var collector = new ActivityCollector(enabled: true);
10275

103-
var beforeStart = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() * 1_000_000;
76+
var beforeStart = (DateTimeOffset.UtcNow.Ticks - DateTime.UnixEpoch.Ticks) * 100L;
10477
var handle = collector.StartCollection();
78+
Thread.Sleep(100);
10579
var activities = handle.EndCollection();
106-
var afterEnd = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() * 1_000_000;
80+
var afterEnd = (DateTimeOffset.UtcNow.Ticks - DateTime.UnixEpoch.Ticks) * 100L;
10781

10882
Assert.NotNull(activities);
10983
Assert.Single(activities);

0 commit comments

Comments
 (0)