Merge remote-tracking branch 'upstream/main' into RichardChukwu-main

Author: CodeBlanch

CONTRIBUTING.md

@@ -308,23 +308,6 @@ analysis](https://learn.microsoft.com/dotnet/fundamentals/code-analysis/overview
 [Common.props](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/build/Common.props)
 new projects must NOT manually override these settings.
 
-## New code
-
-New code files MUST enable [nullable reference
-types](https://learn.microsoft.com/dotnet/csharp/language-reference/builtin-types/nullable-reference-types)
-manually in projects where it is not automatically enabled project-wide. This is
-done by specifying `#nullable enable` towards the top of the file (usually after
-the copyright header). We are currently working towards enabling nullable
-context in every project by updating code as it is worked on, this requirement
-is to make sure the surface area of code needing updates is shrinking and not
-expanding.
-
-> [!NOTE]
-> The first time a project is updated to use nullable context in public APIs
-some housekeeping needs to be done in public API definitions (`.publicApi`
-folder). This can be done automatically via a code fix offered by the public API
-analyzer.
-
 ## License requirements
 
 OpenTelemetry .NET is licensed under the [Apache License, Version

docs/logs/redaction/MyRedactionProcessor.cs

@@ -15,33 +15,33 @@ public override void OnEnd(LogRecord logRecord)
         }
     }
 
-    internal sealed class MyClassWithRedactionEnumerator : IReadOnlyList<KeyValuePair<string, object>>
+    internal sealed class MyClassWithRedactionEnumerator : IReadOnlyList<KeyValuePair<string, object?>>
     {
-        private readonly IReadOnlyList<KeyValuePair<string, object>> state;
+        private readonly IReadOnlyList<KeyValuePair<string, object?>> state;
 
-        public MyClassWithRedactionEnumerator(IReadOnlyList<KeyValuePair<string, object>> state)
+        public MyClassWithRedactionEnumerator(IReadOnlyList<KeyValuePair<string, object?>> state)
         {
             this.state = state;
         }
 
         public int Count => this.state.Count;
 
-        public KeyValuePair<string, object> this[int index]
+        public KeyValuePair<string, object?> this[int index]
         {
             get
             {
                 var item = this.state[index];
                 var entryVal = item.Value?.ToString();
                 if (entryVal != null && entryVal.Contains("<secret>"))
                 {
-                    return new KeyValuePair<string, object>(item.Key, "newRedactedValueHere");
+                    return new KeyValuePair<string, object?>(item.Key, "newRedactedValueHere");
                 }
 
                 return item;
             }
         }
 
-        public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
+        public IEnumerator<KeyValuePair<string, object?>> GetEnumerator()
         {
             for (var i = 0; i < this.Count; i++)
             {

docs/logs/redaction/redaction.csproj

@@ -1,8 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <!-- this is temporary. will remove in future PR. -->
-    <Nullable>disable</Nullable>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Console\OpenTelemetry.Exporter.Console.csproj" />
   </ItemGroup>

docs/trace/customizing-the-sdk/customizing-the-sdk.csproj

@@ -1,8 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <!-- this is temporary. will remove in future PR. -->
-    <Nullable>disable</Nullable>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Console\OpenTelemetry.Exporter.Console.csproj" />
   </ItemGroup>

examples/Console/Examples.Console.csproj

@@ -4,9 +4,6 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>$(DefaultTargetFrameworkForExampleApps)</TargetFramework>
     <NoWarn>$(NoWarn),CS0618</NoWarn>
-
-    <!-- this is temporary. will remove in future PR. -->
-    <Nullable>disable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

examples/Console/InstrumentationWithActivitySource.cs

@@ -47,13 +47,13 @@ public void Start(string url)
                         var context = this.listener.GetContext();
 
                         using var activity = source.StartActivity(
-                            $"{context.Request.HttpMethod}:{context.Request.Url.AbsolutePath}",
+                            $"{context.Request.HttpMethod}:{context.Request.Url!.AbsolutePath}",
                             ActivityKind.Server);
 
                         var headerKeys = context.Request.Headers.AllKeys;
                         foreach (var headerKey in headerKeys)
                         {
-                            string headerValue = context.Request.Headers[headerKey];
+                            string? headerValue = context.Request.Headers[headerKey];
                             activity?.SetTag($"http.header.{headerKey}", headerValue);
                         }
 
@@ -62,7 +62,7 @@ public void Start(string url)
                         using (var reader = new StreamReader(context.Request.InputStream, context.Request.ContentEncoding))
                         {
                             requestContent = reader.ReadToEnd();
-                            childSpan.AddEvent(new ActivityEvent("StreamReader.ReadToEnd"));
+                            childSpan?.AddEvent(new ActivityEvent("StreamReader.ReadToEnd"));
                         }
 
                         activity?.SetTag("request.content", requestContent);
@@ -90,8 +90,8 @@ public void Dispose()
 
     private class SampleClient : IDisposable
     {
-        private CancellationTokenSource cts;
-        private Task requestTask;
+        private CancellationTokenSource? cts;
+        private Task? requestTask;
 
         public void Start(string url)
         {
@@ -154,7 +154,7 @@ public void Dispose()
             if (this.cts != null)
             {
                 this.cts.Cancel();
-                this.requestTask.Wait();
+                this.requestTask!.Wait();
                 this.requestTask.Dispose();
                 this.cts.Dispose();
             }

examples/Console/Program.cs

@@ -33,16 +33,16 @@ public static void Main(string[] args)
     {
         Parser.Default.ParseArguments<ZipkinOptions, PrometheusOptions, MetricsOptions, LogsOptions, GrpcNetClientOptions, HttpClientOptions, ConsoleOptions, OpenTelemetryShimOptions, OpenTracingShimOptions, OtlpOptions, InMemoryOptions>(args)
             .MapResult(
-                (ZipkinOptions options) => TestZipkinExporter.Run(options.Uri),
-                (PrometheusOptions options) => TestPrometheusExporter.Run(options.Port),
+                (ZipkinOptions options) => TestZipkinExporter.Run(options),
+                (PrometheusOptions options) => TestPrometheusExporter.Run(options),
                 (MetricsOptions options) => TestMetrics.Run(options),
                 (LogsOptions options) => TestLogs.Run(options),
-                (GrpcNetClientOptions options) => TestGrpcNetClient.Run(),
-                (HttpClientOptions options) => TestHttpClient.Run(),
+                (GrpcNetClientOptions options) => TestGrpcNetClient.Run(options),
+                (HttpClientOptions options) => TestHttpClient.Run(options),
                 (ConsoleOptions options) => TestConsoleExporter.Run(options),
                 (OpenTelemetryShimOptions options) => TestOTelShimWithConsoleExporter.Run(options),
                 (OpenTracingShimOptions options) => TestOpenTracingShim.Run(options),
-                (OtlpOptions options) => TestOtlpExporter.Run(options.Endpoint, options.Protocol),
+                (OtlpOptions options) => TestOtlpExporter.Run(options),
                 (InMemoryOptions options) => TestInMemoryExporter.Run(options),
                 errs => 1);
     }
@@ -54,7 +54,7 @@ public static void Main(string[] args)
 internal class ZipkinOptions
 {
     [Option('u', "uri", HelpText = "Please specify the uri of Zipkin backend", Required = true)]
-    public string Uri { get; set; }
+    public required string Uri { get; set; }
 }
 
 [Verb("prometheus", HelpText = "Specify the options required to test Prometheus")]
@@ -83,10 +83,10 @@ internal class MetricsOptions
     public int DefaultCollectionPeriodMilliseconds { get; set; }
 
     [Option("useExporter", Default = "console", HelpText = "Options include otlp or console.", Required = false)]
-    public string UseExporter { get; set; }
+    public string? UseExporter { get; set; }
 
     [Option('e', "endpoint", HelpText = "Target to which the exporter is going to send metrics (default value depends on protocol).", Default = null)]
-    public string Endpoint { get; set; }
+    public string? Endpoint { get; set; }
 
     [Option('p', "useGrpc", HelpText = "Use gRPC or HTTP when using the OTLP exporter", Required = false, Default = true)]
     public bool UseGrpc { get; set; }
@@ -121,26 +121,26 @@ internal class OpenTracingShimOptions
 internal class OtlpOptions
 {
     [Option('e', "endpoint", HelpText = "Target to which the exporter is going to send traces (default value depends on protocol).", Default = null)]
-    public string Endpoint { get; set; }
+    public string? Endpoint { get; set; }
 
     [Option('p', "protocol", HelpText = "Transport protocol used by exporter. Supported values: grpc and http/protobuf.", Default = "grpc")]
-    public string Protocol { get; set; }
+    public string? Protocol { get; set; }
 }
 
 [Verb("logs", HelpText = "Specify the options required to test Logs")]
 internal class LogsOptions
 {
     [Option("useExporter", Default = "otlp", HelpText = "Options include otlp or console.", Required = false)]
-    public string UseExporter { get; set; }
+    public string? UseExporter { get; set; }
 
     [Option('e', "endpoint", HelpText = "Target to which the OTLP exporter is going to send logs (default value depends on protocol).", Default = null)]
-    public string Endpoint { get; set; }
+    public string? Endpoint { get; set; }
 
     [Option('p', "protocol", HelpText = "Transport protocol used by OTLP exporter. Supported values: grpc and http/protobuf. Only applicable if Exporter is OTLP", Default = "grpc")]
-    public string Protocol { get; set; }
+    public string? Protocol { get; set; }
 
     [Option("processorType", Default = "batch", HelpText = "export processor type. Supported values: simple and batch", Required = false)]
-    public string ProcessorType { get; set; }
+    public string? ProcessorType { get; set; }
 
     [Option("scheduledDelay", Default = 5000, HelpText = "The delay interval in milliseconds between two consecutive exports.", Required = false)]
     public int ScheduledDelayInMilliseconds { get; set; }

examples/Console/TestConsoleExporter.cs

@@ -15,21 +15,21 @@ internal class TestConsoleExporter
     // (eg: C:\repos\opentelemetry-dotnet\examples\Console\)
     //
     // dotnet run console
-    internal static object Run(ConsoleOptions options)
+    internal static int Run(ConsoleOptions options)
     {
         return RunWithActivitySource();
     }
 
-    private static object RunWithActivitySource()
+    private static int RunWithActivitySource()
     {
         // Enable OpenTelemetry for the sources "Samples.SampleServer" and "Samples.SampleClient"
         // and use Console exporter.
         using var tracerProvider = Sdk.CreateTracerProviderBuilder()
-                .AddSource("Samples.SampleClient", "Samples.SampleServer")
-                .ConfigureResource(res => res.AddService("console-test"))
-                .AddProcessor(new MyProcessor()) // This must be added before ConsoleExporter
-                .AddConsoleExporter()
-                .Build();
+            .AddSource("Samples.SampleClient", "Samples.SampleServer")
+            .ConfigureResource(res => res.AddService("console-test"))
+            .AddProcessor(new MyProcessor()) // This must be added before ConsoleExporter
+            .AddConsoleExporter()
+            .Build();
 
         // The above line is required only in applications
         // which decide to use OpenTelemetry.
@@ -43,7 +43,7 @@ private static object RunWithActivitySource()
             System.Console.ReadLine();
         }
 
-        return null;
+        return 0;
     }
 
     /// <summary>

examples/Console/TestGrpcNetClient.cs

@@ -12,8 +12,10 @@ namespace Examples.Console;
 
 internal class TestGrpcNetClient
 {
-    internal static object Run()
+    internal static int Run(GrpcNetClientOptions options)
     {
+        Debug.Assert(options != null, "options was null");
+
         // Prerequisite for running this example.
         // In a separate console window, start the example
         // ASP.NET Core gRPC service by running the following command
@@ -55,6 +57,6 @@ internal static object Run()
         System.Console.WriteLine("Press Enter key to exit.");
         System.Console.ReadLine();
 
-        return null;
+        return 0;
     }
 }

examples/Console/TestHttpClient.cs

@@ -15,8 +15,10 @@ internal class TestHttpClient
     // (eg: C:\repos\opentelemetry-dotnet\examples\Console\)
     //
     // dotnet run httpclient
-    internal static object Run()
+    internal static int Run(HttpClientOptions options)
     {
+        Debug.Assert(options != null, "options was null");
+
         System.Console.WriteLine("Hello World!");
 
         using var tracerProvider = Sdk.CreateTracerProviderBuilder()
@@ -36,6 +38,6 @@ internal static object Run()
         System.Console.WriteLine("Press Enter key to exit.");
         System.Console.ReadLine();
 
-        return null;
+        return 0;
     }
 }