Skip to content

Commit ec3931e

Browse files
philasmarphilasmar
authored
Merge pull request #292 from aws/asmarp/master-fixup
Fix dev and master sync up
2 parents 168e52d + a2729db commit ec3931e

22 files changed

+249
-207
lines changed

‎CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## Release 2024-12-16
2+
3+
### AWS.Logger.AspNetCore (3.5.4)
4+
* Update package dependencies to address security vulnerabilities
5+
### AWS.Logger.SeriLog (3.4.4)
6+
* Update package dependencies to address security vulnerabilities
7+
18
## Release 2024-05-22
29

310
### AWS.Logger.Core (3.3.3)

‎test/AWS.Logger.AspNetCore.Tests/TestClass.cs

+9-9
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ private void LoggingSetup(string configFileName, string configSectionInfoBlockNa
8080
/// 10 debug messages to CloudWatchLogs. The results are then verified.
8181
/// </summary>
8282
[Fact]
83-
public void ILogger()
83+
public async Task ILogger()
8484
{
8585
LoggingSetup("appsettings.json",null);
86-
SimpleLoggingTest(ConfigSection.Config.LogGroup);
86+
await SimpleLoggingTest(ConfigSection.Config.LogGroup);
8787
}
8888

8989
[Fact]
@@ -129,10 +129,10 @@ public async Task MultiThreadTestMock()
129129
/// threads that log 200 debug messages each to CloudWatchLogs. The results are then verified.
130130
/// </summary>
131131
[Fact]
132-
public void MultiThreadTest()
132+
public async Task MultiThreadTest()
133133
{
134134
LoggingSetup("multiThreadTest.json",null);
135-
MultiThreadTestGroup(ConfigSection.Config.LogGroup);
135+
await MultiThreadTestGroup(ConfigSection.Config.LogGroup);
136136
}
137137

138138
/// <summary>
@@ -143,17 +143,17 @@ public void MultiThreadTest()
143143
/// inorder to force a buffer full scenario. The results are then verified.
144144
/// </summary>
145145
[Fact]
146-
public void MultiThreadBufferFullTest()
146+
public async Task MultiThreadBufferFullTest()
147147
{
148148
LoggingSetup("multiThreadBufferFullTest.json",null);
149-
MultiThreadBufferFullTestGroup(ConfigSection.Config.LogGroup);
149+
await MultiThreadBufferFullTestGroup(ConfigSection.Config.LogGroup);
150150
}
151151

152152
[Fact]
153-
public void OverrideLogStreamNameTest()
153+
public async Task OverrideLogStreamNameTest()
154154
{
155155
LoggingSetup("overrideLogStreamName.json", null);
156-
MultiThreadTestGroup(ConfigSection.Config.LogGroup, ConfigSection.Config.LogStreamName);
156+
await MultiThreadTestGroup(ConfigSection.Config.LogGroup, ConfigSection.Config.LogStreamName);
157157
}
158158

159159
/// <summary>
@@ -165,7 +165,7 @@ protected override void LogMessages(int count)
165165
Logger.LogError(0, new Exception("Exception message."), "Error message");
166166
for (int i = 0; i < count-2; i++)
167167
{
168-
Logger.LogDebug(string.Format("Test logging message {0} Ilogger, Thread Id:{1}", i, Thread.CurrentThread.ManagedThreadId));
168+
Logger.LogDebug(string.Format("Test logging message {0} Ilogger, Thread Id:{1}", i, Environment.CurrentManagedThreadId));
169169
}
170170
Logger.LogDebug(LASTMESSAGE);
171171
}

‎test/AWS.Logger.Log4Net.Tests/MultiThreadBufferFullTest.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- A1 is set to be a ConsoleAppender -->
44
<appender name="MultiThreadBufferFullTest" type="AWS.Logger.Log4net.AWSAppender,AWS.Logger.Log4net" >
55

6-
<LogGroup>AWSLog4NetGroupMultiThreadBufferFullTest</LogGroup>
6+
<LogGroup>{LOG_GROUP_NAME}</LogGroup>
77
<Region>us-west-2</Region>
88
<MaxQueuedMessages>10</MaxQueuedMessages>
99

