From 49747f13c20eb6b3dd6b17fe787dc60cdadae6a6 Mon Sep 17 00:00:00 2001
From: Loic Sharma <sharma.loic@gmail.com>
Date: Fri, 26 May 2017 13:11:31 -0700
Subject: [PATCH] Use ServerCommon's Response Code Processor (#3999)

* Added Nuget.Services.Logging; moved to TelemetryResponseCodeProcessor
* Added binding redirect for AI
---
 src/NuGetGallery/App_Start/OwinStartup.cs     | 13 +++++--
 src/NuGetGallery/NuGetGallery.csproj          | 10 +++---
 .../Telemetry/TelemetryResponseCodeFilter.cs  | 35 -------------------
 src/NuGetGallery/Web.config                   |  4 +++
 src/NuGetGallery/packages.config              |  2 +-
 5 files changed, 20 insertions(+), 44 deletions(-)
 delete mode 100644 src/NuGetGallery/Telemetry/TelemetryResponseCodeFilter.cs

diff --git a/src/NuGetGallery/App_Start/OwinStartup.cs b/src/NuGetGallery/App_Start/OwinStartup.cs
index f03d16652c..e021afb78c 100644
--- a/src/NuGetGallery/App_Start/OwinStartup.cs
+++ b/src/NuGetGallery/App_Start/OwinStartup.cs
@@ -16,6 +16,7 @@
 using Microsoft.Owin.Logging;
 using Microsoft.Owin.Security;
 using Microsoft.Owin.Security.Cookies;
+using NuGet.Services.Logging;
 using NuGetGallery.Authentication;
 using NuGetGallery.Authentication.Providers;
 using NuGetGallery.Authentication.Providers.Cookie;
@@ -64,8 +65,16 @@ public static void Configuration(IAppBuilder app)
 
                 var telemetryProcessorChainBuilder = TelemetryConfiguration.Active.TelemetryProcessorChainBuilder;
 
-                // Add filters
-                telemetryProcessorChainBuilder.Use(next => new TelemetryResponseCodeFilter(next));
+                // Add processors
+                telemetryProcessorChainBuilder.Use(next =>
+                {
+                    var processor = new TelemetryResponseCodeProcessor(next);
+
+                    processor.SuccessfulResponseCodes.Add(400);
+                    processor.SuccessfulResponseCodes.Add(404);
+
+                    return processor;
+                });
 
                 // Note: sampling rate must be a factor 100/N where N is a whole number
                 // e.g.: 50 (= 100/2), 33.33 (= 100/3), 25 (= 100/4), ...
diff --git a/src/NuGetGallery/NuGetGallery.csproj b/src/NuGetGallery/NuGetGallery.csproj
index 3211413e64..2f56762b04 100644
--- a/src/NuGetGallery/NuGetGallery.csproj
+++ b/src/NuGetGallery/NuGetGallery.csproj
@@ -429,11 +429,6 @@
     <Reference Include="NuGet.Frameworks, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\NuGet.Frameworks.4.3.0-preview1-2507\lib\net45\NuGet.Frameworks.dll</HintPath>
     </Reference>
-    <Reference Include="NuGet.Logging, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\NuGet.Logging.3.5.0-beta-1160\lib\net45\NuGet.Logging.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="NuGet.Packaging, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\NuGet.Packaging.4.3.0-preview1-2507\lib\net45\NuGet.Packaging.dll</HintPath>
     </Reference>
@@ -444,6 +439,10 @@
       <HintPath>..\..\packages\NuGet.Services.KeyVault.1.0.0.0\lib\net45\NuGet.Services.KeyVault.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="NuGet.Services.Logging, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NuGet.Services.Logging.2.2.1\lib\net452\NuGet.Services.Logging.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="NuGet.Services.Platform.Client, Version=3.0.29.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\NuGet.Services.Platform.Client.3.0.29-r-master\lib\portable-net45+wp80+win\NuGet.Services.Platform.Client.dll</HintPath>
@@ -774,7 +773,6 @@
     <Compile Include="Security\UserSecurityPolicySubscriptionContext.cs" />
     <Compile Include="Telemetry\ClientInformationTelemetryEnricher.cs" />
     <Compile Include="Telemetry\QuietExceptionLogger.cs" />
-    <Compile Include="Telemetry\TelemetryResponseCodeFilter.cs" />
     <Compile Include="Infrastructure\Authentication\CredentialBuilder.cs" />
     <Compile Include="Infrastructure\Authentication\CredentialValidator.cs" />
     <Compile Include="Infrastructure\Authentication\ICredentialBuilder.cs" />
diff --git a/src/NuGetGallery/Telemetry/TelemetryResponseCodeFilter.cs b/src/NuGetGallery/Telemetry/TelemetryResponseCodeFilter.cs
deleted file mode 100644
index 7b4c1db73b..0000000000
--- a/src/NuGetGallery/Telemetry/TelemetryResponseCodeFilter.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.ApplicationInsights.Extensibility;
-using Microsoft.ApplicationInsights.Channel;
-using Microsoft.ApplicationInsights.DataContracts;
-
-namespace NuGetGallery.Helpers
-{
-    public class TelemetryResponseCodeFilter : ITelemetryProcessor
-    {
-        public TelemetryResponseCodeFilter(ITelemetryProcessor next)
-        {
-            Next = next;
-        }
-        
-        private ITelemetryProcessor Next { get; set; }
-
-        public void Process(ITelemetry item)
-        {
-            var request = item as RequestTelemetry;
-            int responseCode;
-
-            if (request != null && int.TryParse(request.ResponseCode, out responseCode))
-            {
-                if (responseCode == 400 || responseCode == 404)
-                {
-                    request.Success = true;
-                }
-            }
-
-            this.Next.Process(item);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/NuGetGallery/Web.config b/src/NuGetGallery/Web.config
index 5816b78c90..b640eed66f 100644
--- a/src/NuGetGallery/Web.config
+++ b/src/NuGetGallery/Web.config
@@ -436,6 +436,10 @@
   </system.webServer>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.ApplicationInsights" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
+      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
diff --git a/src/NuGetGallery/packages.config b/src/NuGetGallery/packages.config
index 994516b946..2b277f9381 100644
--- a/src/NuGetGallery/packages.config
+++ b/src/NuGetGallery/packages.config
@@ -79,11 +79,11 @@
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
   <package id="NuGet.Common" version="4.3.0-preview1-2507" targetFramework="net46" />
   <package id="NuGet.Frameworks" version="4.3.0-preview1-2507" targetFramework="net46" />
-  <package id="NuGet.Logging" version="3.5.0-beta-1160" targetFramework="net46" />
   <package id="NuGet.Packaging" version="4.3.0-preview1-2507" targetFramework="net46" />
   <package id="NuGet.Packaging.Core" version="4.3.0-preview1-2507" targetFramework="net46" />
   <package id="NuGet.Protocol" version="4.3.0-preview1-2507" targetFramework="net46" />
   <package id="NuGet.Services.KeyVault" version="1.0.0.0" targetFramework="net46" />
+  <package id="NuGet.Services.Logging" version="2.2.1.0" targetFramework="net46" />
   <package id="NuGet.Services.Platform.Client" version="3.0.29-r-master" targetFramework="net46" />
   <package id="NuGet.Versioning" version="4.3.0-preview1-2507" targetFramework="net46" />
   <package id="ODataNullPropagationVisitor" version="0.5.4237.2641" targetFramework="net46" />