diff --git a/examples/net8.0/aspnetcore/TodoAppEndpoints.cs b/examples/net8.0/aspnetcore/TodoAppEndpoints.cs index e16a7576..7307002d 100644 --- a/examples/net8.0/aspnetcore/TodoAppEndpoints.cs +++ b/examples/net8.0/aspnetcore/TodoAppEndpoints.cs @@ -22,7 +22,7 @@ public static IServiceCollection AddTodoApp(this IServiceCollection services) if (string.IsNullOrEmpty(dataDirectory) || !Path.IsPathRooted(dataDirectory)) { var environment = serviceProvider.GetRequiredService(); - dataDirectory = Path.Combine(environment.ContentRootPath, "App_Data"); + dataDirectory = Path.Join(environment.ContentRootPath, "App_Data"); } if (!Directory.Exists(dataDirectory)) @@ -30,7 +30,7 @@ public static IServiceCollection AddTodoApp(this IServiceCollection services) Directory.CreateDirectory(dataDirectory); } - var databaseFile = Path.Combine(dataDirectory, "TodoApp.db"); + var databaseFile = Path.Join(dataDirectory, "TodoApp.db"); options.UseSqlite("Data Source=" + databaseFile); }); @@ -45,7 +45,7 @@ public static IEndpointRouteBuilder MapTodoApp(this IEndpointRouteBuilder builde todos.MapPost("/", async (CreateTodoItemModel model, TodoRepository repository) => { var id = await repository.AddItemAsync(model.Text); - return Results.Created($"/api/items/{id}", new { Id = id }); + return Results.Created($"/api/items/{id.Id}", new { Id = id }); }); todos.MapGet("/", async (TodoRepository repository) => await repository.GetItemsAsync()); diff --git a/src/Grafana.OpenTelemetry.Base/ExporterSettings/AgentOtlpExporter.cs b/src/Grafana.OpenTelemetry.Base/ExporterSettings/AgentOtlpExporter.cs index 93beaee4..31ff7fc9 100644 --- a/src/Grafana.OpenTelemetry.Base/ExporterSettings/AgentOtlpExporter.cs +++ b/src/Grafana.OpenTelemetry.Base/ExporterSettings/AgentOtlpExporter.cs @@ -29,36 +29,36 @@ public class AgentOtlpExporter : ExporterSettings public OtlpExportProtocol Protocol { get; set; } /// - override internal void Apply(TracerProviderBuilder builder) + internal override void Apply(TracerProviderBuilder builder) { - if (EnableTraces == false) + if (!EnableTraces) { return; } - builder.AddOtlpExporter(config => ApplyToConfig(config)); + builder.AddOtlpExporter(ApplyToConfig); } /// - override internal void Apply(MeterProviderBuilder builder) + internal override void Apply(MeterProviderBuilder builder) { - if (EnableMetrics == false) + if (!EnableMetrics) { return; } - builder.AddOtlpExporter(config => ApplyToConfig(config)); + builder.AddOtlpExporter(ApplyToConfig); } /// - override internal void Apply(OpenTelemetryLoggerOptions options) + internal override void Apply(OpenTelemetryLoggerOptions options) { - if (EnableLogs == false) + if (!EnableLogs) { return; } - options.AddOtlpExporter(config => ApplyToConfig(config)); + options.AddOtlpExporter(ApplyToConfig); } private void ApplyToConfig(OtlpExporterOptions options) @@ -70,7 +70,7 @@ private void ApplyToConfig(OtlpExporterOptions options) if (Protocol != default) { - options.Protocol = (OtlpExportProtocol)Protocol; + options.Protocol = Protocol; } } } diff --git a/src/Grafana.OpenTelemetry.Base/ExporterSettings/CloudOtlpExporter.cs b/src/Grafana.OpenTelemetry.Base/ExporterSettings/CloudOtlpExporter.cs index 1c3677e3..0bddd8d2 100644 --- a/src/Grafana.OpenTelemetry.Base/ExporterSettings/CloudOtlpExporter.cs +++ b/src/Grafana.OpenTelemetry.Base/ExporterSettings/CloudOtlpExporter.cs @@ -66,9 +66,9 @@ internal CloudOtlpExporter(IConfiguration configuration) { } /// - override internal void Apply(TracerProviderBuilder builder) + internal override void Apply(TracerProviderBuilder builder) { - if (EnableTraces == false) + if (!EnableTraces) { return; } @@ -84,9 +84,9 @@ override internal void Apply(TracerProviderBuilder builder) } /// - override internal void Apply(MeterProviderBuilder builder) + internal override void Apply(MeterProviderBuilder builder) { - if (EnableMetrics == false) + if (!EnableMetrics) { return; } @@ -102,9 +102,9 @@ override internal void Apply(MeterProviderBuilder builder) } /// - override internal void Apply(OpenTelemetryLoggerOptions options) + internal override void Apply(OpenTelemetryLoggerOptions options) { - if (EnableLogs == false) + if (!EnableLogs) { return; } diff --git a/src/Grafana.OpenTelemetry.Base/ExporterSettings/GrafanaCloudConfigurationHelper.cs b/src/Grafana.OpenTelemetry.Base/ExporterSettings/GrafanaCloudConfigurationHelper.cs index 85bf03b2..df8bd0d8 100644 --- a/src/Grafana.OpenTelemetry.Base/ExporterSettings/GrafanaCloudConfigurationHelper.cs +++ b/src/Grafana.OpenTelemetry.Base/ExporterSettings/GrafanaCloudConfigurationHelper.cs @@ -16,9 +16,9 @@ internal class GrafanaCloudConfigurationHelper private const string PathExtensionMetrics = "/v1/metrics"; private const string PathExtensionLogs = "/v1/logs"; - private string _zone; - private string _instanceId; - private string _apiKey; + private readonly string _zone; + private readonly string _instanceId; + private readonly string _apiKey; public GrafanaCloudConfigurationHelper(string zone, string instanceId, string apiKey) { diff --git a/src/Grafana.OpenTelemetry.Base/ExporterSettings/OtlpExporter.cs b/src/Grafana.OpenTelemetry.Base/ExporterSettings/OtlpExporter.cs index 85be7dd6..c8066bad 100644 --- a/src/Grafana.OpenTelemetry.Base/ExporterSettings/OtlpExporter.cs +++ b/src/Grafana.OpenTelemetry.Base/ExporterSettings/OtlpExporter.cs @@ -34,9 +34,9 @@ public class OtlpExporter : ExporterSettings public OtlpExportProtocol Protocol { get; set; } /// - override internal void Apply(TracerProviderBuilder builder) + internal override void Apply(TracerProviderBuilder builder) { - if (EnableTraces == false) + if (!EnableTraces) { return; } @@ -50,9 +50,9 @@ override internal void Apply(TracerProviderBuilder builder) } /// - override internal void Apply(MeterProviderBuilder builder) + internal override void Apply(MeterProviderBuilder builder) { - if (EnableMetrics == false) + if (!EnableMetrics) { return; } @@ -66,9 +66,9 @@ override internal void Apply(MeterProviderBuilder builder) } /// - override internal void Apply(OpenTelemetryLoggerOptions options) + internal override void Apply(OpenTelemetryLoggerOptions options) { - if (EnableLogs == false) + if (!EnableLogs) { return; } diff --git a/src/Grafana.OpenTelemetry.Base/GrafanaOpenTelemetryResourceDetector.cs b/src/Grafana.OpenTelemetry.Base/GrafanaOpenTelemetryResourceDetector.cs index ecce1d05..44870b9e 100644 --- a/src/Grafana.OpenTelemetry.Base/GrafanaOpenTelemetryResourceDetector.cs +++ b/src/Grafana.OpenTelemetry.Base/GrafanaOpenTelemetryResourceDetector.cs @@ -16,7 +16,7 @@ internal class GrafanaOpenTelemetryResourceDetector : IResourceDetector internal const string ResourceKey_DeploymentEnvironment = "deployment.environment"; internal const string ResourceValue_DistroName = "grafana-opentelemetry-dotnet"; - private GrafanaOpenTelemetrySettings _settings; + private readonly GrafanaOpenTelemetrySettings _settings; public GrafanaOpenTelemetryResourceDetector(GrafanaOpenTelemetrySettings settings) { diff --git a/src/Grafana.OpenTelemetry.Base/Instrumentations/InstrumentationInitializer.cs b/src/Grafana.OpenTelemetry.Base/Instrumentations/InstrumentationInitializer.cs index 6a6b316a..81f01a3b 100644 --- a/src/Grafana.OpenTelemetry.Base/Instrumentations/InstrumentationInitializer.cs +++ b/src/Grafana.OpenTelemetry.Base/Instrumentations/InstrumentationInitializer.cs @@ -17,7 +17,7 @@ namespace Grafana.OpenTelemetry { internal abstract class InstrumentationInitializer { - public static InstrumentationInitializer[] Initializers = GetDefaults(); + public static readonly InstrumentationInitializer[] Initializers = GetDefaults(); public abstract Instrumentation Id { get; } diff --git a/src/Grafana.OpenTelemetry.Base/ResourceBuilderExtension.cs b/src/Grafana.OpenTelemetry.Base/ResourceBuilderExtension.cs index 72c9f1e2..ef1c3c74 100644 --- a/src/Grafana.OpenTelemetry.Base/ResourceBuilderExtension.cs +++ b/src/Grafana.OpenTelemetry.Base/ResourceBuilderExtension.cs @@ -19,7 +19,7 @@ public static ResourceBuilder AddGrafanaResource(this ResourceBuilder resourceBu serviceName: settings.ServiceName, serviceVersion: settings.ServiceVersion, serviceInstanceId: serviceInstanceIdProvided ? settings.ServiceInstanceId : null, - autoGenerateServiceInstanceId: serviceInstanceIdProvided == false); + autoGenerateServiceInstanceId: !serviceInstanceIdProvided); } } diff --git a/src/Grafana.OpenTelemetry.Base/ResourceDetectors/ResourceDetectorInitializer.cs b/src/Grafana.OpenTelemetry.Base/ResourceDetectors/ResourceDetectorInitializer.cs index 4c89f749..fd7e27f8 100644 --- a/src/Grafana.OpenTelemetry.Base/ResourceDetectors/ResourceDetectorInitializer.cs +++ b/src/Grafana.OpenTelemetry.Base/ResourceDetectors/ResourceDetectorInitializer.cs @@ -12,7 +12,7 @@ namespace Grafana.OpenTelemetry { internal abstract class ResourceDetectorInitializer { - public static ResourceDetectorInitializer[] Initializers = new ResourceDetectorInitializer[] + public static readonly ResourceDetectorInitializer[] Initializers = new ResourceDetectorInitializer[] { #if !NETSTANDARD new AWSEBSDetectorInitializer(), @@ -36,7 +36,7 @@ internal abstract class ResourceDetectorInitializer #endif }; - abstract public ResourceDetector Id { get; } + public abstract ResourceDetector Id { get; } public void Initialize(TracerProviderBuilder builder) { diff --git a/tests/Grafana.OpenTelemetry.Tests/Grafana.OpenTelemetry.Tests.csproj b/tests/Grafana.OpenTelemetry.Tests/Grafana.OpenTelemetry.Tests.csproj index 0c5047cd..691f858f 100644 --- a/tests/Grafana.OpenTelemetry.Tests/Grafana.OpenTelemetry.Tests.csproj +++ b/tests/Grafana.OpenTelemetry.Tests/Grafana.OpenTelemetry.Tests.csproj @@ -5,6 +5,7 @@ $(TargetFrameworks);net481 false true + latest diff --git a/tests/Grafana.OpenTelemetry.Tests/OpenTelemetryLoggerOptionsExtensionsTest.cs b/tests/Grafana.OpenTelemetry.Tests/OpenTelemetryLoggerOptionsExtensionsTest.cs index 627b286d..e4ccc8db 100644 --- a/tests/Grafana.OpenTelemetry.Tests/OpenTelemetryLoggerOptionsExtensionsTest.cs +++ b/tests/Grafana.OpenTelemetry.Tests/OpenTelemetryLoggerOptionsExtensionsTest.cs @@ -22,6 +22,8 @@ public void BuildDefault() }); var logger = loggerFactory.CreateLogger(); + + logger.LogInformation("This is a test log message."); } } } diff --git a/tests/Grafana.OpenTelemetry.Tests/TracerProviderExtensionsTest.cs b/tests/Grafana.OpenTelemetry.Tests/TracerProviderExtensionsTest.cs index 7c1a59ec..1f5b61ae 100644 --- a/tests/Grafana.OpenTelemetry.Tests/TracerProviderExtensionsTest.cs +++ b/tests/Grafana.OpenTelemetry.Tests/TracerProviderExtensionsTest.cs @@ -15,15 +15,14 @@ namespace Grafana.OpenTelemetry.Tests { public class TracerProviderExtensionsTest { - private static ActivitySource activitySource = new ActivitySource(typeof(TracerProviderExtensionsTest).Name); + private static readonly ActivitySource activitySource = new(typeof(TracerProviderExtensionsTest).Name); [Fact] public void EnableDefaultInstrumentations() { - Sdk - .CreateTracerProviderBuilder() - .UseGrafana() - .Build(); + Sdk.CreateTracerProviderBuilder() + .UseGrafana() + .Build(); } [Fact] @@ -38,7 +37,7 @@ public void StandardResourceAttributes() .AddSource(activitySource.Name) .Build(); - var span = activitySource.StartActivity("root"); + using var span = activitySource.StartActivity("root"); span.Stop(); span.Dispose(); @@ -89,7 +88,7 @@ public void CustomResourceAttributes() .AddSource(activitySource.Name) .Build(); - var span = activitySource.StartActivity("root"); + using var span = activitySource.StartActivity("root"); span.Stop(); span.Dispose(); @@ -129,7 +128,7 @@ public void OverrideResourceAttributes() .AddSource(activitySource.Name) .Build(); - var span = activitySource.StartActivity("root"); + using var span = activitySource.StartActivity("root"); span.Stop(); span.Dispose(); @@ -164,7 +163,7 @@ public void OverrideResourceAttributesEnvironment() .AddSource(activitySource.Name) .Build(); - var span = activitySource.StartActivity("root"); + using var span = activitySource.StartActivity("root"); span.Stop(); span.Dispose();