‎test/AWS.Logger.Log4Net.Tests/MultiThreadTest.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- A1 is set to be a ConsoleAppender -->
44
<appender name="MultiThreadTest" type="AWS.Logger.Log4net.AWSAppender,AWS.Logger.Log4net" >
55

6-
<LogGroup>AWSLog4NetGroupLog4NetMultiThreadTest</LogGroup>
6+
<LogGroup>{LOG_GROUP_NAME}</LogGroup>
77
<Region>us-west-2</Region>
88

99
<layout type="log4net.Layout.PatternLayout">

‎test/AWS.Logger.Log4Net.Tests/OverrideLogStreamName.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<!-- A1 is set to be a ConsoleAppender -->
55
<appender name="OverrideLogStreamName" type="AWS.Logger.Log4net.AWSAppender,AWS.Logger.Log4net" >
66

7-
<LogGroup>AWSLog4NetGroupOverrideLogStreamName</LogGroup>
7+
<LogGroup>{LOG_GROUP_NAME}</LogGroup>
88
<LogStreamName>CustomStreamName</LogStreamName>
99
<Region>us-west-2</Region>
1010
<LogStreamNameSuffix>Custom</LogStreamNameSuffix> <!-- should be ignored since LogStreamName is set -->

‎test/AWS.Logger.Log4Net.Tests/Properties/AssemblyInfo.cs

+2
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@
2929
// You can specify all the values or you can default the Build and Revision Numbers
3030
// by using the '*' as shown below:
3131
// [assembly: AssemblyVersion("1.0.*")]
32+
33+
[assembly: Xunit.CollectionBehavior(DisableTestParallelization = true)]

‎test/AWS.Logger.Log4Net.Tests/TestClass.cs

+30-16
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
using System;
2+
using System.IO;
3+
using System.Linq;
24
using System.Reflection;
5+
using System.Text;
36
using System.Threading;
7+
using System.Threading.Tasks;
8+
using AWS.Logger.Log4net;
49
using AWS.Logger.TestUtils;
510
using log4net;
611
using log4net.Config;
@@ -12,13 +17,18 @@ public class Log4NetTestClass : BaseTestClass
1217
{
1318
public ILog Logger;
1419

15-
private void GetLog4NetLogger(string fileName, string logName)
20+
private void GetLog4NetLogger(string fileName, string logName, string logGroupName)
1621
{
1722
// Create logger
1823
var repositoryAssembly = typeof(Log4NetTestClass).GetTypeInfo().Assembly;
1924
var loggerRepository = LogManager.GetRepository(repositoryAssembly);
20-
XmlConfigurator.Configure(loggerRepository, new System.IO.FileInfo(fileName));
21-
Logger = LogManager.GetLogger(repositoryAssembly, logName);
25+
var fileInfo = new FileInfo(fileName);
26+
var fileContent = File.ReadAllText(fileInfo.FullName);
27+
using (Stream memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(fileContent.Replace("{LOG_GROUP_NAME}", logGroupName))))
28+
{
29+
XmlConfigurator.Configure(loggerRepository, memoryStream);
30+
Logger = LogManager.GetLogger(repositoryAssembly, logName);
31+
}
2232
}
2333

2434
public Log4NetTestClass(TestFixture testFixture) : base(testFixture)
@@ -27,42 +37,46 @@ public Log4NetTestClass(TestFixture testFixture) : base(testFixture)
2737

2838
#region Test Cases
2939
[Fact]
30-
public void Log4Net()
40+
public async Task Log4Net()
3141
{
32-
GetLog4NetLogger("log4net.config","Log4Net");
33-
SimpleLoggingTest("AWSLog4NetGroupLog4Net");
42+
var logGroupName = $"AWSLog4NetGroupLog4Net{Guid.NewGuid().ToString().Split('-').Last()}";
43+
GetLog4NetLogger("log4net.config","Log4Net", logGroupName);
44+
await SimpleLoggingTest(logGroupName);
3445
}
3546

3647
[Fact]
37-
public void MultiThreadTest()
48+
public async Task MultiThreadTest()
3849
{
39-
GetLog4NetLogger("MultiThreadTest.config", "MultiThreadTest");
40-
MultiThreadTestGroup("AWSLog4NetGroupLog4NetMultiThreadTest");
50+
var logGroupName = $"AWSLog4NetGroupLog4NetMultiThreadTest{Guid.NewGuid().ToString().Split('-').Last()}";
51+
GetLog4NetLogger("MultiThreadTest.config", "MultiThreadTest", logGroupName);
52+
await MultiThreadTestGroup(logGroupName);
4153
}
4254

