Merge pull request #232 from Arkatufus/master

0.6.2 Release
petabridge · Sep 17, 2021 · 89c792b · 89c792b
2 parents 479cf34 + 9476048
commit 89c792b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,7 @@
+#### 0.6.2 September 17 2021 ###
+* [Make internal ActorSystem more lightweight by using default executor](https://github.com/petabridge/Petabridge.Tracing.Zipkin/pull/230)
+* [Update Confluent.Kafka to 1.8.0](https://github.com/petabridge/Petabridge.Tracing.Zipkin/pull/229)
+
 #### 0.6.1 September 10 2021 ###
 * Upgraded to [Akka.NET 1.4.25](https://github.com/akkadotnet/akka.net/releases/tag/1.4.25)
 * [Update Confluent.Kafka to 1.7.0](https://github.com/petabridge/Petabridge.Tracing.Zipkin/pull/209)

diff --git a/src/Petabridge.Tracing.Zipkin/Petabridge.Tracing.Zipkin.csproj b/src/Petabridge.Tracing.Zipkin/Petabridge.Tracing.Zipkin.csproj
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Akka" Version="$(AkkaVersion)" />
-    <PackageReference Include="Confluent.Kafka" Version="1.7.0" />
+    <PackageReference Include="Confluent.Kafka" Version="1.8.0" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.1.3" />
     <PackageReference Include="OpenTracing" Version="0.12.1" />
     <PackageReference Include="Phobos.Actor.Common" Version="1.1.1" />

diff --git a/src/Petabridge.Tracing.Zipkin/Reporting/Http/ZipkinHttpSpanReporter.cs b/src/Petabridge.Tracing.Zipkin/Reporting/Http/ZipkinHttpSpanReporter.cs
@@ -19,7 +19,8 @@ public sealed class ZipkinHttpSpanReporter : ISpanReporter
     {
         private static readonly AtomicCounter NameCounter = new AtomicCounter(0);
 
-        private static readonly Config NormalHocon = ConfigurationFactory.Empty;
+        private static readonly Config NormalHocon = ConfigurationFactory
+            .ParseString(@"akka.actor.internal-dispatcher.executor = ""default-executor""");
         private static readonly Config DebugHocon = ConfigurationFactory.ParseString(@"akka.loglevel = DEBUG");
         private readonly ActorSystem _ownedActorSystem; // if we own the ActorSystem, we have to kill it.
         private readonly IActorRef _reporterActorRef;
@@ -63,7 +64,7 @@ public static ZipkinHttpSpanReporter Create(ZipkinHttpReportingOptions options,
             {
                 weOwnActorSystem = true;
                 actorSystem = ActorSystem.Create("pbzipkin",
-                    options.DebugLogging ? DebugHocon : NormalHocon);
+                    options.DebugLogging ? DebugHocon.WithFallback(NormalHocon) : NormalHocon);
             }
 
             // spawn as a System actor, so in the event of being in a non-owned system our traces get shut down