Add some improvements (#283)

ElderJames · web-flow · commit 595950f7e1f4 · 2020-02-18T14:50:37.000+08:00
* fix conflict and compatibility of hosting

* Add missing license header
diff --git a/sample/SkyApm.Sample.GenericHost/Program.cs b/sample/SkyApm.Sample.GenericHost/Program.cs
@@ -1,5 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using SkyApm.Agent.GeneralHost;
 
 namespace SkyApm.Sample.GenericHost
 {
diff --git a/sample/SkyApm.Sample.GenericHost/SkyApm.Sample.GenericHost.csproj b/sample/SkyApm.Sample.GenericHost/SkyApm.Sample.GenericHost.csproj
@@ -20,7 +20,7 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\SkyApm.Agent.Hosting\SkyApm.Agent.Hosting.csproj" />
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\SkyApm.Agent.GeneralHost\SkyApm.Agent.GeneralHost.csproj" />
   </ItemGroup>
 </Project>
diff --git a/sample/grpc/SkyApm.Sample.GrpcServer/Program.cs b/sample/grpc/SkyApm.Sample.GrpcServer/Program.cs
@@ -2,6 +2,7 @@
 using GrpcGreeter;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using SkyApm.Agent.GeneralHost;
 using System;
 using System.Net.Http;
 using System.Threading;
diff --git a/sample/grpc/SkyApm.Sample.GrpcServer/SkyApm.Sample.GrpcServer.csproj b/sample/grpc/SkyApm.Sample.GrpcServer/SkyApm.Sample.GrpcServer.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.0" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\SkyApm.Agent.Hosting\SkyApm.Agent.Hosting.csproj" />
+    <ProjectReference Include="..\..\..\src\SkyApm.Agent.GeneralHost\SkyApm.Agent.GeneralHost.csproj" />
     <ProjectReference Include="..\SkyApm.Sample.GrpcProto\SkyApm.Sample.GrpcProto.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/SkyApm.Abstractions/Tracing/ICarrierHeaderCollection.cs b/src/SkyApm.Abstractions/Tracing/ICarrierHeaderCollection.cs
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the SkyAPM under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The SkyAPM licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 using System.Collections.Generic;
 
 namespace SkyApm.Tracing
diff --git a/src/SkyApm.Agent.AspNetCore/SkyApmHostingStartup.cs b/src/SkyApm.Agent.AspNetCore/SkyApmHostingStartup.cs
@@ -17,8 +17,8 @@
  */
 
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
 using SkyApm.Agent.AspNetCore;
-using SkyApm.Agent.Hosting;
 using SkyApm.AspNetCore.Diagnostics;
 
 [assembly: HostingStartup(typeof(SkyApmHostingStartup))]
diff --git a/src/SkyApm.Agent.GeneralHost/HostBuilderExtensions.cs b/src/SkyApm.Agent.GeneralHost/HostBuilderExtensions.cs
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the SkyAPM under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The SkyAPM licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+using Microsoft.Extensions.Hosting;
+using SkyApm.Agent.Hosting;
+
+namespace SkyApm.Agent.GeneralHost
+{
+    public static class HostBuilderExtensions
+    {
+        public static IHostBuilder AddSkyAPM(this IHostBuilder builder) => builder.UseSkyAPM();
+    }
+}
diff --git a/src/SkyApm.Agent.GeneralHost/SkyApm.Agent.GeneralHost.csproj b/src/SkyApm.Agent.GeneralHost/SkyApm.Agent.GeneralHost.csproj
@@ -12,6 +12,13 @@
     <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.0" PrivateAssets="All" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.0" PrivateAssets="All" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\SkyApm.Agent.Hosting\SkyApm.Agent.Hosting.csproj" />
   </ItemGroup>
diff --git a/src/SkyApm.Agent.Hosting/Extensions/HostBuilderExtensions.cs b/src/SkyApm.Agent.Hosting/Extensions/HostBuilderExtensions.cs
@@ -16,13 +16,14 @@
  *
  */
 
-using SkyApm.Agent.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 
-namespace Microsoft.Extensions.Hosting
+namespace SkyApm.Agent.Hosting
 {
     public static class HostBuilderExtensions
     {
-        public static IHostBuilder AddSkyAPM(this IHostBuilder builder) =>
+        public static IHostBuilder UseSkyAPM(this IHostBuilder builder) =>
             builder.ConfigureServices((context, services) => services.AddSkyAPM());
     }
 }
diff --git a/src/SkyApm.Agent.Hosting/Extensions/ServiceCollectionExtensions.cs b/src/SkyApm.Agent.Hosting/Extensions/ServiceCollectionExtensions.cs
@@ -21,6 +21,7 @@
 using SkyApm.Diagnostics;
 using SkyApm.Diagnostics.EntityFrameworkCore;
 using SkyApm.Diagnostics.Grpc;
+using SkyApm.Diagnostics.Grpc.Net.Client;
 using SkyApm.Diagnostics.HttpClient;
 using SkyApm.Diagnostics.SqlClient;
 using SkyApm.Logging;
@@ -35,10 +36,10 @@
 using SkyApm.Utilities.DependencyInjection;
 using SkyApm.Utilities.Logging;
 using System;
-using Microsoft.Extensions.DependencyInjection;
-using SkyApm.Diagnostics.Grpc.Net.Client;
+using SkyApm;
+using SkyApm.Agent.Hosting;
 
-namespace SkyApm.Agent.Hosting
+namespace Microsoft.Extensions.DependencyInjection
 {
     public static class ServiceCollectionExtensions
     {
@@ -67,7 +68,7 @@ internal static IServiceCollection AddSkyAPMCore(this IServiceCollection service
             services.AddSingleton<IConfigurationFactory, ConfigurationFactory>();
             services.AddSingleton<IHostedService, InstrumentationHostedService>();
             services.AddSingleton<IEnvironmentProvider, HostingEnvironmentProvider>();
-            services.AddTracing().AddSampling().AddGrpcTransport().AddLogging();
+            services.AddTracing().AddSampling().AddGrpcTransport().AddSkyApmLogging();
             var extensions = services.AddSkyApmExtensions()
                  .AddHttpClient()
                  .AddGrpcClient()
@@ -118,7 +119,7 @@ private static IServiceCollection AddGrpcTransport(this IServiceCollection servi
             return services;
         }
 
-        private static IServiceCollection AddLogging(this IServiceCollection services)
+        private static IServiceCollection AddSkyApmLogging(this IServiceCollection services)
         {
             services.AddSingleton<ILoggerFactory, DefaultLoggerFactory>();
             return services;
diff --git a/src/SkyApm.Diagnostics.Grpc/Client/ClientDiagnosticInterceptor.cs b/src/SkyApm.Diagnostics.Grpc/Client/ClientDiagnosticInterceptor.cs
@@ -1,4 +1,22 @@
-﻿using Grpc.Core;
+﻿/*
+ * Licensed to the SkyAPM under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The SkyAPM licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+using Grpc.Core;
 using Grpc.Core.Interceptors;
 using System;
 using System.Collections.Generic;
@@ -64,4 +82,4 @@ public override AsyncUnaryCall<TResponse> AsyncUnaryCall<TRequest, TResponse>(TR
             }
         }
     }
-}
+}
diff --git a/src/SkyApm.Diagnostics.Grpc/Client/ClientDiagnosticProcessor.cs b/src/SkyApm.Diagnostics.Grpc/Client/ClientDiagnosticProcessor.cs
@@ -1,4 +1,22 @@
-﻿using Grpc.Core;
+﻿/*
+ * Licensed to the SkyAPM under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The SkyAPM licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+using Grpc.Core;
 using Grpc.Core.Interceptors;
 using SkyApm.Common;
 using SkyApm.Tracing;
@@ -19,7 +37,7 @@ public ClientDiagnosticProcessor(IExitSegmentContextAccessor segmentContextAcces
             _segmentContextAccessor = segmentContextAccessor;
         }
 
-        public Metadata BeginRequest<TRequest, TResponse>(ClientInterceptorContext<TRequest, TResponse> grpcContext) 
+        public Metadata BeginRequest<TRequest, TResponse>(ClientInterceptorContext<TRequest, TResponse> grpcContext)
             where TRequest : class
             where TResponse : class
         {
@@ -69,4 +87,4 @@ public void DiagnosticUnhandledException(Exception exception)
             }
         }
     }
-}
+}
diff --git a/src/SkyApm.Diagnostics.Grpc/GrpcCarrierHeaderCollection.cs b/src/SkyApm.Diagnostics.Grpc/GrpcCarrierHeaderCollection.cs
@@ -1,4 +1,22 @@
-﻿using Grpc.Core;
+﻿/*
+ * Licensed to the SkyAPM under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The SkyAPM licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+using Grpc.Core;
 using SkyApm.Tracing;
 using System;
 using System.Collections;
diff --git a/src/SkyApm.Diagnostics.Grpc/Server/ServerDiagnosticInterceptor.cs b/src/SkyApm.Diagnostics.Grpc/Server/ServerDiagnosticInterceptor.cs
@@ -1,4 +1,22 @@
-﻿using Grpc.Core;
+﻿/*
+ * Licensed to the SkyAPM under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The SkyAPM licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+using Grpc.Core;
 using Grpc.Core.Interceptors;
 using System;
 using System.Collections.Generic;
@@ -9,7 +27,8 @@ namespace SkyApm.Diagnostics.Grpc.Server
 {
     public class ServerDiagnosticInterceptor : Interceptor
     {
-        private readonly ServerDiagnosticProcessor _processor;
+        private readonly ServerDiagnosticProcessor _processor;
+
         public ServerDiagnosticInterceptor(ServerDiagnosticProcessor processor)
         {
             _processor = processor;
diff --git a/src/SkyApm.Diagnostics.Grpc/Server/ServerDiagnosticProcessor.cs b/src/SkyApm.Diagnostics.Grpc/Server/ServerDiagnosticProcessor.cs
@@ -1,4 +1,22 @@
-﻿using Grpc.Core;
+﻿/*
+ * Licensed to the SkyAPM under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The SkyAPM licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+using Grpc.Core;
 using SkyApm.Common;
 using SkyApm.Tracing;
 using SkyApm.Tracing.Segments;
diff --git a/src/SkyApm.Diagnostics.Grpc/SkyWalkingBuilderExtensions.cs b/src/SkyApm.Diagnostics.Grpc/SkyWalkingBuilderExtensions.cs
@@ -1,4 +1,22 @@
-﻿using Microsoft.Extensions.DependencyInjection;
+﻿/*
+ * Licensed to the SkyAPM under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The SkyAPM licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+using Microsoft.Extensions.DependencyInjection;
 using SkyApm.Diagnostics.Grpc.Client;
 using SkyApm.Diagnostics.Grpc.Server;
 using SkyApm.Utilities.DependencyInjection;
diff --git a/src/SkyApm.Diagnostics.SmartSql/SkyWalkingBuilderExtensions.cs b/src/SkyApm.Diagnostics.SmartSql/SkyWalkingBuilderExtensions.cs
@@ -1,4 +1,22 @@
-﻿using Microsoft.Extensions.DependencyInjection;
+﻿/*
+ * Licensed to the SkyAPM under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The SkyAPM licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+using Microsoft.Extensions.DependencyInjection;
 using SkyApm.Utilities.DependencyInjection;
 using System;
 
diff --git a/src/SkyApm.Diagnostics.SmartSql/SmartSqlTracingDiagnosticProcessor.cs b/src/SkyApm.Diagnostics.SmartSql/SmartSqlTracingDiagnosticProcessor.cs
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the SkyAPM under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The SkyAPM licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/test/SkyApm.Core.Tests/UniqueIdParserTest.cs b/test/SkyApm.Core.Tests/UniqueIdParserTest.cs

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using Microsoft.Extensions.DependencyInjection;`
`2`	`2`	`using Microsoft.Extensions.Hosting;`
	`3`	`+using SkyApm.Agent.GeneralHost;`
`3`	`4`
`4`	`5`	`namespace SkyApm.Sample.GenericHost`
`5`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,13 +16,14 @@`
`16`	`16`	`*`
`17`	`17`	`*/`
`18`	`18`
`19`		`-using SkyApm.Agent.Hosting;`
	`19`	`+using Microsoft.Extensions.DependencyInjection;`
	`20`	`+using Microsoft.Extensions.Hosting;`
`20`	`21`
`21`		`-namespace Microsoft.Extensions.Hosting`
	`22`	`+namespace SkyApm.Agent.Hosting`
`22`	`23`	`{`
`23`	`24`	`public static class HostBuilderExtensions`
`24`	`25`	`{`
`25`		`- public static IHostBuilder AddSkyAPM(this IHostBuilder builder) =>`
	`26`	`+ public static IHostBuilder UseSkyAPM(this IHostBuilder builder) =>`
`26`	`27`	`builder.ConfigureServices((context, services) => services.AddSkyAPM());`
`27`	`28`	`}`
`28`	`29`	`}`