4355
[Fact]
44-
public void MultiThreadBufferFullTest()
56+
public async Task MultiThreadBufferFullTest()
4557
{
46-
GetLog4NetLogger("MultiThreadBufferFullTest.config", "MultiThreadBufferFullTest");
47-
MultiThreadBufferFullTestGroup("AWSLog4NetGroupMultiThreadBufferFullTest");
58+
var logGroupName = $"AWSLog4NetGroupMultiThreadBufferFullTest{Guid.NewGuid().ToString().Split('-').Last()}";
59+
GetLog4NetLogger("MultiThreadBufferFullTest.config", "MultiThreadBufferFullTest", logGroupName);
60+
await MultiThreadBufferFullTestGroup(logGroupName);
4861
}
4962

5063
/// <summary>
5164
/// Verifies that multiple producers can log to the same log stream
5265
/// when an override log stream name is provided
5366
/// </summary>
5467
[Fact]
55-
public void CustomLogStreamNameTest()
68+
public async Task CustomLogStreamNameTest()
5669
{
57-
GetLog4NetLogger("OverrideLogStreamName.config", "OverrideLogStreamName");
58-
MultiThreadTestGroup("AWSLog4NetGroupOverrideLogStreamName");
70+
var logGroupName = $"AWSLog4NetGroupMultiThreadBufferFullTest{Guid.NewGuid().ToString().Split('-').Last()}";
71+
GetLog4NetLogger("OverrideLogStreamName.config", "OverrideLogStreamName", logGroupName);
72+
await MultiThreadTestGroup(logGroupName);
5973
}
6074

6175
protected override void LogMessages(int count)
6276
{
6377
for (int i = 0; i < count-1; i++)
6478
{
65-
Logger.Debug(string.Format("Test logging message {0} Log4Net, Thread Id:{1}", i, Thread.CurrentThread.ManagedThreadId));
79+
Logger.Debug(string.Format("Test logging message {0} Log4Net, Thread Id:{1}", i, Environment.CurrentManagedThreadId));
6680
}
6781
Logger.Debug(LASTMESSAGE);
6882
}

‎test/AWS.Logger.Log4Net.Tests/log4net.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<!-- A1 is set to be a ConsoleAppender -->
55
<appender name="AWS" type="AWS.Logger.Log4net.AWSAppender,AWS.Logger.Log4net" >
66

7-
<LogGroup>AWSLog4NetGroupLog4Net</LogGroup>
7+
<LogGroup>{LOG_GROUP_NAME}</LogGroup>
88
<Region>us-west-2</Region>
99
<LogStreamNameSuffix>Custom</LogStreamNameSuffix>
1010
<LogStreamNamePrefix>CustomPrefix</LogStreamNamePrefix>

‎test/AWS.Logger.NLog.Tests/AWSNLogGroupEventSizeExceededTest.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<add assembly ="NLog.AWS.Logger"/>
66
</extensions>
77
<targets>
8-
<target name="AWSNLogGroupEventSizeExceededTest" type="AWSTarget" logGroup="AWSNLogGroupEventSizeExceededTest" region="us-west-2" logStreamNameSuffix="Custom"/>
8+
<target name="{LOG_GROUP_NAME}" type="AWSTarget" logGroup="{LOG_GROUP_NAME}" region="us-west-2" logStreamNameSuffix="Custom"/>
99
<target name="loggerRegular" xsi:type="Console" layout="${callsite} ${message}" />
1010
</targets>
1111
<rules>
12-
<logger name="loggerRegularEventSizeExceeded" minlevel="Debug" writeTo="loggerRegular,AWSNLogGroupEventSizeExceededTest"/>
12+
<logger name="loggerRegularEventSizeExceeded" minlevel="Debug" writeTo="loggerRegular,{LOG_GROUP_NAME}"/>
1313
</rules>
1414
</nlog>

