Merge branch 'main' into alanwest/default-periodic

.editorconfig

@@ -64,8 +64,11 @@ dotnet_sort_system_directives_first = true
 csharp_prefer_braces = true:silent
 csharp_preserve_single_line_blocks = true
 csharp_preserve_single_line_statements = true
+csharp_prefer_simple_using_statement = true:suggestion
 dotnet_style_readonly_field = true:suggestion
 csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
+dotnet_style_prefer_simplified_interpolation = true:suggestion
+dotnet_style_object_initializer = true:suggestion
 
 # Expression-level preferences
 dotnet_style_object_initializer = true:suggestion

CONTRIBUTING.md

@@ -44,7 +44,7 @@ You can contribute to this project from a Windows, macOS or Linux machine.
 On all platforms, the minimum requirements are:
 
 * Git client and command line tools.
-* .NET Core 6.0+
+* .NET 6.0+
 
 ### Linux or MacOS
 

build/Common.nonprod.props

@@ -42,7 +42,7 @@
     <MoqPkgVer>[4.14.5,5.0)</MoqPkgVer>
     <RabbitMQClientPkgVer>[6.1.0,7.0)</RabbitMQClientPkgVer>
     <StackExchangeRedisPkgVer>[2.1.58,3.0)</StackExchangeRedisPkgVer>
-    <SwashbuckleAspNetCorePkgVer>[5.0.0]</SwashbuckleAspNetCorePkgVer>
+    <SwashbuckleAspNetCorePkgVer>[6.2.3]</SwashbuckleAspNetCorePkgVer>
     <XUnitRunnerVisualStudioPkgVer>[2.4.3,3.0)</XUnitRunnerVisualStudioPkgVer>
     <XUnitPkgVer>[2.4.1,3.0)</XUnitPkgVer>
   </PropertyGroup>

docs/logs/extending-the-sdk/MyExporter.cs

@@ -61,7 +61,7 @@ void ProcessScope(LogRecordScope scope, StringBuilder builder)
             sb.Append(')');
         }
 
-        Console.WriteLine($"{this.name}.Export([{sb.ToString()}])");
+        Console.WriteLine($"{this.name}.Export([{sb}])");
         return ExportResult.Success;
     }
 

docs/metrics/customizing-the-sdk/README.md

@@ -39,7 +39,7 @@ in `Application_Start`, and disposed in `Application_End` (both methods part of
 Global.asax.cs file) as shown [here](../../../examples/AspNet/Global.asax.cs). In
 a typical ASP.NET Core application, `MeterProvider` lifetime is managed by
 leveraging the built-in Dependency Injection container as shown
-[here](../../../examples/AspNetCore/Startup.cs).
+[here](../../../examples/AspNetCore/Program.cs).
 
 ## MeterProvider configuration
 

docs/trace/customizing-the-sdk/README.md

@@ -42,7 +42,7 @@ in `Application_Start`, and disposed in `Application_End` (both methods part of
 Global.asax.cs file) as shown [here](../../../examples/AspNet/Global.asax.cs). In
 a typical ASP.NET Core application, `TracerProvider` lifetime is managed by
 leveraging the built-in Dependency Injection container as shown
-[here](../../../examples/AspNetCore/Startup.cs).
+[here](../../../examples/AspNetCore/Program.cs).
 
 ## TracerProvider configuration
 

docs/trace/extending-the-sdk/MyExporter.cs

@@ -45,7 +45,7 @@ public override ExportResult Export(in Batch<Activity> batch)
             sb.Append(activity.DisplayName);
         }
 
-        Console.WriteLine($"{this.name}.Export([{sb.ToString()}])");
+        Console.WriteLine($"{this.name}.Export([{sb}])");
         return ExportResult.Success;
     }
 

docs/trace/extending-the-sdk/Program.cs

@@ -35,14 +35,8 @@ public static void Main()
             .AddMyExporter()
             .Build();
 
-        using (var foo = DemoSource.StartActivity("Foo"))
-        {
-            using (var bar = DemoSource.StartActivity("Bar"))
-            {
-                using (var baz = DemoSource.StartActivity("Baz"))
-                {
-                }
-            }
-        }
+        using var foo = DemoSource.StartActivity("Foo");
+        using var bar = DemoSource.StartActivity("Bar");
+        using var baz = DemoSource.StartActivity("Baz");
     }
 }

docs/trace/getting-started/Program.cs

@@ -31,11 +31,9 @@ public static void Main()
             .AddConsoleExporter()
             .Build();
 
-        using (var activity = MyActivitySource.StartActivity("SayHello"))
-        {
-            activity?.SetTag("foo", 1);
-            activity?.SetTag("bar", "Hello, World!");
-            activity?.SetTag("baz", new int[] { 1, 2, 3 });
-        }
+        using var activity = MyActivitySource.StartActivity("SayHello");
+        activity?.SetTag("foo", 1);
+        activity?.SetTag("bar", "Hello, World!");
+        activity?.SetTag("baz", new int[] { 1, 2, 3 });
     }
 }

