From 9b9fa9093d8b1821b71f20c4eafa09f2da9b31c2 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Fri, 29 Nov 2024 15:59:28 +0000 Subject: [PATCH] update tests --- src/Elastic.Apm/Api/Tracer.cs | 10 ++++++---- .../HelpersTests/PlatformDetectionTests.cs | 13 ++++++------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/Elastic.Apm/Api/Tracer.cs b/src/Elastic.Apm/Api/Tracer.cs index dce255cc9..416e1c803 100644 --- a/src/Elastic.Apm/Api/Tracer.cs +++ b/src/Elastic.Apm/Api/Tracer.cs @@ -23,7 +23,7 @@ internal class Tracer : ITracer private readonly IConfigurationSnapshotProvider _configurationProvider; private readonly IApmLogger _logger; private readonly IPayloadSender _sender; - private readonly Service _service; + private readonly BreakdownMetricsProvider _breakdownMetricsProvider; public Tracer( @@ -37,13 +37,14 @@ BreakdownMetricsProvider breakdownMetricsProvider ) { _logger = logger?.Scoped(nameof(Tracer)); - _service = service; _sender = payloadSender.ThrowIfArgumentNull(nameof(payloadSender)); _configurationProvider = configurationProvider.ThrowIfArgumentNull(nameof(configurationProvider)); - CurrentExecutionSegmentsContainer = currentExecutionSegmentsContainer.ThrowIfArgumentNull(nameof(currentExecutionSegmentsContainer)); - DbSpanCommon = new DbSpanCommon(logger); _apmServerInfo = apmServerInfo; _breakdownMetricsProvider = breakdownMetricsProvider; + + CurrentExecutionSegmentsContainer = currentExecutionSegmentsContainer.ThrowIfArgumentNull(nameof(currentExecutionSegmentsContainer)); + DbSpanCommon = new DbSpanCommon(logger); + Service = service; } internal ICurrentExecutionSegmentsContainer CurrentExecutionSegmentsContainer { get; } @@ -53,6 +54,7 @@ BreakdownMetricsProvider breakdownMetricsProvider public ITransaction CurrentTransaction => CurrentExecutionSegmentsContainer.CurrentTransaction; public DbSpanCommon DbSpanCommon { get; } + internal Service Service { get; } public ITransaction StartTransaction(string name, string type, DistributedTracingData distributedTracingData = null, bool ignoreActivity = false, IEnumerable links = null diff --git a/test/Elastic.Apm.Tests/HelpersTests/PlatformDetectionTests.cs b/test/Elastic.Apm.Tests/HelpersTests/PlatformDetectionTests.cs index b8c7f8e33..274a986fa 100644 --- a/test/Elastic.Apm.Tests/HelpersTests/PlatformDetectionTests.cs +++ b/test/Elastic.Apm.Tests/HelpersTests/PlatformDetectionTests.cs @@ -19,24 +19,23 @@ public class PlatformDetectionTests [Fact] public void RuntimeName() { - var mockPayloadSender = new MockPayloadSender(); - using (var agent = new ApmAgent(new TestAgentComponents(payloadSender: mockPayloadSender))) - agent.Tracer.CaptureTransaction("TestTransaction", "Test", () => { }); + var mockPayloadSender = new NoopPayloadSender(); + using var agent = new ApmAgent(new TestAgentComponents(payloadSender: mockPayloadSender)); switch (RuntimeInformation.FrameworkDescription) { case { } str when str.StartsWith(Runtime.MonoName, StringComparison.OrdinalIgnoreCase): - mockPayloadSender.FirstTransaction.Context.Service.Runtime.Name.Should().Be(Runtime.MonoName); + agent.Service.Runtime.Name.Should().Be(Runtime.MonoName); break; case { } str when str.StartsWith(Runtime.DotNetFullFrameworkName, StringComparison.OrdinalIgnoreCase): - mockPayloadSender.FirstTransaction.Context.Service.Runtime.Name.Should().Be(Runtime.DotNetFullFrameworkName); + agent.Service.Runtime.Name.Should().Be(Runtime.DotNetFullFrameworkName); break; case { } str when str.StartsWith(Runtime.DotNetCoreName, StringComparison.OrdinalIgnoreCase): - mockPayloadSender.FirstTransaction.Context.Service.Runtime.Name.Should().Be(Runtime.DotNetCoreName); + agent.Service.Runtime.Name.Should().Be(Runtime.DotNetCoreName); break; case { } str when str.StartsWith(Runtime.DotNetName, StringComparison.OrdinalIgnoreCase) && !str.StartsWith(Runtime.DotNetFullFrameworkName, StringComparison.OrdinalIgnoreCase): - mockPayloadSender.FirstTransaction.Context.Service.Runtime.Name.Should().Be(Runtime.DotNetName + $" {RuntimeInformation.FrameworkDescription.Substring(5).Split('.')[0]}"); + agent.Service.Runtime.Name.Should().Be(Runtime.DotNetName + $" {RuntimeInformation.FrameworkDescription.Substring(5).Split('.')[0]}"); break; } }