Skip to content

Add specific tag selection #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danielrbradley wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Add specific tag selection #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ecf4a2c
Remove catching of all exceptions
Jun 17, 2016
418a488
Make conversion to string dictionary more robust
Jun 17, 2016
ce4fec0
Make the client thread-safe
Jun 17, 2016
a32e77c
Make mapping of levels safer
Jun 17, 2016
3080951
Make IgnoreEventsWithNoException obsolete
Jun 17, 2016
acc1eba
Always use the log message as the sentry message
Jun 17, 2016
58b7fd9
Upgrade SharpRaven
Jun 17, 2016
fd539db
Specific which properties should become tags
Jun 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions NLog.Targets.Sentry.UnitTests/NLog.Targets.Sentry.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="SharpRaven">
<HintPath>..\packages\SharpRaven.1.4.3\lib\net45\SharpRaven.dll</HintPath>
<Reference Include="SharpRaven, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SharpRaven.2.1.0\lib\net45\SharpRaven.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
122 changes: 97 additions & 25 deletions NLog.Targets.Sentry.UnitTests/SentryTargetTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,29 +40,38 @@ public void TestPublicConstructor()
[Test]
public void TestBadDsn()
{
Assert.Throws<ArgumentException>(() => new SentryTarget(null) { Dsn = "http://localhost" });
var sentryTarget = new SentryTarget { Dsn = "http://localhost" };
var configuration = new LoggingConfiguration();
configuration.AddTarget("NLogSentry", sentryTarget);
configuration.LoggingRules.Add(new LoggingRule("*", LogLevel.Trace, sentryTarget));
LogManager.Configuration = configuration;
try
{
LogManager.GetCurrentClassLogger().Info("Test");
Assert.Fail("Expected exception not raised");
}
catch (NLogRuntimeException ex)
{
Assert.IsInstanceOf<ArgumentException>(ex.InnerException);
}
}

[Test]
public void TestLoggingToSentry()
{
var sentryClient = new Mock<IRavenClient>();
ErrorLevel lErrorLevel = ErrorLevel.Debug;
IDictionary<string, string> lTags = null;
Exception lException = null;
SentryEvent lastSentryEvent = null;

sentryClient
.Setup(x => x.CaptureException(It.IsAny<Exception>(), It.IsAny<SentryMessage>(), It.IsAny<ErrorLevel>(), It.IsAny<IDictionary<string, string>>(), It.IsAny<object>()))
.Callback((Exception exception, SentryMessage msg, ErrorLevel lvl, IDictionary<string, string> d, object extra) =>
.Setup(x => x.Capture(It.IsAny<SentryEvent>()))
.Callback((SentryEvent sentryEvent) =>
{
lException = exception;
lErrorLevel = lvl;
lTags = d;
lastSentryEvent = sentryEvent;
})
.Returns("Done");

// Setup NLog
var sentryTarget = new SentryTarget(sentryClient.Object)
var sentryTarget = new SentryTarget(() => sentryClient.Object)
{
Dsn = "http://25e27038b1df4930b93c96c170d95527:d87ac60bb07b4be8908845b23e914dae@test/4",
};
Expand All @@ -81,9 +90,9 @@ public void TestLoggingToSentry()
logger.ErrorException("Error Message", e);
}

Assert.IsTrue(lException.Message == "Oh No!");
Assert.IsTrue(lTags == null);
Assert.IsTrue(lErrorLevel == ErrorLevel.Error);
Assert.IsTrue(lastSentryEvent.Message == "Oh No!");
Assert.IsEmpty(lastSentryEvent.Tags);
Assert.IsTrue(lastSentryEvent.Level == ErrorLevel.Error);
}


