From 471b8c8b3667057c9f1c60cdf57f4afdcf3f0744 Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@squidex.io>
Date: Mon, 8 Aug 2022 08:24:31 +0200
Subject: [PATCH] Fix stackdriver logging.

---
 .../APM/Stackdriver/StackdriverPlugin.cs      | 34 +++++++++++--------
 .../Backup/BackupProcessor.cs                 |  2 +-
 .../Squidex.Infrastructure.csproj             |  2 +-
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/backend/extensions/Squidex.Extensions/APM/Stackdriver/StackdriverPlugin.cs b/backend/extensions/Squidex.Extensions/APM/Stackdriver/StackdriverPlugin.cs
index 388ce91ea..9d95e57d7 100644
--- a/backend/extensions/Squidex.Extensions/APM/Stackdriver/StackdriverPlugin.cs
+++ b/backend/extensions/Squidex.Extensions/APM/Stackdriver/StackdriverPlugin.cs
@@ -37,27 +37,31 @@ namespace Squidex.Extensions.APM.Stackdriver
         {
             var isEnabled = config.GetValue<bool>("logging:stackdriver:enabled");
 
-            if (isEnabled)
+            if (!isEnabled)
             {
-                var projectId = config.GetValue<string>("logging:stackdriver:projectId");
+                return;
+            }
+
+            var projectId = config.GetValue<string>("logging:stackdriver:projectId");
+
+            if (string.IsNullOrWhiteSpace(projectId))
+            {
+                return;
+            }
 
-                if (!string.IsNullOrWhiteSpace(projectId))
-                {
-                    services.AddSingleton<ITelemetryConfigurator>(
-                        new Configurator(projectId));
+            services.AddSingleton<ITelemetryConfigurator>(
+                new Configurator(projectId));
 
-                    services.AddSingleton<ILogAppender,
-                        StackdriverSeverityLogAppender>();
+            services.AddSingleton<ILogAppender,
+                StackdriverSeverityLogAppender>();
 
-                    services.AddSingleton<ILogAppender,
-                        StackdriverExceptionHandler>();
+            services.AddSingleton<ILogAppender,
+                StackdriverExceptionHandler>();
 
-                    var serviceName = config.GetValue<string>("logging:name") ?? "Squidex";
-                    var serviceVersion = Assembly.GetEntryAssembly()?.GetName().Version?.ToString();
+            var serviceName = config.GetValue<string>("logging:name") ?? "Squidex";
+            var serviceVersion = Assembly.GetEntryAssembly()?.GetName().Version?.ToString();
 
-                    services.AddSingleton(c => ContextExceptionLogger.Create(projectId, serviceVersion, serviceVersion, null));
-                }
-            }
+            services.AddSingleton(c => ContextExceptionLogger.Create(projectId, serviceVersion, serviceVersion, null));
         }
     }
 }
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Backup/BackupProcessor.cs b/backend/src/Squidex.Domain.Apps.Entities/Backup/BackupProcessor.cs
index a5faa2508..42c3810e8 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Backup/BackupProcessor.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Backup/BackupProcessor.cs
@@ -128,7 +128,6 @@ namespace Squidex.Domain.Apps.Entities.Backup
         private async Task ProcessAsync(Run run,
             CancellationToken ct)
         {
-            var lastTimestamp = run.Job.Started;
             try
             {
                 await using (var stream = backupArchiveLocation.OpenStream(run.Job.Id))
@@ -182,6 +181,7 @@ namespace Squidex.Domain.Apps.Entities.Backup
 
                     await backupArchiveStore.UploadAsync(run.Job.Id, stream, ct);
                 }
+
                 await SetStatusAsync(run, JobStatus.Completed);
             }
             catch (OperationCanceledException)
diff --git a/backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj b/backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
index 20cd517f5..587797295 100644
--- a/backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
+++ b/backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
@@ -27,7 +27,7 @@
     <PackageReference Include="Squidex.Caching" Version="1.9.0" />
     <PackageReference Include="Squidex.Hosting.Abstractions" Version="2.13.0" />
     <PackageReference Include="Squidex.Log" Version="1.6.0" />
-    <PackageReference Include="Squidex.Messaging" Version="1.7.0" />
+    <PackageReference Include="Squidex.Messaging" Version="2.1.0" />
     <PackageReference Include="Squidex.Text" Version="1.7.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
     <PackageReference Include="System.Collections.Immutable" Version="6.0.0" />