Skip to content

Commit

Permalink
Add OverwriteDiscoverDefaultServiceName configuration item
Browse files Browse the repository at this point in the history
  • Loading branch information
rfavreau committed Apr 1, 2024
1 parent 0faa54d commit 1c29919
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ public ConfigurationKeyValue Lookup(ConfigurationOption option) =>
public int MaxQueueEventCount => _mainConfiguration.MaxQueueEventCount;

public double MetricsIntervalInMilliseconds => _mainConfiguration.MetricsIntervalInMilliseconds;

public bool OverwriteDiscoverDefaultServiceName => _mainConfiguration.OverwriteDiscoverDefaultServiceName;

public bool Recording => _dynamicConfiguration?.Recording ?? _mainConfiguration.Recording;

public IReadOnlyList<WildcardMatcher> SanitizeFieldNames => _dynamicConfiguration?.SanitizeFieldNames ?? _mainConfiguration.SanitizeFieldNames;
Expand Down
1 change: 1 addition & 0 deletions src/Elastic.Apm/Config/ConfigConsts.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public static class DefaultValues
public const int MaxQueueEventCount = 1000;
public const string MetricsInterval = "30s";
public const double MetricsIntervalInMilliseconds = 30 * 1000;
public const bool OverwriteDiscoverDefaultServiceName = true;
public const bool SpanCompressionEnabled = true;
public const string SpanCompressionExactMatchMaxDuration = "50ms";
public const double SpanCompressionExactMatchMaxDurationInMilliseconds = 50;
Expand Down
4 changes: 4 additions & 0 deletions src/Elastic.Apm/Config/ConfigurationOption.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ public enum ConfigurationOption
MaxQueueEventCount,
/// <inheritdoc cref="IConfigurationReader.MetricsIntervalInMilliseconds"/>
MetricsInterval,
/// <inheritdoc cref="IConfigurationReader.OverwriteDiscoverDefaultServiceName"/>
OverwriteDiscoverDefaultServiceName,
/// <inheritdoc cref="IConfigurationReader.Recording"/>
Recording,
/// <inheritdoc cref="IConfigurationReader.SanitizeFieldNames"/>
Expand Down Expand Up @@ -160,6 +162,7 @@ public static string ToEnvironmentVariable(this ConfigurationOption option) =>
MaxBatchEventCount => EnvPrefix + "MAX_BATCH_EVENT_COUNT",
MaxQueueEventCount => EnvPrefix + "MAX_QUEUE_EVENT_COUNT",
MetricsInterval => EnvPrefix + "METRICS_INTERVAL",
OverwriteDiscoverDefaultServiceName => EnvPrefix + "OVERWRITE_DISCOVER_DEFAULT_SERVICE_NAME",
Recording => EnvPrefix + "RECORDING",
SanitizeFieldNames => EnvPrefix + "SANITIZE_FIELD_NAMES",
SecretToken => EnvPrefix + "SECRET_TOKEN",
Expand Down Expand Up @@ -212,6 +215,7 @@ public static string ToConfigKey(this ConfigurationOption option) =>
MaxBatchEventCount => KeyPrefix + nameof(MaxBatchEventCount),
MaxQueueEventCount => KeyPrefix + nameof(MaxQueueEventCount),
MetricsInterval => KeyPrefix + nameof(MetricsInterval),
OverwriteDiscoverDefaultServiceName => KeyPrefix + nameof(OverwriteDiscoverDefaultServiceName),
Recording => KeyPrefix + nameof(Recording),
SanitizeFieldNames => KeyPrefix + nameof(SanitizeFieldNames),
SecretToken => KeyPrefix + nameof(SecretToken),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ IConfigurationEnvironmentValueProvider environmentValueProvider
MaxBatchEventCount = ParseMaxBatchEventCount(Lookup(ConfigurationOption.MaxBatchEventCount));
MaxQueueEventCount = ParseMaxQueueEventCount(Lookup(ConfigurationOption.MaxQueueEventCount));
MetricsIntervalInMilliseconds = ParseMetricsInterval(Lookup(MetricsInterval));
OverwriteDiscoverDefaultServiceName = ParseRecording(Lookup(ConfigurationOption.OverwriteDiscoverDefaultServiceName));
Recording = ParseRecording(Lookup(ConfigurationOption.Recording));
SanitizeFieldNames = ParseSanitizeFieldNames(Lookup(ConfigurationOption.SanitizeFieldNames));
SecretToken = ParseSecretToken(Lookup(ConfigurationOption.SecretToken));
Expand Down Expand Up @@ -195,6 +196,8 @@ public ConfigurationKeyValue Lookup(ConfigurationOption option) =>

public double MetricsIntervalInMilliseconds { get; }

public bool OverwriteDiscoverDefaultServiceName { get; }

public bool Recording { get; }

public IReadOnlyList<WildcardMatcher> SanitizeFieldNames { get; }
Expand Down
8 changes: 8 additions & 0 deletions src/Elastic.Apm/Config/IConfigurationReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,14 @@ public interface IConfigurationReader : IConfigurationDescription, IConfiguratio

double MetricsIntervalInMilliseconds { get; }

/// <summary>
/// Overwrite the discover default service name by the Azure Functions name.
/// </summary>
/// <remarks>
/// This option is only used during the setup of Azure Functions agent
/// </remarks>
bool OverwriteDiscoverDefaultServiceName { get; }

/// <summary>
/// Whether the agent is recording.
/// When set to <c>true</c>. the agent instruments and capture requests, tracks errors, and
Expand Down

0 comments on commit 1c29919

Please sign in to comment.