Merge pull request #10 from dotnetcore/master

merge
fanliang11 · Nov 11, 2019 · 6ab1da0 · 6ab1da0
2 parents 7412a58 + be43a8d
commit 6ab1da0
Show file tree

Hide file tree

Showing 33 changed files with 308 additions and 113 deletions.
diff --git a/src/Surging.ApiGateway/Configs/gatewaySettings.json b/src/Surging.ApiGateway/Configs/gatewaySettings.json
@@ -5,7 +5,6 @@
   "TokenEndpointPath": "api/oauth2/token",
   "CacheMode": "MemoryCache", //MemoryCache or  gateway.Redis save token
   "AccessPolicy": {
-    "Origins": [ "http://127.0.0.1:1927", "http://localhost:927" ],
     "AllowAnyHeader": true,
     "AllowAnyMethod": true
   },

diff --git a/src/Surging.ApiGateway/Startup.cs b/src/Surging.ApiGateway/Startup.cs
@@ -26,6 +26,8 @@
 using Surging.Core.Caching;
 using Surging.Core.CPlatform.Cache;
 using System.Linq;
+using Surging.Apm.Skywalking;
+using Surging.Apm.Skywalking.Abstractions;
 
 namespace Surging.ApiGateway
 {
@@ -74,7 +76,9 @@ private IServiceProvider RegisterAutofac(IServiceCollection services)
                else if(registerConfig.Provider == RegisterProvider.Zookeeper)
                     option.UseZooKeeperManager(new ZookeeperConfigInfo(registerConfig.Address, enableChildrenMonitor: true));
                 option.UseDotNettyTransport();
-                option.AddApiGateWay();
+                option.AddApiGateWay();  
+                option.AddRpcTransportDiagnostic(); 
+                option.UseSkywalking();
                 option.AddFilter(new ServiceExceptionFilter());
                 //option.UseProtoBufferCodec();
                 option.UseMessagePackCodec();
@@ -93,7 +97,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             ServiceLocator.Current.Resolve<IServiceProxyFactory>();
             ServiceLocator.Current.Resolve<IServiceCacheManager>().SetCachesAsync(addressDescriptors);
             ServiceLocator.Current.Resolve<IConfigurationWatchProvider>();
-
+            ServiceLocator.Current.Resolve<IInstrumentStartup>().StartAsync();
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
@@ -105,6 +109,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             app.UseCors(builder =>
             {
                 var policy = Core.ApiGateWay.AppConfig.Policy;
+                if(policy.Origins !=null)
                 builder.WithOrigins(policy.Origins);
                 if (policy.AllowAnyHeader)
                     builder.AllowAnyHeader();

diff --git a/src/Surging.ApiGateway/Surging.ApiGateway.csproj b/src/Surging.ApiGateway/Surging.ApiGateway.csproj
@@ -42,6 +42,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Surging.Apm\SkyApm.Transport.Grpc.Protocol\SkyApm.Transport.Grpc.Protocol.csproj" />
+    <ProjectReference Include="..\Surging.Apm\Surging.Apm.Skywalking\Surging.Apm.Skywalking.csproj" />
     <ProjectReference Include="..\Surging.Core\Surging.Core.ApiGateWay\Surging.Core.ApiGateWay.csproj" />
     <ProjectReference Include="..\Surging.Core\Surging.Core.Caching\Surging.Core.Caching.csproj" />
     <ProjectReference Include="..\Surging.Core\Surging.Core.Codec.MessagePack\Surging.Core.Codec.MessagePack.csproj" />
@@ -64,6 +66,9 @@
     <Content Update="Configs\gatewaySettings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Update="skyapm.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 
 </Project>
diff --git a/src/Surging.ApiGateway/skyapm.json b/src/Surging.ApiGateway/skyapm.json
@@ -0,0 +1,29 @@
+{
+  "SkyWalking": {
+    "ServiceName": "Surging.ApiGateway",
+    "Namespace": "",
+    "HeaderVersions": [
+      "sw6"
+    ],
+    "Sampling": {
+      "SamplePer3Secs": -1,
+      "Percentage": -1.0
+    },
+    "Logging": {
+      "Level": "Information",
+      "FilePath": "logs/skyapm-{Date}.log"
+    },
+    "Transport": {
+      "Interval": 3000,
+      "ProtocolVersion": "v6",
+      "QueueSize": 30000,
+      "BatchSize": 3000,
+      "gRPC": {
+        "Servers": "localhost:11800",
+        "Timeout": 100000,
+        "ConnectTimeout": 100000,
+        "ReportTimeout": 600000
+      }
+    }
+  }
+}
diff --git a/src/Surging.Apm/SkyApm.Transport.Grpc.Protocol/SkyApm.Transport.Grpc.Protocol.csproj b/src/Surging.Apm/SkyApm.Transport.Grpc.Protocol/SkyApm.Transport.Grpc.Protocol.csproj
@@ -4,7 +4,7 @@
     <PropertyGroup>
         <Description>$(Product) gRPC data transmitter.</Description>
         <AssemblyTitle>$(PackagePrefix).Transport.Grpc.Protocol</AssemblyTitle>
-        <AssemblyName>$(PackagePrefix).Transport.Grpc.Protocol</AssemblyName>
+        <AssemblyName>SkyApm.Transport.Grpc.Protocol</AssemblyName>
         <PackageId>$(PackagePrefix).Transport.Grpc.Protocol</PackageId>
         <PackageTags>SkyWalking;Grpc</PackageTags>
         <PackageReleaseNotes>
@@ -14,9 +14,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Google.Protobuf" Version="3.6.1" />
-        <PackageReference Include="Grpc" Version="1.17.0" />
-        <PackageReference Include="Grpc.Tools" Version="1.17.0" PrivateAssets="All" />
+        <PackageReference Include="Google.Protobuf" Version="3.10.1" />
+        <PackageReference Include="Grpc" Version="2.24.0" />
+        <PackageReference Include="Grpc.Tools" Version="2.24.0" PrivateAssets="All" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Surging.Apm/SkyApm.Transport.Grpc.Protocol/generated/ApplicationRegisterService.cs b/src/Surging.Apm/SkyApm.Transport.Grpc.Protocol/generated/ApplicationRegisterService.cs
@@ -280,7 +280,7 @@ public sealed partial class ApplicationMapping : pb::IMessage<ApplicationMapping
       }
       if (other.application_ != null) {
         if (application_ == null) {
-          application_ = new global::SkyWalking.NetworkProtocol.KeyWithIntegerValue();
+          Application = new global::SkyWalking.NetworkProtocol.KeyWithIntegerValue();
         }
         Application.MergeFrom(other.Application);
       }
@@ -297,9 +297,9 @@ public sealed partial class ApplicationMapping : pb::IMessage<ApplicationMapping
             break;
           case 10: {
             if (application_ == null) {
-              application_ = new global::SkyWalking.NetworkProtocol.KeyWithIntegerValue();
+              Application = new global::SkyWalking.NetworkProtocol.KeyWithIntegerValue();
             }
-            input.ReadMessage(application_);
+            input.ReadMessage(Application);
             break;
           }
         }

diff --git a/src/Surging.Apm/SkyApm.Transport.Grpc.Protocol/generated/ApplicationRegisterServiceGrpc.cs b/src/Surging.Apm/SkyApm.Transport.Grpc.Protocol/generated/ApplicationRegisterServiceGrpc.cs
@@ -50,6 +50,7 @@ public static partial class ApplicationRegisterService
     }
 
     /// <summary>Base class for server-side implementations of ApplicationRegisterService</summary>
