Add AddOpenTelemetrySelfDiagnosticsLogging to OpenTelemetry.Extensions.Hosting

build/Common.nonprod.props

@@ -45,6 +45,7 @@
  <SwashbuckleAspNetCorePkgVer>[5.0.0]</SwashbuckleAspNetCorePkgVer>
  <XUnitRunnerVisualStudioPkgVer>[2.4.3,3.0)</XUnitRunnerVisualStudioPkgVer>
  <XUnitPkgVer>[2.4.1,3.0)</XUnitPkgVer>
+ <FoundatioXUnitPkgVer>[10.0.2,11.0)</FoundatioXUnitPkgVer>
  </PropertyGroup>
 
  <ItemGroup>

examples/AspNetCore/Startup.cs

@@ -65,6 +65,7 @@ public void ConfigureServices(IServiceCollection services)
  {
  case "jaeger":
  services.AddOpenTelemetryTracing((builder) => builder
+ .AddSelfDiagnosticsLogging()
  .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService(this.Configuration.GetValue<string>("Jaeger:ServiceName")))
  .AddAspNetCoreInstrumentation()
  .AddHttpClientInstrumentation()
@@ -77,6 +78,7 @@ public void ConfigureServices(IServiceCollection services)
  break;
  case "zipkin":
  services.AddOpenTelemetryTracing((builder) => builder
+ .AddSelfDiagnosticsLogging()
  .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService(this.Configuration.GetValue<string>("Zipkin:ServiceName")))
  .AddAspNetCoreInstrumentation()
  .AddHttpClientInstrumentation()
@@ -91,6 +93,7 @@ public void ConfigureServices(IServiceCollection services)
  AppContext.SetSwitch("System.Net.Http.SocketsHttpHandler.Http2UnencryptedSupport", true);
 
  services.AddOpenTelemetryTracing((builder) => builder
+ .AddSelfDiagnosticsLogging()
  .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService(this.Configuration.GetValue<string>("Otlp:ServiceName")))
  .AddAspNetCoreInstrumentation()
  .AddHttpClientInstrumentation()
@@ -101,6 +104,7 @@ public void ConfigureServices(IServiceCollection services)
  break;
  default:
  services.AddOpenTelemetryTracing((builder) => builder
+ .AddSelfDiagnosticsLogging()
  .AddAspNetCoreInstrumentation()
  .AddHttpClientInstrumentation()
  .AddConsoleExporter());

examples/AspNetCore/appsettings.json

@@ -2,6 +2,7 @@
  "Logging": {
  "LogLevel": {
  "Default": "Information",
+ "OpenTelemetry": "Trace",
  "Microsoft": "Warning",
  "Microsoft.Hosting.Lifetime": "Information"
  }

src/OpenTelemetry.Extensions.Hosting/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt

@@ -12,6 +12,7 @@ static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.Configure(this OpenT
 static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.GetServices(this OpenTelemetry.Metrics.MeterProviderBuilder meterProviderBuilder) -> Microsoft.Extensions.DependencyInjection.IServiceCollection
 static OpenTelemetry.Trace.TracerProviderBuilderExtensions.AddInstrumentation<T>(this OpenTelemetry.Trace.TracerProviderBuilder tracerProviderBuilder) -> OpenTelemetry.Trace.TracerProviderBuilder
 static OpenTelemetry.Trace.TracerProviderBuilderExtensions.AddProcessor<T>(this OpenTelemetry.Trace.TracerProviderBuilder tracerProviderBuilder) -> OpenTelemetry.Trace.TracerProviderBuilder
+static OpenTelemetry.Trace.TracerProviderBuilderExtensions.AddSelfDiagnosticsLogging(this OpenTelemetry.Trace.TracerProviderBuilder tracerProviderBuilder) -> OpenTelemetry.Trace.TracerProviderBuilder
 static OpenTelemetry.Trace.TracerProviderBuilderExtensions.Build(this OpenTelemetry.Trace.TracerProviderBuilder tracerProviderBuilder, System.IServiceProvider serviceProvider) -> OpenTelemetry.Trace.TracerProvider
 static OpenTelemetry.Trace.TracerProviderBuilderExtensions.Configure(this OpenTelemetry.Trace.TracerProviderBuilder tracerProviderBuilder, System.Action<System.IServiceProvider, OpenTelemetry.Trace.TracerProviderBuilder> configure) -> OpenTelemetry.Trace.TracerProviderBuilder
 static OpenTelemetry.Trace.TracerProviderBuilderExtensions.GetServices(this OpenTelemetry.Trace.TracerProviderBuilder tracerProviderBuilder) -> Microsoft.Extensions.DependencyInjection.IServiceCollection

src/OpenTelemetry.Extensions.Hosting/Implementation/EventSourceEventFormatter.cs

@@ -0,0 +1,111 @@
+// <copyright file="EventSourceEventFormatter.cs" company="OpenTelemetry Authors">
+// Copyright The OpenTelemetry Authors
+//
+// 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.
+// </copyright>
+
+using System;
+using System.Diagnostics.Tracing;
+using System.Globalization;
+using System.Linq;
+
+namespace OpenTelemetry.Internal
+{
+ internal static class EventSourceEventFormatter
+ {
+ private static readonly object[] EmptyPayload = Array.Empty<object>();
+
+ public static string Format(EventWrittenEventArgs eventData)
+ {
+ if (eventData == null)
+ {
+ return string.Empty;
+ }
+
+ var payloadCollection = eventData.Payload?.ToArray() ?? EmptyPayload;
+
+ ProcessPayloadArray(payloadCollection);
+
+ if (eventData.Message != null)
+ {
+ try
+ {
+ return string.Format(CultureInfo.InvariantCulture, eventData.Message, payloadCollection);
+ }
+ catch (FormatException)
+ {
+ }
+ }
+
+ var stringBuilder = StringBuilderPool.Instance.Get();
+
+ try
+ {
+ stringBuilder.Append(eventData.EventName);
+
+ if (!string.IsNullOrWhiteSpace(eventData.Message))
+ {
+ stringBuilder.AppendLine();
+ stringBuilder.Append(nameof(eventData.Message)).Append(" = ").Append(eventData.Message);
+ }
+
+ if (eventData.PayloadNames != null)
+ {
+ for (int i = 0; i < eventData.PayloadNames.Count; i++)
+ {
+ stringBuilder.AppendLine();
+ stringBuilder.Append(eventData.PayloadNames[i]).Append(" = ").Append(payloadCollection[i]);
+ }
+ }
+
+ return stringBuilder.ToString();
+ }
+ finally
+ {
+ StringBuilderPool.Instance.Return(stringBuilder);
+ }
+ }
+
+ private static void ProcessPayloadArray(object[] payloadArray)
+ {
+ for (int i = 0; i < payloadArray.Length; i++)
+ {
+ payloadArray[i] = FormatValue(payloadArray[i]);
+ }
+ }
+
+ private static object FormatValue(object o)
+ {
+ if (o is byte[] bytes)
+ {
+ var stringBuilder = StringBuilderPool.Instance.Get();
+
+ try
+ {
+ foreach (byte b in bytes)
+ {
+ stringBuilder.AppendFormat(CultureInfo.InvariantCulture, "{0:X2}", b);
+ }
+
+ return stringBuilder.ToString();
+ }
+ finally
+ {
+ StringBuilderPool.Instance.Return(stringBuilder);
+ }
+ }
+
+ return o;
+ }
+ }
+}