Skip to content

Commit 0899653

Browse files
Address some AoT warnings (#356)
1 parent af64846 commit 0899653

39 files changed

+78
-65
lines changed

Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<Deterministic>true</Deterministic>
1010
<EmbedUntrackedSources>true</EmbedUntrackedSources>
1111
<GenerateDocumentationFile>false</GenerateDocumentationFile>
12+
<LangVersion>latest</LangVersion>
1213
<NeutralLanguage>en-US</NeutralLanguage>
1314
<!-- Disable warning about stable packages depending on prerelease packages until all OpenTelemetry dependencies are stable -->
1415
<NoWarn>$(NoWarn);NU5104</NoWarn>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace Grafana.OpenTelemetry
1010
/// <summary>
1111
/// Helper class for Grafana Cloud configuration.
1212
/// </summary>
13-
internal class GrafanaCloudConfigurationHelper
13+
internal sealed class GrafanaCloudConfigurationHelper
1414
{
1515
private const string PathExtensionTraces = "/v1/traces";
1616
private const string PathExtensionMetrics = "/v1/metrics";

src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,9 @@
4747
</AssemblyAttribute>
4848
</ItemGroup>
4949

50+
<!-- Not supported due to extensive use of reflection https://github.com/grafana/grafana-opentelemetry-dotnet/issues/97 -->
51+
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
52+
<IsAotCompatible>false</IsAotCompatible>
53+
</PropertyGroup>
54+
5055
</Project>

src/Grafana.OpenTelemetry.Base/GrafanaOpenTelemetryResourceDetector.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
namespace Grafana.OpenTelemetry
1111
{
12-
internal class GrafanaOpenTelemetryResourceDetector : IResourceDetector
12+
internal sealed class GrafanaOpenTelemetryResourceDetector : IResourceDetector
1313
{
1414
internal const string ResourceKey_DistroName = "telemetry.distro.name";
1515
internal const string ResourceKey_DistroVersion = "telemetry.distro.version";
@@ -25,12 +25,12 @@ public GrafanaOpenTelemetryResourceDetector(GrafanaOpenTelemetrySettings setting
2525

2626
public Resource Detect()
2727
{
28-
var attributes = new List<KeyValuePair<string, object>>(new KeyValuePair<string, object>[]
29-
{
28+
var attributes = new List<KeyValuePair<string, object>>(
29+
[
3030
new KeyValuePair<string, object>(ResourceKey_DistroName, ResourceValue_DistroName),
3131
new KeyValuePair<string, object>(ResourceKey_DistroVersion, GetDistroVersion()),
3232
new KeyValuePair<string, object>(ResourceKey_DeploymentEnvironment, _settings.DeploymentEnvironment)
33-
});
33+
]);
3434

3535
attributes.AddRange(_settings.ResourceAttributes);
3636

src/Grafana.OpenTelemetry.Base/GrafanaOpenTelemetrySettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ internal GrafanaOpenTelemetrySettings(IConfiguration configuration)
119119
Instrumentations.Remove(Instrumentation.AWSLambda);
120120

121121
var disableInstrumentations = configuration[DisableInstrumentationsEnvVarName];
122-
char[] separators = new char[] { ',', ':' };
122+
char[] separators = [',', ':'];
123123

124124
if (!string.IsNullOrEmpty(disableInstrumentations))
125125
{

src/Grafana.OpenTelemetry.Base/Instrumentations/AWSInitializer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Grafana.OpenTelemetry
99
{
10-
internal class AWSInitializer : InstrumentationInitializer
10+
internal sealed class AWSInitializer : InstrumentationInitializer
1111
{
1212
public override Instrumentation Id { get; } = Instrumentation.AWS;
1313

@@ -17,7 +17,7 @@ protected override void InitializeTracing(TracerProviderBuilder builder)
1717
"OpenTelemetry.Instrumentation.AWS",
1818
"OpenTelemetry.Trace.TracerProviderBuilderExtensions",
1919
"AddAWSInstrumentation",
20-
new object[] { builder });
20+
[builder]);
2121
}
2222
}
2323
}

src/Grafana.OpenTelemetry.Base/Instrumentations/AWSLambdaInitializer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Grafana.OpenTelemetry
99
{
10-
internal class AWSLambdaInitializer : InstrumentationInitializer
10+
internal sealed class AWSLambdaInitializer : InstrumentationInitializer
1111
{
1212
public override Instrumentation Id { get; } = Instrumentation.AWSLambda;
1313

@@ -17,7 +17,7 @@ protected override void InitializeTracing(TracerProviderBuilder builder)
1717
"OpenTelemetry.Instrumentation.AWSLambda",
1818
"OpenTelemetry.Instrumentation.AWSLambda.TracerProviderBuilderExtensions",
1919
"AddAWSLambdaConfigurations",
20-
new object[] { builder });
20+
[builder]);
2121
}
2222
}
2323
}

src/Grafana.OpenTelemetry.Base/Instrumentations/AspNetCoreInitializer.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace Grafana.OpenTelemetry
1010
{
11-
internal class AspNetCoreInitializer : InstrumentationInitializer
11+
internal sealed class AspNetCoreInitializer : InstrumentationInitializer
1212
{
1313
public override Instrumentation Id { get; } = Instrumentation.AspNetCore;
1414

@@ -18,7 +18,7 @@ protected override void InitializeTracing(TracerProviderBuilder builder)
1818
"OpenTelemetry.Instrumentation.AspNetCore",
1919
"OpenTelemetry.Trace.AspNetCoreInstrumentationTracerProviderBuilderExtensions",
2020
"AddAspNetCoreInstrumentation",
21-
new object[] { builder });
21+
[builder]);
2222
}
2323

