Update ApacheThrift to 0.14 (#213)

Signed-off-by: Kraemer, Benjamin <[email protected]>
jaegertracing · May 27, 2021 · 9d4debc · 9d4debc
1 parent c3ba70d
commit 9d4debc
Show file tree

Hide file tree

Showing 72 changed files with 4,781 additions and 3,081 deletions.
diff --git a/crossdock/Jaeger.Crossdock/Jaeger.Crossdock.csproj b/crossdock/Jaeger.Crossdock/Jaeger.Crossdock.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.7.9" />
     <PackageReference Include="OpenTracing.Contrib.NetCore" Version="0.6.2" />
   </ItemGroup>

diff --git a/crossdock/Jaeger.Crossdock/Startup.cs b/crossdock/Jaeger.Crossdock/Startup.cs
@@ -3,7 +3,6 @@
 using Jaeger.Crossdock.Behavior;
 using Jaeger.Reporters;
 using Jaeger.Samplers;
-using Jaeger.Senders;
 using Jaeger.Senders.Thrift;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;

diff --git a/examples/Jaeger.Example.WebApi.NetFx/App_Start/AutofacConfig.cs b/examples/Jaeger.Example.WebApi.NetFx/App_Start/AutofacConfig.cs
@@ -4,6 +4,9 @@
 using OpenTracing;
 using System.Reflection;
 using System.Web.Http;
+using Jaeger.Senders;
+using Jaeger.Senders.Thrift;
+using Microsoft.Extensions.Logging;
 
 namespace Jaeger.Example.WebApi.NetFx
 {
@@ -13,6 +16,10 @@ public class AutofacConfig
 
         static AutofacConfig()
         {
+            // This is necessary to pick the correct sender, otherwise a NoopSender is used!
+            Configuration.SenderConfiguration.DefaultSenderResolver = new SenderResolver(null)
+                .RegisterSenderFactory<ThriftSenderFactory>();
+
             tracer = new Tracer.Builder("WebApi-NetFx")
                 .WithSampler(new ConstSampler(true))
                 .Build();

diff --git a/examples/Jaeger.Example.WebApi.NetFx/Jaeger.Example.WebApi.NetFx.csproj b/examples/Jaeger.Example.WebApi.NetFx/Jaeger.Example.WebApi.NetFx.csproj
@@ -14,7 +14,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Jaeger.Example.WebApi.NetFx</RootNamespace>
     <AssemblyName>Jaeger.Example.WebApi.NetFx</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
@@ -55,14 +55,14 @@
       <HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="OpenTracing, Version=0.12.0.0, Culture=neutral, PublicKeyToken=61503406977abdaf, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\OpenTracing.0.12.0\lib\net45\OpenTracing.dll</HintPath>
+    <Reference Include="OpenTracing, Version=0.12.1.0, Culture=neutral, PublicKeyToken=61503406977abdaf, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\OpenTracing.0.12.1\lib\net45\OpenTracing.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -144,7 +144,7 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>57084</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:57084/</IISUrl>
+          <IISUrl>http://localhost:62631</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

diff --git a/examples/Jaeger.Example.WebApi.NetFx/packages.config b/examples/Jaeger.Example.WebApi.NetFx/packages.config
@@ -7,7 +7,7 @@
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net471" />
   <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net471" />
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net471" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net471" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="3.1.0" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net471" />
-  <package id="OpenTracing" version="0.12.0" targetFramework="net471" />
+  <package id="OpenTracing" version="0.12.1" targetFramework="net472" />
 </packages>
diff --git a/examples/Jaeger.Example.WebApi/Startup.cs b/examples/Jaeger.Example.WebApi/Startup.cs
@@ -1,9 +1,12 @@
 using Jaeger.Samplers;
+using Jaeger.Senders;
+using Jaeger.Senders.Thrift;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 using OpenTracing;
 using OpenTracing.Util;
 
@@ -30,10 +33,16 @@ public void ConfigureServices(IServiceCollection services)
             // Adds the Jaeger Tracer.
             services.AddSingleton<ITracer>(serviceProvider =>
             {
-                string serviceName = serviceProvider.GetRequiredService<IWebHostEnvironment>().ApplicationName;
+                var serviceName = serviceProvider.GetRequiredService<IWebHostEnvironment>().ApplicationName;
+                var loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();
+
+                // This is necessary to pick the correct sender, otherwise a NoopSender is used!
+                Jaeger.Configuration.SenderConfiguration.DefaultSenderResolver = new SenderResolver(loggerFactory)
+                    .RegisterSenderFactory<ThriftSenderFactory>();
 
                 // This will log to a default localhost installation of Jaeger.
                 var tracer = new Tracer.Builder(serviceName)
+                    .WithLoggerFactory(loggerFactory)
                     .WithSampler(new ConstSampler(true))
                     .Build();
 
@@ -58,8 +67,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 app.UseHsts();
             }
 
-            app.UseHttpsRedirection();
-
             app.UseRouting();
 
             app.UseEndpoints(endpoints => { endpoints.MapControllers(); });