[AzureMonitorDistro] revert custom events (#45797)

* disable tests in net6 and MacOS * revert pr 45630 * revert change in LogForwarder from pr 45681
Azure · Sep 4, 2024 · 7116390 · 7116390
1 parent ad65e49
commit 7116390
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 400 deletions.
diff --git a/.../Azure.Monitor.OpenTelemetry.AspNetCore/src/Azure.Monitor.OpenTelemetry.AspNetCore.csproj b/.../Azure.Monitor.OpenTelemetry.AspNetCore/src/Azure.Monitor.OpenTelemetry.AspNetCore.csproj
@@ -23,10 +23,10 @@
     <!-- Depending on monthly deliverables, we may switch between PackageReference or ProjectReference. Keeping both here to make the switch easier. -->
 
     <!-- FOR PUBLIC RELEASES, MUST USE PackageReference. THIS REQUIRES A STAGGERED RELEASE IF SHIPPING A NEW EXPORTER. -->
-    <!--<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" />-->
+    <PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" />
 
     <!-- FOR LOCAL DEV, ProjectReference IS PREFERRED. -->
-    <ProjectReference Include="..\..\Azure.Monitor.OpenTelemetry.Exporter\src\Azure.Monitor.OpenTelemetry.Exporter.csproj" />
+    <!--<ProjectReference Include="..\..\Azure.Monitor.OpenTelemetry.Exporter\src\Azure.Monitor.OpenTelemetry.Exporter.csproj" />-->
   </ItemGroup>
 
   <!-- Shared sources from Azure.Core -->

diff --git a/...tor.OpenTelemetry.AspNetCore/src/Internals/AzureSdkCompat/AzureEventSourceLogForwarder.cs b/...tor.OpenTelemetry.AspNetCore/src/Internals/AzureSdkCompat/AzureEventSourceLogForwarder.cs
@@ -31,7 +31,6 @@ public AzureEventSourceLogForwarder(ILoggerFactory loggerFactory, LoggerFilterOp
             foreach (var rule in loggerFilterOptions?.Rules ?? Enumerable.Empty<LoggerFilterRule>())
             {
                 if (!string.IsNullOrEmpty(rule.CategoryName)
-                    && rule.CategoryName != "Azure.Monitor.OpenTelemetry.CustomEvents" // Exporter defines a custom filter rule to support CustomEvents. We MUST ignore this here.
                     && (rule.CategoryName.StartsWith("Azure.") || rule.CategoryName.StartsWith("Microsoft.Azure.")))
                 {
                     _hasAzureLoggerFilterOptionsRules = true;

diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.AspNetCore/src/OpenTelemetryBuilderExtensions.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.AspNetCore/src/OpenTelemetryBuilderExtensions.cs
@@ -6,7 +6,6 @@
 using Azure.Monitor.OpenTelemetry.AspNetCore.Internals.LiveMetrics;
 using Azure.Monitor.OpenTelemetry.AspNetCore.Internals.Profiling;
 using Azure.Monitor.OpenTelemetry.AspNetCore.LiveMetrics;
-using Azure.Monitor.OpenTelemetry.Events;
 using Azure.Monitor.OpenTelemetry.Exporter;
 using Azure.Monitor.OpenTelemetry.Exporter.Internals.Platform;
 using Microsoft.Extensions.Configuration;
@@ -29,7 +28,6 @@ namespace Azure.Monitor.OpenTelemetry.AspNetCore
     public static class OpenTelemetryBuilderExtensions
     {
         private const string SqlClientInstrumentationPackageName = "OpenTelemetry.Instrumentation.SqlClient";
-        private const string EventLoggerName = "Azure.Monitor.OpenTelemetry.CustomEvents";
 
         /// <summary>
         /// Configures Azure Monitor for logging, distributed tracing, and metrics.
@@ -214,34 +212,6 @@ public static OpenTelemetryBuilder UseAzureMonitor(this OpenTelemetryBuilder bui
                     }
                 });
 
-            // Enable custom events and set filter to enable collection.
-            builder.Services.TryAddSingleton<IApplicationInsightsEventLogger, ApplicationInsightsEventLogger>();
-
-            // The default behavior is to always capture logs for custom events.
-            // This can achieved with this code level filter -> loggingBuilder.AddFilter<OpenTelemetry.Logs.ApplicationInsightsLoggerProvider>("",LogLevel.Information);
-            // However, this may run into issues when users try to override this behavior from Configuration like below using appsettings.json:
-            // {
-            //   "Logging": {
-            //     "OpenTelemetry": {
-            //       "LogLevel": {
-            //         "Azure.Monitor.OpenTelemetry.CustomEvents": "None"
-            //       }
-            //     }
-            //   },
-            //   ...
-            // }
-            // The reason is as both rules will match the filter, the last one added wins.
-            // To ensure that the default filter is in the beginning of filter rules, so that user override from Configuration will always win,
-            // we add code filter rule to the 0th position as below.
-            builder.Services.Configure<LoggerFilterOptions>(
-                options => options.Rules.Insert(
-                    0,
-                    new LoggerFilterRule(
-                        "OpenTelemetry",
-                        EventLoggerName,
-                        LogLevel.Information,
-                        null)));
-
             return builder;
         }
 

diff --git a/...ry.AspNetCore/tests/Azure.Monitor.OpenTelemetry.AspNetCore.Tests/E2ETests/ILoggerTests.cs b/...ry.AspNetCore/tests/Azure.Monitor.OpenTelemetry.AspNetCore.Tests/E2ETests/ILoggerTests.cs
diff --git a/...r/Azure.Monitor.OpenTelemetry.Exporter/api/Azure.Monitor.OpenTelemetry.Exporter.net6.0.cs b/...r/Azure.Monitor.OpenTelemetry.Exporter/api/Azure.Monitor.OpenTelemetry.Exporter.net6.0.cs
@@ -1,15 +1,3 @@
-namespace Azure.Monitor.OpenTelemetry.Events
-{
-    public sealed partial class ApplicationInsightsEventLogger : Azure.Monitor.OpenTelemetry.Events.IApplicationInsightsEventLogger
-    {
-        public ApplicationInsightsEventLogger(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { }
-        public void TrackEvent(string name, System.Collections.Generic.IReadOnlyList<System.Collections.Generic.KeyValuePair<string, object?>>? attributes = null) { }
-    }
-    public partial interface IApplicationInsightsEventLogger
-    {
-        void TrackEvent(string name, System.Collections.Generic.IReadOnlyList<System.Collections.Generic.KeyValuePair<string, object?>>? attributes = null);
-    }
-}
 namespace Azure.Monitor.OpenTelemetry.Exporter
 {
     public static partial class AzureMonitorExporterExtensions

diff --git a/...Monitor.OpenTelemetry.Exporter/api/Azure.Monitor.OpenTelemetry.Exporter.netstandard2.0.cs b/...Monitor.OpenTelemetry.Exporter/api/Azure.Monitor.OpenTelemetry.Exporter.netstandard2.0.cs
@@ -1,15 +1,3 @@
-namespace Azure.Monitor.OpenTelemetry.Events
-{
-    public sealed partial class ApplicationInsightsEventLogger : Azure.Monitor.OpenTelemetry.Events.IApplicationInsightsEventLogger
-    {
-        public ApplicationInsightsEventLogger(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { }
-        public void TrackEvent(string name, System.Collections.Generic.IReadOnlyList<System.Collections.Generic.KeyValuePair<string, object?>>? attributes = null) { }
-    }
-    public partial interface IApplicationInsightsEventLogger
-    {
-        void TrackEvent(string name, System.Collections.Generic.IReadOnlyList<System.Collections.Generic.KeyValuePair<string, object?>>? attributes = null);
-    }
-}
 namespace Azure.Monitor.OpenTelemetry.Exporter
 {
     public static partial class AzureMonitorExporterExtensions

diff --git a/...r/Azure.Monitor.OpenTelemetry.Exporter/src/CustomEvents/ApplicationInsightsEventLogger.cs b/...r/Azure.Monitor.OpenTelemetry.Exporter/src/CustomEvents/ApplicationInsightsEventLogger.cs
diff --git a/.../Azure.Monitor.OpenTelemetry.Exporter/src/CustomEvents/IApplicationInsightsEventLogger.cs b/.../Azure.Monitor.OpenTelemetry.Exporter/src/CustomEvents/IApplicationInsightsEventLogger.cs
diff --git a/...itor/Azure.Monitor.OpenTelemetry.Exporter/src/Customizations/Models/TelemetryEventData.cs b/...itor/Azure.Monitor.OpenTelemetry.Exporter/src/Customizations/Models/TelemetryEventData.cs
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Customizations/Models/TelemetryItem.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Customizations/Models/TelemetryItem.cs
@@ -91,8 +91,8 @@ public TelemetryItem(string name, TelemetryItem telemetryItem, ActivitySpanId ac
             }
         }
 
-        public TelemetryItem (string name, LogRecord logRecord, AzureMonitorResource? resource, string instrumentationKey) :
-            this(name, FormatUtcTimestamp(logRecord.Timestamp))
+        public TelemetryItem (LogRecord logRecord, AzureMonitorResource? resource, string instrumentationKey) :
+            this(logRecord.Exception != null ? "Exception" : "Message", FormatUtcTimestamp(logRecord.Timestamp))
         {
             if (logRecord.TraceId != default)
             {