-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #77 from datalust/dev
4.0.0 Release
- Loading branch information
Showing
13 changed files
with
182 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
{ | ||
"sdk": { | ||
"version": "6.0.100", | ||
"version": "8.0.100", | ||
"rollForward": "latestMinor" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,8 +25,6 @@ public static void Main() | |
|
||
// As are objects | ||
Logger.Info(new object()); | ||
|
||
Console.ReadKey(); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
// Seq Target for NLog - Copyright © Datalust and contributors | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
using System; | ||
using System.Diagnostics; | ||
using System.Text; | ||
using NLog.Layouts; | ||
|
||
namespace NLog.Targets.Seq.Layouts | ||
{ | ||
/// <summary> | ||
/// Formats elements of <see cref="Activity.Current"/> for inclusion in log events. Non-W3C-format activities are | ||
/// ignored (Seq does not support the older Microsoft-proprietary hierarchical activity id format). | ||
/// </summary> | ||
class CurrentW3CActivityLayout: Layout | ||
{ | ||
readonly Func<Activity, string> _format; | ||
|
||
public CurrentW3CActivityLayout(Func<Activity, string> format) | ||
{ | ||
_format = format; | ||
} | ||
|
||
protected override void RenderFormattedMessage(LogEventInfo logEvent, StringBuilder target) | ||
{ | ||
target.Append(GetFormattedMessage(logEvent)); | ||
} | ||
|
||
protected override string GetFormattedMessage(LogEventInfo logEvent) | ||
{ | ||
return Activity.Current is { IdFormat: ActivityIdFormat.W3C } activity ? _format(activity) : null; | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
using NLog.Config; | ||
using NLog.Layouts; | ||
|
||
namespace NLog.Targets.Seq | ||
{ | ||
/// <summary> | ||
/// Represents an additional HTTP header that wil be attached to outgoing HTTP requests made by | ||
/// <see cref="SeqTarget"/>. | ||
/// </summary> | ||
[NLogConfigurationItem] | ||
public sealed class SeqHttpHeaderItem | ||
{ | ||
/// <summary> | ||
/// The name of the HTTP header to add. | ||
/// </summary> | ||
[RequiredParameter] | ||
public string Name { get; set; } | ||
|
||
/// <summary> | ||
/// The value of the HTTP header. | ||
/// </summary> | ||
[RequiredParameter] | ||
public Layout Value { get; set; } | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.