Log trace logs to build output if not on TeamCity

OctopusDeploy · Nov 9, 2023 · 1649bd5 · 1649bd5
1 parent 5911c70
commit 1649bd5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/source/Halibut.Tests/Support/LatestClientAndLatestServiceBuilder.cs b/source/Halibut.Tests/Support/LatestClientAndLatestServiceBuilder.cs
@@ -49,7 +49,7 @@ public class LatestClientAndLatestServiceBuilder : IClientAndServiceBuilder
  Reference<PortForwarder>? portForwarderReference;
  Func<RetryPolicy>? pollingReconnectRetryPolicy;
  ProxyFactory? proxyFactory;
- LogLevel halibutLogLevel = LogLevel.Trace;
+ LogLevel halibutLogLevel = LogLevel.Info;
  ConcurrentDictionary<string, ILog>? clientInMemoryLoggers;
  ConcurrentDictionary<string, ILog>? serviceInMemoryLoggers;
  ITrustProvider clientTrustProvider;

diff --git a/source/Halibut.Tests/Support/SerilogLoggerBuilder.cs b/source/Halibut.Tests/Support/SerilogLoggerBuilder.cs
@@ -39,7 +39,7 @@ static SerilogLoggerBuilder()
 
  Logger = new LoggerConfiguration()
  .MinimumLevel.Verbose()
- .WriteTo.Sink(new NonProgressNUnitSink(new MessageTemplateTextFormatter(nUnitOutputTemplate)), LogEventLevel.Debug)
+ .WriteTo.Sink(new NonProgressNUnitSink(new MessageTemplateTextFormatter(nUnitOutputTemplate)))
  .WriteTo.Sink(new TraceLogsForFailedTestsSink(new MessageTemplateTextFormatter(localOutputTemplate)))
  .CreateLogger();
  }
@@ -98,6 +98,12 @@ public void Emit(LogEvent logEvent)
  throw new ArgumentNullException(nameof(logEvent));
  if (TestContext.Out == null)
  return;
+
+ // SerilogLoggerBuilder creates this sink with Verbose logging, but we only want Verbose logging
+ // if we're running locally, as Verbose logs spam the TeamCity build log.
+ if (TeamCityDetection.IsRunningInTeamCity() && logEvent.Level < LogEventLevel.Debug)
+ return;
+
  var output = new StringWriter();
  if (logEvent.Properties.TryGetValue("SourceContext", out var sourceContext))
  {