Add NLog instrumentation for OpenTelemetry .NET Auto-Instrumentation #4371
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,73 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| using OpenTelemetry.AutoInstrumentation.CallTarget; | ||
| using OpenTelemetry.AutoInstrumentation.Logging; | ||
| #if NET | ||
| using OpenTelemetry.AutoInstrumentation.Logger; | ||
| #endif | ||
|
|
||
| namespace OpenTelemetry.AutoInstrumentation.Instrumentations.NLog.Bridge.Integrations; | ||
|
|
||
| /// <summary> | ||
| /// NLog Logger integration that hooks into the actual logging process. | ||
| /// This integration intercepts NLog's Logger.Log method calls to automatically | ||
| /// capture log events and forward them to OpenTelemetry when the NLog bridge is enabled. | ||
| /// | ||
| /// The integration targets NLog.Logger.Log method which is the core method called | ||
| /// for all logging operations, allowing us to capture events without modifying configuration. | ||
| /// </summary> | ||
| [InstrumentMethod( | ||
| assemblyName: "NLog", | ||
| typeName: "NLog.Logger", | ||
| methodName: "Log", | ||
| returnTypeName: ClrNames.Void, | ||
| parameterTypeNames: new[] { "NLog.LogEventInfo" }, | ||
|
Comment on lines
+23
to
+28
There was a problem hiding this comment. I think that you need to revisit the way how you injecting bytecode.
Even when I have checked the testing application calling this method, it is failing. |
||
| minimumVersion: "4.0.0", | ||
| maximumVersion: "6.*.*", | ||
| integrationName: "NLog", | ||
| type: InstrumentationType.Log)] | ||
| public static class LoggerIntegration | ||
Kielek marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| { | ||
| #if NET | ||
| private static readonly IOtelLogger Logger = OtelLogging.GetLogger(); | ||
| private static int _warningLogged; | ||
| #endif | ||
|
|
||
| /// <summary> | ||
| /// Intercepts NLog's Logger.Log method calls to capture log events. | ||
| /// This method is called before the original Log method executes, | ||
| /// allowing us to capture and forward log events to OpenTelemetry. | ||
| /// </summary> | ||
| /// <typeparam name="TTarget">The type of the logger instance.</typeparam> | ||
| /// <param name="instance">The NLog Logger instance.</param> | ||
| /// <param name="logEvent">The NLog LogEventInfo being logged.</param> | ||
| /// <returns>A CallTargetState (unused in this case).</returns> | ||
| internal static CallTargetState OnMethodBegin<TTarget>(TTarget instance, ILoggingEvent logEvent) | ||
| { | ||
| #if NET | ||
| // Check if ILogger bridge has been initialized and warn if so | ||
| // This prevents conflicts between different logging bridges | ||
| if (LoggerInitializer.IsInitializedAtLeastOnce) | ||
| { | ||
| if (Interlocked.Exchange(ref _warningLogged, 1) != default) | ||
| { | ||
| return CallTargetState.GetDefault(); | ||
| } | ||
|
|
||
| Logger.Warning("Disabling NLog bridge due to ILogger bridge initialization."); | ||
| return CallTargetState.GetDefault(); | ||
| } | ||
| #endif | ||
|
|
||
| // Only process the log event if the NLog bridge is enabled | ||
| if (Instrumentation.LogSettings.Value.EnableNLogBridge && logEvent != null) | ||
| { | ||
| // Forward the log event to OpenTelemetry using our target | ||
| OpenTelemetryNLogTarget.Instance.WriteLogEvent(logEvent); | ||
| } | ||
|
|
||
| // Return default state - we don't need to track anything between begin/end | ||
| return CallTargetState.GetDefault(); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.