Feature/#246 (#252)

* failing test

* failing test but needs real butterfly server running..need to fix that...also worked out ive broken tracing...yey

* brought in butterfly source code so i can work out how to write acceptance tests for this...

* fixed the bug but still need to fix tracing

* tracing working again across services but need to make tracing hook into new Ocelot middleware as it still uses asp.net middleware

* removed butterfly libs brought in for testing

docs/features/administration.rst

@@ -21,7 +21,7 @@ All you need to do to hook into your own IdentityServer is add the following to
             };
 
         services
-            .AddOcelot(Configuration)
+            .AddOcelot()
             .AddAdministration("/administration", options);
     }
 
@@ -51,7 +51,7 @@ The secret is the client secret that Ocelot's internal IdentityServer will use t
     public virtual void ConfigureServices(IServiceCollection services)
     {
         services
-            .AddOcelot(Configuration)
+            .AddOcelot()
             .AddAdministration("/administration", "secret");
     }
 

docs/features/authentication.rst

@@ -63,7 +63,7 @@ If you want to authenticate using JWT tokens maybe from a provider like Auth0 yo
                 x.Audience = "test";
             });
 
-        services.AddOcelot(Configuration);
+        services.AddOcelot();
     }
 
 Then map the authentication provider key to a ReRoute in your configuration e.g.
@@ -111,7 +111,7 @@ In order to use IdentityServer bearer tokens register your IdentityServer servic
         services.AddAuthentication()
             .AddIdentityServerAuthentication(authenticationProviderKey, options);
 
-        services.AddOcelot(Configuration);
+        services.AddOcelot();
     }
 
 Then map the authentication provider key to a ReRoute in your configuration e.g.

docs/features/configuration.rst

@@ -109,7 +109,7 @@ If you add the following when you register your services Ocelot will attempt to
 .. code-block:: csharp
 
  services
-    .AddOcelot(Configuration)
+    .AddOcelot()
     .AddStoreOcelotConfigurationInConsul();
 
 You also need to add the following to your configuration.json. This is how Ocelot

docs/features/raft.rst

@@ -12,7 +12,7 @@ In order to enable Rafty in Ocelot you must make the following changes to your S
     public virtual void ConfigureServices(IServiceCollection services)
     {
          services
-            .AddOcelot(Configuration)
+            .AddOcelot()
             .AddAdministration("/administration", "secret")
             .AddRafty();
     }

docs/features/tracing.rst

@@ -12,7 +12,7 @@ In your ConfigureServices method
 .. code-block:: csharp
 
     services
-        .AddOcelot(Configuration)
+        .AddOcelot()
         .AddOpenTracing(option =>
         {
             //this is the url that the butterfly collector server is running on...