Skip to content

Commit 48fd9fe

Browse files
martincostellomartincostello
committed
Fix CodeQL warnings
Fix CodeQL suggestions, which mostly fall into the "minor code analysis warnings" category and a few style ones, plus one bug in the example app.
1 parent 5eddbb9 commit 48fd9fe

File tree

12 files changed

+44
-42
lines changed

12 files changed

+44
-42
lines changed

‎examples/net8.0/aspnetcore/TodoAppEndpoints.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ public static IServiceCollection AddTodoApp(this IServiceCollection services)
2222
if (string.IsNullOrEmpty(dataDirectory) || !Path.IsPathRooted(dataDirectory))
2323
{
2424
var environment = serviceProvider.GetRequiredService<IHostEnvironment>();
25-
dataDirectory = Path.Combine(environment.ContentRootPath, "App_Data");
25+
dataDirectory = Path.Join(environment.ContentRootPath, "App_Data");
2626
}
2727

2828
if (!Directory.Exists(dataDirectory))
2929
{
3030
Directory.CreateDirectory(dataDirectory);
3131
}
3232

33-
var databaseFile = Path.Combine(dataDirectory, "TodoApp.db");
33+
var databaseFile = Path.Join(dataDirectory, "TodoApp.db");
3434

3535
options.UseSqlite("Data Source=" + databaseFile);
3636
});
@@ -45,7 +45,7 @@ public static IEndpointRouteBuilder MapTodoApp(this IEndpointRouteBuilder builde
4545
todos.MapPost("/", async (CreateTodoItemModel model, TodoRepository repository) =>
4646
{
4747
var id = await repository.AddItemAsync(model.Text);
48-
return Results.Created($"/api/items/{id}", new { Id = id });
48+
return Results.Created($"/api/items/{id.Id}", new { Id = id });
4949
});
5050

5151
todos.MapGet("/", async (TodoRepository repository) => await repository.GetItemsAsync());

‎src/Grafana.OpenTelemetry.Base/ExporterSettings/AgentOtlpExporter.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,36 +29,36 @@ public class AgentOtlpExporter : ExporterSettings
2929
public OtlpExportProtocol Protocol { get; set; }
3030

3131
/// <inheritdoc/>
32-
override internal void Apply(TracerProviderBuilder builder)
32+
internal override void Apply(TracerProviderBuilder builder)
3333
{
34-
if (EnableTraces == false)
34+
if (!EnableTraces)
3535
{
3636
return;
3737
}
3838

39-
builder.AddOtlpExporter(config => ApplyToConfig(config));
39+
builder.AddOtlpExporter(ApplyToConfig);
4040
}
4141

4242
/// <inheritdoc/>
43-
override internal void Apply(MeterProviderBuilder builder)
43+
internal override void Apply(MeterProviderBuilder builder)
4444
{
45-
if (EnableMetrics == false)
45+
if (!EnableMetrics)
4646
{
4747
return;
4848
}
4949

50-
builder.AddOtlpExporter(config => ApplyToConfig(config));
50+
builder.AddOtlpExporter(ApplyToConfig);
5151
}
5252

5353
/// <inheritdoc/>
54-
override internal void Apply(OpenTelemetryLoggerOptions options)
54+
internal override void Apply(OpenTelemetryLoggerOptions options)
5555
{
56-
if (EnableLogs == false)
56+
if (!EnableLogs)
5757
{
5858
return;
5959
}
6060

61-
options.AddOtlpExporter(config => ApplyToConfig(config));
61+
options.AddOtlpExporter(ApplyToConfig);
6262
}
6363

6464
private void ApplyToConfig(OtlpExporterOptions options)
@@ -70,7 +70,7 @@ private void ApplyToConfig(OtlpExporterOptions options)
7070

7171
if (Protocol != default)
7272
{
73-
options.Protocol = (OtlpExportProtocol)Protocol;
73+
options.Protocol = Protocol;
7474
}
7575
}
7676
}

‎src/Grafana.OpenTelemetry.Base/ExporterSettings/CloudOtlpExporter.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ internal CloudOtlpExporter(IConfiguration configuration)
6666
{ }
6767

6868
/// <inheritdoc/>
69-
override internal void Apply(TracerProviderBuilder builder)
69+
internal override void Apply(TracerProviderBuilder builder)
7070
{
71-
if (EnableTraces == false)
71+
if (!EnableTraces)
7272
{
7373
return;
7474
}
@@ -84,9 +84,9 @@ override internal void Apply(TracerProviderBuilder builder)
8484
}
8585

8686
/// <inheritdoc/>
87-
override internal void Apply(MeterProviderBuilder builder)
87+
internal override void Apply(MeterProviderBuilder builder)
8888
{
89-
if (EnableMetrics == false)
89+
if (!EnableMetrics)
9090
{
9191
return;
9292
}
@@ -102,9 +102,9 @@ override internal void Apply(MeterProviderBuilder builder)
102102
}
103103

