Merge branch 'main' into 2029_httpinstrumentation_net9

open-telemetry · Nov 25, 2024 · 72440bb · 72440bb
2 parents cecbf1e + 65629b0
commit 72440bb
Show file tree

Hide file tree

Showing 16 changed files with 36 additions and 28 deletions.
diff --git a/examples/AspNet/Controllers/WeatherForecastController.cs b/examples/AspNet/Controllers/WeatherForecastController.cs
@@ -13,10 +13,10 @@ namespace Examples.AspNet.Controllers;
 
 public class WeatherForecastController : ApiController
 {
-    private static readonly string[] Summaries = new[]
-    {
-        "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching",
-    };
+    private static readonly string[] Summaries =
+    [
+        "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
+    ];
 
     [HttpGet] // For testing traditional routing. Ex: https://localhost:XXXX/api/weatherforecast
     public async Task<IEnumerable<WeatherForecast>> Get()
@@ -89,7 +89,7 @@ public async Task<string> GetData()
     [HttpPost]
     public async Task<HttpResponseMessage> PostData()
     {
-        string? value1 = Baggage.GetBaggage("key1");
+        var value1 = Baggage.GetBaggage("key1");
         if (string.IsNullOrEmpty(value1))
         {
             throw new InvalidOperationException("Key1 was not found on Baggage.");

diff --git a/examples/enrichment/Examples.Enrichment/IMyService.cs b/examples/enrichment/Examples.Enrichment/IMyService.cs
@@ -3,7 +3,7 @@
 
 namespace Examples.Enrichment;
 
-public interface IMyService
+internal interface IMyService
 {
     public (string Service, string Status) MyDailyStatus();
 }
diff --git a/examples/enrichment/Examples.Enrichment/MyService.cs b/examples/enrichment/Examples.Enrichment/MyService.cs
@@ -5,12 +5,12 @@ namespace Examples.Enrichment;
 
 internal sealed class MyService : IMyService
 {
-    private readonly List<string> statuses = new()
-    {
+    private readonly List<string> statuses =
+    [
         "Blocked",
         "No blockers",
-        "Out of office",
-    };
+        "Out of office"
+    ];
 
     /// <summary>
     /// Returns daily status.

diff --git a/examples/enrichment/Examples.Enrichment/Program.cs b/examples/enrichment/Examples.Enrichment/Program.cs
@@ -9,7 +9,7 @@
 
 namespace Examples.Enrichment;
 
-public static class Program
+internal static class Program
 {
     public static void Main()
     {

diff --git a/examples/grpc.core/Examples.GrpcCore.AspNetCore/Controllers/WeatherForecastController.cs b/examples/grpc.core/Examples.GrpcCore.AspNetCore/Controllers/WeatherForecastController.cs
@@ -7,12 +7,14 @@ namespace Examples.GrpcCore.AspNetCore.Controllers;
 
 [ApiController]
 [Route("[controller]")]
+#pragma warning disable CA1515
 public class WeatherForecastController : ControllerBase
+#pragma warning restore CA1515
 {
-    private static readonly string[] Summaries = new[]
-    {
-        "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching",
-    };
+    private static readonly string[] Summaries =
+    [
+        "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
+    ];
 
     private readonly Echo.EchoClient echoClient;
 

diff --git a/examples/grpc.core/Examples.GrpcCore.AspNetCore/Program.cs b/examples/grpc.core/Examples.GrpcCore.AspNetCore/Program.cs
@@ -3,7 +3,7 @@
 
 namespace Examples.GrpcCore.AspNetCore;
 
-public class Program
+internal class Program
 {
     internal const int Port = 5000;
     internal const int GrpcServicePort = 5001;

diff --git a/examples/grpc.core/Examples.GrpcCore.AspNetCore/Startup.cs b/examples/grpc.core/Examples.GrpcCore.AspNetCore/Startup.cs
@@ -8,7 +8,7 @@
 
 namespace Examples.GrpcCore.AspNetCore;
 
-public class Startup
+internal class Startup
 {
     public Startup(IConfiguration configuration)
     {

diff --git a/examples/grpc.core/Examples.GrpcCore.AspNetCore/WeatherForecast.cs b/examples/grpc.core/Examples.GrpcCore.AspNetCore/WeatherForecast.cs
@@ -3,7 +3,9 @@
 
 namespace Examples.GrpcCore.AspNetCore;
 
+#pragma warning disable CA1515
 public class WeatherForecast
+#pragma warning restore CA1515
 {
     public WeatherForecast(DateTime date, int temperatureC, string summary)
     {

diff --git a/examples/kafka/Constants.cs b/examples/kafka/Constants.cs
@@ -3,7 +3,7 @@
 
 namespace Examples.ConfluentKafka;
 
-public static class Constants
+internal static class Constants
 {
     public static readonly string Topic = $"test-topic-{Guid.NewGuid()}";
 }
diff --git a/examples/kafka/ProduceConsumeHostedService.cs b/examples/kafka/ProduceConsumeHostedService.cs
@@ -5,25 +5,25 @@
 
 namespace Examples.ConfluentKafka;
 
-public class ProduceConsumeHostedService(
+internal class ProduceConsumeHostedService(
     InstrumentedProducerBuilder<string, string> instrumentedProducerBuilder,
     InstrumentedConsumerBuilder<string, string> instrumentedConsumerBuilder)
     : BackgroundService
 {
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
-        IProducer<string, string> producer = instrumentedProducerBuilder.Build();
-        IConsumer<string, string> consumer = instrumentedConsumerBuilder.Build();
+        var producer = instrumentedProducerBuilder.Build();
+        var consumer = instrumentedConsumerBuilder.Build();
 
-        for (int j = 0; j < 100; j++)
+        for (var j = 0; j < 100; j++)
         {
             await producer.ProduceAsync(
                 Constants.Topic,
                 new Message<string, string> { Key = "any_key", Value = $"any_value_{j}" },
                 stoppingToken);
         }
 
-        for (int j = 0; j < 100; j++)
+        for (var j = 0; j < 100; j++)
         {
             producer.Produce(
                 Constants.Topic,
@@ -35,7 +35,7 @@ await producer.ProduceAsync(
         consumer.Subscribe(Constants.Topic);
         while (!stoppingToken.IsCancellationRequested)
         {
-            ConsumeResult<string, string> consumeResult = consumer.Consume(stoppingToken);
+            var consumeResult = consumer.Consume(stoppingToken);
             if (consumeResult == null)
             {
                 continue;

diff --git a/examples/owin/Controllers/TestController.cs b/examples/owin/Controllers/TestController.cs
@@ -5,7 +5,9 @@
 
 namespace Examples.Owin.Controllers;
 
+#pragma warning disable CA1515
 public class TestController : ApiController
+#pragma warning restore CA1515
 {
     // GET api/test/{id}
     public string Get(string? id = null)

diff --git a/examples/process-instrumentation/Program.cs b/examples/process-instrumentation/Program.cs
@@ -4,7 +4,7 @@
 using OpenTelemetry;
 using OpenTelemetry.Metrics;
 
-public class Program
+internal class Program
 {
     public static void Main()
     {

diff --git a/examples/runtime-instrumentation/Program.cs b/examples/runtime-instrumentation/Program.cs
@@ -4,7 +4,7 @@
 using OpenTelemetry;
 using OpenTelemetry.Metrics;
 
-public class Program
+internal class Program
 {
     public static void Main()
     {

diff --git a/examples/wcf/client-core/StatusServiceClient.cs b/examples/wcf/client-core/StatusServiceClient.cs
@@ -6,7 +6,9 @@
 
 namespace Examples.Wcf.Client;
 
+#pragma warning disable CA1515
 public class StatusServiceClient : ClientBase<IStatusServiceContract>, IStatusServiceContract
+#pragma warning restore CA1515
 {
     public StatusServiceClient(string name)
         : base(name)

diff --git a/examples/wcf/client-netframework/StatusServiceClient.cs b/examples/wcf/client-netframework/StatusServiceClient.cs
@@ -5,7 +5,7 @@
 
 namespace Examples.Wcf.Client;
 
-public class StatusServiceClient : ClientBase<IStatusServiceContract>, IStatusServiceContract
+internal class StatusServiceClient : ClientBase<IStatusServiceContract>, IStatusServiceContract
 {
     public StatusServiceClient(string name)
         : base(name)

diff --git a/examples/wcf/server-netframework/StatusService.cs b/examples/wcf/server-netframework/StatusService.cs
@@ -11,7 +11,7 @@ namespace Examples.Wcf.Server;
     InstanceContextMode = InstanceContextMode.Single,
     UseSynchronizationContext = false,
     Name = "StatusService")]
-public class StatusService : IStatusServiceContract
+internal class StatusService : IStatusServiceContract
 {
     public Task<StatusResponse> PingAsync(StatusRequest request)
     {