Skip to content

Commit 2b8c872

Browse files
committed
Revert "Feat/opentracing (#1243)"
This reverts commit 865520f.
1 parent 865520f commit 2b8c872

File tree

13 files changed

+76
-929
lines changed

13 files changed

+76
-929
lines changed

Ocelot.sln

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "basic", "basic", "{ED066001
8282
EndProject
8383
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "graphql", "graphql", "{C15CD120-5F8D-41DE-9B21-00E3EA77D6C1}"
8484
EndProject
85-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ocelot.Tracing.OpenTracing", "src\Ocelot.Tracing.OpenTracing\Ocelot.Tracing.OpenTracing.csproj", "{11C622AD-8C0A-4CF4-811B-3DBB76550797}"
86-
EndProject
87-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "open-tracing", "open-tracing", "{731C6A8A-69ED-445C-A132-C638AA93F9C7}"
88-
EndProject
89-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OcelotOpenTracing", "samples\OcelotOpenTracing\OcelotOpenTracing.csproj", "{C9427E78-4281-4F59-A66E-17C0B66550E5}"
90-
EndProject
9185
Global
9286
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9387
Debug|Any CPU = Debug|Any CPU
@@ -186,14 +180,6 @@ Global
186180
{33BE6D88-F188-4E60-83AC-3C4B94D24675}.Debug|Any CPU.Build.0 = Debug|Any CPU
187181
{33BE6D88-F188-4E60-83AC-3C4B94D24675}.Release|Any CPU.ActiveCfg = Release|Any CPU
188182
{33BE6D88-F188-4E60-83AC-3C4B94D24675}.Release|Any CPU.Build.0 = Release|Any CPU
189-
{11C622AD-8C0A-4CF4-811B-3DBB76550797}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
190-
{11C622AD-8C0A-4CF4-811B-3DBB76550797}.Debug|Any CPU.Build.0 = Debug|Any CPU
191-
{11C622AD-8C0A-4CF4-811B-3DBB76550797}.Release|Any CPU.ActiveCfg = Release|Any CPU
192-
{11C622AD-8C0A-4CF4-811B-3DBB76550797}.Release|Any CPU.Build.0 = Release|Any CPU
193-
{C9427E78-4281-4F59-A66E-17C0B66550E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
194-
{C9427E78-4281-4F59-A66E-17C0B66550E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
195-
{C9427E78-4281-4F59-A66E-17C0B66550E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
196-
{C9427E78-4281-4F59-A66E-17C0B66550E5}.Release|Any CPU.Build.0 = Release|Any CPU
197183
EndGlobalSection
198184
GlobalSection(SolutionProperties) = preSolution
199185
HideSolutionNode = FALSE
@@ -228,9 +214,6 @@ Global
228214
{1F1F324D-6EA4-4E63-A6A7-C6053F412F1A} = {8FA0CBA0-0338-48EB-B37F-83CA5022237C}
229215
{ED066001-BAF7-4117-9884-DF591A56347D} = {8FA0CBA0-0338-48EB-B37F-83CA5022237C}
230216
{C15CD120-5F8D-41DE-9B21-00E3EA77D6C1} = {8FA0CBA0-0338-48EB-B37F-83CA5022237C}
231-
{11C622AD-8C0A-4CF4-811B-3DBB76550797} = {5CFB79B7-C9DC-45A4-9A75-625D92471702}
232-
{731C6A8A-69ED-445C-A132-C638AA93F9C7} = {8FA0CBA0-0338-48EB-B37F-83CA5022237C}
233-
{C9427E78-4281-4F59-A66E-17C0B66550E5} = {731C6A8A-69ED-445C-A132-C638AA93F9C7}
234217
EndGlobalSection
235218
GlobalSection(ExtensibilityGlobals) = postSolution
236219
SolutionGuid = {21476EFF-778A-4F97-8A56-D1AF1CEC0C48}

docs/features/tracing.rst

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,8 @@
11
Tracing
22
=======
33

4-
This page details how to perform distributed tracing with Ocelot.
5-
6-
OpenTracing
7-
^^^^^^^^^^^
8-
9-
Ocelot providers tracing functionality from the excellent `OpenTracing C# <https://github.com/opentracing/opentracing-csharp>`_ project. The code for the Ocelot integration
10-
can be found `here <https://github.com/ThreeMammals/Ocelot.Tracing.OpenTracing>`_.
11-
12-
The example below uses `Jaeger C# <https://github.com/jaegertracing/jaeger-client-csharp>`_ client to provide the tracer used in Ocelot.
13-
14-
.. code-block:: csharp
15-
16-
services.AddSingleton<ITracer>(sp =>
17-
{
18-
var loggerFactory = sp.GetService<ILoggerFactory>();
19-
Configuration config = new Configuration(context.HostingEnvironment.ApplicationName, loggerFactory);
20-
21-
var tracer = config.GetTracer();
22-
GlobalTracer.Register(tracer);
23-
return tracer;
24-
});
25-
26-
services
27-
.AddOcelot()
28-
.AddOpenTracing();
29-
30-
Then in your ocelot.json add the following to the Route you want to trace..
31-
32-
.. code-block:: json
33-
34-
"HttpHandlerOptions": {
35-
"UseTracing": true
36-
},
37-
38-
Ocelot will now send tracing information to Jaeger when this Route is called.
4+
This page details how to perform distributed tracing with Ocelot. At the moment we only support Butterfly but other tracers might just work without
5+
anything Ocelot specific.
396

407
Butterfly
418
^^^^^^^^^

samples/OcelotOpenTracing/OcelotOpenTracing.csproj

Lines changed: 0 additions & 30 deletions
This file was deleted.

samples/OcelotOpenTracing/Program.cs

Lines changed: 0 additions & 65 deletions
This file was deleted.

samples/OcelotOpenTracing/appsettings.Development.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

samples/OcelotOpenTracing/appsettings.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

samples/OcelotOpenTracing/ocelot.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/Ocelot.Tracing.OpenTracing/Ocelot.Tracing.OpenTracing.csproj

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/Ocelot.Tracing.OpenTracing/OcelotBuilderExtensions.cs

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/Ocelot.Tracing.OpenTracing/OpenTracingTracer.cs

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)