Skip to content

Commit b360e70

Browse files
committed
Add logging of configured values for LogLevelDenyList, fixed typo in integration tests
1 parent dbdf5e3 commit b360e70

File tree

2 files changed

+55
-44
lines changed

2 files changed

+55
-44
lines changed

src/Agent/NewRelic/Agent/Core/Configuration/DefaultConfiguration.cs

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1995,12 +1995,23 @@ public virtual HashSet<string> LogLevelDenyList
19951995
{
19961996
get
19971997
{
1998-
return _logLevelDenyList ??= new HashSet<string>(
1999-
EnvironmentOverrides(_localConfiguration.applicationLogging.forwarding.logLevelDenyList,
2000-
"NEW_RELIC_APPLICATION_LOGGING_FORWARDING_LOG_LEVEL_DENYLIST")
2001-
?.Split(new[] { StringSeparators.CommaChar, ' ' }, StringSplitOptions.RemoveEmptyEntries)
2002-
.Select(s => s.ToUpper())
2003-
?? Enumerable.Empty<string>());
1998+
if (_logLevelDenyList == null)
1999+
{
2000+
_logLevelDenyList = new HashSet<string>(
2001+
EnvironmentOverrides(_localConfiguration.applicationLogging.forwarding.logLevelDenyList,
2002+
"NEW_RELIC_APPLICATION_LOGGING_FORWARDING_LOG_LEVEL_DENYLIST")
2003+
?.Split(new[] { StringSeparators.CommaChar, ' ' }, StringSplitOptions.RemoveEmptyEntries)
2004+
.Select(s => s.ToUpper())
2005+
?? Enumerable.Empty<string>());
2006+
2007+
if (_logLevelDenyList.Count > 0)
2008+
{
2009+
var logLevels = string.Join(",", _logLevelDenyList);
2010+
Log.Info($"Log Level Filtering is enabled for the following levels: {logLevels}");
2011+
}
2012+
}
2013+
2014+
return _logLevelDenyList;
20042015
}
20052016
}
20062017

tests/Agent/IntegrationTests/IntegrationTests/Logging/LogLevelDenyListTests.cs

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111