2424
protected override void InitializeMetrics(MeterProviderBuilder builder)
@@ -27,7 +27,7 @@ protected override void InitializeMetrics(MeterProviderBuilder builder)
2727
"OpenTelemetry.Instrumentation.AspNetCore",
2828
"OpenTelemetry.Metrics.AspNetCoreInstrumentationMeterProviderBuilderExtensions",
2929
"AddAspNetCoreInstrumentation",
30-
new object[] { builder });
30+
[builder]);
3131
}
3232
}
3333
}

src/Grafana.OpenTelemetry.Base/Instrumentations/AspNetInitializer.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace Grafana.OpenTelemetry
1010
{
11-
internal class AspNetInitializer : InstrumentationInitializer
11+
internal sealed class AspNetInitializer : InstrumentationInitializer
1212
{
1313
public override Instrumentation Id { get; } = Instrumentation.AspNet;
1414

@@ -18,7 +18,7 @@ protected override void InitializeTracing(TracerProviderBuilder builder)
1818
"OpenTelemetry.Instrumentation.AspNet",
1919
"OpenTelemetry.Trace.TracerProviderBuilderExtensions",
2020
"AddAspNetInstrumentation",
21-
new object[] { builder });
21+
[builder]);
2222
}
2323

2424
protected override void InitializeMetrics(MeterProviderBuilder builder)
@@ -27,7 +27,7 @@ protected override void InitializeMetrics(MeterProviderBuilder builder)
2727
"OpenTelemetry.Instrumentation.AspNet",
2828
"OpenTelemetry.Metrics.MeterProviderBuilderExtensions",
2929
"AddAspNetInstrumentation",
30-
new object[] { builder });
30+
[builder]);
3131
}
3232
}
3333
}

src/Grafana.OpenTelemetry.Base/Instrumentations/CassandraInitializer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace Grafana.OpenTelemetry
1010
{
11-
internal class CassandraInitializer : InstrumentationInitializer
11+
internal sealed class CassandraInitializer : InstrumentationInitializer
1212
{
1313
public override Instrumentation Id { get; } = Instrumentation.Cassandra;
1414

@@ -18,7 +18,7 @@ protected override void InitializeMetrics(MeterProviderBuilder builder)
1818
"OpenTelemetry.Instrumentation.Cassandra",
1919
"OpenTelemetry.Metrics.MeterProviderBuilderExtensions",
2020
"AddCassandraInstrumentation",
21-
new object[] { builder });
21+
[builder]);
2222
}
2323

2424
protected override void InitializeTracing(TracerProviderBuilder builder)

0 commit comments

Comments
 (0)