diff --git a/src/Elastic.OpenTelemetry/AutoInstrumentationPlugin.cs b/src/Elastic.OpenTelemetry/AutoInstrumentationPlugin.cs index 9343d7c..266b31c 100644 --- a/src/Elastic.OpenTelemetry/AutoInstrumentationPlugin.cs +++ b/src/Elastic.OpenTelemetry/AutoInstrumentationPlugin.cs @@ -14,7 +14,7 @@ namespace Elastic.OpenTelemetry; /// -/// Elastic Distribution for OpenTelemetry .NET plugin for Auto Instrumentation. +/// Elastic Distribution of OpenTelemetry .NET plugin for Auto Instrumentation. /// Ensures all signals are rich enough to report to Elastic /// // ReSharper disable once UnusedType.Global diff --git a/src/Elastic.OpenTelemetry/Configuration/ElasticDefaults.cs b/src/Elastic.OpenTelemetry/Configuration/ElasticDefaults.cs index 38f0ed7..3bc90f9 100644 --- a/src/Elastic.OpenTelemetry/Configuration/ElasticDefaults.cs +++ b/src/Elastic.OpenTelemetry/Configuration/ElasticDefaults.cs @@ -15,15 +15,15 @@ public enum ElasticDefaults /// No Elastic defaults will be included, acting effectively as a vanilla OpenTelemetry None, - /// Include Elastic Distribution for OpenTelemetry .NET tracing defaults + /// Include Elastic Distribution of OpenTelemetry .NET tracing defaults Traces = 1 << 0, //1 - /// Include Elastic Distribution for OpenTelemetry .NET metrics defaults + /// Include Elastic Distribution of OpenTelemetry .NET metrics defaults Metrics = 1 << 1, //2 - /// Include Elastic Distribution for OpenTelemetry .NET logging defaults + /// Include Elastic Distribution of OpenTelemetry .NET logging defaults Logs = 1 << 2, //4 - /// (default) Include all Elastic Distribution for OpenTelemetry .NET logging defaults + /// (default) Include all Elastic Distribution of OpenTelemetry .NET logging defaults All = ~0 } diff --git a/src/Elastic.OpenTelemetry/Configuration/ElasticOpenTelemetryOptions.cs b/src/Elastic.OpenTelemetry/Configuration/ElasticOpenTelemetryOptions.cs index 3d47cc1..57ec5a4 100644 --- a/src/Elastic.OpenTelemetry/Configuration/ElasticOpenTelemetryOptions.cs +++ b/src/Elastic.OpenTelemetry/Configuration/ElasticOpenTelemetryOptions.cs @@ -134,7 +134,7 @@ private static string GetDefaultLogDirectory() public string LogDirectoryDefault { get; } /// - /// The output directory where the Elastic Distribution for OpenTelemetry .NET will write log files. + /// The output directory where the Elastic Distribution of OpenTelemetry .NET will write log files. /// /// /// When configured, a file log will be created in this directory with the name @@ -192,7 +192,7 @@ public bool SkipOtlpExporter } /// - /// Allows flags to be set based of to selectively opt in to Elastic Distribution for OpenTelemetry .NET features. + /// Allows flags to be set based of to selectively opt in to Elastic Distribution of OpenTelemetry .NET features. /// Defaults to /// /// @@ -212,7 +212,7 @@ public ElasticDefaults ElasticDefaults } /// - /// Control which signals will be automatically enabled by the Elastic Distribution for OpenTelemetry .NET. + /// Control which signals will be automatically enabled by the Elastic Distribution of OpenTelemetry .NET. /// /// This configuration respects the open telemetry environment configuration out of the box: /// diff --git a/src/Elastic.OpenTelemetry/Configuration/Signals.cs b/src/Elastic.OpenTelemetry/Configuration/Signals.cs index 3e78e16..a0c9840 100644 --- a/src/Elastic.OpenTelemetry/Configuration/Signals.cs +++ b/src/Elastic.OpenTelemetry/Configuration/Signals.cs @@ -14,15 +14,15 @@ public enum Signals /// No Elastic defaults will be included, acting effectively as a vanilla OpenTelemetry None, - /// Include Elastic Distribution for OpenTelemetry .NET tracing defaults + /// Include Elastic Distribution of OpenTelemetry .NET tracing defaults Traces = 1 << 0, //1 - /// Include Elastic Distribution for OpenTelemetry .NET metrics defaults + /// Include Elastic Distribution of OpenTelemetry .NET metrics defaults Metrics = 1 << 1, //2 - /// Include Elastic Distribution for OpenTelemetry .NET logging defaults + /// Include Elastic Distribution of OpenTelemetry .NET logging defaults Logs = 1 << 2, //4 - /// (default) Include all Elastic Distribution for OpenTelemetry .NET logging defaults + /// (default) Include all Elastic Distribution of OpenTelemetry .NET logging defaults All = ~0 } diff --git a/src/Elastic.OpenTelemetry/Diagnostics/LoggerMessages.cs b/src/Elastic.OpenTelemetry/Diagnostics/LoggerMessages.cs index 79f8751..26686f1 100644 --- a/src/Elastic.OpenTelemetry/Diagnostics/LoggerMessages.cs +++ b/src/Elastic.OpenTelemetry/Diagnostics/LoggerMessages.cs @@ -36,13 +36,13 @@ internal static partial class LoggerMessages public static void LogAgentPreamble(this ILogger logger) { var process = Process.GetCurrentProcess(); - logger.LogInformation("Elastic Distribution for OpenTelemetry .NET: {AgentInformationalVersion}", VersionHelper.InformationalVersion); + logger.LogInformation("Elastic Distribution of OpenTelemetry .NET: {AgentInformationalVersion}", VersionHelper.InformationalVersion); if (logger is CompositeLogger distributionLogger) { if (distributionLogger.LogFileEnabled) - logger.LogInformation("Elastic Distribution for OpenTelemetry .NET, log file: {LogFilePath}", distributionLogger.LogFilePath); + logger.LogInformation("Elastic Distribution of OpenTelemetry .NET, log file: {LogFilePath}", distributionLogger.LogFilePath); else - logger.LogInformation("Elastic Distribution for OpenTelemetry .NET, log file: "); + logger.LogInformation("Elastic Distribution of OpenTelemetry .NET, log file: "); } logger.LogInformation("Process ID: {ProcessId}", process.Id); diff --git a/src/Elastic.OpenTelemetry/Elastic.OpenTelemetry.csproj b/src/Elastic.OpenTelemetry/Elastic.OpenTelemetry.csproj index d16d0e7..69f6374 100644 --- a/src/Elastic.OpenTelemetry/Elastic.OpenTelemetry.csproj +++ b/src/Elastic.OpenTelemetry/Elastic.OpenTelemetry.csproj @@ -3,7 +3,7 @@ Library netstandard2.0;netstandard2.1;net462;net6.0;net8.0 - Elastic Distribution for OpenTelemetry .NET + Elastic Distribution of OpenTelemetry .NET OpenTelemetry extensions for Elastic Observability, fully native with zero code changes. elastic;opentelemetry;observabillity;apm;logs;metrics;traces;monitoring enable diff --git a/src/Elastic.OpenTelemetry/ElasticOpenTelemetryBuilder.cs b/src/Elastic.OpenTelemetry/ElasticOpenTelemetryBuilder.cs index 217f973..6b44c98 100644 --- a/src/Elastic.OpenTelemetry/ElasticOpenTelemetryBuilder.cs +++ b/src/Elastic.OpenTelemetry/ElasticOpenTelemetryBuilder.cs @@ -52,7 +52,7 @@ public class ElasticOpenTelemetryBuilder : IOpenTelemetryBuilder public IServiceCollection Services { get; } /// - /// Shared bootstrap routine for the Elastic Distribution for OpenTelemetry .NET. + /// Shared bootstrap routine for the Elastic Distribution of OpenTelemetry .NET. /// Used to ensure auto instrumentation and manual instrumentation bootstrap the same way. /// public static (EventListener, ILogger) Bootstrap(ElasticOpenTelemetryBuilderOptions options) diff --git a/src/Elastic.OpenTelemetry/Extensions/MeterProviderBuilderExtensions.cs b/src/Elastic.OpenTelemetry/Extensions/MeterProviderBuilderExtensions.cs index 88d9282..092c847 100644 --- a/src/Elastic.OpenTelemetry/Extensions/MeterProviderBuilderExtensions.cs +++ b/src/Elastic.OpenTelemetry/Extensions/MeterProviderBuilderExtensions.cs @@ -14,7 +14,7 @@ namespace Elastic.OpenTelemetry.Extensions; /// public static class MeterProviderBuilderExtensions { - /// Use Elastic Distribution for OpenTelemetry .NET defaults for + /// Use Elastic Distribution of OpenTelemetry .NET defaults for public static MeterProviderBuilder UseElasticDefaults(this MeterProviderBuilder builder, ILogger? logger = null) { logger ??= NullLogger.Instance; diff --git a/src/Elastic.OpenTelemetry/Extensions/TracerProviderBuilderExtensions.cs b/src/Elastic.OpenTelemetry/Extensions/TracerProviderBuilderExtensions.cs index 8446490..6807d57 100644 --- a/src/Elastic.OpenTelemetry/Extensions/TracerProviderBuilderExtensions.cs +++ b/src/Elastic.OpenTelemetry/Extensions/TracerProviderBuilderExtensions.cs @@ -34,7 +34,7 @@ private static TracerProviderBuilder LogAndAddProcessor(this TracerProviderBuild return builder.AddProcessor(processor); } - /// Use Elastic Distribution for OpenTelemetry .NET defaults for + /// Use Elastic Distribution of OpenTelemetry .NET defaults for public static TracerProviderBuilder UseElasticDefaults(this TracerProviderBuilder builder, ILogger? logger = null) { logger ??= NullLogger.Instance; diff --git a/src/Elastic.OpenTelemetry/IInstrumentationLifetime.cs b/src/Elastic.OpenTelemetry/IInstrumentationLifetime.cs index 31f667b..29d41dd 100644 --- a/src/Elastic.OpenTelemetry/IInstrumentationLifetime.cs +++ b/src/Elastic.OpenTelemetry/IInstrumentationLifetime.cs @@ -4,6 +4,6 @@ namespace Elastic.OpenTelemetry; /// -/// A logical Elastic Distribution for OpenTelemetry .NET instance. +/// A logical Elastic Distribution of OpenTelemetry .NET instance. /// public interface IInstrumentationLifetime : IDisposable, IAsyncDisposable; diff --git a/tests/AutoInstrumentation.IntegrationTests/PluginLoaderTests.cs b/tests/AutoInstrumentation.IntegrationTests/PluginLoaderTests.cs index 4a91c95..20fc496 100644 --- a/tests/AutoInstrumentation.IntegrationTests/PluginLoaderTests.cs +++ b/tests/AutoInstrumentation.IntegrationTests/PluginLoaderTests.cs @@ -19,7 +19,7 @@ public async Task ObserveDistributionPluginLoad() var output = exampleApplicationContainer.FailureTestOutput(); output.Should() .NotBeNullOrWhiteSpace() - .And.Contain("Elastic Distribution for OpenTelemetry .NET:") + .And.Contain("Elastic Distribution of OpenTelemetry .NET:") .And.Contain("ElasticOpenTelemetryBuilder initialized") .And.Contain("Added 'Elastic.OpenTelemetry.Processors.ElasticCompatibilityProcessor'"); diff --git a/tests/Elastic.OpenTelemetry.Tests/LoggingTests.cs b/tests/Elastic.OpenTelemetry.Tests/LoggingTests.cs index 7d1a363..43ded66 100644 --- a/tests/Elastic.OpenTelemetry.Tests/LoggingTests.cs +++ b/tests/Elastic.OpenTelemetry.Tests/LoggingTests.cs @@ -33,9 +33,9 @@ public async Task ObserveLogging() } //assert preamble information gets logged - logger.Messages.Should().ContainMatch("*Elastic Distribution for OpenTelemetry .NET:*"); + logger.Messages.Should().ContainMatch("*Elastic Distribution of OpenTelemetry .NET:*"); - var preambles = logger.Messages.Where(l => l.Contains("[Information] Elastic Distribution for OpenTelemetry .NET:")).ToList(); + var preambles = logger.Messages.Where(l => l.Contains("[Information] Elastic Distribution of OpenTelemetry .NET:")).ToList(); preambles.Should().NotBeNull().And.HaveCount(1); // assert instrumentation session logs initialized and stack trace gets dumped.