Feat/monorepo (#734)

* copied everything from repos back to ocelot repo * added src projects to sln * removed all test projects that have no tests * added all test projects to sln * removed test not on master * merged unit tests * merged acceptance tests * merged integration tests * fixed namepaces * build script creates packages for all projects * updated docs to make sure no references to external repos that we will remove * +semver: breaking
2025-06-19 17:08:15 +08:00 · 2019-01-07 19:52:53 +00:00
parent 35253025c7
commit 11a2d13f18
107 changed files with 9483 additions and 585 deletions
--- a/src/Ocelot.Tracing.Butterfly/ButterflyTracer.cs
+++ b/src/Ocelot.Tracing.Butterfly/ButterflyTracer.cs
@ -0,0 +1,103 @@
+namespace Ocelot.Tracing.Butterfly
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Net.Http;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using global::Butterfly.Client.AspNetCore;
+    using global::Butterfly.Client.Tracing;
+    using global::Butterfly.OpenTracing;
+    using Infrastructure.Extensions;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.Extensions.DependencyInjection;
+
+    public class ButterflyTracer : DelegatingHandler, Logging.ITracer
+    {
+        private readonly IServiceTracer _tracer;
+        private const string PrefixSpanId = "ot-spanId";
+
+        public ButterflyTracer(IServiceProvider services)
+        {
+            _tracer = services.GetService<IServiceTracer>();
+        }
+
+        public void Event(HttpContext httpContext, string @event)
+        {
+            // todo - if the user isnt using tracing the code gets here and will blow up on 
+            // _tracer.Tracer.TryExtract..
+            if (_tracer == null)
+            {
+                return;
+            }
+
+            var span = httpContext.GetSpan();
+
+            if (span == null)
+            {
+                var spanBuilder = new SpanBuilder($"server {httpContext.Request.Method} {httpContext.Request.Path}");
+                if (_tracer.Tracer.TryExtract(out var spanContext, httpContext.Request.Headers, (c, k) => c[k].GetValue(),
+                    c => c.Select(x => new KeyValuePair<string, string>(x.Key, x.Value.GetValue())).GetEnumerator()))
+                {
+                    spanBuilder.AsChildOf(spanContext);
+                }
+
+                span = _tracer.Start(spanBuilder);
+                httpContext.SetSpan(span);
+            }
+
+            span?.Log(LogField.CreateNew().Event(@event));
+        }
+
+        public Task<HttpResponseMessage> SendAsync(
+            HttpRequestMessage request,
+            CancellationToken cancellationToken, 
+            Action<string> addTraceIdToRepo, 
+            Func<HttpRequestMessage, CancellationToken, Task<HttpResponseMessage>> baseSendAsync)
+        {
+            return _tracer.ChildTraceAsync($"httpclient {request.Method}", DateTimeOffset.UtcNow, span => TracingSendAsync(span, request, cancellationToken, addTraceIdToRepo, baseSendAsync));
+        }
+
+        protected virtual async Task<HttpResponseMessage> TracingSendAsync(
+            ISpan span,
+            HttpRequestMessage request,
+            CancellationToken cancellationToken, 
+            Action<string> addTraceIdToRepo, 
+            Func<HttpRequestMessage, CancellationToken, Task<HttpResponseMessage>> baseSendAsync)
+        {
+            if (request.Headers.Contains(PrefixSpanId))
+            {
+                request.Headers.Remove(PrefixSpanId);
+                request.Headers.TryAddWithoutValidation(PrefixSpanId, span.SpanContext.SpanId);
+            }
+
+            addTraceIdToRepo(span.SpanContext.TraceId);
+
+            span.Tags.Client().Component("HttpClient")
+                .HttpMethod(request.Method.Method)
+                .HttpUrl(request.RequestUri.OriginalString)
+                .HttpHost(request.RequestUri.Host)
+                .HttpPath(request.RequestUri.PathAndQuery)
+                .PeerAddress(request.RequestUri.OriginalString)
+                .PeerHostName(request.RequestUri.Host)
+                .PeerPort(request.RequestUri.Port);
+
+            _tracer.Tracer.Inject(span.SpanContext, request.Headers, (c, k, v) =>
+            {
+                if (!c.Contains(k))
+                {
+                    c.Add(k, v);
+                }
+            });
+
+            span.Log(LogField.CreateNew().ClientSend());
+
+            var responseMessage = await baseSendAsync(request, cancellationToken);
+
+            span.Log(LogField.CreateNew().ClientReceive());
+
+            return responseMessage;
+        }
+    }
+}
--- a/src/Ocelot.Tracing.Butterfly/Ocelot.Tracing.Butterfly.csproj
+++ b/src/Ocelot.Tracing.Butterfly/Ocelot.Tracing.Butterfly.csproj
@ -0,0 +1,37 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
+    <NETStandardImplicitPackageVersion>2.0.0</NETStandardImplicitPackageVersion>
+    <NoPackageAnalysis>true</NoPackageAnalysis>
+    <Description>This package provides methods to integrate Butterfly tracing with Ocelot.</Description>
+    <AssemblyTitle>Ocelot.Tracing.Butterfly</AssemblyTitle>
+    <VersionPrefix>0.0.0-dev</VersionPrefix>
+    <AssemblyName>Ocelot.Tracing.Butterfly</AssemblyName>
+    <PackageId>Ocelot.Tracing.Butterfly</PackageId>
+    <PackageTags>API Gateway;.NET core; Butterfly; ButterflyAPM</PackageTags>
+    <PackageProjectUrl>https://github.com/ThreeMammals/Ocelot</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/ThreeMammals/Ocelot</PackageProjectUrl>
+    <RuntimeIdentifiers>win10-x64;osx.10.11-x64;osx.10.12-x64;win7-x64</RuntimeIdentifiers>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <Authors>Tom Pallister</Authors>
+    <CodeAnalysisRuleSet>..\..\codeanalysis.ruleset</CodeAnalysisRuleSet>
+    <RootNamespace>Ocelot.Tracing.Butterfly</RootNamespace>
+  </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DebugType>full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Ocelot\Ocelot.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Butterfly.Client" Version="0.0.8" />
+    <PackageReference Include="Butterfly.Client.AspNetCore" Version="0.0.8" />
+  </ItemGroup>
+
+</Project>
--- a/src/Ocelot.Tracing.Butterfly/OcelotBuilderExtensions.cs
+++ b/src/Ocelot.Tracing.Butterfly/OcelotBuilderExtensions.cs
@ -0,0 +1,18 @@
+namespace Ocelot.Tracing.Butterfly
+{
+    using System;
+    using DependencyInjection;
+    using global::Butterfly.Client.AspNetCore;
+    using Logging;
+    using Microsoft.Extensions.DependencyInjection;
+
+    public static class OcelotBuilderExtensions
+    {
+        public static IOcelotBuilder AddButterfly(this IOcelotBuilder builder, Action<ButterflyOptions> settings)
+        {
+            builder.Services.AddSingleton<ITracer, ButterflyTracer>();
+            builder.Services.AddButterfly(settings);
+            return builder;
+        }
+    }
+}