examples/AspNetCore/Controllers/WeatherForecastController.cs

@@ -14,58 +14,51 @@
 // limitations under the License.
 // </copyright>
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using Examples.AspNetCore.Models;
+namespace Examples.AspNetCore.Controllers;
+
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 
-namespace Examples.AspNetCore.Controllers
+[ApiController]
+[Route("[controller]")]
+public class WeatherForecastController : ControllerBase
 {
-    [ApiController]
-    [Route("[controller]")]
-    public class WeatherForecastController : ControllerBase
+    private static readonly string[] Summaries = new[]
     {
-        private static readonly string[] Summaries = new[]
-        {
             "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching",
-        };
+    };
 
-        private static readonly HttpClient HttpClient = new();
+    private static readonly HttpClient HttpClient = new HttpClient();
 
-        private readonly ILogger<WeatherForecastController> logger;
+    private readonly ILogger<WeatherForecastController> logger;
 
-        public WeatherForecastController(ILogger<WeatherForecastController> logger)
-        {
-            this.logger = logger ?? throw new ArgumentNullException(nameof(logger));
-        }
+    public WeatherForecastController(ILogger<WeatherForecastController> logger)
+    {
+        this.logger = logger ?? throw new ArgumentNullException(nameof(logger));
+    }
 
-        [HttpGet]
-        public IEnumerable<WeatherForecast> Get()
-        {
-            using var scope = this.logger.BeginScope("{Id}", Guid.NewGuid().ToString("N"));
+    [HttpGet]
+    public IEnumerable<WeatherForecast> Get()
+    {
+        using var scope = this.logger.BeginScope("{Id}", Guid.NewGuid().ToString("N"));
 
-            // Making an http call here to serve as an example of
-            // how dependency calls will be captured and treated
-            // automatically as child of incoming request.
-            var res = HttpClient.GetStringAsync("http://google.com").Result;
-            var rng = new Random();
-            var forecast = Enumerable.Range(1, 5).Select(index => new WeatherForecast
-            {
-                Date = DateTime.Now.AddDays(index),
-                TemperatureC = rng.Next(-20, 55),
-                Summary = Summaries[rng.Next(Summaries.Length)],
-            })
-            .ToArray();
+        // Making an http call here to serve as an example of
+        // how dependency calls will be captured and treated
+        // automatically as child of incoming request.
+        var res = HttpClient.GetStringAsync("http://google.com").Result;
+        var rng = new Random();
+        var forecast = Enumerable.Range(1, 5).Select(index => new WeatherForecast
+        {
+            Date = DateTime.Now.AddDays(index),
+            TemperatureC = rng.Next(-20, 55),
+            Summary = Summaries[rng.Next(Summaries.Length)],
+        })
+        .ToArray();
 
-            this.logger.LogInformation(
-                "WeatherForecasts generated {count}: {forecasts}",
-                forecast.Length,
-                forecast);
+        this.logger.LogInformation(
+            "WeatherForecasts generated {count}: {forecasts}",
+            forecast.Length,
+            forecast);
 
-            return forecast;
-        }
+        return forecast;
     }
 }

examples/AspNetCore/Examples.AspNetCore.csproj

@@ -1,28 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <NoWarn>$(NoWarn);1591</NoWarn>
-    <IsPackable>false</IsPackable>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.20" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="$(SwashbuckleAspNetCorePkgVer)" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Extensions.Hosting\OpenTelemetry.Extensions.Hosting.csproj" />
     <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Console\OpenTelemetry.Exporter.Console.csproj" />
-    <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Jaeger\OpenTelemetry.Exporter.Jaeger.csproj" />
-    <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Zipkin\OpenTelemetry.Exporter.Zipkin.csproj" />
     <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.OpenTelemetryProtocol\OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj" />
     <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs\OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs.csproj" />
-    <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Prometheus\OpenTelemetry.Exporter.Prometheus.csproj" />
     <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.AspNetCore\OpenTelemetry.Instrumentation.AspNetCore.csproj" />
     <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.Http\OpenTelemetry.Instrumentation.Http.csproj" />
+    <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Jaeger\OpenTelemetry.Exporter.Jaeger.csproj" />
+    <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Prometheus\OpenTelemetry.Exporter.Prometheus.csproj" />
+    <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Zipkin\OpenTelemetry.Exporter.Zipkin.csproj" />
   </ItemGroup>
-
-
 </Project>

examples/AspNetCore/Models/WeatherForecast.cs

@@ -14,9 +14,7 @@
 // limitations under the License.
 // </copyright>
 
-using System;
-
-namespace Examples.AspNetCore.Models
+namespace Examples.AspNetCore
 {
     public class WeatherForecast
     {
@@ -26,6 +24,6 @@ public class WeatherForecast
 
         public int TemperatureF => 32 + (int)(this.TemperatureC / 0.5556);
 
-        public string Summary { get; set; }
+        public string? Summary { get; set; }
     }
 }