Remove OTel-specific bits (#4304)

--------- Co-authored-by: Nikita Balabaev <nbalabaev@microsoft.com>
dotnet · Aug 28, 2023 · 03d4f61 · 03d4f61
1 parent df3dfc3
commit 03d4f61
Show file tree

Hide file tree

Showing 98 changed files with 41 additions and 8,766 deletions.
diff --git a/.spelling b/.spelling
@@ -241,9 +241,7 @@ OneBranch
 OneCert
 OneDrive
 OneObservability
-OpenTelemetry
 OSS
-OTel
 OTEPs
 PaaSv1
 parallelization

diff --git a/THIRD-PARTY-NOTICES.TXT b/THIRD-PARTY-NOTICES.TXT
@@ -7,18 +7,3 @@ bring it to our attention. Post an issue or email us:
            dotnet@microsoft.com
 
 The attached notices are provided for information only.
-
-
-License notice for OpenTelemetry .NET
---------------------------------
-
-https://github.com/open-telemetry/opentelemetry-dotnet
-
-https://github.com/open-telemetry/opentelemetry-dotnet/blob/952c3b17f/src/OpenTelemetry/Internal/SelfDiagnostics.cs
-https://github.com/open-telemetry/opentelemetry-dotnet/blob/952c3b17f/src/OpenTelemetry/Internal/SelfDiagnosticsConfigParser.cs
-https://github.com/open-telemetry/opentelemetry-dotnet/blob/952c3b17f/src/OpenTelemetry/Internal/SelfDiagnosticsConfigRefresher.cs
-https://github.com/open-telemetry/opentelemetry-dotnet/blob/952c3b17f/src/OpenTelemetry/Internal/SelfDiagnosticsEventListener.cs
-
-Copyright The OpenTelemetry Authors
-Licensed under the Apache License, Version 2.0.
-https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/LICENSE
diff --git a/bench/Libraries/Microsoft.AspNetCore.Telemetry.PerformanceTests/RedactionBenchmark.cs b/bench/Libraries/Microsoft.AspNetCore.Telemetry.PerformanceTests/RedactionBenchmark.cs
@@ -18,8 +18,8 @@ namespace Microsoft.AspNetCore.Telemetry.Bench;
 [MemoryDiagnoser]
 public class RedactionBenchmark
 {
-    private readonly HttpTracingOptions _options;
     private readonly string _httpPath;
+    private readonly Dictionary<string, DataClassification> _routeParameterDataClasses = new();
     private readonly ObjectPool<StringBuilder> _stringBuilderPool;
     private readonly Dictionary<string, object?> _routeValues = new()
     {
@@ -29,9 +29,8 @@ public class RedactionBenchmark
 
     public RedactionBenchmark()
     {
-        _options = new HttpTracingOptions();
-        _options.RouteParameterDataClasses.Add("userId", SimpleClassifications.PrivateData);
-        _options.RouteParameterDataClasses.Add("chatId", SimpleClassifications.PrivateData);
+        _routeParameterDataClasses.Add("userId", SimpleClassifications.PrivateData);
+        _routeParameterDataClasses.Add("chatId", SimpleClassifications.PrivateData);
 
         _httpPath = "/users/{userId}/chats/{chatId}/test1/test2/{userId}";
         _stringBuilderPool = PoolFactory.CreateStringBuilderPool();
@@ -87,7 +86,7 @@ public void RedactHttpPathStringBuilderNETStd()
                     {
                         if (((string)item.Value!).AsSpan().SequenceEqual(segment))
                         {
-                            if (_options.RouteParameterDataClasses.TryGetValue(item.Key, out DataClassification classification))
+                            if (_routeParameterDataClasses.TryGetValue(item.Key, out DataClassification classification))
                             {
                                 pathStringBuilder.Append(Redact(segment, destinationBuffer));
                                 isRouteKeyFound = true;
@@ -146,7 +145,7 @@ public void RedactHttpPathStringBuilderOptimizedForSpeedNETStd()
                 {
                     var segment = span.Slice(startIndex, i - startIndex).ToString();
                     if (newDict.TryGetValue(segment, out var value) &&
-                        _options.RouteParameterDataClasses.TryGetValue(value, out DataClassification classification))
+                        _routeParameterDataClasses.TryGetValue(value, out DataClassification classification))
                     {
                         _ = pathStringBuilder.Append(Redact(segment, destinationBuffer));
                     }
@@ -202,7 +201,7 @@ public void RedactHttpPathUsingIndexOfNETStd()
                     {
                         if (((string)item.Value!).AsSpan().SequenceEqual(segment))
                         {
-                            if (_options.RouteParameterDataClasses.TryGetValue(item.Key, out DataClassification classification))
+                            if (_routeParameterDataClasses.TryGetValue(item.Key, out DataClassification classification))
                             {
                                 _ = pathStringBuilder.Append(Redact(segment, destinationBuffer));
                                 isRouteKeyFound = true;
@@ -280,7 +279,7 @@ public void RedactHttpPathWithSegmentsNETStd()
                 {
                     if (((string)item.Value!).AsSpan().SequenceEqual(segment))
                     {
-                        if (_options.RouteParameterDataClasses.TryGetValue(item.Key, out DataClassification classification))
+                        if (_routeParameterDataClasses.TryGetValue(item.Key, out DataClassification classification))
                         {
                             _ = pathStringBuilder.Append(Redact(segment, destinationBuffer));
                             isRouteKeyFound = true;
@@ -320,7 +319,7 @@ public void RedactHttpRouteNETCore()
                 {
                     if (_routeValues.TryGetValue(routeSegment.Segment, out var paramValue))
                     {
-                        if (_options.RouteParameterDataClasses.TryGetValue(routeSegment.Segment, out DataClassification classification))
+                        if (_routeParameterDataClasses.TryGetValue(routeSegment.Segment, out DataClassification classification))
                         {
                             _ = pathStringBuilder.Append(Redact((string)paramValue!, destinationBuffer));
                         }

diff --git a/bench/Libraries/Microsoft.Extensions.Telemetry.PerformanceTests/BenchLogger.cs b/bench/Libraries/Microsoft.Extensions.Telemetry.PerformanceTests/BenchLogger.cs
@@ -65,7 +65,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
 
         if (o?.GetType() == typeof(Guid))
         {
-            // simulate what a real exporter like OTel would do.
+            // simulate what a real exporter would do.
             o = o.ToString();
         }
 

diff --git a/eng/packages/General.props b/eng/packages/General.props
@@ -36,11 +36,6 @@
     <PackageVersion Include="Microsoft.Extensions.Primitives" Version="$(MicrosoftExtensionsPrimitivesVersion)" />
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageVersion Include="OpenTelemetry.Api" Version="1.4.0" />
-    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.4.0" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.14" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.14" />
-    <PackageVersion Include="OpenTelemetry" Version="1.4.0" />
     <PackageVersion Include="Polly.Contrib.Simmy" Version="0.3.0" />
     <PackageVersion Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
     <PackageVersion Include="Polly.Core" Version="8.0.0-alpha.8" />

diff --git a/eng/packages/TestOnly.props b/eng/packages/TestOnly.props
@@ -8,8 +8,7 @@
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.3" />
     <PackageVersion Include="Moq.AutoMock" Version="3.1.0" />
     <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.4.0" />
-    <PackageVersion Include="Polly.Testing" Version="8.0.0-alpha.8" />    
+    <PackageVersion Include="Polly.Testing" Version="8.0.0-alpha.8" />
     <PackageVersion Include="StrongNamer" Version="0.2.5" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
     <PackageVersion Include="Xunit.Combinatorial" Version="1.5.25" />

diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry/Microsoft.AspNetCore.Telemetry.csproj b/src/Libraries/Microsoft.AspNetCore.Telemetry/Microsoft.AspNetCore.Telemetry.csproj
@@ -30,7 +30,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))" />
     <PackageReference Include="System.Collections.Immutable" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))" />
   </ItemGroup>
@@ -40,14 +39,10 @@
     <PackageReference Include="Microsoft.AspNetCore.Http" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
-    <PackageVersion Update="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.4" />
-  </ItemGroup>
-
   <ItemGroup>
     <InternalsVisibleToDynamicProxyGenAssembly2 Include="*" />
     <InternalsVisibleToTest Include="$(AssemblyName).Tests" />
-    <InternalsVisibleTo Include="Microsoft.AspNetCore.Telemetry.Middleware"/>
-    <InternalsVisibleTo Include="Microsoft.AspNetCore.Telemetry.Middleware.Tests"/>
+    <InternalsVisibleTo Include="Microsoft.AspNetCore.Telemetry.Middleware" />
+    <InternalsVisibleTo Include="Microsoft.AspNetCore.Telemetry.Middleware.Tests" />
   </ItemGroup>
 </Project>
diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry/Microsoft.AspNetCore.Telemetry.json b/src/Libraries/Microsoft.AspNetCore.Telemetry/Microsoft.AspNetCore.Telemetry.json
@@ -1,78 +1,6 @@
 {
   "Name": "Microsoft.AspNetCore.Telemetry, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35",
   "Types": [
-    {
-      "Type": "static class Microsoft.AspNetCore.Telemetry.HttpTracingExtensions",
-      "Stage": "Stable",
-      "Methods": [
-        {
-          "Member": "static OpenTelemetry.Trace.TracerProviderBuilder Microsoft.AspNetCore.Telemetry.HttpTracingExtensions.AddHttpTraceEnricher<T>(this OpenTelemetry.Trace.TracerProviderBuilder builder);",
-          "Stage": "Stable"
-        },
-        {
-          "Member": "static OpenTelemetry.Trace.TracerProviderBuilder Microsoft.AspNetCore.Telemetry.HttpTracingExtensions.AddHttpTraceEnricher(this OpenTelemetry.Trace.TracerProviderBuilder builder, Microsoft.AspNetCore.Telemetry.IHttpTraceEnricher enricher);",
-          "Stage": "Stable"
-        },
-        {
-          "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.AspNetCore.Telemetry.HttpTracingExtensions.AddHttpTraceEnricher<T>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);",
-          "Stage": "Experimental"
-        },
-        {
-          "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.AspNetCore.Telemetry.HttpTracingExtensions.AddHttpTraceEnricher(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.AspNetCore.Telemetry.IHttpTraceEnricher enricher);",
-          "Stage": "Experimental"
-        },
-        {
-          "Member": "static OpenTelemetry.Trace.TracerProviderBuilder Microsoft.AspNetCore.Telemetry.HttpTracingExtensions.AddHttpTracing(this OpenTelemetry.Trace.TracerProviderBuilder builder);",
-          "Stage": "Stable"
-        },
-        {
-          "Member": "static OpenTelemetry.Trace.TracerProviderBuilder Microsoft.AspNetCore.Telemetry.HttpTracingExtensions.AddHttpTracing(this OpenTelemetry.Trace.TracerProviderBuilder builder, System.Action<Microsoft.AspNetCore.Telemetry.HttpTracingOptions> configure);",
-          "Stage": "Stable"
-        },
-        {
-          "Member": "static OpenTelemetry.Trace.TracerProviderBuilder Microsoft.AspNetCore.Telemetry.HttpTracingExtensions.AddHttpTracing(this OpenTelemetry.Trace.TracerProviderBuilder builder, Microsoft.Extensions.Configuration.IConfigurationSection section);",
-          "Stage": "Stable"
-        }
-      ]
-    },
-    {
-      "Type": "class Microsoft.AspNetCore.Telemetry.HttpTracingOptions",
-      "Stage": "Stable",
-      "Methods": [
-        {
-          "Member": "Microsoft.AspNetCore.Telemetry.HttpTracingOptions.HttpTracingOptions();",
-          "Stage": "Stable"
-        }
-      ],
-      "Properties": [
-        {
-          "Member": "System.Collections.Generic.ISet<string> Microsoft.AspNetCore.Telemetry.HttpTracingOptions.ExcludePathStartsWith { get; set; }",
-          "Stage": "Stable"
-        },
-        {
-          "Member": "bool Microsoft.AspNetCore.Telemetry.HttpTracingOptions.IncludePath { get; set; }",
-          "Stage": "Stable"
-        },
-        {
-          "Member": "Microsoft.Extensions.Http.Telemetry.HttpRouteParameterRedactionMode Microsoft.AspNetCore.Telemetry.HttpTracingOptions.RequestPathParameterRedactionMode { get; set; }",
-          "Stage": "Experimental"
-        },
-        {
-          "Member": "System.Collections.Generic.IDictionary<string, Microsoft.Extensions.Compliance.Classification.DataClassification> Microsoft.AspNetCore.Telemetry.HttpTracingOptions.RouteParameterDataClasses { get; set; }",
-          "Stage": "Stable"
-        }
-      ]
-    },
-    {
-      "Type": "interface Microsoft.AspNetCore.Telemetry.IHttpTraceEnricher",
-      "Stage": "Stable",
-      "Methods": [
-        {
-          "Member": "void Microsoft.AspNetCore.Telemetry.IHttpTraceEnricher.Enrich(System.Diagnostics.Activity activity, Microsoft.AspNetCore.Http.HttpRequest request);",
-          "Stage": "Stable"
-        }
-      ]
-    },
     {
       "Type": "static class Microsoft.AspNetCore.Telemetry.RequestHeadersEnricherExtensions",
       "Stage": "Stable",

diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry/Tracing/Constants.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry/Tracing/Constants.cs
diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry/Tracing/HttpTraceEnrichmentProcessor.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry/Tracing/HttpTraceEnrichmentProcessor.cs
diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry/Tracing/HttpTraceEnrichmentProcessor.netfx.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry/Tracing/HttpTraceEnrichmentProcessor.netfx.cs