PR feedback

newrelic · Jun 21, 2024 · 0eff085 · 0eff085
1 parent 627e08c
commit 0eff085
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/...nctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchElasticClient.cs b/...nctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchElasticClient.cs
@@ -47,7 +47,7 @@ protected override string Password
  }
 
  [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
- public override async Task Connect()
+ public override async Task ConnectAsync()
  {
  var settings = new ElasticsearchClientSettings(Address)
  .Authentication(new BasicAuthentication(Username, Password)).
@@ -188,7 +188,7 @@ public override async Task<long> MultiSearchAsync()
  }
 
  [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
- public override async Task GenerateError()
+ public override async Task GenerateErrorAsync()
  {
  // This isn't the password, so connection should fail, but we won't get an error until the Ping
  var settings = new ElasticsearchClientSettings(Address)
@@ -198,7 +198,7 @@ public override async Task GenerateError()
 
  var client = new ElasticsearchClient(settings);
 
- var response = _ = await client.PingAsync();
+ var response = await client.PingAsync();
 
  if (response.IsSuccess())
  {

diff --git a/...tiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchExerciser.cs b/...tiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchExerciser.cs
@@ -44,7 +44,7 @@ public async Task SetClient(string clientType)
  _client = new ElasticsearchElasticClient();
  break;
  }
- await _client.Connect();
+ await _client.ConnectAsync();
  }
  else
  {
@@ -94,6 +94,6 @@ public async Task SetClient(string clientType)
  [LibraryMethod]
  [Transaction]
  [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
- public async Task GenerateError() => await _client.GenerateError();
+ public async Task GenerateErrorAsync() => await _client.GenerateErrorAsync();
  }
 }
diff --git a/...iFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchNestClient.cs b/...iFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchNestClient.cs
@@ -36,7 +36,7 @@ protected override string Password
  }
 
  [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
- public override async Task Connect()
+ public override async Task ConnectAsync()
  {
  var settings = new ConnectionSettings(Address).
  BasicAuthentication(Username,Password).
@@ -176,7 +176,7 @@ public override async Task<long> MultiSearchAsync()
  }
 
  [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
- public override async Task GenerateError()
+ public override async Task GenerateErrorAsync()
  {
  // This isn't the password, so connection should fail, but we won't get an error until the Ping
  var settings = new ConnectionSettings(Address).

diff --git a/...tiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchNetClient.cs b/...tiFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchNetClient.cs
@@ -36,7 +36,7 @@ protected override string Password
  }
 
  [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
- public override async Task Connect()
+ public override async Task ConnectAsync()
  {
  var settings = new ConnectionConfiguration(Address)
  .BasicAuthentication(Username, Password)
@@ -211,7 +211,7 @@ public override async Task<long> MultiSearchAsync()
  }
 
  [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
- public override async Task GenerateError()
+ public override async Task GenerateErrorAsync()
  {
  // This isn't the password, so connection should fail, but we won't get an error until the Ping
  var settings = new ConnectionConfiguration(Address)

diff --git a/...iFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchTestClient.cs b/...iFunctionApplicationHelpers/NetStandardLibraries/Elasticsearch/ElasticsearchTestClient.cs
@@ -28,7 +28,7 @@ protected abstract string Password
 
  public ElasticsearchTestClient() { }
 
- public abstract Task Connect();
+ public abstract Task ConnectAsync();
 
  public abstract void Index();
 
@@ -46,7 +46,7 @@ public ElasticsearchTestClient() { }
 
  public abstract Task<long> MultiSearchAsync();
 
- public abstract Task GenerateError();
+ public abstract Task GenerateErrorAsync();
  }
 
  public class FlightRecord

diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Elasticsearch/ElasticsearchTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Elasticsearch/ElasticsearchTests.cs
@@ -65,6 +65,7 @@ protected ElasticsearchTestsBase(TFixture fixture, ITestOutputHelper output, Cli
  _fixture.AddCommand($"ElasticsearchExerciser SearchAsync");
  _fixture.AddCommand($"ElasticsearchExerciser IndexManyAsync");
  _fixture.AddCommand($"ElasticsearchExerciser MultiSearchAsync");
+ _fixture.AddCommand($"ElasticsearchExerciser GenerateErrorAsync");
 
  // Sync operations
  if (_syncMethodsOk )
@@ -75,7 +76,6 @@ protected ElasticsearchTestsBase(TFixture fixture, ITestOutputHelper output, Cli
  _fixture.AddCommand($"ElasticsearchExerciser MultiSearch");
 
  }
- _fixture.AddCommand($"ElasticsearchExerciser GenerateError");
 
  _fixture.AddActions
  (
@@ -153,9 +153,9 @@ public void MultiSearchAsync()
  }
 
  [Fact]
- public void Error()
+ public void ErrorAsync()
  {
- ValidateError("GenerateError");
+ ValidateError("GenerateErrorAsync");
  }
 
  private void ValidateError(string operationName)