Expand All @@ -93,22 +102,18 @@ public void TestLoggingToSentry()
public void TestLoggingToSentry_SendLogEventInfoPropertiesAsTags()
{
var sentryClient = new Mock<IRavenClient>();
ErrorLevel lErrorLevel = ErrorLevel.Debug;
IDictionary<string, string> lTags = null;
Exception lException = null;
SentryEvent lastSentryEvent = null;

sentryClient
.Setup(x => x.CaptureException(It.IsAny<Exception>(), It.IsAny<SentryMessage>(), It.IsAny<ErrorLevel>(), It.IsAny<IDictionary<string, string>>(), It.IsAny<object>()))
.Callback((Exception exception, SentryMessage msg, ErrorLevel lvl, IDictionary<string, string> d, object extra) =>
.Setup(x => x.Capture(It.IsAny<SentryEvent>()))
.Callback((SentryEvent sentryEvent) =>
{
lException = exception;
lErrorLevel = lvl;
lTags = d;
lastSentryEvent = sentryEvent;
})
.Returns("Done");

// Setup NLog
var sentryTarget = new SentryTarget(sentryClient.Object)
var sentryTarget = new SentryTarget(() => sentryClient.Object)
{
Dsn = "http://25e27038b1df4930b93c96c170d95527:d87ac60bb07b4be8908845b23e914dae@test/4",
SendLogEventInfoPropertiesAsTags = true,
Expand All @@ -133,9 +138,76 @@ public void TestLoggingToSentry_SendLogEventInfoPropertiesAsTags()
logger.Log(logEventInfo);
}

Assert.IsTrue(lException.Message == "Oh No!");
Assert.IsTrue(lTags != null);
Assert.IsTrue(lErrorLevel == ErrorLevel.Error);
Assert.IsTrue(lastSentryEvent.Message == "Oh No!");
CollectionAssert.AreEqual(new Dictionary<string, string> { { "tag1", tag1Value } }, lastSentryEvent.Tags);
Assert.IsTrue(lastSentryEvent.Level == ErrorLevel.Error);
}


[Test]
public void TestLoggingToSentry_SendSpecifiedPropertiesAsTags()
{
var sentryClient = new Mock<IRavenClient>();
SentryEvent lastSentryEvent = null;

sentryClient
.Setup(x => x.Capture(It.IsAny<SentryEvent>()))
.Callback((SentryEvent sentryEvent) =>
{
lastSentryEvent = sentryEvent;
})
.Returns("Done");

// Setup NLog
var tag1 = "tag1";
var tag2 = "tag2";
var tag1Value = "abcde";
var tag2Value = "fghij";

var sentryTarget = new SentryTarget(() => sentryClient.Object)
{
Dsn = "http://25e27038b1df4930b93c96c170d95527:d87ac60bb07b4be8908845b23e914dae@test/4",
TagProperties = tag1,
};
var configuration = new LoggingConfiguration();
configuration.AddTarget("NLogSentry", sentryTarget);
configuration.LoggingRules.Add(new LoggingRule("*", LogLevel.Trace, sentryTarget));
LogManager.Configuration = configuration;


try
{
throw new Exception("Oh No!");
}
catch (Exception e)
{
var logger = LogManager.GetCurrentClassLogger();

var logEventInfo = LogEventInfo.Create(LogLevel.Error, "default", "Error Message", e);
logEventInfo.Properties.Add(tag1, tag1Value);
logEventInfo.Properties.Add(tag2, tag2Value);
logger.Log(logEventInfo);
}

Assert.IsTrue(lastSentryEvent.Message == "Oh No!");
CollectionAssert.AreEqual(new Dictionary<string, string> { { tag1, tag1Value } }, lastSentryEvent.Tags);
CollectionAssert.AreEqual(new Dictionary<string, string> { { tag2, tag2Value } }, (Dictionary<string, string>)lastSentryEvent.Extra);
Assert.IsTrue(lastSentryEvent.Level == ErrorLevel.Error);
}

[TestCase("Trace", 0, ErrorLevel.Debug)]
[TestCase("Debug", 1, ErrorLevel.Debug)]
[TestCase("Info", 2, ErrorLevel.Info)]
[TestCase("Warn", 3, ErrorLevel.Warning)]
[TestCase("Error", 4, ErrorLevel.Error)]
[TestCase("Fatal", 5, ErrorLevel.Fatal)]
[TestCase("Off", 6, null)]
public void TestLevelMappings(string name, int ordinal, ErrorLevel? expectedErrorLevel)
{
var level = LogLevel.FromString(name);
Assert.AreEqual(level, LogLevel.FromOrdinal(ordinal));
var errorLevel = SentryTarget.TryGetErrorLevel(level);
Assert.AreEqual(expectedErrorLevel, errorLevel);
}
}
}
2 changes: 1 addition & 1 deletion NLog.Targets.Sentry.UnitTests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
<package id="NLog" version="3.2.0.0" targetFramework="net45" />
<package id="NUnit" version="2.6.4" targetFramework="net45" />
<package id="SharpRaven" version="1.4.3" targetFramework="net45" />
<package id="SharpRaven" version="2.1.0" targetFramework="net45" />
</packages>
5 changes: 3 additions & 2 deletions NLog.Targets.Sentry/NLog.Targets.Sentry.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@
<Reference Include="NLog">
<HintPath>..\packages\NLog.3.2.0.0\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="SharpRaven">
<HintPath>..\packages\SharpRaven.1.4.3\lib\net45\SharpRaven.dll</HintPath>
<Reference Include="SharpRaven, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SharpRaven.2.1.0\lib\net45\SharpRaven.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion NLog.Targets.Sentry/Packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<packages>
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
<package id="NLog" version="3.2.0.0" targetFramework="net45" />
<package id="SharpRaven" version="1.4.3" targetFramework="net45" />
<package id="SharpRaven" version="2.1.0" targetFramework="net45" />
</packages>
Loading