+    [grpc::BindServiceMethod(typeof(ApplicationRegisterService), "BindService")]
     public abstract partial class ApplicationRegisterServiceBase
     {
       public virtual global::System.Threading.Tasks.Task<global::SkyWalking.NetworkProtocol.ApplicationMapping> applicationCodeRegister(global::SkyWalking.NetworkProtocol.Application request, grpc::ServerCallContext context)
@@ -64,7 +65,7 @@ public partial class ApplicationRegisterServiceClient : grpc::ClientBase<Applica
     {
       /// <summary>Creates a new client for ApplicationRegisterService</summary>
       /// <param name="channel">The channel to use to make remote calls.</param>
-      public ApplicationRegisterServiceClient(grpc::Channel channel) : base(channel)
+      public ApplicationRegisterServiceClient(grpc::ChannelBase channel) : base(channel)
       {
       }
       /// <summary>Creates a new client for ApplicationRegisterService that uses a custom <c>CallInvoker</c>.</summary>
@@ -113,13 +114,13 @@ protected override ApplicationRegisterServiceClient NewInstance(ClientBaseConfig
           .AddMethod(__Method_applicationCodeRegister, serviceImpl.applicationCodeRegister).Build();
     }
 
-    /// <summary>Register service method implementations with a service binder. Useful when customizing the service binding logic.
+    /// <summary>Register service method with a service binder with or without implementation. Useful when customizing the  service binding logic.
     /// Note: this method is part of an experimental API that can change or be removed without any prior notice.</summary>
     /// <param name="serviceBinder">Service methods will be bound by calling <c>AddMethod</c> on this object.</param>
     /// <param name="serviceImpl">An object implementing the server-side handling logic.</param>
     public static void BindService(grpc::ServiceBinderBase serviceBinder, ApplicationRegisterServiceBase serviceImpl)
     {
-      serviceBinder.AddMethod(__Method_applicationCodeRegister, serviceImpl.applicationCodeRegister);
+      serviceBinder.AddMethod(__Method_applicationCodeRegister, serviceImpl == null ? null : new grpc::UnaryServerMethod<global::SkyWalking.NetworkProtocol.Application, global::SkyWalking.NetworkProtocol.ApplicationMapping>(serviceImpl.applicationCodeRegister));
     }
 
   }

diff --git a/src/Surging.Apm/SkyApm.Transport.Grpc.Protocol/generated/CLR.cs b/src/Surging.Apm/SkyApm.Transport.Grpc.Protocol/generated/CLR.cs
@@ -220,19 +220,19 @@ public sealed partial class CLRMetric : pb::IMessage<CLRMetric> {
       }
       if (other.cpu_ != null) {
         if (cpu_ == null) {
-          cpu_ = new global::SkyWalking.NetworkProtocol.CPU();
+          Cpu = new global::SkyWalking.NetworkProtocol.CPU();
         }
         Cpu.MergeFrom(other.Cpu);
       }
       if (other.gc_ != null) {
         if (gc_ == null) {
-          gc_ = new global::SkyWalking.NetworkProtocol.ClrGC();
+          Gc = new global::SkyWalking.NetworkProtocol.ClrGC();
         }
         Gc.MergeFrom(other.Gc);
       }
       if (other.thread_ != null) {
         if (thread_ == null) {
-          thread_ = new global::SkyWalking.NetworkProtocol.ClrThread();
+          Thread = new global::SkyWalking.NetworkProtocol.ClrThread();
         }
         Thread.MergeFrom(other.Thread);
       }
@@ -253,23 +253,23 @@ public sealed partial class CLRMetric : pb::IMessage<CLRMetric> {
           }
           case 18: {
             if (cpu_ == null) {
-              cpu_ = new global::SkyWalking.NetworkProtocol.CPU();
+              Cpu = new global::SkyWalking.NetworkProtocol.CPU();
             }
-            input.ReadMessage(cpu_);
+            input.ReadMessage(Cpu);
             break;
           }
           case 26: {
             if (gc_ == null) {
-              gc_ = new global::SkyWalking.NetworkProtocol.ClrGC();
+              Gc = new global::SkyWalking.NetworkProtocol.ClrGC();
             }
-            input.ReadMessage(gc_);
+            input.ReadMessage(Gc);
             break;
           }
           case 34: {
             if (thread_ == null) {
-              thread_ = new global::SkyWalking.NetworkProtocol.ClrThread();
+              Thread = new global::SkyWalking.NetworkProtocol.ClrThread();
             }
-            input.ReadMessage(thread_);
+            input.ReadMessage(Thread);
             break;
           }
         }

