Updates.

open-telemetry · Jul 18, 2022 · cf69b8c · cf69b8c
1 parent 12c92ad
commit cf69b8c
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 85 deletions.
diff --git a/OpenTelemetry.sln b/OpenTelemetry.sln
@@ -235,6 +235,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions.Tr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.LoggingExtensions", "examples\LoggingExtensions\Examples.LoggingExtensions.csproj", "{CCBBAD69-4A7D-41F8-8697-6E3F043F7BD5}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions.Serilog.Tests", "test\OpenTelemetry.Extensions.Serilog.Tests\OpenTelemetry.Extensions.Serilog.Tests.csproj", "{C470DC46-8DE6-4668-BD25-ADF851F6E1E2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -481,6 +483,10 @@ Global
 		{CCBBAD69-4A7D-41F8-8697-6E3F043F7BD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CCBBAD69-4A7D-41F8-8697-6E3F043F7BD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CCBBAD69-4A7D-41F8-8697-6E3F043F7BD5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C470DC46-8DE6-4668-BD25-ADF851F6E1E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C470DC46-8DE6-4668-BD25-ADF851F6E1E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C470DC46-8DE6-4668-BD25-ADF851F6E1E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C470DC46-8DE6-4668-BD25-ADF851F6E1E2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/examples/LogEmitter/Examples.LogEmitter.csproj b/examples/LogEmitter/Examples.LogEmitter.csproj
diff --git a/examples/LogEmitter/Program.cs b/examples/LogEmitter/Program.cs
diff --git a/examples/LogEmitter/README.md b/examples/LogEmitter/README.md
diff --git a/examples/LoggingExtensions/Examples.LoggingExtensions.csproj b/examples/LoggingExtensions/Examples.LoggingExtensions.csproj
@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Console\OpenTelemetry.Exporter.Console.csproj" />
+    <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Extensions.Tracing\OpenTelemetry.Extensions.Tracing.csproj" />
     <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Extensions.Serilog\OpenTelemetry.Extensions.Serilog.csproj" />
   </ItemGroup>
 

diff --git a/examples/LoggingExtensions/Program.cs b/examples/LoggingExtensions/Program.cs
@@ -14,11 +14,12 @@
 // limitations under the License.
 // </copyright>
 
+using System.Diagnostics.Tracing;
 using OpenTelemetry.Logs;
 using OpenTelemetry.Resources;
 using Serilog;
 
-var resourceBuilder = ResourceBuilder.CreateDefault().AddService("Examples.LogEmitter");
+var resourceBuilder = ResourceBuilder.CreateDefault().AddService("Examples.LoggingExtensions");
 
 // Note: It is important that OpenTelemetryLoggerProvider is disposed when the
 // app is shutdown. In this example we allow Serilog to do that by calling CloseAndFlush.
@@ -30,6 +31,12 @@
         .AddConsoleExporter();
 });
 
+// Creates an OpenTelemetryEventSourceLogEmitter for routing EventSources with
+// names matching OpenTelemetry* into logs
+using var openTelemetryEventSourceLogEmitter = new OpenTelemetryEventSourceLogEmitter(
+    openTelemetryLoggerProvider,
+    (name) => name.StartsWith("OpenTelemetry") ? EventLevel.LogAlways : null);
+
 // Configure Serilog global logger
 Log.Logger = new LoggerConfiguration()
     .WriteTo.OpenTelemetry(openTelemetryLoggerProvider, disposeProvider: true) // <- Register OpenTelemetry Serilog sink

diff --git a/src/OpenTelemetry.Extensions.Tracing/OpenTelemetryEventSourceLogEmitter.cs b/src/OpenTelemetry.Extensions.Tracing/OpenTelemetryEventSourceLogEmitter.cs
@@ -188,7 +188,7 @@ protected override void OnEventWritten(EventWrittenEventArgs eventData)
 
             data.Message = rawMessage;
 
-            this.logEmitter.Log(in data, in attributes);
+            this.logEmitter.Emit(in data, in attributes);
         }
 #pragma warning restore CA1062 // Validate arguments of public methods