[repo/ElasticsearchClient] Prepare to .NET9 (open-telemetry#2292)

Kielek · web-flow · commit d7a8fc21f2be · 2024-11-04T19:19:17.000+01:00
diff --git a/src/OpenTelemetry.Instrumentation.ElasticsearchClient/Implementation/ElasticsearchRequestPipelineDiagnosticListener.cs b/src/OpenTelemetry.Instrumentation.ElasticsearchClient/Implementation/ElasticsearchRequestPipelineDiagnosticListener.cs
@@ -57,6 +57,8 @@ public override void OnEventWritten(string name, object? payload)
             case "CallElasticsearch.Stop":
                 this.OnStopActivity(activity, payload);
                 break;
+            default:
+                break;
         }
     }
 
@@ -69,12 +71,7 @@ private static string GetDisplayName(Activity activity, object? method, string?
             case "CallElasticsearch" when method != null:
                 {
                     var methodName = MethodNameCache.GetOrAdd(method, $"Elasticsearch {method}");
-                    if (elasticType == null)
-                    {
-                        return methodName;
-                    }
-
-                    return $"{methodName} {elasticType}";
+                    return elasticType == null ? methodName : $"{methodName} {elasticType}";
                 }
 
             default:
@@ -122,7 +119,7 @@ private string ParseAndFormatRequest(string debugInformation)
         var request = ParseRequest.Match(debugInformation);
         if (request.Success)
         {
-            string? body = request.Groups[1]?.Value?.Trim();
+            var body = request.Groups[1]?.Value?.Trim();
             if (body == null)
             {
                 return debugInformation;
@@ -193,7 +190,7 @@ private void OnStartActivity(Activity activity, object? payload)
             }
 
             var uriHostNameType = Uri.CheckHostName(uri.Host);
-            if (uriHostNameType == UriHostNameType.IPv4 || uriHostNameType == UriHostNameType.IPv6)
+            if (uriHostNameType is UriHostNameType.IPv4 or UriHostNameType.IPv6)
             {
                 activity.SetTag(SemanticConventions.AttributeNetPeerIp, uri.Host);
             }
@@ -269,14 +266,10 @@ private void OnStopActivity(Activity activity, object? payload)
 
                 if (originalException is HttpRequestException)
                 {
-                    if (originalException.InnerException is SocketException exception)
+                    if (originalException.InnerException is SocketException { SocketErrorCode: SocketError.HostNotFound })
                     {
-                        switch (exception.SocketErrorCode)
-                        {
-                            case SocketError.HostNotFound:
-                                activity.SetStatus(Status.Error.WithDescription(originalException.Message));
-                                return;
-                        }
+                        activity.SetStatus(Status.Error.WithDescription(originalException.Message));
+                        return;
                     }
 
                     if (originalException.InnerException != null)
diff --git a/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/Customer.cs b/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/Customer.cs
@@ -3,7 +3,7 @@
 
 namespace OpenTelemetry.Instrumentation.ElasticsearchClient.Tests;
 
-public class Customer
+internal class Customer
 {
     public string? Id { get; set; }
 
diff --git a/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/DependencyInjectionConfigTests.cs b/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/DependencyInjectionConfigTests.cs
@@ -15,7 +15,7 @@ public class DependencyInjectionConfigTests
     [InlineData("CustomName")]
     public async Task TestTracingOptionsDiConfig(string? name)
     {
-        bool optionsPickedFromDi = false;
+        var optionsPickedFromDi = false;
 
         var services = new ServiceCollection();
 
diff --git a/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/ElasticsearchClientTests.cs b/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/ElasticsearchClientTests.cs
@@ -181,7 +181,7 @@ public async Task CanCaptureSearchCall()
     [Fact]
     public async Task CanRecordAndSampleSearchCall()
     {
-        bool samplerCalled = false;
+        var samplerCalled = false;
 
         var sampler = new TestSampler
         {
@@ -193,10 +193,10 @@ public async Task CanRecordAndSampleSearchCall()
                 },
         };
 
-        using TestActivityProcessor testActivityProcessor = new TestActivityProcessor();
+        using var testActivityProcessor = new TestActivityProcessor();
 
-        int startCalled = 0;
-        int endCalled = 0;
+        var startCalled = 0;
+        var endCalled = 0;
 
         testActivityProcessor.StartAction =
             (a) =>
@@ -239,9 +239,9 @@ public async Task CanRecordAndSampleSearchCall()
     }
 
     [Fact]
-    public async Task CanSupressDownstreamActivities()
+    public async Task CanSuppressDownstreamActivities()
     {
-        bool samplerCalled = false;
+        var samplerCalled = false;
 
         var sampler = new TestSampler
         {
@@ -253,10 +253,10 @@ public async Task CanSupressDownstreamActivities()
                 },
         };
 
-        using TestActivityProcessor testActivityProcessor = new TestActivityProcessor();
+        using var testActivityProcessor = new TestActivityProcessor();
 
-        int startCalled = 0;
-        int endCalled = 0;
+        var startCalled = 0;
+        var endCalled = 0;
 
         testActivityProcessor.StartAction =
             (a) =>
@@ -301,7 +301,7 @@ public async Task CanSupressDownstreamActivities()
     [Fact]
     public async Task CanDropSearchCall()
     {
-        bool samplerCalled = false;
+        var samplerCalled = false;
 
         var sampler = new TestSampler
         {
@@ -313,10 +313,10 @@ public async Task CanDropSearchCall()
                 },
         };
 
-        using TestActivityProcessor testActivityProcessor = new TestActivityProcessor();
+        using var testActivityProcessor = new TestActivityProcessor();
 
-        int startCalled = 0;
-        int endCalled = 0;
+        var startCalled = 0;
+        var endCalled = 0;
 
         testActivityProcessor.StartAction =
             (a) =>
@@ -725,8 +725,8 @@ public async Task DoesNotCaptureWhenInstrumentationIsSuppressed()
     public async Task CapturesBasedOnSamplingDecision(SamplingDecision samplingDecision, bool isActivityExpected)
     {
         var expectedResource = ResourceBuilder.CreateDefault().AddService("test-service");
-        bool startActivityCalled = false;
-        bool endActivityCalled = false;
+        var startActivityCalled = false;
+        var endActivityCalled = false;
         var processor = new TestActivityProcessor(
             activity => startActivityCalled = true,
             activity => endActivityCalled = true);
@@ -851,7 +851,7 @@ public async Task ShouldRemoveSensitiveInformation()
         Assert.Single(exportedItems);
         var searchActivity = exportedItems[0];
 
-        string? dbUrl = (string?)searchActivity.GetTagValue(SemanticConventions.AttributeUrlFull);
+        var dbUrl = (string?)searchActivity.GetTagValue(SemanticConventions.AttributeUrlFull);
 
         Assert.DoesNotContain("sensitive", dbUrl);
         Assert.Contains("REDACTED:REDACTED", dbUrl);
diff --git a/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/InMemoryConnectionWithDownstreamActivity.cs b/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/InMemoryConnectionWithDownstreamActivity.cs
@@ -6,10 +6,10 @@
 
 namespace OpenTelemetry.Instrumentation.ElasticsearchClient.Tests;
 
-public class InMemoryConnectionWithDownstreamActivity : InMemoryConnection
+internal class InMemoryConnectionWithDownstreamActivity : InMemoryConnection
 {
-    internal static readonly ActivitySource ActivitySource = new ActivitySource("Downstream");
-    internal static readonly ActivitySource NestedActivitySource = new ActivitySource("NestedDownstream");
+    internal static readonly ActivitySource ActivitySource = new("Downstream");
+    internal static readonly ActivitySource NestedActivitySource = new("NestedDownstream");
 
     public override Task<TResponse> RequestAsync<TResponse>(RequestData requestData, CancellationToken cancellationToken)
     {

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,8 @@ public override void OnEventWritten(string name, object? payload)`
`57`	`57`	`case "CallElasticsearch.Stop":`
`58`	`58`	`this.OnStopActivity(activity, payload);`
`59`	`59`	`break;`
	`60`	`+ default:`
	`61`	`+ break;`
`60`	`62`	`}`
`61`	`63`	`}`
`62`	`64`
`@@ -69,12 +71,7 @@ private static string GetDisplayName(Activity activity, object? method, string?`
`69`	`71`	`case "CallElasticsearch" when method != null:`
`70`	`72`	`{`
`71`	`73`	`var methodName = MethodNameCache.GetOrAdd(method, $"Elasticsearch {method}");`
`72`		`- if (elasticType == null)`
`73`		`- {`
`74`		`- return methodName;`
`75`		`- }`
`76`		`-`
`77`		`- return $"{methodName} {elasticType}";`
	`74`	`+ return elasticType == null ? methodName : $"{methodName} {elasticType}";`
`78`	`75`	`}`
`79`	`76`
`80`	`77`	`default:`
`@@ -122,7 +119,7 @@ private string ParseAndFormatRequest(string debugInformation)`
`122`	`119`	`var request = ParseRequest.Match(debugInformation);`
`123`	`120`	`if (request.Success)`
`124`	`121`	`{`
`125`		`- string? body = request.Groups[1]?.Value?.Trim();`
	`122`	`+ var body = request.Groups[1]?.Value?.Trim();`
`126`	`123`	`if (body == null)`
`127`	`124`	`{`
`128`	`125`	`return debugInformation;`
`@@ -193,7 +190,7 @@ private void OnStartActivity(Activity activity, object? payload)`
`193`	`190`	`}`
`194`	`191`
`195`	`192`	`var uriHostNameType = Uri.CheckHostName(uri.Host);`
`196`		`- if (uriHostNameType == UriHostNameType.IPv4 \|\| uriHostNameType == UriHostNameType.IPv6)`
	`193`	`+ if (uriHostNameType is UriHostNameType.IPv4 or UriHostNameType.IPv6)`
`197`	`194`	`{`
`198`	`195`	`activity.SetTag(SemanticConventions.AttributeNetPeerIp, uri.Host);`
`199`	`196`	`}`
`@@ -269,14 +266,10 @@ private void OnStopActivity(Activity activity, object? payload)`
`269`	`266`
`270`	`267`	`if (originalException is HttpRequestException)`
`271`	`268`	`{`
`272`		`- if (originalException.InnerException is SocketException exception)`
	`269`	`+ if (originalException.InnerException is SocketException { SocketErrorCode: SocketError.HostNotFound })`
`273`	`270`	`{`
`274`		`- switch (exception.SocketErrorCode)`
`275`		`- {`
`276`		`- case SocketError.HostNotFound:`
`277`		`- activity.SetStatus(Status.Error.WithDescription(originalException.Message));`
`278`		`- return;`
`279`		`- }`
	`271`	`+ activity.SetStatus(Status.Error.WithDescription(originalException.Message));`
	`272`	`+ return;`
`280`	`273`	`}`
`281`	`274`
`282`	`275`	`if (originalException.InnerException != null)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace OpenTelemetry.Instrumentation.ElasticsearchClient.Tests;`
`5`	`5`
`6`		`-public class Customer`
	`6`	`+internal class Customer`
`7`	`7`	`{`
`8`	`8`	`public string? Id { get; set; }`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public class DependencyInjectionConfigTests`
`15`	`15`	`[InlineData("CustomName")]`
`16`	`16`	`public async Task TestTracingOptionsDiConfig(string? name)`
`17`	`17`	`{`
`18`		`- bool optionsPickedFromDi = false;`
	`18`	`+ var optionsPickedFromDi = false;`
`19`	`19`
`20`	`20`	`var services = new ServiceCollection();`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,10 @@`
`6`	`6`
`7`	`7`	`namespace OpenTelemetry.Instrumentation.ElasticsearchClient.Tests;`
`8`	`8`
`9`		`-public class InMemoryConnectionWithDownstreamActivity : InMemoryConnection`
	`9`	`+internal class InMemoryConnectionWithDownstreamActivity : InMemoryConnection`
`10`	`10`	`{`
`11`		`- internal static readonly ActivitySource ActivitySource = new ActivitySource("Downstream");`
`12`		`- internal static readonly ActivitySource NestedActivitySource = new ActivitySource("NestedDownstream");`
	`11`	`+ internal static readonly ActivitySource ActivitySource = new("Downstream");`
	`12`	`+ internal static readonly ActivitySource NestedActivitySource = new("NestedDownstream");`
`13`	`13`
`14`	`14`	`public override Task<TResponse> RequestAsync<TResponse>(RequestData requestData, CancellationToken cancellationToken)`
`15`	`15`	`{`