diff --git a/src/Surging.Apm/SkyApm.Transport.Grpc.Protocol/generated/CLRMetricGrpc.cs b/src/Surging.Apm/SkyApm.Transport.Grpc.Protocol/generated/CLRMetricGrpc.cs
@@ -47,6 +47,7 @@ public static partial class CLRMetricReportService
     }
 
     /// <summary>Base class for server-side implementations of CLRMetricReportService</summary>
+    [grpc::BindServiceMethod(typeof(CLRMetricReportService), "BindService")]
     public abstract partial class CLRMetricReportServiceBase
     {
       public virtual global::System.Threading.Tasks.Task<global::SkyWalking.NetworkProtocol.Commands> collect(global::SkyWalking.NetworkProtocol.CLRMetricCollection request, grpc::ServerCallContext context)
@@ -61,7 +62,7 @@ public partial class CLRMetricReportServiceClient : grpc::ClientBase<CLRMetricRe
     {
       /// <summary>Creates a new client for CLRMetricReportService</summary>
       /// <param name="channel">The channel to use to make remote calls.</param>
-      public CLRMetricReportServiceClient(grpc::Channel channel) : base(channel)
+      public CLRMetricReportServiceClient(grpc::ChannelBase channel) : base(channel)
       {
       }
       /// <summary>Creates a new client for CLRMetricReportService that uses a custom <c>CallInvoker</c>.</summary>
@@ -110,13 +111,13 @@ protected override CLRMetricReportServiceClient NewInstance(ClientBaseConfigurat
           .AddMethod(__Method_collect, serviceImpl.collect).Build();
     }
 
-    /// <summary>Register service method implementations with a service binder. Useful when customizing the service binding logic.
+    /// <summary>Register service method with a service binder with or without implementation. Useful when customizing the  service binding logic.
     /// Note: this method is part of an experimental API that can change or be removed without any prior notice.</summary>
     /// <param name="serviceBinder">Service methods will be bound by calling <c>AddMethod</c> on this object.</param>
     /// <param name="serviceImpl">An object implementing the server-side handling logic.</param>
     public static void BindService(grpc::ServiceBinderBase serviceBinder, CLRMetricReportServiceBase serviceImpl)
     {
-      serviceBinder.AddMethod(__Method_collect, serviceImpl.collect);
+      serviceBinder.AddMethod(__Method_collect, serviceImpl == null ? null : new grpc::UnaryServerMethod<global::SkyWalking.NetworkProtocol.CLRMetricCollection, global::SkyWalking.NetworkProtocol.Commands>(serviceImpl.collect));
     }
 
   }

diff --git a/src/Surging.Apm/SkyApm.Transport.Grpc.Protocol/generated/DiscoveryService.cs b/src/Surging.Apm/SkyApm.Transport.Grpc.Protocol/generated/DiscoveryService.cs
@@ -250,7 +250,7 @@ public sealed partial class ApplicationInstance : pb::IMessage<ApplicationInstan
       }
       if (other.osinfo_ != null) {
         if (osinfo_ == null) {
-          osinfo_ = new global::SkyWalking.NetworkProtocol.OSInfo();
+          Osinfo = new global::SkyWalking.NetworkProtocol.OSInfo();
         }
         Osinfo.MergeFrom(other.Osinfo);
       }
