From 1649bd5d5195a48c68788958e147b48f56060e7c Mon Sep 17 00:00:00 2001 From: Adrian Codrington Date: Thu, 9 Nov 2023 10:33:56 +0800 Subject: [PATCH] Log trace logs to build output if not on TeamCity --- .../Support/LatestClientAndLatestServiceBuilder.cs | 2 +- source/Halibut.Tests/Support/SerilogLoggerBuilder.cs | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/source/Halibut.Tests/Support/LatestClientAndLatestServiceBuilder.cs b/source/Halibut.Tests/Support/LatestClientAndLatestServiceBuilder.cs index 8a4b4131..87a675a1 100644 --- a/source/Halibut.Tests/Support/LatestClientAndLatestServiceBuilder.cs +++ b/source/Halibut.Tests/Support/LatestClientAndLatestServiceBuilder.cs @@ -49,7 +49,7 @@ public class LatestClientAndLatestServiceBuilder : IClientAndServiceBuilder Reference? portForwarderReference; Func? pollingReconnectRetryPolicy; ProxyFactory? proxyFactory; - LogLevel halibutLogLevel = LogLevel.Trace; + LogLevel halibutLogLevel = LogLevel.Info; ConcurrentDictionary? clientInMemoryLoggers; ConcurrentDictionary? serviceInMemoryLoggers; ITrustProvider clientTrustProvider; diff --git a/source/Halibut.Tests/Support/SerilogLoggerBuilder.cs b/source/Halibut.Tests/Support/SerilogLoggerBuilder.cs index d447c312..21a69055 100644 --- 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)) {