Sort of working

newrelic · Oct 19, 2023 · d289edf · d289edf
1 parent 8fe8d63
commit d289edf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Elasticsearch/Instrumentation.xml b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Elasticsearch/Instrumentation.xml
@@ -32,5 +32,18 @@ SPDX-License-Identifier: Apache-2.0
       </match>
     </tracerFactory>
 
+    <!--8.10.0+-->
+    <tracerFactory name="RequestWrapper">
+      <match assemblyName="Elastic.Transport" className="Elastic.Transport.DefaultHttpTransport`1">
+        <exactMethodMatcher methodName="Request" parameters="Elastic.Transport.HttpMethod,System.String,Elastic.Transport.PostData,Elastic.Transport.RequestParameters,Elastic.Transport.Diagnostics.OpenTelemetryData&amp;" />
+      </match>
+    </tracerFactory>
+
+    <tracerFactory name="RequestWrapper">
+      <match assemblyName="Elastic.Transport" className="Elastic.Transport.DefaultHttpTransport`1">
+        <exactMethodMatcher methodName="RequestAsync" parameters="Elastic.Transport.HttpMethod,System.String,Elastic.Transport.PostData,Elastic.Transport.RequestParameters,Elastic.Transport.Diagnostics.OpenTelemetryData&amp;,System.Threading.CancellationToken" />
+      </match>
+    </tracerFactory>
+
   </instrumentation>
 </extension>
diff --git a/...pplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj b/...pplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj
@@ -124,11 +124,11 @@
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.0.0" Condition="'$(TargetFramework)' == 'net462'" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.0.9" Condition="'$(TargetFramework)' == 'net471'" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.0.9" Condition="'$(TargetFramework)' == 'net48'" />
-    <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.9.3" Condition="'$(TargetFramework)' == 'net481'" />
+    <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.10.0" Condition="'$(TargetFramework)' == 'net481'" />
 
     <!-- Elastic.Clients.Elasticsearch .NET/Core references - only actually testing oldest and newest -->
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.0.0" Condition="'$(TargetFramework)' == 'net6.0'" />
-    <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.9.3" Condition="'$(TargetFramework)' == 'net7.0'" />
+    <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.10.0" Condition="'$(TargetFramework)' == 'net7.0'" />
 
     <!-- Serilog .NET framework references -->
     <PackageReference Include="Serilog" Version="1.5.14" Condition="'$(TargetFramework)' == 'net462'" />

diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Elasticsearch/ElasticsearchTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Elasticsearch/ElasticsearchTests.cs
@@ -69,6 +69,7 @@ protected ElasticsearchTestsBase(TFixture fixture, ITestOutputHelper output, Cli
                     configModifier.ConfigureFasterSpanEventsHarvestCycle(15);
 
                     configModifier.ForceTransactionTraces();
+                    configModifier.SetLogLevel("finest");
                 },
                 exerciseApplication: () =>
                 {