@@ -279,9 +279,9 @@ public sealed partial class ApplicationInstance : pb::IMessage<ApplicationInstan
           }
           case 34: {
             if (osinfo_ == null) {
-              osinfo_ = new global::SkyWalking.NetworkProtocol.OSInfo();
+              Osinfo = new global::SkyWalking.NetworkProtocol.OSInfo();
             }
-            input.ReadMessage(osinfo_);
+            input.ReadMessage(Osinfo);
             break;
           }
         }
@@ -626,7 +626,7 @@ public sealed partial class ApplicationInstanceRecover : pb::IMessage<Applicatio
       }
       if (other.osinfo_ != null) {
         if (osinfo_ == null) {
-          osinfo_ = new global::SkyWalking.NetworkProtocol.OSInfo();
+          Osinfo = new global::SkyWalking.NetworkProtocol.OSInfo();
         }
         Osinfo.MergeFrom(other.Osinfo);
       }
@@ -655,9 +655,9 @@ public sealed partial class ApplicationInstanceRecover : pb::IMessage<Applicatio
           }
           case 34: {
             if (osinfo_ == null) {
-              osinfo_ = new global::SkyWalking.NetworkProtocol.OSInfo();
+              Osinfo = new global::SkyWalking.NetworkProtocol.OSInfo();
             }
-            input.ReadMessage(osinfo_);
+            input.ReadMessage(Osinfo);
             break;
           }
         }
@@ -1401,7 +1401,7 @@ public sealed partial class ServiceNameMappingElement : pb::IMessage<ServiceName
       }
       if (other.element_ != null) {
         if (element_ == null) {
-          element_ = new global::SkyWalking.NetworkProtocol.ServiceNameElement();
+          Element = new global::SkyWalking.NetworkProtocol.ServiceNameElement();
         }
         Element.MergeFrom(other.Element);
       }
@@ -1422,9 +1422,9 @@ public sealed partial class ServiceNameMappingElement : pb::IMessage<ServiceName
           }
           case 18: {
             if (element_ == null) {
-              element_ = new global::SkyWalking.NetworkProtocol.ServiceNameElement();
+              Element = new global::SkyWalking.NetworkProtocol.ServiceNameElement();
             }
-            input.ReadMessage(element_);
+            input.ReadMessage(Element);
             break;
           }
         }
@@ -1609,7 +1609,7 @@ public sealed partial class ServiceNameElement : pb::IMessage<ServiceNameElement
             break;
           }
           case 24: {
-            srcSpanType_ = (global::SkyWalking.NetworkProtocol.SpanType) input.ReadEnum();
+            SrcSpanType = (global::SkyWalking.NetworkProtocol.SpanType) input.ReadEnum();
             break;
           }
         }