‎test/AWS.Logger.NLog.Tests/AWSNLogGroupMultiThreadBufferFullTest.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<add assembly ="NLog.AWS.Logger"/>
66
</extensions>
77
<targets>
8-
<target name="AWSNLogGroupMultiThreadBufferFullTest" type="AWSTarget" logGroup="AWSNLogGroupMultiThreadBufferFullTest" region="us-west-2" MaxQueuedMessages="10"/>
8+
<target name="{LOG_GROUP_NAME}" type="AWSTarget" logGroup="{LOG_GROUP_NAME}" region="us-west-2" MaxQueuedMessages="10"/>
99
<target name="loggerRegular" xsi:type="Console" layout="${callsite} ${message}" />
1010
</targets>
1111
<rules>
12-
<logger name="loggerMultiThreadBufferFull" minlevel="Debug" writeTo="loggerRegular,AWSNLogGroupMultiThreadBufferFullTest" />
12+
<logger name="loggerMultiThreadBufferFull" minlevel="Debug" writeTo="loggerRegular,{LOG_GROUP_NAME}" />
1313
</rules>
1414
</nlog>

‎test/AWS.Logger.NLog.Tests/AWSNLogGroupMultiThreadTest.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<add assembly ="NLog.AWS.Logger"/>
66
</extensions>
77
<targets>
8-
<target name="AWSNLogGroupMultiThreadTest" type="AWSTarget" logGroup="AWSNLogGroupMultiThreadTest" region="us-west-2"/>
8+
<target name="{LOG_GROUP_NAME}" type="AWSTarget" logGroup="{LOG_GROUP_NAME}" region="us-west-2"/>
99
<target name="loggerRegular" xsi:type="Console" layout="${callsite} ${message}" />
1010
</targets>
1111
<rules>
12-
<logger name="loggerMultiThread" minlevel="Debug" writeTo="loggerRegular,AWSNLogGroupMultiThreadTest" />
12+
<logger name="loggerMultiThread" minlevel="Debug" writeTo="loggerRegular,{LOG_GROUP_NAME}" />
1313
</rules>
1414
</nlog>

‎test/AWS.Logger.NLog.Tests/AWSNLogOverrideLogStreamName.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<add assembly ="NLog.AWS.Logger"/>
66
</extensions>
77
<targets>
8-
<target name="AWSNLogOverrideLogStreamName" type="AWSTarget" logGroup="AWSNLogOverrideLogStreamName" region="us-west-2" logStreamNameSuffix="Custom" logStreamNamePrefix="CustomPrefix" logStreamName="CustomStreamName"/>
8+
<target name="{LOG_GROUP_NAME}" type="AWSTarget" logGroup="{LOG_GROUP_NAME}" region="us-west-2" logStreamNameSuffix="Custom" logStreamNamePrefix="CustomPrefix" logStreamName="CustomStreamName"/>
99
<target name="overrideLogStreamName" xsi:type="Console" layout="${callsite} ${message}" />
1010
</targets>
1111
<rules>
12-
<logger name="overrideLogStreamName" minlevel="Debug" writeTo="overrideLogStreamName,AWSNLogOverrideLogStreamName"/>
12+
<logger name="overrideLogStreamName" minlevel="Debug" writeTo="overrideLogStreamName,{LOG_GROUP_NAME}"/>
1313
</rules>
1414
</nlog>

‎test/AWS.Logger.NLog.Tests/Regular.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<add assembly ="NLog.AWS.Logger"/>
66
</extensions>
77
<targets>
8-
<target name="AWSNLogGroup" type="AWSTarget" logGroup="AWSNLogGroup" region="us-west-2" logStreamNameSuffix="Custom" logStreamNamePrefix="CustomPrefix"/>
8+
<target name="{LOG_GROUP_NAME}" type="AWSTarget" logGroup="{LOG_GROUP_NAME}" region="us-west-2" logStreamNameSuffix="Custom" logStreamNamePrefix="CustomPrefix"/>
99
<target name="loggerRegular" xsi:type="Console" layout="${callsite} ${message}" />
1010
</targets>
1111
<rules>
12-
<logger name="loggerRegular" minlevel="Debug" writeTo="loggerRegular,AWSNLogGroup"/>
12+
<logger name="loggerRegular" minlevel="Debug" writeTo="loggerRegular,{LOG_GROUP_NAME}"/>
1313
</rules>
1414
</nlog>

0 commit comments

Comments
 (0)