Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -358,4 +358,7 @@ test/Elastic.Apm.Feature.Tests/SpecFlow/userid

# Azurite
__azurite_*
__blobstorage__
__blobstorage__

# C# Dev Kit
*.lscache
4 changes: 2 additions & 2 deletions src/Elastic.Apm/AgentComponents.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ internal AgentComponents(
// Initialize early because ServerInfoCallback requires it and might execute
// before EnsureElasticActivityStarted runs
#if NET || NETSTANDARD2_1
ElasticActivityListener = new ElasticActivityListener(this, HttpTraceConfiguration);
ElasticActivityListener = new ElasticActivityListener(this);

// Ensure we have a listener so that transaction activities are created when the OTel bridge is disabled
if (!Configuration.OpenTelemetryBridgeEnabled && !Transaction.ElasticApmActivitySource.HasListeners())
Expand Down Expand Up @@ -251,7 +251,7 @@ internal static IApmLogger GetGlobalLogger(IApmLogger fallbackLogger, LogLevel a
}

#if NET || NETSTANDARD2_1
private ElasticActivityListener ElasticActivityListener { get; }
internal ElasticActivityListener ElasticActivityListener { get; }
#endif

internal ICentralConfigurationFetcher CentralConfigurationFetcher { get; }
Expand Down
2 changes: 1 addition & 1 deletion src/Elastic.Apm/DiagnosticListeners/KnownListeners.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ internal static class KnownListeners
public const string SystemNetHttpDesktopHttpRequestOut = "System.Net.Http.Desktop.HttpRequestOut";
public const string ApmTransactionActivityName = "ElasticApm.Transaction";

public static HashSet<string> SkippedActivityNamesSet =>
public static readonly HashSet<string> SkippedActivityNamesSet =
[
MicrosoftAspNetCoreHostingHttpRequestIn,
SystemNetHttpHttpRequestOut,
Expand Down
Loading
Loading