104104
/// <inheritdoc/>
105-
override internal void Apply(OpenTelemetryLoggerOptions options)
105+
internal override void Apply(OpenTelemetryLoggerOptions options)
106106
{
107-
if (EnableLogs == false)
107+
if (!EnableLogs)
108108
{
109109
return;
110110
}

‎src/Grafana.OpenTelemetry.Base/ExporterSettings/GrafanaCloudConfigurationHelper.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ internal class GrafanaCloudConfigurationHelper
1616
private const string PathExtensionMetrics = "/v1/metrics";
1717
private const string PathExtensionLogs = "/v1/logs";
1818

19-
private string _zone;
20-
private string _instanceId;
21-
private string _apiKey;
19+
private readonly string _zone;
20+
private readonly string _instanceId;
21+
private readonly string _apiKey;
2222

2323
public GrafanaCloudConfigurationHelper(string zone, string instanceId, string apiKey)
2424
{

‎src/Grafana.OpenTelemetry.Base/ExporterSettings/OtlpExporter.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ public class OtlpExporter : ExporterSettings
3434
public OtlpExportProtocol Protocol { get; set; }
3535

3636
/// <inheritdoc/>
37-
override internal void Apply(TracerProviderBuilder builder)
37+
internal override void Apply(TracerProviderBuilder builder)
3838
{
39-
if (EnableTraces == false)
39+
if (!EnableTraces)
4040
{
4141
return;
4242
}
@@ -50,9 +50,9 @@ override internal void Apply(TracerProviderBuilder builder)
5050
}
5151

5252
/// <inheritdoc/>
53-
override internal void Apply(MeterProviderBuilder builder)
53+
internal override void Apply(MeterProviderBuilder builder)
5454
{
55-
if (EnableMetrics == false)
55+
if (!EnableMetrics)
5656
{
5757
return;
5858
}
@@ -66,9 +66,9 @@ override internal void Apply(MeterProviderBuilder builder)
6666
}
6767

6868
/// <inheritdoc/>
69-
override internal void Apply(OpenTelemetryLoggerOptions options)
69+
internal override void Apply(OpenTelemetryLoggerOptions options)
7070
{
71-
if (EnableLogs == false)
71+
if (!EnableLogs)
7272
{
7373
return;
7474
}

‎src/Grafana.OpenTelemetry.Base/GrafanaOpenTelemetryResourceDetector.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ internal class GrafanaOpenTelemetryResourceDetector : IResourceDetector
1616
internal const string ResourceKey_DeploymentEnvironment = "deployment.environment";
1717
internal const string ResourceValue_DistroName = "grafana-opentelemetry-dotnet";
1818

19-
private GrafanaOpenTelemetrySettings _settings;
19+
private readonly GrafanaOpenTelemetrySettings _settings;
2020

2121
public GrafanaOpenTelemetryResourceDetector(GrafanaOpenTelemetrySettings settings)
2222
{

‎src/Grafana.OpenTelemetry.Base/Instrumentations/InstrumentationInitializer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace Grafana.OpenTelemetry
1717
{
1818
internal abstract class InstrumentationInitializer
1919
{
20-
public static InstrumentationInitializer[] Initializers = GetDefaults();
20+
public static readonly InstrumentationInitializer[] Initializers = GetDefaults();
2121

2222
public abstract Instrumentation Id { get; }
2323

‎src/Grafana.OpenTelemetry.Base/ResourceBuilderExtension.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public static ResourceBuilder AddGrafanaResource(this ResourceBuilder resourceBu
1919
serviceName: settings.ServiceName,
2020
serviceVersion: settings.ServiceVersion,
2121
serviceInstanceId: serviceInstanceIdProvided ? settings.ServiceInstanceId : null,
22-
autoGenerateServiceInstanceId: serviceInstanceIdProvided == false);
22+
autoGenerateServiceInstanceId: !serviceInstanceIdProvided);
2323

2424
}
2525
}

‎src/Grafana.OpenTelemetry.Base/ResourceDetectors/ResourceDetectorInitializer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Grafana.OpenTelemetry
1212
{
1313
internal abstract class ResourceDetectorInitializer
1414
{
15-
public static ResourceDetectorInitializer[] Initializers = new ResourceDetectorInitializer[]
15+
public static readonly ResourceDetectorInitializer[] Initializers = new ResourceDetectorInitializer[]
1616
{
1717
#if !NETSTANDARD
1818
new AWSEBSDetectorInitializer(),
@@ -36,7 +36,7 @@ internal abstract class ResourceDetectorInitializer
3636
#endif
3737
};
3838

39-
abstract public ResourceDetector Id { get; }
39+
public abstract ResourceDetector Id { get; }
4040

4141
public void Initialize(TracerProviderBuilder builder)
4242
{

‎tests/Grafana.OpenTelemetry.Tests/Grafana.OpenTelemetry.Tests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<TargetFrameworks Condition="$([System.OperatingSystem]::IsWindows())">$(TargetFrameworks);net481</TargetFrameworks>
66
<IsPackable>false</IsPackable>
77
<IsTestProject>true</IsTestProject>
8+
<LangVersion>latest</LangVersion>
89
</PropertyGroup>
910

1011
<ItemGroup>

0 commit comments

Comments
 (0)