From 66f8d19f67611f11efd244a154c89344526c7a77 Mon Sep 17 00:00:00 2001
From: Roland Fieger <roland.fieger@it-factum.de>
Date: Tue, 12 Oct 2021 11:22:16 +0200
Subject: [PATCH] OP changes

---
 SearchWebApi/SearchWebApi.csproj | 1 +
 SearchWebApi/Startup.cs          | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/SearchWebApi/SearchWebApi.csproj b/SearchWebApi/SearchWebApi.csproj
index 6173e22..7e111a0 100644
--- a/SearchWebApi/SearchWebApi.csproj
+++ b/SearchWebApi/SearchWebApi.csproj
@@ -10,6 +10,7 @@
     <PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.11.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.16" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="OpenTelemetry.Contrib.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta2" />
     <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.1.0" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.1.0" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc7" />
diff --git a/SearchWebApi/Startup.cs b/SearchWebApi/Startup.cs
index b112648..4d18342 100644
--- a/SearchWebApi/Startup.cs
+++ b/SearchWebApi/Startup.cs
@@ -52,8 +52,10 @@ namespace FwSearchApi
             services.AddSwaggerGen();
 
             services.AddOpenTelemetryTracing((builder) => builder
+                        //.SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("TxSearchApi"))
                         .AddAspNetCoreInstrumentation()
                         .AddHttpClientInstrumentation()
+                        .AddEntityFrameworkCoreInstrumentation()
                         .AddConsoleExporter()
                         .AddOtlpExporter(otlpOptions => {
                             otlpOptions.Endpoint = new Uri("http://192.168.178.44:8200");
@@ -73,7 +75,7 @@ namespace FwSearchApi
 
             app.UseSwagger();
 
-            app.UseElasticApm(_configuration, new EfCoreDiagnosticsSubscriber());
+            //app.UseElasticApm(_configuration, new EfCoreDiagnosticsSubscriber());
 
             app.UseSwaggerUI(c =>
             {