1212
namespace NewRelic.Agent.IntegrationTests.Logging.MetricsAndForwarding
1313
{
14-
public abstract class logLevelDenyListTestsBase<TFixture> : NewRelicIntegrationTest<TFixture>
14+
public abstract class LogLevelDenyListTestsBase<TFixture> : NewRelicIntegrationTest<TFixture>
1515
where TFixture : ConsoleDynamicMethodFixture
1616
{
1717
private readonly TFixture _fixture;
1818
private LoggingFramework _loggingFramework;
1919

2020

21-
public logLevelDenyListTestsBase(TFixture fixture, ITestOutputHelper output,
21+
public LogLevelDenyListTestsBase(TFixture fixture, ITestOutputHelper output,
2222
LoggingFramework loggingFramework) : base(fixture)
2323
{
2424
_fixture = fixture;
@@ -86,45 +86,45 @@ public void LoggingMetricsExist()
8686
#region log4net
8787

8888
[NetFrameworkTest]
89-
public class Log4NetlogLevelDenyListTestsFWLatestTests : logLevelDenyListTestsBase<ConsoleDynamicMethodFixtureFWLatest>
89+
public class Log4NetLogLevelDenyListTestsFWLatestTests : LogLevelDenyListTestsBase<ConsoleDynamicMethodFixtureFWLatest>
9090
{
91-
public Log4NetlogLevelDenyListTestsFWLatestTests(ConsoleDynamicMethodFixtureFWLatest fixture, ITestOutputHelper output)
91+
public Log4NetLogLevelDenyListTestsFWLatestTests(ConsoleDynamicMethodFixtureFWLatest fixture, ITestOutputHelper output)
9292
: base(fixture, output, LoggingFramework.Log4net)
9393
{
9494
}
9595
}
9696

9797
[NetFrameworkTest]
98-
public class Log4NetlogLevelDenyListTestsFW471Tests : logLevelDenyListTestsBase<ConsoleDynamicMethodFixtureFW471>
98+
public class Log4NetLogLevelDenyListTestsFW471Tests : LogLevelDenyListTestsBase<ConsoleDynamicMethodFixtureFW471>
9999
{
100-
public Log4NetlogLevelDenyListTestsFW471Tests(ConsoleDynamicMethodFixtureFW471 fixture, ITestOutputHelper output)
100+
public Log4NetLogLevelDenyListTestsFW471Tests(ConsoleDynamicMethodFixtureFW471 fixture, ITestOutputHelper output)
101101
: base(fixture, output, LoggingFramework.Log4net)
102102
{
103103
}
104104
}
105105

106106
[NetFrameworkTest]
107-
public class Log4NetlogLevelDenyListTestsFW462Tests : logLevelDenyListTestsBase<ConsoleDynamicMethodFixtureFW462>
107+
public class Log4NetLogLevelDenyListTestsFW462Tests : LogLevelDenyListTestsBase<ConsoleDynamicMethodFixtureFW462>
108108
{
109-
public Log4NetlogLevelDenyListTestsFW462Tests(ConsoleDynamicMethodFixtureFW462 fixture, ITestOutputHelper output)
109+
public Log4NetLogLevelDenyListTestsFW462Tests(ConsoleDynamicMethodFixtureFW462 fixture, ITestOutputHelper output)
110110
: base(fixture, output, LoggingFramework.Log4net)
111111
{
112112
}
113113
}
114114

115115
[NetCoreTest]
116-
public class Log4NetlogLevelDenyListTestsNetCoreLatestTests : logLevelDenyListTestsBase<ConsoleDynamicMethodFixtureCoreLatest>
116+
public class Log4NetLogLevelDenyListTestsNetCoreLatestTests : LogLevelDenyListTestsBase<ConsoleDynamicMethodFixtureCoreLatest>
117117
{
118-
public Log4NetlogLevelDenyListTestsNetCoreLatestTests(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output)
118+
public Log4NetLogLevelDenyListTestsNetCoreLatestTests(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output)
119119
: base(fixture, output, LoggingFramework.Log4net)
120120
{
121121
}
122122
}
123123

124124
[NetCoreTest]
125-
public class Log4NetlogLevelDenyListTestsNetCoreOldestTests : logLevelDenyListTestsBase<ConsoleDynamicMethodFixtureCoreOldest>
125+
public class Log4NetLogLevelDenyListTestsNetCoreOldestTests : LogLevelDenyListTestsBase<ConsoleDynamicMethodFixtureCoreOldest>
126126
{
127-
public Log4NetlogLevelDenyListTestsNetCoreOldestTests(ConsoleDynamicMethodFixtureCoreOldest fixture, ITestOutputHelper output)
127+
public Log4NetLogLevelDenyListTestsNetCoreOldestTests(ConsoleDynamicMethodFixtureCoreOldest fixture, ITestOutputHelper output)
128128
: base(fixture, output, LoggingFramework.Log4net)
129129
{
130130
}
@@ -134,9 +134,9 @@ public Log4NetlogLevelDenyListTestsNetCoreOldestTests(ConsoleDynamicMethodFixtur
134134
#region MEL
135135

136136
[NetCoreTest]
137-
public class MELlogLevelDenyListTestsNetCoreLatestTests : logLevelDenyListTestsBase<ConsoleDynamicMethodFixtureCoreLatest>
137+
public class MELLogLevelDenyListTestsNetCoreLatestTests : LogLevelDenyListTestsBase<ConsoleDynamicMethodFixtureCoreLatest>
138138
{
139-
public MELlogLevelDenyListTestsNetCoreLatestTests(
139+
public MELLogLevelDenyListTestsNetCoreLatestTests(
140140
ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output)
141141
: base(fixture, output, LoggingFramework.MicrosoftLogging)
142142
{
@@ -145,9 +145,9 @@ public MELlogLevelDenyListTestsNetCoreLatestTests(
145145

146146
[NetCoreTest]
147147
public class
148-
MELlogLevelDenyListTestsNetCoreOldestTests : logLevelDenyListTestsBase<ConsoleDynamicMethodFixtureCoreOldest>
148+
MELLogLevelDenyListTestsNetCoreOldestTests : LogLevelDenyListTestsBase<ConsoleDynamicMethodFixtureCoreOldest>
149149
{
150-
public MELlogLevelDenyListTestsNetCoreOldestTests(
150+
public MELLogLevelDenyListTestsNetCoreOldestTests(
151151
ConsoleDynamicMethodFixtureCoreOldest fixture, ITestOutputHelper output)
152152
: base(fixture, output, LoggingFramework.MicrosoftLogging)
153153
{
@@ -156,9 +156,9 @@ public MELlogLevelDenyListTestsNetCoreOldestTests(
156156

157157
[NetFrameworkTest]
158158
public class
159-
MELlogLevelDenyListTestsFWLatestTests : logLevelDenyListTestsBase<ConsoleDynamicMethodFixtureFWLatest>
159+
MELLogLevelDenyListTestsFWLatestTests : LogLevelDenyListTestsBase<ConsoleDynamicMethodFixtureFWLatest>
160160
{
161-
public MELlogLevelDenyListTestsFWLatestTests(
161+
public MELLogLevelDenyListTestsFWLatestTests(
162162
ConsoleDynamicMethodFixtureFWLatest fixture, ITestOutputHelper output)
163163
: base(fixture, output, LoggingFramework.MicrosoftLogging)
164164
{
@@ -171,10 +171,10 @@ public MELlogLevelDenyListTestsFWLatestTests(
171171

172172
[NetFrameworkTest]
173173
public class
174-
SeriloglogLevelDenyListTestsFWLatestTests : logLevelDenyListTestsBase<
174+
SerilogLogLevelDenyListTestsFWLatestTests : LogLevelDenyListTestsBase<
175175
ConsoleDynamicMethodFixtureFWLatest>
176176
{
177-
public SeriloglogLevelDenyListTestsFWLatestTests(ConsoleDynamicMethodFixtureFWLatest fixture,
177+
public SerilogLogLevelDenyListTestsFWLatestTests(ConsoleDynamicMethodFixtureFWLatest fixture,
178178
ITestOutputHelper output)
179179
: base(fixture, output, LoggingFramework.Serilog)
180180
{
@@ -183,10 +183,10 @@ public SeriloglogLevelDenyListTestsFWLatestTests(ConsoleDynamicMethodFixtureFWLa
183183

184184
[NetFrameworkTest]
185185
public class
186-
SeriloglogLevelDenyListTestsFW471Tests : logLevelDenyListTestsBase<
186+
SerilogLogLevelDenyListTestsFW471Tests : LogLevelDenyListTestsBase<
187187
ConsoleDynamicMethodFixtureFW471>
188188
{
189-
public SeriloglogLevelDenyListTestsFW471Tests(ConsoleDynamicMethodFixtureFW471 fixture,
189+
public SerilogLogLevelDenyListTestsFW471Tests(ConsoleDynamicMethodFixtureFW471 fixture,
190190
ITestOutputHelper output)
191191
: base(fixture, output, LoggingFramework.Serilog)
192192
{
@@ -195,10 +195,10 @@ public SeriloglogLevelDenyListTestsFW471Tests(ConsoleDynamicMethodFixtureFW471 f
195195

196196
[NetFrameworkTest]
197197
public class
198-
SeriloglogLevelDenyListTestsFW462Tests : logLevelDenyListTestsBase<
198+
SerilogLogLevelDenyListTestsFW462Tests : LogLevelDenyListTestsBase<
199199
ConsoleDynamicMethodFixtureFW462>
200200
{
201-
public SeriloglogLevelDenyListTestsFW462Tests(ConsoleDynamicMethodFixtureFW462 fixture,
201+
public SerilogLogLevelDenyListTestsFW462Tests(ConsoleDynamicMethodFixtureFW462 fixture,
202202
ITestOutputHelper output)
203203
: base(fixture, output, LoggingFramework.Serilog)
204204
{
@@ -207,10 +207,10 @@ public SeriloglogLevelDenyListTestsFW462Tests(ConsoleDynamicMethodFixtureFW462 f
207207

208208
[NetCoreTest]
209209
public class
210-
SeriloglogLevelDenyListTestsNetCoreLatestTests : logLevelDenyListTestsBase<
210+
SerilogLogLevelDenyListTestsNetCoreLatestTests : LogLevelDenyListTestsBase<
211211
ConsoleDynamicMethodFixtureCoreLatest>
212212
{
213-
public SeriloglogLevelDenyListTestsNetCoreLatestTests(
213+
public SerilogLogLevelDenyListTestsNetCoreLatestTests(
214214
ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output)
215215
: base(fixture, output, LoggingFramework.Serilog)
216216
{
@@ -219,10 +219,10 @@ public SeriloglogLevelDenyListTestsNetCoreLatestTests(
219219

220220
[NetCoreTest]
221221
public class
222-
SeriloglogLevelDenyListTestsNetCoreOldestTests : logLevelDenyListTestsBase<
222+
SerilogLogLevelDenyListTestsNetCoreOldestTests : LogLevelDenyListTestsBase<
223223
ConsoleDynamicMethodFixtureCoreOldest>
224224
{
225-
public SeriloglogLevelDenyListTestsNetCoreOldestTests(ConsoleDynamicMethodFixtureCoreOldest fixture,
225+
public SerilogLogLevelDenyListTestsNetCoreOldestTests(ConsoleDynamicMethodFixtureCoreOldest fixture,
226226
ITestOutputHelper output)
227227
: base(fixture, output, LoggingFramework.Serilog)
228228
{
@@ -235,10 +235,10 @@ public SeriloglogLevelDenyListTestsNetCoreOldestTests(ConsoleDynamicMethodFixtur
235235

236236
[NetFrameworkTest]
237237
public class
238-
NLoglogLevelDenyListTestsFWLatestTests : logLevelDenyListTestsBase<
238+
NLogLogLevelDenyListTestsFWLatestTests : LogLevelDenyListTestsBase<
239239
ConsoleDynamicMethodFixtureFWLatest>
240240
{
241-
public NLoglogLevelDenyListTestsFWLatestTests(ConsoleDynamicMethodFixtureFWLatest fixture,
241+
public NLogLogLevelDenyListTestsFWLatestTests(ConsoleDynamicMethodFixtureFWLatest fixture,
242242
ITestOutputHelper output)
243243
: base(fixture, output, LoggingFramework.NLog)
244244
{
@@ -247,10 +247,10 @@ public NLoglogLevelDenyListTestsFWLatestTests(ConsoleDynamicMethodFixtureFWLates
247247

248248
[NetFrameworkTest]
249249
public class
250-
NLoglogLevelDenyListTestsFW471Tests : logLevelDenyListTestsBase<
250+
NLogLogLevelDenyListTestsFW471Tests : LogLevelDenyListTestsBase<
251251
ConsoleDynamicMethodFixtureFW471>
252252
{
253-
public NLoglogLevelDenyListTestsFW471Tests(ConsoleDynamicMethodFixtureFW471 fixture,
253+
public NLogLogLevelDenyListTestsFW471Tests(ConsoleDynamicMethodFixtureFW471 fixture,
254254
ITestOutputHelper output)
255255
: base(fixture, output, LoggingFramework.NLog)
256256
{
@@ -259,10 +259,10 @@ public NLoglogLevelDenyListTestsFW471Tests(ConsoleDynamicMethodFixtureFW471 fixt
259259

260260
[NetFrameworkTest]
261261
public class
262-
NLoglogLevelDenyListTestsFW462Tests : logLevelDenyListTestsBase<
262+
NLogLogLevelDenyListTestsFW462Tests : LogLevelDenyListTestsBase<
263263
ConsoleDynamicMethodFixtureFW462>
264264
{
265-
public NLoglogLevelDenyListTestsFW462Tests(ConsoleDynamicMethodFixtureFW462 fixture,
265+
public NLogLogLevelDenyListTestsFW462Tests(ConsoleDynamicMethodFixtureFW462 fixture,
266266
ITestOutputHelper output)
267267
: base(fixture, output, LoggingFramework.NLog)
268268
{
@@ -271,10 +271,10 @@ public NLoglogLevelDenyListTestsFW462Tests(ConsoleDynamicMethodFixtureFW462 fixt
271271

272272
[NetCoreTest]
273273
public class
274-
NLoglogLevelDenyListTestsNetCoreLatestTests : logLevelDenyListTestsBase<
274+
NLogLogLevelDenyListTestsNetCoreLatestTests : LogLevelDenyListTestsBase<
275275
ConsoleDynamicMethodFixtureCoreLatest>
276276
{
277-
public NLoglogLevelDenyListTestsNetCoreLatestTests(ConsoleDynamicMethodFixtureCoreLatest fixture,
277+
public NLogLogLevelDenyListTestsNetCoreLatestTests(ConsoleDynamicMethodFixtureCoreLatest fixture,
278278
ITestOutputHelper output)
279279
: base(fixture, output, LoggingFramework.NLog)
280280
{
@@ -283,10 +283,10 @@ public NLoglogLevelDenyListTestsNetCoreLatestTests(ConsoleDynamicMethodFixtureCo
283283

284284
[NetCoreTest]
285285
public class
286-
NLoglogLevelDenyListTestsNetCoreOldestTests : logLevelDenyListTestsBase<
286+
NLogLogLevelDenyListTestsNetCoreOldestTests : LogLevelDenyListTestsBase<
287287
ConsoleDynamicMethodFixtureCoreOldest>
288288
{
289-
public NLoglogLevelDenyListTestsNetCoreOldestTests(ConsoleDynamicMethodFixtureCoreOldest fixture,
289+
public NLogLogLevelDenyListTestsNetCoreOldestTests(ConsoleDynamicMethodFixtureCoreOldest fixture,
290290
ITestOutputHelper output)
291291
: base(fixture, output, LoggingFramework.NLog)
292292
{

0 commit comments

Comments
 (0)