Change copyright and the link (#148)

* rename skywalking-netcore to skyapm-dotnet

* rename namespace

* rename project name

* rm

* update protocol submodule

* Update CI

* change file header

* update sample

* add config

* Add sample config file

* Update docs

.gitmodules

-[submodule "src/SkyWalking.Transport.Grpc.Protocol/protocol"]
-	path = src/SkyWalking.Transport.Grpc.Protocol/protocol
-	url = https://github.com/apache/incubator-skywalking-data-collect-protocol.git
+
+[submodule "src/SkyApm.Transport.Grpc.Protocol/protocol"]
+	path = src/SkyApm.Transport.Grpc.Protocol/protocol
+	url = https://github.com/apache/incubator-skywalking-data-collect-protocol

CONTIBUTING.md

-# Contributing to skywalking-netcore
+# Contributing to SkyAPM-dotnet
 
 One of the easiest ways to contribute is to participate in discussions and discuss issues. You can also contribute by submitting pull requests with code changes.
 
 ## General feedback and discussions?
-Please start a discussion on the [issue tracker](https://github.com/OpenSkywalking/skywalking-netcore/issues).
\ No newline at end of file
+Please start a discussion on the [issue tracker](https://github.com/SkyAPM/SkyAPM-dotnet/issues).
\ No newline at end of file

NuGet.config

@@ -2,6 +2,6 @@
 <configuration>
     <packageSources>
         <add key="nuget" value="https://api.nuget.org/v3/index.json" />
-        <add key="skywalking-netcore-vnext" value="https://www.myget.org/F/skywalking/api/v3/index.json" />
+        <add key="skyapm-dotnet-vnext" value="https://www.myget.org/F/skyapm-dotnet/api/v3/index.json" />
     </packageSources>
 </configuration>
\ No newline at end of file

README.md

@@ -3,14 +3,29 @@ SkyAPM C#/.NET instrument agent
 
 <img src="https://skyapmtest.github.io/page-resources/SkyAPM/skyapm.png" alt="Sky Walking logo" height="90px" align="right" />
 
-[Apache SkyWalking](https://github.com/apache/incubator-skywalking) is an APM designed for microservices, cloud native and container-based (Docker, K8s, Mesos) architectures. **SkyAPM-netcore** provides the native support agent in C# and .NETStandard platform, with the helps from Apache SkyWalking committer team.
+[Apache SkyWalking](https://github.com/apache/incubator-skywalking) is an APM designed for microservices, cloud native and container-based (Docker, K8s, Mesos) architectures. **SkyAPM-dotnet** provides the native support agent in C# and .NETStandard platform, with the helps from Apache SkyWalking committer team.
 
-[![Twitter Follow](https://img.shields.io/twitter/follow/asfskywalking.svg?style=for-the-badge&label=Follow&logo=twitter)](https://twitter.com/AsfSkyWalking)
+![](https://img.shields.io/github/issues-raw/skyapm/skyapm-dotnet.svg?style=flat-square)
+![](https://img.shields.io/github/issues-pr-raw/skyapm/skyapm-dotnet.svg?style=flat-square)
+![](https://img.shields.io/github/release/skyapm/skyapm-dotnet.svg?style=flat-square)
+![](https://img.shields.io/gitter/room/openskywalking/lobby.svg?style=flat-square)
+[![Twitter Follow](https://img.shields.io/twitter/follow/asfskywalking.svg?style=flat-square&label=Follow&logo=twitter)](https://twitter.com/AsfSkyWalking)
 
-[![Build status](https://ci.appveyor.com/api/projects/status/fl6vucwfn1vu94dv/branch/master?svg=true)](https://ci.appveyor.com/project/wu-sheng/skywalking-csharp/branch/master)
+## CI Build Status
+
+| Platform | Build Server | Master Status  |
+|--------- |------------- |---------|
+| AppVeyor |  Windows/Linux |[![Build status](https://ci.appveyor.com/api/projects/status/fl6vucwfn1vu94dv/branch/master?svg=true)](https://ci.appveyor.com/project/wu-sheng/skywalking-csharp/branch/master)|
+
+## Nuget Packages
+
+| Package Name |  Nuget | Myget | Downloads 
+|--------------|  ------- |  ------- |  ---- 
+| SkyAPM.Agent.AspNetCore | ![](https://img.shields.io/nuget/v/SkyAPM.Agent.AspNetCore.svg?style=flat-square) | ![](https://img.shields.io/myget/skyapm-dotnet/v/SkyAPM.Agent.AspNetCore.svg?style=flat-square) | ![](https://img.shields.io/nuget/dt/SkyAPM.Agent.AspNetCore.svg?style=flat-square) 
+| SkyAPM.Agent.AspNet | ![](https://img.shields.io/nuget/v/SkyAPM.Agent.AspNet.svg?style=flat-square) | ![](https://img.shields.io/myget/skyapm-dotnet/v/SkyAPM.Agent.AspNet.svg?style=flat-square) | ![](https://img.shields.io/nuget/dt/SkyAPM.Agent.AspNet.svg?style=flat-square) 
 
 # Supported
-- This project currently supports apps targeting netcoreapp2.1 or higher.
+- This project currently supports apps targeting netcoreapp2.0/.net framework4.6.1 or higher.
 - [Supported middlewares, frameworks and libraries.](docs/Supported-list.md)
 
 # Features
@@ -32,27 +47,16 @@ A quick list of SkyWalking .NET Core Agent's capabilities
 
 ## Install SkyWalking .NET Core Agent
 
-You can run the following command to install the SkyWalking .NET Core Agent in your computer.
-
-```
-// install SkyWalking DotNet CLI
-dotnet tool install -g SkyWalking.DotNet.CLI
-```
-On windows, run as Administrator
-```
-dotnet skywalking install
-```
+You can run the following command to install the SkyWalking .NET Core Agent in your project.
 
-On macOS/Linux
 ```
-sudo dotnet skywalking install
+dotnet add package SkyAPM.Agent.AspNetCore
 ```
 
 ## How to use
-Set the `ASPNETCORE_HOSTINGSTARTUPASSEMBLIES` and `DOTNET_ADDITIONAL_DEPS` environment variables to support the activation of the SkyAPM .NET Core Agent. 
+Set the `ASPNETCORE_HOSTINGSTARTUPASSEMBLIES` environment variable to support the activation of the SkyAPM .NET Core Agent. 
 
-- Add the assembly name of `SkyWalking.Agent.AspNetCore` to the `ASPNETCORE_HOSTINGSTARTUPASSEMBLIES` environment variable.
-- On Windows, set the `DOTNET_ADDITIONAL_DEPS` environment variable to `%PROGRAMFILES%\dotnet\x64\additionalDeps\skywalking.agent.aspnetcore`. On macOS/Linux, set the `DOTNET_ADDITIONAL_DEPS` environment variable to `/usr/local/share/dotnet/x64/additionalDeps/skywalking.agent.aspnetcore`.
+- Add the assembly name of `SkyAPM.Agent.AspNetCore` to the `ASPNETCORE_HOSTINGSTARTUPASSEMBLIES` environment variable.
 
 ### Examples
 - On windows
@@ -61,12 +65,13 @@ Set the `ASPNETCORE_HOSTINGSTARTUPASSEMBLIES` and `DOTNET_ADDITIONAL_DEPS` envir
 dotnet new mvc -n sampleapp
 cd sampleapp
 
-// enable SkyWalking.Agent.AspNetCore
-set ASPNETCORE_HOSTINGSTARTUPASSEMBLIES=SkyWalking.Agent.AspNetCore
-set DOTNET_ADDITIONAL_DEPS=%PROGRAMFILES%\dotnet\x64\additionalDeps\skywalking.agent.aspnetcore
+dotnet add package SkyAPM.Agent.AspNetCore
 
-// set Application_Code
-set SKYWALKING__APPLICATIONCODE=sample_app
+// enable SkyAPM.Agent.AspNetCore
+set ASPNETCORE_HOSTINGSTARTUPASSEMBLIES=SkyAPM.Agent.AspNetCore
+
+// set service_name
+set SKYWALKING__SERVICENAME=sample_app
 
 dotnet run
 ```
@@ -77,28 +82,38 @@ dotnet run
 dotnet new mvc -n sampleapp
 cd sampleapp
 
-// enable SkyWalking.Agent.AspNetCore
-export ASPNETCORE_HOSTINGSTARTUPASSEMBLIES=SkyWalking.Agent.AspNetCore
-export DOTNET_ADDITIONAL_DEPS=/usr/local/share/dotnet/x64/additionalDeps/skywalking.agent.aspnetcore
+dotnet add package SkyAPM.Agent.AspNetCore
+
+// enable SkyAPM.Agent.AspNetCore
+export ASPNETCORE_HOSTINGSTARTUPASSEMBLIES=SkyAPM.Agent.AspNetCore
 
-// set Application_Code
-export SKYWALKING__APPLICATIONCODE=sample_app
+// set service_name
+export SKYWALKING__SERVICENAME=sample_app
 
 dotnet run
 ```
 
 ## Configuration
-Use `dotnet skywalking config [your_application_code] [your_collector_server]` to generate config file. Example
+
+Install `SkyAPM.DotNet.CLI`
+
+```
+dotnet tool install -g SkyAPM.DotNet.CLI
+```
+
+Use `dotnet skywalking config [your_service_name] [your_servers]` to generate config file. 
+
+Example
 
 ```
-dotnet skywalking config sample_app 192.168.0.1:11800
+dotnet skyapm config sample_app 192.168.0.1:11800
 ```
 
 # Roadmap
 [What are we going to do next?](/docs/roadmap.md)
 
 # Contributing
-This section is in progress here: [Contributing to SkyAPM-netcore](/CONTIBUTING.md)
+This section is in progress here: [Contributing to SkyAPM-dotnet](/CONTIBUTING.md)
 
 # Contact Us
 * Submit an issue

appveyor.yml

@@ -11,7 +11,7 @@ skip_commits:
     - LICENSE
 install:
 - git submodule update --init
-- dotnet build -c Release src/SkyWalking.Transport.Grpc.Protocol 
+- dotnet build -c Release src/SkyApm.Transport.Grpc.Protocol 
 build_script:
 - ps: ./scripts/build.ps1
 artifacts:

docs/Supported-list.md

 - [ASP.NET Core](https://github.com/aspnet)
 - [.NET Core BCL types (HttpClient and SqlClient)](https://github.com/dotnet/corefx) 
 - [EntityFrameworkCore](https://github.com/aspnet/EntityFrameworkCore)
+- [EntityFrameworkCore.Sqlite](https://github.com/aspnet/EntityFrameworkCore)
 - [Npgsql.EntityFrameworkCore.PostgreSQL](https://github.com/npgsql/Npgsql.EntityFrameworkCore.PostgreSQL)
 - [Pomelo.EntityFrameworkCore.MySql](https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql)
 - [CAP](https://github.com/dotnetcore/CAP)
+- ASP.NET
+

docs/roadmap.md

@@ -4,11 +4,17 @@
 - TraceContext refactoring.
 - Upgrade to Skywalking 6.0 protocol.
 - Fix known bugs in the issue list.
-- CLR runtime monitoring.
-- Support IIS monitoring and tracing.
-- ASP.NET and WCF request tracing.
+- ASP.NET request tracing.
 
 ## v0.9.0
+- CLR runtime monitoring(need backend support).
+- Support IIS monitoring and tracing.
+- WCF request tracing.
+- Custom Sampling Interceptor.
+- Custom Configuration Loading.
+- Performance optimization
+
+## v1.0.0
 - CLR Profiler(Experimental feature)
 - Support plug-in.
 - More third-party library support, such as mysql, redis, kafka, rabbitmq..

docs/skywalking.json.cn.md

 # SkyWalking Config 配置说明
 
-# ApplicationCode
+# ServiceName
 
-应用名称
-
-# SpanLimitPerSegment
-
-每段限制
+服务名称
 
 ## Sampling 
 
@@ -14,6 +10,8 @@
 
 1. SamplePer3Secs 每3秒采样数
 
+2. Percentage 采样百分比，例如10%采样则配置为`10`
+
 ## Logging
 
 SkyWalking日志配置节点
@@ -26,8 +24,6 @@ SkyWalking日志配置节点
 传输配置节点
 
 1. Interval 每多少毫秒刷新
-2. PendingSegmentLimit  排队限制
-3. PendingSegmentTimeout 排队超时毫秒，超时时排队的数据会被丢弃
 
 ### gRPC
 
@@ -37,27 +33,33 @@ gRPC配置节点
 2. Timeout 创建gRPC链接的超时时间，毫秒
 3. ConnectTimeout gRPC最长链接时间，毫秒
 
-# skywalking.json 示例
+# skyapm.json 示例
 ```
 {
   "SkyWalking": {
-    "ApplicationCode": "app",
-    "SpanLimitPerSegment": 300,
+    "ServiceName": "your_service_name",
+    "Namespace": "",
+    "HeaderVersions": [
+      "sw6"
+    ],
     "Sampling": {
-      "SamplePer3Secs": -1
+      "SamplePer3Secs": -1,
+      "Percentage": -1.0
     },
     "Logging": {
       "Level": "Information",
-      "FilePath": "logs\\SkyWalking-{Date}.log"
+      "FilePath": "logs/skyapm-{Date}.log"
     },
     "Transport": {
       "Interval": 3000,
-      "PendingSegmentLimit": 30000,
-      "PendingSegmentTimeout": 1000,
+      "ProtocolVersion": "v6",
+      "QueueSize": 30000,
+      "BatchSize": 3000,
       "gRPC": {
         "Servers": "localhost:11800",
-        "Timeout": 2000,
-        "ConnectTimeout": 10000
+        "Timeout": 10000,
+        "ConnectTimeout": 10000,
+        "ReportTimeout": 600000
       }
     }
   }

docs/skywalking.json.md

 # SkyWalking Configuration
 
-# ApplicationCode
+# ServiceName
 
-App name displayed.
-
-# SpanLimitPerSegment
-
-"Span" Limit Per Segment Max.
+Service name displayed.
 
 ## Sampling 
 
@@ -26,8 +22,6 @@ SkyWalking Logging Configuration Section
 Transport Configuration Section
 
 1. Interval, Flush Interval Millisecond,(unit:Millisecond)
-2. PendingSegmentLimit,  PendingSegmentLimit Count
-3. PendingSegmentTimeout, Data queued beyond this time will be discarded,(unit:Millisecond)
 
 ### gRPC 
 
@@ -37,27 +31,33 @@ gRPC Configuration Section
 2. Timeout, Timeout for creating a link,(unit:Millisecond)
 3. ConnectTimeout, gRPC Connectioning timed out,(unit:Millisecond)
 
-# skywalking.json sample
+# skyapm.json sample
 ```
 {
   "SkyWalking": {
-    "ApplicationCode": "app",
-    "SpanLimitPerSegment": 300,
+    "ServiceName": "your_service_name",
+    "Namespace": "",
+    "HeaderVersions": [
+      "sw6"
+    ],
     "Sampling": {
-      "SamplePer3Secs": -1
+      "SamplePer3Secs": -1,
+      "Percentage": -1.0
     },
     "Logging": {
       "Level": "Information",
-      "FilePath": "logs\\SkyWalking-{Date}.log"
+      "FilePath": "logs/skyapm-{Date}.log"
     },
     "Transport": {
       "Interval": 3000,
-      "PendingSegmentLimit": 30000,
-      "PendingSegmentTimeout": 1000,
+      "ProtocolVersion": "v6",
+      "QueueSize": 30000,
+      "BatchSize": 3000,
       "gRPC": {
         "Servers": "localhost:11800",
-        "Timeout": 2000,
-        "ConnectTimeout": 10000
+        "Timeout": 10000,
+        "ConnectTimeout": 10000,
+        "ReportTimeout": 600000
       }
     }
   }

generate_protos.bat

-@rem Generate the C# code for .proto files
-
-@rem enter this directory
-cd /d %~dp0
-
-set PROTOC=%UserProfile%\.nuget\packages\google.protobuf.tools\3.5.1\tools\windows_x64\protoc.exe
-set PLUGIN=%UserProfile%\.nuget\packages\grpc.tools\1.9.0\tools\windows_x64\grpc_csharp_plugin.exe
-
-@rem dotnet restore
-
-%PROTOC% -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/ApplicationRegisterService.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=%PLUGIN%
-%PROTOC% -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/Common.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=%PLUGIN%
-%PROTOC% -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/DiscoveryService.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=%PLUGIN%
-%PROTOC% -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/Downstream.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=%PLUGIN%
-%PROTOC% -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/JVMMetricsService.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=%PLUGIN%
-%PROTOC% -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/KeyWithIntegerValue.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=%PLUGIN%
-%PROTOC% -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/KeyWithStringValue.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=%PLUGIN%
-%PROTOC% -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/NetworkAddressRegisterService.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=%PLUGIN%
-%PROTOC% -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/TraceSegmentService.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=%PLUGIN%
\ No newline at end of file

generate_protos_linux.sh

-#!/usr/bin/env bash
-
-PROTOC=~/.nuget/packages/google.protobuf.tools/3.5.1/tools/linux_x64/protoc
-PLUGIN=~/.nuget/packages/grpc.tools/1.9.0/tools/linux_x64/grpc_csharp_plugin
-
-$PROTOC -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/ApplicationRegisterService.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=$PLUGIN
-$PROTOC -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/Common.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=$PLUGIN
-$PROTOC -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/DiscoveryService.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=$PLUGIN
-$PROTOC -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/Downstream.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=$PLUGIN
-$PROTOC -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/JVMMetricsService.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=$PLUGIN
-$PROTOC -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/KeyWithIntegerValue.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=$PLUGIN
-$PROTOC -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/KeyWithStringValue.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=$PLUGIN
-$PROTOC -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/NetworkAddressRegisterService.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=$PLUGIN
-$PROTOC -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/TraceSegmentService.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=$PLUGIN
\ No newline at end of file

generate_protos_macos.sh

-#!/usr/bin/env bash
-PROTOC=~/.nuget/packages/google.protobuf.tools/3.6.1/tools/macosx_x64/protoc
-PLUGIN=~/.nuget/packages/grpc.tools/1.15.0/tools/macosx_x64/grpc_csharp_plugin
-
-$PROTOC -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/ApplicationRegisterService.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=$PLUGIN
-$PROTOC -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/Common.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=$PLUGIN
-$PROTOC -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/DiscoveryService.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=$PLUGIN
-$PROTOC -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/Downstream.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=$PLUGIN
-$PROTOC -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/JVMMetricsService.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=$PLUGIN
-$PROTOC -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/KeyWithIntegerValue.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=$PLUGIN
-$PROTOC -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/KeyWithStringValue.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=$PLUGIN
-$PROTOC -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/NetworkAddressRegisterService.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=$PLUGIN
-$PROTOC -I protos --csharp_out src/SkyWalking.Transport.Grpc/NetworkProtocol  protos/TraceSegmentService.proto --grpc_out src/SkyWalking.Transport.Grpc/NetworkProtocol --plugin=protoc-gen-grpc=$PLUGIN
\ No newline at end of file

sample/SkyWalking.Sample.AspNet/App_Start/RouteConfig.cs → sample/SkyApm.Sample.AspNet/App_Start/RouteConfig.cs

 using System.Web.Mvc;
 using System.Web.Routing;
 
-namespace SkyWalking.Sample.AspNet
+namespace SkyApm.Sample.AspNet
 {
     public class RouteConfig
     {

sample/SkyWalking.Sample.AspNet/App_Start/WebApiConfig.cs → sample/SkyApm.Sample.AspNet/App_Start/WebApiConfig.cs

 using System.Web.Http;
 
-namespace SkyWalking.Sample.AspNet
+namespace SkyApm.Sample.AspNet
 {
     public static class WebApiConfig
     {

sample/SkyWalking.Sample.AspNet/Controllers/ValuesController.cs → sample/SkyApm.Sample.AspNet/Controllers/ValuesController.cs

 using System.Net.Http;
 using System.Threading.Tasks;
 using System.Web.Http;
-using SkyWalking.AspNet;
+using SkyApm.Agent.AspNet;
 
-namespace SkyWalking.Sample.AspNet.Controllers
+namespace SkyApm.Sample.AspNet.Controllers
 {
     public class ValuesController : ApiController
     {

sample/SkyApm.Sample.AspNet/Global.asax

+<%@ Application Inherits="SkyApm.Sample.AspNet.Global" %>

sample/SkyWalking.Sample.AspNet/Global.asax.cs → sample/SkyApm.Sample.AspNet/Global.asax.cs

@@ -3,7 +3,7 @@ using System.Web.Mvc;
 using System.Web.Routing;
 using System.Web.Http;
 
-namespace SkyWalking.Sample.AspNet
+namespace SkyApm.Sample.AspNet
 {
     public class Global : HttpApplication
     {

sample/SkyWalking.Sample.AspNet/Properties/AssemblyInfo.cs → sample/SkyApm.Sample.AspNet/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("SkyWalking.Sample.AspNet")]
+[assembly: AssemblyTitle("SkyApm.Sample.AspNet")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SkyWalking.Sample.AspNet")]
+[assembly: AssemblyProduct("SkyApm.Sample.AspNet")]
 [assembly: AssemblyCopyright("Copyright ©  2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

sample/SkyWalking.Sample.AspNet/SkyWalking.Sample.AspNet.csproj → sample/SkyApm.Sample.AspNet/SkyApm.Sample.AspNet.csproj

@@ -8,8 +8,8 @@
     <ProjectTypeGuids>{349C5851-65DF-11DA-9384-00065B846F21};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SkyWalking.Sample.AspNet</RootNamespace>
-    <AssemblyName>SkyWalking.Sample.AspNet</AssemblyName>
+    <RootNamespace>SkyApm.Sample.AspNet</RootNamespace>
+    <AssemblyName>SkyApm.Sample.AspNet</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>40</FileUpgradeFlags>
@@ -174,13 +174,16 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\SkyWalking.AspNet\SkyWalking.AspNet.csproj">
+    <Content Include="skyapm.json" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\SkyApm.Agent.AspNet\SkyApm.Agent.AspNet.csproj">
       <Project>{3a454a8a-a1b7-4c6d-be08-52d956f95cc1}</Project>
-      <Name>SkyWalking.AspNet</Name>
+      <Name>SkyApm.Agent.AspNet</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="skywalking.json" />
+    <Folder Include="logs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\packages\Grpc.Core.1.12.0\build\net45\Grpc.Core.targets" Condition="Exists('..\..\packages\Grpc.Core.1.12.0\build\net45\Grpc.Core.targets')" />

sample/SkyWalking.Sample.AspNet/Web.config → sample/SkyApm.Sample.AspNet/Web.config

 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Web.config file for SkyWalking.Sample.AspNet.
-
 The settings that can be used in this file are documented at 
 http://www.mono-project.com/Config_system.web and 
 http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx

sample/SkyWalking.Sample.AspNet/skywalking.json → sample/SkyApm.Sample.AspNet/skyapm.json

 {
   "SkyWalking": {
-    "ServiceName": "aspnet-sample",
+    "ServiceName": "asp-net-sample",
+    "Namespace": "",
+    "HeaderVersions": [
+      "sw6"
+    ],
+    "Sampling": {
+      "SamplePer3Secs": -1,
+      "Percentage": -1.0
+    },
     "Logging": {
-      "Level": "Debug",
-      "FilePath": "/tmp/logs/SkyWalking-{Date}.log"
+      "Level": "Information",
+      "FilePath": "logs/skyapm-{Date}.log"
     },
     "Transport": {
       "Interval": 3000,
+      "ProtocolVersion": "v6",
+      "QueueSize": 30000,
+      "BatchSize": 3000,
       "gRPC": {
         "Servers": "localhost:11800",
         "Timeout": 10000,
-        "ConnectTimeout": 10000
+        "ConnectTimeout": 10000,
+        "ReportTimeout": 600000
       }
     }
   }

sample/SkyWalking.Sample.Backend/Controllers/AppsController.cs → sample/SkyApm.Sample.Backend/Controllers/AppsController.cs

 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc;
-using SkyWalking.Sample.Backend.Models;
+using SkyApm.Sample.Backend.Models;
 
-namespace SkyWalking.Sample.Backend.Controllers
+namespace SkyApm.Sample.Backend.Controllers
 {
     [Route("api/[controller]")]
     public class AppsController: Controller

sample/SkyWalking.Sample.Backend/Controllers/DelayController.cs → sample/SkyApm.Sample.Backend/Controllers/DelayController.cs

 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 
-namespace SkyWalking.Sample.Backend.Controllers
+namespace SkyApm.Sample.Backend.Controllers
 {
     [Route("api/[controller]")]
     public class DelayController : Controller

sample/SkyWalking.Sample.Backend/Controllers/ErrorsController.cs → sample/SkyApm.Sample.Backend/Controllers/ErrorsController.cs

 using System;
 using Microsoft.AspNetCore.Mvc;
 
-namespace SkyWalking.Sample.Backend.Controllers
+namespace SkyApm.Sample.Backend.Controllers
 {
     [Route("api/[controller]")]
     public class ErrorsController :Controller

sample/SkyWalking.Sample.Backend/Controllers/ValuesController.cs → sample/SkyApm.Sample.Backend/Controllers/ValuesController.cs

@@ -3,9 +3,9 @@ using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
-using SkyWalking.Sample.Backend.Models;
+using SkyApm.Sample.Backend.Models;
 
-namespace SkyWalking.Sample.Backend.Controllers
+namespace SkyApm.Sample.Backend.Controllers
 {
     [Route("api/[controller]")]
     public class ValuesController : Controller

sample/SkyWalking.Sample.Backend/Models/Application.cs → sample/SkyApm.Sample.Backend/Models/Application.cs

-namespace SkyWalking.Sample.Backend.Models
+namespace SkyApm.Sample.Backend.Models
 {
     public class Application
     {

sample/SkyWalking.Sample.Backend/Models/SampleDbContext.cs → sample/SkyApm.Sample.Backend/Models/SampleDbContext.cs

 using Microsoft.EntityFrameworkCore;
 
-namespace SkyWalking.Sample.Backend.Models
+namespace SkyApm.Sample.Backend.Models
 {
     public class SampleDbContext :DbContext
     {

sample/SkyWalking.Sample.Backend/Program.cs → sample/SkyApm.Sample.Backend/Program.cs

@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
-namespace SkyWalking.Sample.Backend
+namespace SkyApm.Sample.Backend
 {
     public class Program
     {

sample/SkyWalking.Sample.Backend/Properties/launchSettings.json → sample/SkyApm.Sample.Backend/Properties/launchSettings.json

@@ -12,14 +12,16 @@
       "commandName": "IISExpress",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "SkyAPM.Agent.AspNetCore"
       }
     },
     "SkyWalking.Sample.Backend": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "SkyAPM.Agent.AspNetCore"
       },
       "applicationUrl": "http://localhost:5002/"
     }

sample/SkyWalking.Sample.Backend/Sampling/CustomSamplingInterceptor.cs → sample/SkyApm.Sample.Backend/Sampling/CustomSamplingInterceptor.cs

-using SkyWalking.Tracing;
+using SkyApm.Tracing;
 
-namespace SkyWalking.Sample.Backend.Sampling
+namespace SkyApm.Sample.Backend.Sampling
 {
     public class CustomSamplingInterceptor : ISamplingInterceptor
     {

sample/SkyWalking.Sample.Backend/SkyWalking.Sample.Backend.csproj → sample/SkyApm.Sample.Backend/SkyApm.Sample.Backend.csproj

 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.3" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\SkyWalking.Agent.AspNetCore\SkyWalking.Agent.AspNetCore.csproj" />
-    <ProjectReference Include="..\..\src\SkyWalking.Diagnostics.EntityFrameworkCore.Sqlite\SkyWalking.Diagnostics.EntityFrameworkCore.Sqlite.csproj" />
+    <ProjectReference Include="..\..\src\SkyApm.Agent.AspNetCore\SkyApm.Agent.AspNetCore.csproj" />
+    <ProjectReference Include="..\..\src\SkyApm.Diagnostics.EntityFrameworkCore.Sqlite\SkyApm.Diagnostics.EntityFrameworkCore.Sqlite.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
@@ -24,6 +24,10 @@
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Update="skyapm.json">
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="logs" />

sample/SkyWalking.Sample.Backend/Startup.cs → sample/SkyApm.Sample.Backend/Startup.cs

@@ -4,11 +4,11 @@ using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using SkyWalking.Sample.Backend.Models;
-using SkyWalking.Sample.Backend.Sampling;
-using SkyWalking.Tracing;
+using SkyApm.Sample.Backend.Models;
+using SkyApm.Sample.Backend.Sampling;
+using SkyApm.Tracing;
 
-namespace SkyWalking.Sample.Backend
+namespace SkyApm.Sample.Backend
 {
     public class Startup
     {

sample/SkyWalking.Sample.Backend/appsettings.json → sample/SkyApm.Sample.Backend/appsettings.json

@@ -11,8 +11,5 @@
         "Default": "Warning"
       }
     }
-  },
-  "SkyWalking": {
-    "ServiceName": "asp-net-core-backend"
   }
 }

sample/SkyApm.Sample.Backend/skyapm.json

+{
+  "SkyWalking": {
+    "ServiceName": "asp-net-core-backend",
+    "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": 10000,
+        "ConnectTimeout": 10000,
+        "ReportTimeout": 600000
+      }
+    }
+  }
+}
\ No newline at end of file

sample/SkyWalking.Sample.Frontend/Controllers/ValuesController.cs → sample/SkyApm.Sample.Frontend/Controllers/ValuesController.cs

@@ -3,7 +3,7 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 
-namespace SkyWalking.Sample.Frontend.Controllers
+namespace SkyApm.Sample.Frontend.Controllers
 {
     [Route("api/[controller]")]
     public class ValuesController : Controller

sample/SkyWalking.Sample.Frontend/Program.cs → sample/SkyApm.Sample.Frontend/Program.cs

@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
-namespace SkyWalking.Sample.Frontend
+namespace SkyApm.Sample.Frontend
 {
     public class Program
     {

sample/SkyWalking.Sample.Frontend/Properties/launchSettings.json → sample/SkyApm.Sample.Frontend/Properties/launchSettings.json

@@ -12,14 +12,16 @@
       "commandName": "IISExpress",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "SkyAPM.Agent.AspNetCore"
       }
     },
     "SkyWalking.Sample.Frontend": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "SkyAPM.Agent.AspNetCore"
       },
       "applicationUrl": "http://localhost:5001/"
     }

sample/SkyWalking.Sample.Frontend/SkyWalking.Sample.Frontend.csproj → sample/SkyApm.Sample.Frontend/SkyApm.Sample.Frontend.csproj

 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <RootNamespace>SkyApm.Sample.Backend</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.3" />
@@ -13,8 +14,15 @@
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Update="skyapm.json">
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\SkyApm.Agent.AspNetCore\SkyApm.Agent.AspNetCore.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\SkyWalking.Agent.AspNetCore\SkyWalking.Agent.AspNetCore.csproj" />
+    <Folder Include="logs" />
   </ItemGroup>
 </Project>
\ No newline at end of file

sample/SkyWalking.Sample.Frontend/Startup.cs → sample/SkyApm.Sample.Frontend/Startup.cs

@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace SkyWalking.Sample.Frontend
+namespace SkyApm.Sample.Frontend
 {
     public class Startup
     {

sample/SkyWalking.Sample.Frontend/appsettings.json → sample/SkyApm.Sample.Frontend/appsettings.json

@@ -11,9 +11,6 @@
         "Default": "Warning"
       }
     }
-  },
-  "SkyWalking": {
-    "ServiceName": "asp-net-core-frontend"
   }
 }
 

sample/SkyApm.Sample.Frontend/skyapm.json

+{
+  "SkyWalking": {
+    "ServiceName": "asp-net-core-frontend",
+    "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": 10000,
+        "ConnectTimeout": 10000,
+        "ReportTimeout": 600000
+      }
+    }
+  }
+}
\ No newline at end of file

sample/SkyWalking.Sample.AspNet/Global.asax

-<%@ Application Inherits="SkyWalking.Sample.AspNet.Global" %>

skywalking-netcore.sln → skyapm-dotnet.sln

@@ -8,16 +8,11 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "solution items", "solution items", "{E38F0F6E-6E10-491D-8786-650F6A4B6698}"
 	ProjectSection(SolutionItems) = preProject
 		appveyor.yml = appveyor.yml
-		generate_protos.bat = generate_protos.bat
-		generate_protos_linux.sh = generate_protos_linux.sh
-		generate_protos_macos.sh = generate_protos_macos.sh
 		NuGet.config = NuGet.config
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{613F0980-91ED-4064-8E8C-168582EF4AD7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Components", "Components", "{79ED86A5-E9B9-49B2-9354-C911C079D03E}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{CBFF7EE0-69D7-4D6A-9BBD-8E567FF4D810}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{844CEACD-4C85-4B15-9E2B-892B01FDA4BB}"
@@ -39,51 +34,51 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{F0B43114
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Agent", "Agent", "{EF6194B2-9ACB-49B9-8049-DD6AFAEB0399}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cli", "cli", "{A238D227-433B-461E-8C57-73B147E0F672}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Abstractions", "src\SkyApm.Abstractions\SkyApm.Abstractions.csproj", "{C3860B5F-21D0-429F-8A00-B0C0F4573DF7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.Abstractions", "src\SkyWalking.Abstractions\SkyWalking.Abstractions.csproj", "{C3860B5F-21D0-429F-8A00-B0C0F4573DF7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Sample.Backend", "sample\SkyApm.Sample.Backend\SkyApm.Sample.Backend.csproj", "{80A67B09-83F2-477F-907F-95FFF5B8FEAF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.Core", "src\SkyWalking.Core\SkyWalking.Core.csproj", "{FD84A10C-C962-4AEA-BA06-86F08EB048E6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Sample.Frontend", "sample\SkyApm.Sample.Frontend\SkyApm.Sample.Frontend.csproj", "{2B4E350E-A1E5-4B4A-A642-BCA6D3887E5A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.Core.Tests", "test\SkyWalking.Core.Tests\SkyWalking.Core.Tests.csproj", "{3915A2C2-7174-4651-A4F1-D45CD109916A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Diagnostics.HttpClient", "src\SkyApm.Diagnostics.HttpClient\SkyApm.Diagnostics.HttpClient.csproj", "{49DEFCA8-4289-4875-B6A5-35D84B3D2290}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.Sample.Backend", "sample\SkyWalking.Sample.Backend\SkyWalking.Sample.Backend.csproj", "{80A67B09-83F2-477F-907F-95FFF5B8FEAF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Diagnostics.CAP", "src\SkyApm.Diagnostics.CAP\SkyApm.Diagnostics.CAP.csproj", "{55621423-19C3-4928-8B45-666FA87BF6A2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.Sample.Frontend", "sample\SkyWalking.Sample.Frontend\SkyWalking.Sample.Frontend.csproj", "{2B4E350E-A1E5-4B4A-A642-BCA6D3887E5A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Diagnostics.EntityFrameworkCore", "src\SkyApm.Diagnostics.EntityFrameworkCore\SkyApm.Diagnostics.EntityFrameworkCore.csproj", "{CD334460-8E61-41EB-9762-62C6A342CACB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.Diagnostics.HttpClient", "src\SkyWalking.Diagnostics.HttpClient\SkyWalking.Diagnostics.HttpClient.csproj", "{49DEFCA8-4289-4875-B6A5-35D84B3D2290}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Diagnostics.SqlClient", "src\SkyApm.Diagnostics.SqlClient\SkyApm.Diagnostics.SqlClient.csproj", "{44DFFDF7-5935-475A-825F-2C0298464117}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.Diagnostics.CAP", "src\SkyWalking.Diagnostics.CAP\SkyWalking.Diagnostics.CAP.csproj", "{55621423-19C3-4928-8B45-666FA87BF6A2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Diagnostics.EntityFrameworkCore.Sqlite", "src\SkyApm.Diagnostics.EntityFrameworkCore.Sqlite\SkyApm.Diagnostics.EntityFrameworkCore.Sqlite.csproj", "{F5C529C9-23C4-46B7-84FF-E86C6D17EB3E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.Diagnostics.EntityFrameworkCore", "src\SkyWalking.Diagnostics.EntityFrameworkCore\SkyWalking.Diagnostics.EntityFrameworkCore.csproj", "{CD334460-8E61-41EB-9762-62C6A342CACB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Diagnostics.EntityFrameworkCore.Npgsql", "src\SkyApm.Diagnostics.EntityFrameworkCore.Npgsql\SkyApm.Diagnostics.EntityFrameworkCore.Npgsql.csproj", "{F8D96C30-369C-4FCB-B5B2-02EAA74199C9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.Diagnostics.SqlClient", "src\SkyWalking.Diagnostics.SqlClient\SkyWalking.Diagnostics.SqlClient.csproj", "{44DFFDF7-5935-475A-825F-2C0298464117}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Agent.AspNet", "src\SkyApm.Agent.AspNet\SkyApm.Agent.AspNet.csproj", "{3A454A8A-A1B7-4C6D-BE08-52D956F95CC1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.Diagnostics.EntityFrameworkCore.Sqlite", "src\SkyWalking.Diagnostics.EntityFrameworkCore.Sqlite\SkyWalking.Diagnostics.EntityFrameworkCore.Sqlite.csproj", "{F5C529C9-23C4-46B7-84FF-E86C6D17EB3E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkyApm.Sample.AspNet", "sample\SkyApm.Sample.AspNet\SkyApm.Sample.AspNet.csproj", "{C3649845-E458-448D-B97D-C7E231E1D040}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.Diagnostics.EntityFrameworkCore.Pomelo.MySql", "src\SkyWalking.Diagnostics.EntityFrameworkCore.Pomelo.MySql\SkyWalking.Diagnostics.EntityFrameworkCore.Pomelo.MySql.csproj", "{7BD880F3-2886-4EE6-9569-114613AFFCBC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Transport.Grpc", "src\SkyApm.Transport.Grpc\SkyApm.Transport.Grpc.csproj", "{FF2FC3FB-D112-45C1-AF34-1FE37D55F682}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.Diagnostics.EntityFrameworkCore.Npgsql", "src\SkyWalking.Diagnostics.EntityFrameworkCore.Npgsql\SkyWalking.Diagnostics.EntityFrameworkCore.Npgsql.csproj", "{F8D96C30-369C-4FCB-B5B2-02EAA74199C9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Diagnostics.AspNetCore", "src\SkyApm.Diagnostics.AspNetCore\SkyApm.Diagnostics.AspNetCore.csproj", "{CFBB522D-495F-40F9-B68F-DA25E48D9F6A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.AspNet", "src\SkyWalking.AspNet\SkyWalking.AspNet.csproj", "{3A454A8A-A1B7-4C6D-BE08-52D956F95CC1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Utilities.Configuration", "src\SkyApm.Utilities.Configuration\SkyApm.Utilities.Configuration.csproj", "{0B87C4B8-3F4F-456A-B588-28D8E9E3395A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkyWalking.Sample.AspNet", "sample\SkyWalking.Sample.AspNet\SkyWalking.Sample.AspNet.csproj", "{C3649845-E458-448D-B97D-C7E231E1D040}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Utilities.DependencyInjection", "src\SkyApm.Utilities.DependencyInjection\SkyApm.Utilities.DependencyInjection.csproj", "{1812A19C-729C-410B-A90D-D5AF1404DD60}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.Transport.Grpc", "src\SkyWalking.Transport.Grpc\SkyWalking.Transport.Grpc.csproj", "{FF2FC3FB-D112-45C1-AF34-1FE37D55F682}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Utilities.Logging", "src\SkyApm.Utilities.Logging\SkyApm.Utilities.Logging.csproj", "{AEB61F19-3DBB-411E-A67E-93007B96E160}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.Diagnostics.AspNetCore", "src\SkyWalking.Diagnostics.AspNetCore\SkyWalking.Diagnostics.AspNetCore.csproj", "{CFBB522D-495F-40F9-B68F-DA25E48D9F6A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Agent.AspNetCore", "src\SkyApm.Agent.AspNetCore\SkyApm.Agent.AspNetCore.csproj", "{5CB2889E-33DD-4326-9403-4977849E065D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.Utilities.Configuration", "src\SkyWalking.Utilities.Configuration\SkyWalking.Utilities.Configuration.csproj", "{0B87C4B8-3F4F-456A-B588-28D8E9E3395A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkyApm.Transport.Grpc.Protocol", "src\SkyApm.Transport.Grpc.Protocol\SkyApm.Transport.Grpc.Protocol.csproj", "{BAF5C1ED-09C4-4B32-8190-47D16265F01E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.Utilities.DependencyInjection", "src\SkyWalking.Utilities.DependencyInjection\SkyWalking.Utilities.DependencyInjection.csproj", "{1812A19C-729C-410B-A90D-D5AF1404DD60}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Diagnostics", "Diagnostics", "{B5E677CF-2920-4B0A-A056-E73F6B2CF2BC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.Utilities.Logging", "src\SkyWalking.Utilities.Logging\SkyWalking.Utilities.Logging.csproj", "{AEB61F19-3DBB-411E-A67E-93007B96E160}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkyApm.Core", "src\SkyApm.Core\SkyApm.Core.csproj", "{60D34708-45A2-4374-9500-5B3FF80C0AA9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.Agent.AspNetCore", "src\SkyWalking.Agent.AspNetCore\SkyWalking.Agent.AspNetCore.csproj", "{5CB2889E-33DD-4326-9403-4977849E065D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkyApm.Diagnostics.EntityFrameworkCore.Pomelo.MySql", "src\SkyApm.Diagnostics.EntityFrameworkCore.Pomelo.MySql\SkyApm.Diagnostics.EntityFrameworkCore.Pomelo.MySql.csproj", "{2F7EEC69-35F4-4D31-B52A-7465D65E9DE0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.DotNet.CLI", "cli\SkyWalking.DotNet.CLI\SkyWalking.DotNet.CLI.csproj", "{412E5D7D-9448-4C65-8EC7-26F6D5C49865}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CLI", "CLI", "{1B0865AF-369E-493C-AA6F-C56D3E520A22}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkyWalking.Transport.Grpc.Protocol", "src\SkyWalking.Transport.Grpc.Protocol\SkyWalking.Transport.Grpc.Protocol.csproj", "{BAF5C1ED-09C4-4B32-8190-47D16265F01E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkyApm.DotNet.CLI", "src\SkyApm.DotNet.CLI\SkyApm.DotNet.CLI.csproj", "{E909EEF5-5EBF-43F3-AB4A-6B2FB56EF89B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -95,14 +90,6 @@ Global
 		{C3860B5F-21D0-429F-8A00-B0C0F4573DF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C3860B5F-21D0-429F-8A00-B0C0F4573DF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C3860B5F-21D0-429F-8A00-B0C0F4573DF7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FD84A10C-C962-4AEA-BA06-86F08EB048E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD84A10C-C962-4AEA-BA06-86F08EB048E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD84A10C-C962-4AEA-BA06-86F08EB048E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FD84A10C-C962-4AEA-BA06-86F08EB048E6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3915A2C2-7174-4651-A4F1-D45CD109916A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3915A2C2-7174-4651-A4F1-D45CD109916A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3915A2C2-7174-4651-A4F1-D45CD109916A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3915A2C2-7174-4651-A4F1-D45CD109916A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{80A67B09-83F2-477F-907F-95FFF5B8FEAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{80A67B09-83F2-477F-907F-95FFF5B8FEAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{80A67B09-83F2-477F-907F-95FFF5B8FEAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -131,10 +118,6 @@ Global
 		{F5C529C9-23C4-46B7-84FF-E86C6D17EB3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F5C529C9-23C4-46B7-84FF-E86C6D17EB3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F5C529C9-23C4-46B7-84FF-E86C6D17EB3E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7BD880F3-2886-4EE6-9569-114613AFFCBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7BD880F3-2886-4EE6-9569-114613AFFCBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7BD880F3-2886-4EE6-9569-114613AFFCBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7BD880F3-2886-4EE6-9569-114613AFFCBC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F8D96C30-369C-4FCB-B5B2-02EAA74199C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F8D96C30-369C-4FCB-B5B2-02EAA74199C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F8D96C30-369C-4FCB-B5B2-02EAA74199C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -171,48 +154,56 @@ Global
 		{5CB2889E-33DD-4326-9403-4977849E065D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5CB2889E-33DD-4326-9403-4977849E065D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5CB2889E-33DD-4326-9403-4977849E065D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{412E5D7D-9448-4C65-8EC7-26F6D5C49865}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{412E5D7D-9448-4C65-8EC7-26F6D5C49865}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{412E5D7D-9448-4C65-8EC7-26F6D5C49865}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{412E5D7D-9448-4C65-8EC7-26F6D5C49865}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BAF5C1ED-09C4-4B32-8190-47D16265F01E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BAF5C1ED-09C4-4B32-8190-47D16265F01E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BAF5C1ED-09C4-4B32-8190-47D16265F01E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BAF5C1ED-09C4-4B32-8190-47D16265F01E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60D34708-45A2-4374-9500-5B3FF80C0AA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60D34708-45A2-4374-9500-5B3FF80C0AA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60D34708-45A2-4374-9500-5B3FF80C0AA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60D34708-45A2-4374-9500-5B3FF80C0AA9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F7EEC69-35F4-4D31-B52A-7465D65E9DE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F7EEC69-35F4-4D31-B52A-7465D65E9DE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F7EEC69-35F4-4D31-B52A-7465D65E9DE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F7EEC69-35F4-4D31-B52A-7465D65E9DE0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E909EEF5-5EBF-43F3-AB4A-6B2FB56EF89B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E909EEF5-5EBF-43F3-AB4A-6B2FB56EF89B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E909EEF5-5EBF-43F3-AB4A-6B2FB56EF89B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E909EEF5-5EBF-43F3-AB4A-6B2FB56EF89B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{79ED86A5-E9B9-49B2-9354-C911C079D03E} = {05BF0D4E-C824-4EC8-8330-36C1FC49910E}
 		{CBFF7EE0-69D7-4D6A-9BBD-8E567FF4D810} = {05BF0D4E-C824-4EC8-8330-36C1FC49910E}
-		{A4E67E09-3156-4D30-B451-F24F706E96C4} = {79ED86A5-E9B9-49B2-9354-C911C079D03E}
 		{88AEFE60-F743-4AF3-8F55-B4B7B8079D95} = {05BF0D4E-C824-4EC8-8330-36C1FC49910E}
 		{4BD917BC-D579-4C75-9939-41BF012A4EE2} = {05BF0D4E-C824-4EC8-8330-36C1FC49910E}
 		{F0B43114-3BA9-4098-952D-0FB2241691A9} = {E38F0F6E-6E10-491D-8786-650F6A4B6698}
 		{EF6194B2-9ACB-49B9-8049-DD6AFAEB0399} = {05BF0D4E-C824-4EC8-8330-36C1FC49910E}
 		{C3860B5F-21D0-429F-8A00-B0C0F4573DF7} = {CBFF7EE0-69D7-4D6A-9BBD-8E567FF4D810}
-		{FD84A10C-C962-4AEA-BA06-86F08EB048E6} = {CBFF7EE0-69D7-4D6A-9BBD-8E567FF4D810}
-		{3915A2C2-7174-4651-A4F1-D45CD109916A} = {613F0980-91ED-4064-8E8C-168582EF4AD7}
 		{80A67B09-83F2-477F-907F-95FFF5B8FEAF} = {844CEACD-4C85-4B15-9E2B-892B01FDA4BB}
 		{2B4E350E-A1E5-4B4A-A642-BCA6D3887E5A} = {844CEACD-4C85-4B15-9E2B-892B01FDA4BB}
-		{49DEFCA8-4289-4875-B6A5-35D84B3D2290} = {79ED86A5-E9B9-49B2-9354-C911C079D03E}
-		{55621423-19C3-4928-8B45-666FA87BF6A2} = {79ED86A5-E9B9-49B2-9354-C911C079D03E}
 		{CD334460-8E61-41EB-9762-62C6A342CACB} = {A4E67E09-3156-4D30-B451-F24F706E96C4}
-		{44DFFDF7-5935-475A-825F-2C0298464117} = {79ED86A5-E9B9-49B2-9354-C911C079D03E}
 		{F5C529C9-23C4-46B7-84FF-E86C6D17EB3E} = {A4E67E09-3156-4D30-B451-F24F706E96C4}
-		{7BD880F3-2886-4EE6-9569-114613AFFCBC} = {A4E67E09-3156-4D30-B451-F24F706E96C4}
 		{F8D96C30-369C-4FCB-B5B2-02EAA74199C9} = {A4E67E09-3156-4D30-B451-F24F706E96C4}
-		{3A454A8A-A1B7-4C6D-BE08-52D956F95CC1} = {79ED86A5-E9B9-49B2-9354-C911C079D03E}
 		{C3649845-E458-448D-B97D-C7E231E1D040} = {844CEACD-4C85-4B15-9E2B-892B01FDA4BB}
 		{FF2FC3FB-D112-45C1-AF34-1FE37D55F682} = {CBFF7EE0-69D7-4D6A-9BBD-8E567FF4D810}
-		{CFBB522D-495F-40F9-B68F-DA25E48D9F6A} = {79ED86A5-E9B9-49B2-9354-C911C079D03E}
 		{0B87C4B8-3F4F-456A-B588-28D8E9E3395A} = {4BD917BC-D579-4C75-9939-41BF012A4EE2}
 		{1812A19C-729C-410B-A90D-D5AF1404DD60} = {4BD917BC-D579-4C75-9939-41BF012A4EE2}
 		{AEB61F19-3DBB-411E-A67E-93007B96E160} = {4BD917BC-D579-4C75-9939-41BF012A4EE2}
 		{5CB2889E-33DD-4326-9403-4977849E065D} = {EF6194B2-9ACB-49B9-8049-DD6AFAEB0399}
-		{412E5D7D-9448-4C65-8EC7-26F6D5C49865} = {A238D227-433B-461E-8C57-73B147E0F672}
 		{BAF5C1ED-09C4-4B32-8190-47D16265F01E} = {CBFF7EE0-69D7-4D6A-9BBD-8E567FF4D810}
+		{3A454A8A-A1B7-4C6D-BE08-52D956F95CC1} = {EF6194B2-9ACB-49B9-8049-DD6AFAEB0399}
+		{B5E677CF-2920-4B0A-A056-E73F6B2CF2BC} = {05BF0D4E-C824-4EC8-8330-36C1FC49910E}
+		{A4E67E09-3156-4D30-B451-F24F706E96C4} = {B5E677CF-2920-4B0A-A056-E73F6B2CF2BC}
+		{CFBB522D-495F-40F9-B68F-DA25E48D9F6A} = {B5E677CF-2920-4B0A-A056-E73F6B2CF2BC}
+		{55621423-19C3-4928-8B45-666FA87BF6A2} = {B5E677CF-2920-4B0A-A056-E73F6B2CF2BC}
+		{49DEFCA8-4289-4875-B6A5-35D84B3D2290} = {B5E677CF-2920-4B0A-A056-E73F6B2CF2BC}
+		{44DFFDF7-5935-475A-825F-2C0298464117} = {B5E677CF-2920-4B0A-A056-E73F6B2CF2BC}
+		{60D34708-45A2-4374-9500-5B3FF80C0AA9} = {CBFF7EE0-69D7-4D6A-9BBD-8E567FF4D810}
+		{2F7EEC69-35F4-4D31-B52A-7465D65E9DE0} = {A4E67E09-3156-4D30-B451-F24F706E96C4}
+		{1B0865AF-369E-493C-AA6F-C56D3E520A22} = {05BF0D4E-C824-4EC8-8330-36C1FC49910E}
+		{E909EEF5-5EBF-43F3-AB4A-6B2FB56EF89B} = {1B0865AF-369E-493C-AA6F-C56D3E520A22}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {94C0DA2C-CCCB-4314-93A2-9809B5DD0583}

src/SkyWalking.Abstractions/Common/Components.cs → src/SkyApm.Abstractions/Common/Components.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.Common
+namespace SkyApm.Common
 {
     public static class Components
     {

src/SkyWalking.Abstractions/Common/NullableValue.cs → src/SkyApm.Abstractions/Common/NullableValue.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.Common
+namespace SkyApm.Common
 {
     public struct NullableValue
     {

src/SkyWalking.Abstractions/Common/StringOrIntValue.cs → src/SkyApm.Abstractions/Common/StringOrIntValue.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.Common
+namespace SkyApm.Common
 {
     public struct StringOrIntValue
     {

src/SkyWalking.Abstractions/Common/Tags.cs → src/SkyApm.Abstractions/Common/Tags.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.Common
+namespace SkyApm.Common
 {
     public static class Tags
     {

src/SkyWalking.Abstractions/Config/ConfigAttribute.cs → src/SkyApm.Abstractions/Config/ConfigAttribute.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System;
 
-namespace SkyWalking.Config
+namespace SkyApm.Config
 {
     public class ConfigAttribute : Attribute
     {

src/SkyWalking.Abstractions/Config/IConfigAccessor.cs → src/SkyApm.Abstractions/Config/IConfigAccessor.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.Config
+namespace SkyApm.Config
 {
     public interface IConfigAccessor
     {

src/SkyWalking.Abstractions/Config/InstrumentConfig.cs → src/SkyApm.Abstractions/Config/InstrumentConfig.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System;
 
-namespace SkyWalking.Config
+namespace SkyApm.Config
 {
     [Config("SkyWalking")]
     public class InstrumentConfig

src/SkyWalking.Abstractions/Config/SamplingConfig.cs → src/SkyApm.Abstractions/Config/SamplingConfig.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.Config
+namespace SkyApm.Config
 {
     [Config("SkyWalking", "Sampling")]
     public class SamplingConfig

src/SkyWalking.Abstractions/Config/TransportConfig.cs → src/SkyApm.Abstractions/Config/TransportConfig.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.Config
+namespace SkyApm.Config
 {
     [Config("SkyWalking", "Transport")]
     public class TransportConfig

src/SkyWalking.Abstractions/ExecutionService.cs → src/SkyApm.Abstractions/ExecutionService.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,9 +19,9 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using SkyWalking.Logging;
+using SkyApm.Logging;
 
-namespace SkyWalking
+namespace SkyApm
 {
     public abstract class ExecutionService : IExecutionService, IDisposable
     {

src/SkyWalking.Abstractions/IBase64Formatter.cs → src/SkyApm.Abstractions/IBase64Formatter.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking
+namespace SkyApm
 {
     public interface IBase64Formatter
     {

src/SkyWalking.Abstractions/IEnvironmentProvider.cs → src/SkyApm.Abstractions/IEnvironmentProvider.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking
+namespace SkyApm
 {
     public interface IEnvironmentProvider
     {

src/SkyWalking.Abstractions/IExecutionService.cs → src/SkyApm.Abstractions/IExecutionService.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,7 +19,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace SkyWalking
+namespace SkyApm
 {
     public interface IExecutionService
     {

src/SkyWalking.Abstractions/IInstrumentStartup.cs → src/SkyApm.Abstractions/IInstrumentStartup.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,7 +19,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace SkyWalking
+namespace SkyApm
 {
     public interface IInstrumentStartup
     {

src/SkyWalking.Abstractions/IRuntimeEnvironment.cs → src/SkyApm.Abstractions/IRuntimeEnvironment.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -17,9 +17,9 @@
  */
 
 using System;
-using SkyWalking.Common;
+using SkyApm.Common;
 
-namespace SkyWalking
+namespace SkyApm
 {
     public interface IRuntimeEnvironment
     {

src/SkyWalking.Abstractions/ITracingDiagnosticProcessor.cs → src/SkyApm.Abstractions/ITracingDiagnosticProcessor.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking
+namespace SkyApm
 {
     public interface ITracingDiagnosticProcessor
     {

src/SkyWalking.Abstractions/Logging/ILogger.cs → src/SkyApm.Abstractions/Logging/ILogger.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System;
 
-namespace SkyWalking.Logging
+namespace SkyApm.Logging
 {
     public interface ILogger
     {

src/SkyWalking.Abstractions/Logging/ILoggerFactory.cs → src/SkyApm.Abstractions/Logging/ILoggerFactory.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System;
 
-namespace SkyWalking.Logging
+namespace SkyApm.Logging
 {
     public interface ILoggerFactory
     {

src/SkyWalking.Abstractions/SkyWalking.Abstractions.csproj → src/SkyApm.Abstractions/SkyApm.Abstractions.csproj

@@ -8,7 +8,7 @@
     <PackageTags>SkyWalking;APM</PackageTags>
     <PackageReleaseNotes>
     </PackageReleaseNotes>
-    <RootNamespace>SkyWalking</RootNamespace>
+    <RootNamespace>SkyApm</RootNamespace>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 </Project>
\ No newline at end of file

src/SkyWalking.Abstractions/Tracing/Extensions/SegmentSpanExtensions.cs → src/SkyApm.Abstractions/Tracing/Extensions/SegmentSpanExtensions.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -17,9 +17,9 @@
  */
 
 using System;
-using SkyWalking.Tracing.Segments;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public static class SegmentSpanExtensions
     {

src/SkyWalking.Abstractions/Tracing/ICarrier.cs → src/SkyApm.Abstractions/Tracing/ICarrier.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,9 +16,9 @@
  *
  */
 
-using SkyWalking.Common;
+using SkyApm.Common;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public interface ICarrier
     {

src/SkyWalking.Abstractions/Tracing/ICarrierFormatter.cs → src/SkyApm.Abstractions/Tracing/ICarrierFormatter.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,9 +16,9 @@
  *
  */
 
-using SkyWalking.Tracing.Segments;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public interface ICarrierFormatter
     {

src/SkyWalking.Abstractions/Tracing/ICarrierHeaderCollection.cs → src/SkyApm.Abstractions/Tracing/ICarrierHeaderCollection.cs

 using System.Collections.Generic;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public interface ICarrierHeaderCollection : IEnumerable<KeyValuePair<string, string>>
     {

src/SkyWalking.Abstractions/Tracing/ICarrierPropagator.cs → src/SkyApm.Abstractions/Tracing/ICarrierPropagator.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,9 +16,9 @@
  *
  */
 
-using SkyWalking.Tracing.Segments;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public interface ICarrierPropagator
     {

src/SkyWalking.Abstractions/Tracing/IEntrySegmentContextAccessor.cs → src/SkyApm.Abstractions/Tracing/IEntrySegmentContextAccessor.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,9 +16,9 @@
  *
  */
 
-using SkyWalking.Tracing.Segments;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public interface IEntrySegmentContextAccessor
     {

src/SkyWalking.Abstractions/Tracing/IExitSegmentContextAccessor.cs → src/SkyApm.Abstractions/Tracing/IExitSegmentContextAccessor.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,9 +16,9 @@
  *
  */
 
-using SkyWalking.Tracing.Segments;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public interface IExitSegmentContextAccessor
     {

src/SkyWalking.Abstractions/Tracing/ILocalSegmentContextAccessor.cs → src/SkyApm.Abstractions/Tracing/ILocalSegmentContextAccessor.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,9 +16,9 @@
  *
  */
 
-using SkyWalking.Tracing.Segments;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public interface ILocalSegmentContextAccessor
     {

src/SkyWalking.Abstractions/Tracing/ISamplerChainBuilder.cs → src/SkyApm.Abstractions/Tracing/ISamplerChainBuilder.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public interface ISamplerChainBuilder
     {

src/SkyWalking.Abstractions/Tracing/ISamplingInterceptor.cs → src/SkyApm.Abstractions/Tracing/ISamplingInterceptor.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,9 +16,9 @@
  *
  */
 
-using SkyWalking.Tracing.Segments;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public interface ISamplingInterceptor
     {

src/SkyWalking.Abstractions/Tracing/ISegmentContextFactory.cs → src/SkyApm.Abstractions/Tracing/ISegmentContextFactory.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,10 +16,10 @@
  *
  */
 
-using SkyWalking.Common;
-using SkyWalking.Tracing.Segments;
+using SkyApm.Common;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public interface ISegmentContextFactory
     {

src/SkyWalking.Abstractions/Tracing/ITracingContext.cs → src/SkyApm.Abstractions/Tracing/ITracingContext.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,9 +16,9 @@
  *
  */
 
-using SkyWalking.Tracing.Segments;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public interface ITracingContext
     {

src/SkyWalking.Abstractions/Tracing/IUniqueIdGenerator.cs → src/SkyApm.Abstractions/Tracing/IUniqueIdGenerator.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public interface IUniqueIdGenerator
     {

src/SkyWalking.Abstractions/Tracing/IUniqueIdParser.cs → src/SkyApm.Abstractions/Tracing/IUniqueIdParser.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public interface IUniqueIdParser
     {

src/SkyWalking.Abstractions/Tracing/Sampler.cs → src/SkyApm.Abstractions/Tracing/Sampler.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,10 +16,10 @@
  *
  */
 
-using SkyWalking.Common;
-using SkyWalking.Tracing.Segments;
+using SkyApm.Common;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public delegate bool Sampler(SamplingContext samplingContext);
 

src/SkyWalking.Abstractions/Tracing/Segments/SegmentContext.cs → src/SkyApm.Abstractions/Tracing/Segments/SegmentContext.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.Tracing.Segments
+namespace SkyApm.Tracing.Segments
 {
     public class SegmentContext
     {

src/SkyWalking.Abstractions/Tracing/Segments/SegmentReference.cs → src/SkyApm.Abstractions/Tracing/Segments/SegmentReference.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,9 +18,9 @@
 
 using System.Collections;
 using System.Collections.Generic;
-using SkyWalking.Common;
+using SkyApm.Common;
 
-namespace SkyWalking.Tracing.Segments
+namespace SkyApm.Tracing.Segments
 {
     public class SegmentReference
     {

src/SkyWalking.Abstractions/Tracing/Segments/SegmentSpan.cs → src/SkyApm.Abstractions/Tracing/Segments/SegmentSpan.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -20,9 +20,9 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using SkyWalking.Common;
+using SkyApm.Common;
 
-namespace SkyWalking.Tracing.Segments
+namespace SkyApm.Tracing.Segments
 {
     public class SegmentSpan
     {

src/SkyWalking.Abstractions/Tracing/UniqueId.cs → src/SkyApm.Abstractions/Tracing/UniqueId.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public class UniqueId : IEquatable<UniqueId>
     {

src/SkyWalking.Abstractions/Transport/AgentOsInfoRequest.cs → src/SkyApm.Abstractions/Transport/AgentOsInfoRequest.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System;
 
-namespace SkyWalking.Transport
+namespace SkyApm.Transport
 {
     public class AgentOsInfoRequest
     {

src/SkyWalking.Abstractions/Transport/IPingCaller.cs → src/SkyApm.Abstractions/Transport/IPingCaller.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,9 +18,9 @@
 
 using System.Threading;
 using System.Threading.Tasks;
-using SkyWalking.Transport;
+using SkyApm.Transport;
 
-namespace SkyWalking.Transport
+namespace SkyApm.Transport
 {
     public interface IPingCaller
     {

src/SkyWalking.Abstractions/Transport/ISegmentContextMapper.cs → src/SkyApm.Abstractions/Transport/ISegmentContextMapper.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,9 +16,9 @@
  *
  */
 
-using SkyWalking.Tracing.Segments;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Transport
+namespace SkyApm.Transport
 {
     public interface ISegmentContextMapper
     {

src/SkyWalking.Abstractions/Transport/ISegmentDispatcher.cs → src/SkyApm.Abstractions/Transport/ISegmentDispatcher.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,9 +18,9 @@
 
 using System.Threading;
 using System.Threading.Tasks;
-using SkyWalking.Tracing.Segments;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Transport
+namespace SkyApm.Transport
 {
     public interface ISegmentDispatcher
     {

src/SkyWalking.Abstractions/Transport/ISegmentReporter.cs → src/SkyApm.Abstractions/Transport/ISegmentReporter.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -20,7 +20,7 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace SkyWalking.Transport
+namespace SkyApm.Transport
 {
     public interface ISegmentReporter
     {

src/SkyWalking.Abstractions/Transport/IServiceRegister.cs → src/SkyApm.Abstractions/Transport/IServiceRegister.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,10 +19,10 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using SkyWalking.Common;
-using SkyWalking.Transport;
+using SkyApm.Common;
+using SkyApm.Transport;
 
-namespace SkyWalking.Transport
+namespace SkyApm.Transport
 {
     public interface IServiceRegister
     {

src/SkyWalking.Abstractions/Transport/PingRequest.cs → src/SkyApm.Abstractions/Transport/PingRequest.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.Transport
+namespace SkyApm.Transport
 {
     public class PingRequest
     {

src/SkyWalking.Abstractions/Transport/SegmentRequest.cs → src/SkyApm.Abstractions/Transport/SegmentRequest.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -17,9 +17,9 @@
  */
 
 using System.Collections.Generic;
-using SkyWalking.Common;
+using SkyApm.Common;
 
-namespace SkyWalking.Transport
+namespace SkyApm.Transport
 {
     public class SegmentRequest
     {

src/SkyWalking.Abstractions/Transport/ServiceInstanceRequest.cs → src/SkyApm.Abstractions/Transport/ServiceInstanceRequest.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.Transport
+namespace SkyApm.Transport
 {
     public class ServiceInstanceRequest
     {

src/SkyWalking.Abstractions/Transport/ServiceRequest.cs → src/SkyApm.Abstractions/Transport/ServiceRequest.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System.Collections.Generic;
 
-namespace SkyWalking.Transport
+namespace SkyApm.Transport
 {
     public class ServiceRequest
     {

src/SkyWalking.Abstractions/Transport/V5/ISkyWalkingClientV5.cs → src/SkyApm.Abstractions/Transport/V5/ISkyApmClientV5.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,11 +19,11 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using SkyWalking.Common;
+using SkyApm.Common;
 
-namespace SkyWalking.Transport
+namespace SkyApm.Transport
 {
-    public interface ISkyWalkingClientV5
+    public interface ISkyApmClientV5
     {
         Task<NullableValue> RegisterApplicationAsync(string applicationCode, CancellationToken cancellationToken = default(CancellationToken));
 

src/SkyWalking.AspNet/Extensions/ServiceCollectionExtensions.cs → src/SkyApm.Agent.AspNet/Extensions/ServiceCollectionExtensions.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -17,24 +17,24 @@
  */
 
 using Microsoft.Extensions.DependencyInjection;
-using SkyWalking.Config;
-using SkyWalking.Diagnostics;
-using SkyWalking.Logging;
-using SkyWalking.Sampling;
-using SkyWalking.Service;
-using SkyWalking.Tracing;
-using SkyWalking.Transport;
-using SkyWalking.Transport.Grpc;
-using SkyWalking.Transport.Grpc.V5;
-using SkyWalking.Transport.Grpc.V6;
-using SkyWalking.Utilities.Configuration;
-using SkyWalking.Utilities.Logging;
+using SkyApm.Config;
+using SkyApm.Diagnostics;
+using SkyApm.Logging;
+using SkyApm.Sampling;
+using SkyApm.Service;
+using SkyApm.Tracing;
+using SkyApm.Transport;
+using SkyApm.Transport.Grpc;
+using SkyApm.Transport.Grpc.V5;
+using SkyApm.Transport.Grpc.V6;
+using SkyApm.Utilities.Configuration;
+using SkyApm.Utilities.Logging;
 
-namespace SkyWalking.AspNet.Extensions
+namespace SkyApm.Agent.AspNet.Extensions
 {
     internal static class ServiceCollectionExtensions
     {
-        public static IServiceCollection AddSkyWalkingCore(this IServiceCollection services)
+        public static IServiceCollection AddSkyAPMCore(this IServiceCollection services)
         {
             services.AddSingleton<ISegmentDispatcher, AsyncQueueSegmentDispatcher>();
             services.AddSingleton<IExecutionService, RegisterService>();
@@ -67,7 +67,7 @@ namespace SkyWalking.AspNet.Extensions
             services.AddSingleton<IExecutionService>(p => p.GetService<SimpleCountSamplingInterceptor>());
             services.AddSingleton<ISamplingInterceptor, RandomSamplingInterceptor>();
             
-            services.AddSingleton<ISkyWalkingClientV5, SkyWalkingClientV5>();
+            services.AddSingleton<ISkyApmClientV5, SkyApmClientV5>();
             services.AddSingleton<ISegmentReporter, SegmentReporter>();
             services.AddSingleton<ConnectionManager>();
             services.AddSingleton<IPingCaller, PingCaller>();

src/SkyWalking.AspNet/HostingEnvironmentProvider.cs → src/SkyApm.Agent.AspNet/HostingEnvironmentProvider.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System;
 
-namespace SkyWalking.AspNet
+namespace SkyApm.Agent.AspNet
 {
     internal class HostingEnvironmentProvider : IEnvironmentProvider
     {

src/SkyWalking.AspNet/HttpRequestCarrierHeaderCollection.cs → src/SkyApm.Agent.AspNet/HttpRequestCarrierHeaderCollection.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,11 +19,11 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Web;
-using SkyWalking.Tracing;
+using SkyApm.Tracing;
 
-namespace SkyWalking.AspNet
+namespace SkyApm.Agent.AspNet
 {
-    public class HttpRequestCarrierHeaderCollection : ICarrierHeaderCollection
+    internal class HttpRequestCarrierHeaderCollection : ICarrierHeaderCollection
     {
         private readonly Dictionary<string, string> _headers;
 

src/SkyWalking.AspNet/HttpTracingHandler.cs → src/SkyApm.Agent.AspNet/HttpTracingHandler.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -24,10 +24,11 @@ using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
 using CommonServiceLocator;
-using SkyWalking.Tracing;
-using SpanLayer = SkyWalking.Tracing.Segments.SpanLayer;
+using SkyApm.Tracing;
+using SkyApm.Tracing.Segments;
+using SpanLayer = SkyApm.Tracing.Segments.SpanLayer;
 
-namespace SkyWalking.AspNet
+namespace SkyApm.Agent.AspNet
 {
     public class HttpTracingHandler : DelegatingHandler
     {

src/SkyWalking.AspNet/InstrumentModule.cs → src/SkyApm.Agent.AspNet/InstrumentModule.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -20,15 +20,15 @@ using CommonServiceLocator;
 using Microsoft.Extensions.DependencyInjection;
 using System.Web;
 using Nito.AsyncEx;
-using SkyWalking.AspNet.Extensions;
+using SkyApm.Agent.AspNet.Extensions;
 
-namespace SkyWalking.AspNet
+namespace SkyApm.Agent.AspNet
 {
     public class InstrumentModule : IHttpModule
     {
         public InstrumentModule()
         {
-            var serviceProvider = new ServiceCollection().AddSkyWalkingCore().BuildServiceProvider();
+            var serviceProvider = new ServiceCollection().AddSkyAPMCore().BuildServiceProvider();
             var serviceLocatorProvider = new ServiceProviderLocator(serviceProvider);
             ServiceLocator.SetLocatorProvider(() => serviceLocatorProvider);
         }

src/SkyWalking.AspNet/InstrumentModuleFactory.cs → src/SkyApm.Agent.AspNet/InstrumentModuleFactory.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,11 +18,11 @@
 
 using Microsoft.Web.Infrastructure.DynamicModuleHelper;
 using System.Web;
-using SkyWalking.AspNet;
+using SkyApm.Agent.AspNet;
 
 [assembly:PreApplicationStartMethod(typeof(InstrumentModuleFactory), nameof(InstrumentModuleFactory.Create))]
 
-namespace SkyWalking.AspNet
+namespace SkyApm.Agent.AspNet
 {
     public class InstrumentModuleFactory
     {

src/SkyWalking.AspNet/InstrumentRequestCallback.cs → src/SkyApm.Agent.AspNet/InstrumentRequestCallback.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,13 +18,13 @@
 
 using System;
 using System.Web;
-using SkyWalking.Common;
-using SkyWalking.Config;
-using SkyWalking.Tracing;
-using SkyWalking.Tracing.Segments;
-using SpanLayer = SkyWalking.Tracing.Segments.SpanLayer;
+using SkyApm.Common;
+using SkyApm.Config;
+using SkyApm.Tracing;
+using SkyApm.Tracing.Segments;
+using SpanLayer = SkyApm.Tracing.Segments.SpanLayer;
 
-namespace SkyWalking.AspNet
+namespace SkyApm.Agent.AspNet
 {
     internal class InstrumentRequestCallback
     {

src/SkyWalking.AspNet/ServiceProviderLocator.cs → src/SkyApm.Agent.AspNet/ServiceProviderLocator.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -21,7 +21,7 @@ using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace SkyWalking.AspNet
+namespace SkyApm.Agent.AspNet
 {
     internal class ServiceProviderLocator : IServiceLocator
     {

src/SkyWalking.AspNet/SkyWalking.AspNet.csproj → src/SkyApm.Agent.AspNet/SkyApm.Agent.AspNet.csproj

@@ -4,19 +4,19 @@
     <TargetFrameworks>net461;net462;net47;net471</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyName>$(PackagePrefix).AspNet</AssemblyName>
-    <AssemblyTitle>$(PackagePrefix).AspNet</AssemblyTitle>
-    <PackageId>$(PackagePrefix).AspNet</PackageId>
+    <AssemblyName>$(PackagePrefix).Agent.AspNet</AssemblyName>
+    <AssemblyTitle>$(PackagePrefix).Agent.AspNet</AssemblyTitle>
+    <PackageId>$(PackagePrefix).Agent.AspNet</PackageId>
     <PackageTags>SkyWalking;APM;Tracing</PackageTags>
     <Description>$(PackagePrefix) ASP.NET Agent.</Description>
-    <RootNamespace>SkyWalking.AspNet</RootNamespace>
+    <RootNamespace>SkyApm.Agent.AspNet</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SkyWalking.Core\SkyWalking.Core.csproj" />
-    <ProjectReference Include="..\SkyWalking.Transport.Grpc\SkyWalking.Transport.Grpc.csproj" />
-    <ProjectReference Include="..\SkyWalking.Utilities.Configuration\SkyWalking.Utilities.Configuration.csproj" />
-    <ProjectReference Include="..\SkyWalking.Utilities.DependencyInjection\SkyWalking.Utilities.DependencyInjection.csproj" />
-    <ProjectReference Include="..\SkyWalking.Utilities.Logging\SkyWalking.Utilities.Logging.csproj" />
+    <ProjectReference Include="..\SkyApm.Core\SkyApm.Core.csproj" />
+    <ProjectReference Include="..\SkyApm.Transport.Grpc\SkyApm.Transport.Grpc.csproj" />
+    <ProjectReference Include="..\SkyApm.Utilities.Configuration\SkyApm.Utilities.Configuration.csproj" />
+    <ProjectReference Include="..\SkyApm.Utilities.DependencyInjection\SkyApm.Utilities.DependencyInjection.csproj" />
+    <ProjectReference Include="..\SkyApm.Utilities.Logging\SkyApm.Utilities.Logging.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Configuration" />

src/SkyWalking.Agent.AspNetCore/Extensions/ServiceCollectionExtensions.cs → src/SkyApm.Agent.AspNetCore/Extensions/ServiceCollectionExtensions.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,29 +19,29 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using SkyWalking.AspNetCore.Diagnostics;
-using SkyWalking.Config;
-using SkyWalking.Diagnostics;
-using SkyWalking.Diagnostics.EntityFrameworkCore;
-using SkyWalking.Diagnostics.HttpClient;
-using SkyWalking.Diagnostics.SqlClient;
-using SkyWalking.Utilities.Configuration;
-using SkyWalking.Utilities.DependencyInjection;
-using SkyWalking.Utilities.Logging;
-using SkyWalking.Logging;
-using SkyWalking.Sampling;
-using SkyWalking.Service;
-using SkyWalking.Tracing;
-using SkyWalking.Transport;
-using SkyWalking.Transport.Grpc;
-using SkyWalking.Transport.Grpc.V5;
-using SkyWalking.Transport.Grpc.V6;
+using SkyApm.Config;
+using SkyApm.Diagnostics;
+using SkyApm.Logging;
+using SkyApm.Sampling;
+using SkyApm.Service;
+using SkyApm.Tracing;
+using SkyApm.Transport;
+using SkyApm.Transport.Grpc;
+using SkyApm.Transport.Grpc.V5;
+using SkyApm.Transport.Grpc.V6;
+using SkyApm.Utilities.Configuration;
+using SkyApm.Utilities.Logging;
+using SkyApm.AspNetCore.Diagnostics;
+using SkyApm.Diagnostics.EntityFrameworkCore;
+using SkyApm.Diagnostics.HttpClient;
+using SkyApm.Diagnostics.SqlClient;
+using SkyApm.Utilities.DependencyInjection;
 
-namespace SkyWalking.Agent.AspNetCore
+namespace SkyApm.Agent.AspNetCore
 {
-    public static class ServiceCollectionExtensions
+    internal static class ServiceCollectionExtensions
     {
-        public static IServiceCollection AddSkyWalkingCore(this IServiceCollection services)
+        internal static IServiceCollection AddSkyAPMCore(this IServiceCollection services)
         {
             if (services == null)
             {
@@ -60,7 +60,7 @@ namespace SkyWalking.Agent.AspNetCore
             services.AddSingleton<IHostedService, InstrumentationHostedService>();
             services.AddSingleton<IEnvironmentProvider, HostingEnvironmentProvider>();
             services.AddTracing().AddSampling().AddGrpcTransport().AddLogging();
-            services.AddSkyWalkingExtensions().AddAspNetCoreHosting().AddHttpClient().AddSqlClient()
+            services.AddSkyApmExtensions().AddAspNetCoreHosting().AddHttpClient().AddSqlClient()
                 .AddEntityFrameworkCore(c => c.AddPomeloMysql().AddNpgsql().AddSqlite());
             return services;
         }
@@ -94,7 +94,7 @@ namespace SkyWalking.Agent.AspNetCore
 
         private static IServiceCollection AddGrpcTransport(this IServiceCollection services)
         {
-            services.AddSingleton<ISkyWalkingClientV5, SkyWalkingClientV5>();
+            services.AddSingleton<ISkyApmClientV5, SkyApmClientV5>();
             services.AddSingleton<ISegmentReporter, SegmentReporter>();
             services.AddSingleton<ConnectionManager>();
             services.AddSingleton<IPingCaller, PingCaller>();

src/SkyWalking.Agent.AspNetCore/HostingEnvironmentProvider.cs → src/SkyApm.Agent.AspNetCore/HostingEnvironmentProvider.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using Microsoft.AspNetCore.Hosting;
 
-namespace SkyWalking.Agent.AspNetCore
+namespace SkyApm.Agent.AspNetCore
 {
     internal class HostingEnvironmentProvider : IEnvironmentProvider
     {

src/SkyWalking.Agent.AspNetCore/InstrumentationHostedService.cs → src/SkyApm.Agent.AspNetCore/InstrumentationHostedService.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -20,7 +20,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
 
-namespace SkyWalking.Agent.AspNetCore
+namespace SkyApm.Agent.AspNetCore
 {
     internal class InstrumentationHostedService : IHostedService
     {

src/SkyWalking.Agent.AspNetCore/SkyWalking.Agent.AspNetCore.csproj → src/SkyApm.Agent.AspNetCore/SkyApm.Agent.AspNetCore.csproj

@@ -8,25 +8,25 @@
         <PackageTags>SkyWalking;APM</PackageTags>
         <PackageReleaseNotes>
         </PackageReleaseNotes>
-        <RootNamespace>SkyWalking.Agent.AspNetCore</RootNamespace>
+        <RootNamespace>SkyApm.Agent.AspNetCore</RootNamespace>
         <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.0" PrivateAssets="All" />
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\SkyWalking.Abstractions\SkyWalking.Abstractions.csproj" />
-        <ProjectReference Include="..\SkyWalking.Core\SkyWalking.Core.csproj" />
-        <ProjectReference Include="..\SkyWalking.Diagnostics.AspNetCore\SkyWalking.Diagnostics.AspNetCore.csproj" />
-        <ProjectReference Include="..\SkyWalking.Diagnostics.EntityFrameworkCore.Npgsql\SkyWalking.Diagnostics.EntityFrameworkCore.Npgsql.csproj" />
-        <ProjectReference Include="..\SkyWalking.Diagnostics.EntityFrameworkCore.Pomelo.MySql\SkyWalking.Diagnostics.EntityFrameworkCore.Pomelo.MySql.csproj" />
-        <ProjectReference Include="..\SkyWalking.Diagnostics.EntityFrameworkCore.Sqlite\SkyWalking.Diagnostics.EntityFrameworkCore.Sqlite.csproj" />
-        <ProjectReference Include="..\SkyWalking.Diagnostics.EntityFrameworkCore\SkyWalking.Diagnostics.EntityFrameworkCore.csproj" />
-        <ProjectReference Include="..\SkyWalking.Diagnostics.HttpClient\SkyWalking.Diagnostics.HttpClient.csproj" />
-        <ProjectReference Include="..\SkyWalking.Diagnostics.SqlClient\SkyWalking.Diagnostics.SqlClient.csproj" />
-        <ProjectReference Include="..\SkyWalking.Utilities.Configuration\SkyWalking.Utilities.Configuration.csproj" />
-        <ProjectReference Include="..\SkyWalking.Utilities.DependencyInjection\SkyWalking.Utilities.DependencyInjection.csproj" />
-        <ProjectReference Include="..\SkyWalking.Utilities.Logging\SkyWalking.Utilities.Logging.csproj" />
-        <ProjectReference Include="..\SkyWalking.Transport.Grpc\SkyWalking.Transport.Grpc.csproj" />
+        <ProjectReference Include="..\SkyApm.Abstractions\SkyApm.Abstractions.csproj" />
+        <ProjectReference Include="..\SkyApm.Diagnostics.AspNetCore\SkyApm.Diagnostics.AspNetCore.csproj" />
+        <ProjectReference Include="..\SkyApm.Diagnostics.EntityFrameworkCore.Npgsql\SkyApm.Diagnostics.EntityFrameworkCore.Npgsql.csproj" />
+        <ProjectReference Include="..\SkyApm.Diagnostics.EntityFrameworkCore.Pomelo.MySql\SkyApm.Diagnostics.EntityFrameworkCore.Pomelo.MySql.csproj" />
+        <ProjectReference Include="..\SkyApm.Diagnostics.EntityFrameworkCore.Sqlite\SkyApm.Diagnostics.EntityFrameworkCore.Sqlite.csproj" />
+        <ProjectReference Include="..\SkyApm.Diagnostics.EntityFrameworkCore\SkyApm.Diagnostics.EntityFrameworkCore.csproj" />
+        <ProjectReference Include="..\SkyApm.Core\SkyApm.Core.csproj" />
+        <ProjectReference Include="..\SkyApm.Diagnostics.HttpClient\SkyApm.Diagnostics.HttpClient.csproj" />
+        <ProjectReference Include="..\SkyApm.Diagnostics.SqlClient\SkyApm.Diagnostics.SqlClient.csproj" />
+        <ProjectReference Include="..\SkyApm.Transport.Grpc\SkyApm.Transport.Grpc.csproj" />
+        <ProjectReference Include="..\SkyApm.Utilities.Configuration\SkyApm.Utilities.Configuration.csproj" />
+        <ProjectReference Include="..\SkyApm.Utilities.DependencyInjection\SkyApm.Utilities.DependencyInjection.csproj" />
+        <ProjectReference Include="..\SkyApm.Utilities.Logging\SkyApm.Utilities.Logging.csproj" />
     </ItemGroup>
 </Project>
\ No newline at end of file

src/SkyWalking.Agent.AspNetCore/SkyWalkingHostingStartup.cs → src/SkyApm.Agent.AspNetCore/SkyApmHostingStartup.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -17,17 +17,17 @@
  */
 
 using Microsoft.AspNetCore.Hosting;
-using SkyWalking.Agent.AspNetCore;
+using SkyApm.Agent.AspNetCore;
 
-[assembly: HostingStartup(typeof(SkyWalkingHostingStartup))]
+[assembly: HostingStartup(typeof(SkyApmHostingStartup))]
 
-namespace SkyWalking.Agent.AspNetCore
+namespace SkyApm.Agent.AspNetCore
 {
-    internal class SkyWalkingHostingStartup : IHostingStartup
+    internal class SkyApmHostingStartup : IHostingStartup
     {
         public void Configure(IWebHostBuilder builder)
         {
-            builder.ConfigureServices(services => services.AddSkyWalkingCore());
+            builder.ConfigureServices(services => services.AddSkyAPMCore());
         }
     }
 }
\ No newline at end of file

src/SkyWalking.Core/Base64Formatter.cs → src/SkyApm.Core/Base64Formatter.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,7 +19,7 @@
 using System;
 using System.Text;
 
-namespace SkyWalking
+namespace SkyApm
 {
     public class Base64Formatter : IBase64Formatter
     {

src/SkyWalking.Core/Common/AtomicInteger.cs → src/SkyApm.Core/Common/AtomicInteger.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System.Threading;
 
-namespace SkyWalking.Common
+namespace SkyApm.Common
 {
     public class AtomicInteger
     {

src/SkyWalking.Core/Common/DnsHelpers.cs → src/SkyApm.Core/Common/DnsHelpers.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -20,7 +20,7 @@ using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 
-namespace SkyWalking.Common
+namespace SkyApm.Common
 {
     public static class DnsHelpers
     {

src/SkyWalking.Core/Common/EnumerableExtensions.cs → src/SkyApm.Core/Common/EnumerableExtensions.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,7 +19,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace SkyWalking.Common
+namespace SkyApm.Common
 {
     internal static class EnumerableExtensions
     {

src/SkyWalking.Core/Common/PlatformInformation.cs → src/SkyApm.Core/Common/PlatformInformation.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System.Runtime.InteropServices;
 
-namespace SkyWalking.Common
+namespace SkyApm.Common
 {
     internal static class PlatformInformation
     {

src/SkyWalking.Core/Common/StackExtensions.cs → src/SkyApm.Core/Common/StackExtensions.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System.Collections.Generic;
 
-namespace SkyWalking.Common
+namespace SkyApm.Common
 {
     public static class StackExtensions
     {

src/SkyWalking.Core/Common/StringOrIntValueHelpers.cs → src/SkyApm.Core/Common/StringOrIntValueHelpers.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System;
 
-namespace SkyWalking.Common
+namespace SkyApm.Common
 {
     public static class StringOrIntValueHelpers
     {

src/SkyWalking.Core/Diagnostics/AnonymousObject.cs → src/SkyApm.Core/Diagnostics/AnonymousObject.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.Diagnostics
+namespace SkyApm.Diagnostics
 {
     public class AnonymousObject : ParameterBinder
     {

src/SkyWalking.Core/Diagnostics/DiagnosticName.cs → src/SkyApm.Core/Diagnostics/DiagnosticName.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System;
 
-namespace SkyWalking.Diagnostics
+namespace SkyApm.Diagnostics
 {
     public class DiagnosticName :Attribute
     {

src/SkyWalking.Core/Diagnostics/IParameterResolver.cs → src/SkyApm.Core/Diagnostics/IParameterResolver.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.Diagnostics
+namespace SkyApm.Diagnostics
 {
     public interface IParameterResolver
     {

src/SkyWalking.Core/Diagnostics/NullParameterResolver.cs → src/SkyApm.Core/Diagnostics/NullParameterResolver.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.Diagnostics
+namespace SkyApm.Diagnostics
 {
     public class NullParameterResolver : IParameterResolver
     {

src/SkyWalking.Core/Diagnostics/ObjectAttribute.cs → src/SkyApm.Core/Diagnostics/ObjectAttribute.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System;
 
-namespace SkyWalking.Diagnostics
+namespace SkyApm.Diagnostics
 {
     public class ObjectAttribute : ParameterBinder
     {

src/SkyWalking.Core/Diagnostics/ParameterBinder.cs → src/SkyApm.Core/Diagnostics/ParameterBinder.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System;
 
-namespace SkyWalking.Diagnostics
+namespace SkyApm.Diagnostics
 {
     public abstract class ParameterBinder : Attribute, IParameterResolver
     {

src/SkyWalking.Core/Diagnostics/PropertyAttribute.cs → src/SkyApm.Core/Diagnostics/PropertyAttribute.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.Diagnostics
+namespace SkyApm.Diagnostics
 {
     public class PropertyAttribute : ParameterBinder
     {

src/SkyWalking.Core/Diagnostics/TracingDiagnosticMethod.cs → src/SkyApm.Core/Diagnostics/TracingDiagnosticMethod.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -20,7 +20,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 
-namespace SkyWalking.Diagnostics
+namespace SkyApm.Diagnostics
 {
     internal class TracingDiagnosticMethod
     {

src/SkyWalking.Core/Diagnostics/TracingDiagnosticMethodCollection.cs → src/SkyApm.Core/Diagnostics/TracingDiagnosticMethodCollection.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -20,7 +20,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace SkyWalking.Diagnostics
+namespace SkyApm.Diagnostics
 {
     internal class TracingDiagnosticMethodCollection : IEnumerable<TracingDiagnosticMethod>
     {

src/SkyWalking.Core/Diagnostics/TracingDiagnosticObserver.cs → src/SkyApm.Core/Diagnostics/TracingDiagnosticObserver.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,9 +18,9 @@
 
 using System;
 using System.Collections.Generic;
-using SkyWalking.Logging;
+using SkyApm.Logging;
 
-namespace SkyWalking.Diagnostics
+namespace SkyApm.Diagnostics
 {
     internal class TracingDiagnosticObserver : IObserver<KeyValuePair<string, object>>
     {

src/SkyWalking.Core/Diagnostics/TracingDiagnosticProcessorObserver.cs → src/SkyApm.Core/Diagnostics/TracingDiagnosticProcessorObserver.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,10 +19,10 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using SkyWalking.Common;
-using SkyWalking.Logging;
+using SkyApm.Logging;
+using SkyApm.Common;
 
-namespace SkyWalking.Diagnostics
+namespace SkyApm.Diagnostics
 {
     public class TracingDiagnosticProcessorObserver : IObserver<DiagnosticListener>
     {

src/SkyWalking.Core/InstrumentStartup.cs → src/SkyApm.Core/InstrumentStartup.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -22,10 +22,10 @@ using System.Diagnostics;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using SkyWalking.Diagnostics;
-using SkyWalking.Logging;
+using SkyApm.Diagnostics;
+using SkyApm.Logging;
 
-namespace SkyWalking
+namespace SkyApm
 {
     public class InstrumentStartup : IInstrumentStartup
     {

src/SkyWalking.Core/Logging/NullLogger.cs → src/SkyApm.Core/Logging/NullLogger.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System;
 
-namespace SkyWalking.Logging
+namespace SkyApm.Logging
 {
     internal class NullLogger : ILogger
     {

src/SkyWalking.Core/Logging/NullLoggerFactory.cs → src/SkyApm.Core/Logging/NullLoggerFactory.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System;
 
-namespace SkyWalking.Logging
+namespace SkyApm.Logging
 {
     public class NullLoggerFactory : ILoggerFactory
     {

src/SkyWalking.Core/RuntimeEnvironment.cs → src/SkyApm.Core/RuntimeEnvironment.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -17,9 +17,9 @@
  */
 
 using System;
-using SkyWalking.Common;
+using SkyApm.Common;
 
-namespace SkyWalking
+namespace SkyApm
 {
     public class RuntimeEnvironment : IRuntimeEnvironment
     {

src/SkyWalking.Core/Sampling/RandomSamplingInterceptor.cs → src/SkyApm.Core/Sampling/RandomSamplingInterceptor.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -17,10 +17,10 @@
  */
 
 using System;
-using SkyWalking.Config;
-using SkyWalking.Tracing;
+using SkyApm.Config;
+using SkyApm.Tracing;
 
-namespace SkyWalking.Sampling
+namespace SkyApm.Sampling
 {
     public class RandomSamplingInterceptor : ISamplingInterceptor
     {

src/SkyWalking.Core/Sampling/SimpleCountSamplingInterceptor.cs → src/SkyApm.Core/Sampling/SimpleCountSamplingInterceptor.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,12 +19,12 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using SkyWalking.Common;
-using SkyWalking.Config;
-using SkyWalking.Logging;
-using SkyWalking.Tracing;
+using SkyApm.Common;
+using SkyApm.Config;
+using SkyApm.Logging;
+using SkyApm.Tracing;
 
-namespace SkyWalking.Sampling
+namespace SkyApm.Sampling
 {
     public class SimpleCountSamplingInterceptor : ExecutionService, ISamplingInterceptor
     {

src/SkyWalking.Core/Service/PingService.cs → src/SkyApm.Core/Service/PingService.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,11 +19,11 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using SkyWalking.Config;
-using SkyWalking.Logging;
-using SkyWalking.Transport;
+using SkyApm.Config;
+using SkyApm.Logging;
+using SkyApm.Transport;
 
-namespace SkyWalking.Service
+namespace SkyApm.Service
 {
     public class PingService : ExecutionService
     {

src/SkyWalking.Core/Service/RegisterService.cs → src/SkyApm.Core/Service/RegisterService.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -20,12 +20,12 @@ using System;
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
-using SkyWalking.Common;
-using SkyWalking.Config;
-using SkyWalking.Logging;
-using SkyWalking.Transport;
+using SkyApm.Common;
+using SkyApm.Config;
+using SkyApm.Logging;
+using SkyApm.Transport;
 
-namespace SkyWalking.Service
+namespace SkyApm.Service
 {
     public class RegisterService : ExecutionService
     {

src/SkyWalking.Core/Service/SegmentReportService.cs → src/SkyApm.Core/Service/SegmentReportService.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,11 +19,11 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using SkyWalking.Config;
-using SkyWalking.Logging;
-using SkyWalking.Transport;
+using SkyApm.Config;
+using SkyApm.Logging;
+using SkyApm.Transport;
 
-namespace SkyWalking.Service
+namespace SkyApm.Service
 {
     public class SegmentReportService : ExecutionService
     {

src/SkyWalking.Core/Service/ServiceDiscoveryV5Service.cs → src/SkyApm.Core/Service/ServiceDiscoveryV5Service.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -20,30 +20,30 @@ using System;
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
-using SkyWalking.Common;
-using SkyWalking.Config;
-using SkyWalking.Logging;
-using SkyWalking.Transport;
+using SkyApm.Common;
+using SkyApm.Config;
+using SkyApm.Logging;
+using SkyApm.Transport;
 
-namespace SkyWalking.Service
+namespace SkyApm.Service
 {
     public class ServiceDiscoveryV5Service : ExecutionService
     {
         private readonly InstrumentConfig _config;
         private readonly TransportConfig _transportConfig;
-        private readonly ISkyWalkingClientV5 _skyWalkingClient;
+        private readonly ISkyApmClientV5 skyApmClient;
 
         protected override TimeSpan DueTime { get; } = TimeSpan.Zero;
 
         protected override TimeSpan Period { get; } = TimeSpan.FromSeconds(30);
 
-        public ServiceDiscoveryV5Service(IConfigAccessor configAccessor, ISkyWalkingClientV5 skyWalkingClient,
+        public ServiceDiscoveryV5Service(IConfigAccessor configAccessor, ISkyApmClientV5 skyApmClient,
             IRuntimeEnvironment runtimeEnvironment, ILoggerFactory loggerFactory)
             : base(runtimeEnvironment, loggerFactory)
         {
             _config = configAccessor.Get<InstrumentConfig>();
             _transportConfig = configAccessor.Get<TransportConfig>();
-            _skyWalkingClient = skyWalkingClient;
+            this.skyApmClient = skyApmClient;
         }
 
         protected override async Task ExecuteAsync(CancellationToken cancellationToken)
@@ -61,7 +61,7 @@ namespace SkyWalking.Service
             if (!RuntimeEnvironment.ServiceId.HasValue)
             {
                 var value = await Polling(3,
-                    () => _skyWalkingClient.RegisterApplicationAsync(_config.ServiceName ?? _config.ApplicationCode, cancellationToken),
+                    () => skyApmClient.RegisterApplicationAsync(_config.ServiceName ?? _config.ApplicationCode, cancellationToken),
                     cancellationToken);
                 if (value.HasValue && RuntimeEnvironment is RuntimeEnvironment environment)
                 {
@@ -83,7 +83,7 @@ namespace SkyWalking.Service
                     ProcessNo = Process.GetCurrentProcess().Id
                 };
                 var value = await Polling(3,
-                    () => _skyWalkingClient.RegisterApplicationInstanceAsync(RuntimeEnvironment.ServiceId.Value,
+                    () => skyApmClient.RegisterApplicationInstanceAsync(RuntimeEnvironment.ServiceId.Value,
                         RuntimeEnvironment.InstanceId,
                         DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(), osInfoRequest, cancellationToken),
                     cancellationToken);
@@ -120,7 +120,7 @@ namespace SkyWalking.Service
             {
                 try
                 {
-                    await _skyWalkingClient.HeartbeatAsync(RuntimeEnvironment.ServiceInstanceId.Value,
+                    await skyApmClient.HeartbeatAsync(RuntimeEnvironment.ServiceInstanceId.Value,
                         DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(), cancellationToken);
                     Logger.Debug($"Heartbeat at {DateTimeOffset.UtcNow}.");
                 }

src/SkyWalking.Core/SkyWalking.Core.csproj → src/SkyApm.Core/SkyApm.Core.csproj

@@ -11,12 +11,12 @@
     <RootNamespace>SkyWalking</RootNamespace>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\SkyWalking.Abstractions\SkyWalking.Abstractions.csproj" />
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.5.1" />
     <PackageReference Include="System.Memory" Version="4.5.2" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SkyApm.Abstractions\SkyApm.Abstractions.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

src/SkyWalking.Core/Tracing/Carrier.cs → src/SkyApm.Core/Tracing/Carrier.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,9 +16,9 @@
  *
  */
 
-using SkyWalking.Common;
+using SkyApm.Common;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public class Carrier : ICarrier
     {

src/SkyWalking.Core/Tracing/CarrierPropagator.cs → src/SkyApm.Core/Tracing/CarrierPropagator.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,9 +18,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using SkyWalking.Tracing.Segments;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public class CarrierPropagator : ICarrierPropagator
     {

src/SkyWalking.Core/Tracing/EntrySegmentContextAccessor.cs → src/SkyApm.Core/Tracing/EntrySegmentContextAccessor.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -17,9 +17,9 @@
  */
 
 using System.Threading;
-using SkyWalking.Tracing.Segments;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public class EntrySegmentContextAccessor : IEntrySegmentContextAccessor
     {

src/SkyWalking.Core/Tracing/ExitSegmentContextAccessor.cs → src/SkyApm.Core/Tracing/ExitSegmentContextAccessor.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -17,9 +17,9 @@
  */
 
 using System.Threading;
-using SkyWalking.Tracing.Segments;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public class ExitSegmentContextAccessor : IExitSegmentContextAccessor
     {

src/SkyWalking.Core/Tracing/LocalSegmentContextAccessor.cs → src/SkyApm.Core/Tracing/LocalSegmentContextAccessor.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,9 +18,9 @@
 
 using System.Collections.Concurrent;
 using System.Threading;
-using SkyWalking.Tracing.Segments;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public class LocalSegmentContextAccessor : ILocalSegmentContextAccessor
     {

src/SkyWalking.Core/Tracing/NullableCarrier.cs → src/SkyApm.Core/Tracing/NullableCarrier.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,9 +16,9 @@
  *
  */
 
-using SkyWalking.Common;
+using SkyApm.Common;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public class NullableCarrier : ICarrier
     {

src/SkyWalking.Core/Tracing/SamplerChainBuilder.cs → src/SkyApm.Core/Tracing/SamplerChainBuilder.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -21,7 +21,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public class SamplerChainBuilder : ISamplerChainBuilder
     {

src/SkyWalking.Core/Tracing/SegmentContextFactory.cs → src/SkyApm.Core/Tracing/SegmentContextFactory.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,10 +18,10 @@
 
 using System;
 using System.Linq;
-using SkyWalking.Common;
-using SkyWalking.Tracing.Segments;
+using SkyApm.Common;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public class SegmentContextFactory : ISegmentContextFactory
     {

src/SkyWalking.Core/Tracing/Sw3CarrierFormatter.cs → src/SkyApm.Core/Tracing/Sw3CarrierFormatter.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -17,10 +17,10 @@
  */
 
 using System.Linq;
-using SkyWalking.Common;
-using SkyWalking.Config;
+using SkyApm.Common;
+using SkyApm.Config;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public class Sw3CarrierFormatter : ICarrierFormatter
     {

src/SkyWalking.Core/Tracing/Sw6CarrierFormatter.cs → src/SkyApm.Core/Tracing/Sw6CarrierFormatter.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -17,10 +17,10 @@
  */
 
 using System.Linq;
-using SkyWalking.Common;
-using SkyWalking.Config;
+using SkyApm.Common;
+using SkyApm.Config;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public class Sw6CarrierFormatter : ICarrierFormatter
     {

src/SkyWalking.Core/Tracing/TextCarrierHeaderCollection.cs → src/SkyApm.Core/Tracing/TextCarrierHeaderCollection.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,7 +19,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public class TextCarrierHeaderCollection : ICarrierHeaderCollection
     {

src/SkyWalking.Core/Tracing/TracingContext.cs → src/SkyApm.Core/Tracing/TracingContext.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -17,11 +17,11 @@
  */
 
 using System;
-using SkyWalking.Common;
-using SkyWalking.Tracing.Segments;
-using SkyWalking.Transport;
+using SkyApm.Common;
+using SkyApm.Tracing.Segments;
+using SkyApm.Transport;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public class TracingContext : ITracingContext
     {

src/SkyWalking.Core/Tracing/UniqueIdGenerator.cs → src/SkyApm.Core/Tracing/UniqueIdGenerator.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,7 +19,7 @@
 using System;
 using System.Threading;
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public class UniqueIdGenerator : IUniqueIdGenerator
     {

src/SkyWalking.Core/Tracing/UniqueIdParser.cs → src/SkyApm.Core/Tracing/UniqueIdParser.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.Tracing
+namespace SkyApm.Tracing
 {
     public class UniqueIdParser : IUniqueIdParser
     {

src/SkyWalking.Core/Transport/AsyncQueueSegmentDispatcher.cs → src/SkyApm.Core/Transport/AsyncQueueSegmentDispatcher.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -20,11 +20,11 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using SkyWalking.Config;
-using SkyWalking.Logging;
-using SkyWalking.Tracing.Segments;
+using SkyApm.Config;
+using SkyApm.Logging;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Transport
+namespace SkyApm.Transport
 {
     public class AsyncQueueSegmentDispatcher : ISegmentDispatcher
     {

src/SkyWalking.Core/Transport/SegmentContextMapper.cs → src/SkyApm.Core/Transport/SegmentContextMapper.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -17,10 +17,10 @@
  */
 
 using System.Collections.Generic;
-using SkyWalking.Tracing;
-using SkyWalking.Tracing.Segments;
+using SkyApm.Tracing;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Transport
+namespace SkyApm.Transport
 {
     public class SegmentContextMapper : ISegmentContextMapper
     {

src/SkyWalking.Diagnostics.AspNetCore/HostingDiagnosticProcessor.cs → src/SkyApm.Diagnostics.AspNetCore/HostingDiagnosticProcessor.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -20,12 +20,12 @@ using System;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Mvc.Abstractions;
-using SkyWalking.Common;
-using SkyWalking.Diagnostics;
-using SkyWalking.Tracing;
-using SkyWalking.Tracing.Segments;
+using SkyApm.Common;
+using SkyApm.Diagnostics;
+using SkyApm.Tracing;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.AspNetCore.Diagnostics
+namespace SkyApm.AspNetCore.Diagnostics
 {
     public class HostingTracingDiagnosticProcessor : ITracingDiagnosticProcessor
     {

src/SkyWalking.Diagnostics.AspNetCore/HttpContextDiagnosticStrings.cs → src/SkyApm.Diagnostics.AspNetCore/HttpContextDiagnosticStrings.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.AspNetCore.Diagnostics
+namespace SkyApm.AspNetCore.Diagnostics
 {
     internal static class HttpContextDiagnosticStrings
     {

src/SkyWalking.Diagnostics.AspNetCore/HttpRequestCarrierHeaderCollection.cs → src/SkyApm.Diagnostics.AspNetCore/HttpRequestCarrierHeaderCollection.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -20,9 +20,9 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Http;
-using SkyWalking.Tracing;
+using SkyApm.Tracing;
 
-namespace SkyWalking.AspNetCore.Diagnostics
+namespace SkyApm.AspNetCore.Diagnostics
 {
     public class HttpRequestCarrierHeaderCollection : ICarrierHeaderCollection
     {

src/SkyWalking.Diagnostics.AspNetCore/SkyWalking.Diagnostics.AspNetCore.csproj → src/SkyApm.Diagnostics.AspNetCore/SkyApm.Diagnostics.AspNetCore.csproj

@@ -11,13 +11,12 @@
         <PackageTags>SkyWalking;APM;Diagnostics;AspNetCore</PackageTags>
         <PackageReleaseNotes>
         </PackageReleaseNotes>
-        <RootNamespace>SkyWalking.Diagnostics.AspNetCore</RootNamespace>
+        <RootNamespace>SkyApm.Diagnostics.AspNetCore</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\SkyWalking.Abstractions\SkyWalking.Abstractions.csproj" />
-        <ProjectReference Include="..\SkyWalking.Core\SkyWalking.Core.csproj" />
-        <ProjectReference Include="..\SkyWalking.Utilities.DependencyInjection\SkyWalking.Utilities.DependencyInjection.csproj" />
+        <ProjectReference Include="..\SkyApm.Abstractions\SkyApm.Abstractions.csproj" />
+        <ProjectReference Include="..\SkyApm.Utilities.DependencyInjection\SkyApm.Utilities.DependencyInjection.csproj" />
     </ItemGroup>
 
     <ItemGroup>

src/SkyWalking.Diagnostics.AspNetCore/SkyWalkingBuilderExtensions.cs → src/SkyApm.Diagnostics.AspNetCore/SkyWalkingBuilderExtensions.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -17,13 +17,13 @@
  */
 
 using Microsoft.Extensions.DependencyInjection;
-using SkyWalking.Utilities.DependencyInjection;
+using SkyApm.Utilities.DependencyInjection;
 
-namespace SkyWalking.AspNetCore.Diagnostics
+namespace SkyApm.AspNetCore.Diagnostics
 {
     public static class SkyWalkingBuilderExtensions
     {
-        public static SkyWalkingExtensions AddAspNetCoreHosting(this SkyWalkingExtensions extensions)
+        public static SkyApmExtensions AddAspNetCoreHosting(this SkyApmExtensions extensions)
         {
             extensions.Services.AddSingleton<ITracingDiagnosticProcessor, HostingTracingDiagnosticProcessor>();
             return extensions;

src/SkyWalking.Diagnostics.CAP/CapCarrierHeaderCollection.cs → src/SkyApm.Diagnostics.CAP/CapCarrierHeaderCollection.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,9 +19,9 @@
 using System.Collections;
 using System.Collections.Generic;
 using DotNetCore.CAP.Diagnostics;
-using SkyWalking.Tracing;
+using SkyApm.Tracing;
 
-namespace SkyWalking.Diagnostics.CAP
+namespace SkyApm.Diagnostics.CAP
 {
     public class CapCarrierHeaderCollection : ICarrierHeaderCollection
     {

src/SkyWalking.Diagnostics.CAP/CapDiagnosticProcessor.cs → src/SkyApm.Diagnostics.CAP/CapDiagnosticProcessor.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,10 +19,10 @@
 using System;
 using DotNetCore.CAP.Diagnostics;
 using DotNetCore.CAP.Infrastructure;
-using SkyWalking.Tracing;
+using SkyApm.Tracing;
 using CapEvents = DotNetCore.CAP.Diagnostics.CapDiagnosticListenerExtensions;
 
-namespace SkyWalking.Diagnostics.CAP
+namespace SkyApm.Diagnostics.CAP
 {
     /// <summary>
     ///  Diagnostics processor for listen and process releted events of CAP.

src/SkyWalking.Diagnostics.CAP/SkyWalking.Diagnostics.CAP.csproj → src/SkyApm.Diagnostics.CAP/SkyApm.Diagnostics.CAP.csproj

@@ -12,7 +12,7 @@
     <AssemblyName>$(PackagePrefix).Diagnostics.CAP</AssemblyName>
     <PackageId>$(PackagePrefix).Diagnostics.CAP</PackageId>
     <PackageTags>SkyWalking;APM;CAP</PackageTags>
-    <RootNamespace>SkyWalking.Diagnostics.CAP</RootNamespace>
+    <RootNamespace>SkyApm.Diagnostics.CAP</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
@@ -20,9 +20,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SkyWalking.Abstractions\SkyWalking.Abstractions.csproj" />
-    <ProjectReference Include="..\SkyWalking.Core\SkyWalking.Core.csproj" />
-    <ProjectReference Include="..\SkyWalking.Utilities.DependencyInjection\SkyWalking.Utilities.DependencyInjection.csproj" />
+    <ProjectReference Include="..\SkyApm.Abstractions\SkyApm.Abstractions.csproj" />
+    <ProjectReference Include="..\SkyApm.Core\SkyApm.Core.csproj" />
+    <ProjectReference Include="..\SkyApm.Utilities.DependencyInjection\SkyApm.Utilities.DependencyInjection.csproj" />
   </ItemGroup>
 
 </Project>

src/SkyWalking.Diagnostics.CAP/SkyWalkingBuilderExtensions.cs → src/SkyApm.Diagnostics.CAP/SkyWalkingBuilderExtensions.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,13 +18,13 @@
 
 using System;
 using Microsoft.Extensions.DependencyInjection;
-using SkyWalking.Utilities.DependencyInjection;
+using SkyApm.Utilities.DependencyInjection;
 
-namespace SkyWalking.Diagnostics.CAP
+namespace SkyApm.Diagnostics.CAP
 {
     public static class SkyWalkingBuilderExtensions
     {
-        public static SkyWalkingExtensions AddCap(this SkyWalkingExtensions extensions)
+        public static SkyApmExtensions AddCap(this SkyApmExtensions extensions)
         {
             if (extensions == null)
             {

src/SkyWalking.Diagnostics.EntityFrameworkCore.Npgsql/DatabaseProviderBuilderExtensions.cs → src/SkyApm.Diagnostics.EntityFrameworkCore.Npgsql/DatabaseProviderBuilderExtensions.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using Microsoft.Extensions.DependencyInjection;
 
-namespace SkyWalking.Diagnostics.EntityFrameworkCore
+namespace SkyApm.Diagnostics.EntityFrameworkCore
 {
     public static class DatabaseProviderBuilderExtensions
     {

src/SkyWalking.Diagnostics.EntityFrameworkCore.Npgsql/NpgsqlEntityFrameworkCoreSpanMetadataProvider.cs → src/SkyApm.Diagnostics.EntityFrameworkCore.Npgsql/NpgsqlEntityFrameworkCoreSpanMetadataProvider.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System.Data.Common;
 
-namespace SkyWalking.Diagnostics.EntityFrameworkCore
+namespace SkyApm.Diagnostics.EntityFrameworkCore
 {
     public class NpgsqlEntityFrameworkCoreSpanMetadataProvider : IEntityFrameworkCoreSpanMetadataProvider
     {

src/SkyWalking.Diagnostics.EntityFrameworkCore.Npgsql/SkyWalking.Diagnostics.EntityFrameworkCore.Npgsql.csproj → src/SkyApm.Diagnostics.EntityFrameworkCore.Npgsql/SkyApm.Diagnostics.EntityFrameworkCore.Npgsql.csproj

@@ -9,13 +9,13 @@
     <PackageId>$(PackagePrefix).Diagnostics.EntityFrameworkCore.Npgsql</PackageId>
     <PackageTags>SkyWalking;APM;EntityFrameworkCore;EF</PackageTags>
     <Description>$(PackagePrefix).Diagnostics.EntityFrameworkCore.Npgsql notifies of EF requests.</Description>
-    <RootNamespace>SkyWalking.Diagnostics.EntityFrameworkCore</RootNamespace>
+    <RootNamespace>SkyApm.Diagnostics.EntityFrameworkCore</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SkyWalking.Abstractions\SkyWalking.Abstractions.csproj" />
-    <ProjectReference Include="..\SkyWalking.Core\SkyWalking.Core.csproj" />
-    <ProjectReference Include="..\SkyWalking.Diagnostics.EntityFrameworkCore\SkyWalking.Diagnostics.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\SkyWalking.Utilities.DependencyInjection\SkyWalking.Utilities.DependencyInjection.csproj" />
+    <ProjectReference Include="..\SkyApm.Abstractions\SkyApm.Abstractions.csproj" />
+    <ProjectReference Include="..\SkyApm.Diagnostics.EntityFrameworkCore\SkyApm.Diagnostics.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\SkyApm.Core\SkyApm.Core.csproj" />
+    <ProjectReference Include="..\SkyApm.Utilities.DependencyInjection\SkyApm.Utilities.DependencyInjection.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.0.0" PrivateAssets="All" />

src/SkyWalking.Diagnostics.EntityFrameworkCore.Pomelo.MySql/DatabaseProviderBuilderExtensions.cs → src/SkyApm.Diagnostics.EntityFrameworkCore.Pomelo.MySql/DatabaseProviderBuilderExtensions.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using Microsoft.Extensions.DependencyInjection;
 
-namespace SkyWalking.Diagnostics.EntityFrameworkCore
+namespace SkyApm.Diagnostics.EntityFrameworkCore
 {
     public static class DatabaseProviderBuilderExtensions
     {

src/SkyWalking.Diagnostics.EntityFrameworkCore.Pomelo.MySql/MySqlEntityFrameworkCoreSpanMetadataProvider.cs → src/SkyApm.Diagnostics.EntityFrameworkCore.Pomelo.MySql/MySqlEntityFrameworkCoreSpanMetadataProvider.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System.Data.Common;
 
-namespace SkyWalking.Diagnostics.EntityFrameworkCore
+namespace SkyApm.Diagnostics.EntityFrameworkCore
 {
     public class MySqlEntityFrameworkCoreSpanMetadataProvider : IEntityFrameworkCoreSpanMetadataProvider
     {

src/SkyWalking.Diagnostics.EntityFrameworkCore.Pomelo.MySql/SkyWalking.Diagnostics.EntityFrameworkCore.Pomelo.MySql.csproj → src/SkyApm.Diagnostics.EntityFrameworkCore.Pomelo.MySql/SkyApm.Diagnostics.EntityFrameworkCore.Pomelo.MySql.csproj

@@ -9,13 +9,13 @@
     <PackageId>$(PackagePrefix).Diagnostics.EntityFrameworkCore.Pomelo.MySql</PackageId>
     <PackageTags>SkyWalking;APM;EntityFrameworkCore;EF</PackageTags>
     <Description>$(PackagePrefix).Diagnostics.EntityFrameworkCore.Pomelo.MySql notifies of EF requests.</Description>
-    <RootNamespace>SkyWalking.Diagnostics.EntityFrameworkCore</RootNamespace>
+    <RootNamespace>SkyApm.Diagnostics.EntityFrameworkCore</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SkyWalking.Abstractions\SkyWalking.Abstractions.csproj" />
-    <ProjectReference Include="..\SkyWalking.Core\SkyWalking.Core.csproj" />
-    <ProjectReference Include="..\SkyWalking.Diagnostics.EntityFrameworkCore\SkyWalking.Diagnostics.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\SkyWalking.Utilities.DependencyInjection\SkyWalking.Utilities.DependencyInjection.csproj" />
+    <ProjectReference Include="..\SkyApm.Abstractions\SkyApm.Abstractions.csproj" />
+    <ProjectReference Include="..\SkyApm.Diagnostics.EntityFrameworkCore\SkyApm.Diagnostics.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\SkyApm.Core\SkyApm.Core.csproj" />
+    <ProjectReference Include="..\SkyApm.Utilities.DependencyInjection\SkyApm.Utilities.DependencyInjection.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.4" PrivateAssets="All" />

src/SkyWalking.Diagnostics.EntityFrameworkCore.Sqlite/DatabaseProviderBuilderExtensions.cs → src/SkyApm.Diagnostics.EntityFrameworkCore.Sqlite/DatabaseProviderBuilderExtensions.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using Microsoft.Extensions.DependencyInjection;
 
-namespace SkyWalking.Diagnostics.EntityFrameworkCore
+namespace SkyApm.Diagnostics.EntityFrameworkCore
 {
     public static class DatabaseProviderBuilderExtensions
     {

src/SkyWalking.Diagnostics.EntityFrameworkCore.Sqlite/SkyWalking.Diagnostics.EntityFrameworkCore.Sqlite.csproj → src/SkyApm.Diagnostics.EntityFrameworkCore.Sqlite/SkyApm.Diagnostics.EntityFrameworkCore.Sqlite.csproj

@@ -9,13 +9,13 @@
     <PackageId>$(PackagePrefix).Diagnostics.EntityFrameworkCore.Sqlite</PackageId>
     <PackageTags>SkyWalking;APM;EntityFrameworkCore;EF</PackageTags>
     <Description>$(PackagePrefix).Diagnostics.EntityFrameworkCore.Sqlite notifies of EF requests.</Description>
-    <RootNamespace>SkyWalking.Diagnostics.EntityFrameworkCore</RootNamespace>
+    <RootNamespace>SkyApm.Diagnostics.EntityFrameworkCore</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SkyWalking.Abstractions\SkyWalking.Abstractions.csproj" />
-    <ProjectReference Include="..\SkyWalking.Core\SkyWalking.Core.csproj" />
-    <ProjectReference Include="..\SkyWalking.Diagnostics.EntityFrameworkCore\SkyWalking.Diagnostics.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\SkyWalking.Utilities.DependencyInjection\SkyWalking.Utilities.DependencyInjection.csproj" />
+    <ProjectReference Include="..\SkyApm.Abstractions\SkyApm.Abstractions.csproj" />
+    <ProjectReference Include="..\SkyApm.Diagnostics.EntityFrameworkCore\SkyApm.Diagnostics.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\SkyApm.Core\SkyApm.Core.csproj" />
+    <ProjectReference Include="..\SkyApm.Utilities.DependencyInjection\SkyApm.Utilities.DependencyInjection.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.0" PrivateAssets="All" />

src/SkyWalking.Diagnostics.EntityFrameworkCore.Sqlite/SqliteEntityFrameworkCoreSpanMetadataProvider.cs → src/SkyApm.Diagnostics.EntityFrameworkCore.Sqlite/SqliteEntityFrameworkCoreSpanMetadataProvider.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System.Data.Common;
 
-namespace SkyWalking.Diagnostics.EntityFrameworkCore
+namespace SkyApm.Diagnostics.EntityFrameworkCore
 {
     public class SqliteEntityFrameworkCoreSpanMetadataProvider : IEntityFrameworkCoreSpanMetadataProvider
     {

src/SkyWalking.Diagnostics.EntityFrameworkCore/DatabaseProviderBuilder.cs → src/SkyApm.Diagnostics.EntityFrameworkCore/DatabaseProviderBuilder.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using Microsoft.Extensions.DependencyInjection;
 
-namespace SkyWalking.Diagnostics.EntityFrameworkCore
+namespace SkyApm.Diagnostics.EntityFrameworkCore
 {
     public class DatabaseProviderBuilder
     {

src/SkyWalking.Diagnostics.EntityFrameworkCore/EntityFrameworkCoreDiagnosticProcessor.cs → src/SkyApm.Diagnostics.EntityFrameworkCore/EntityFrameworkCoreDiagnosticProcessor.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -22,9 +22,9 @@ using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Storage.Internal;
-using SkyWalking.Tracing;
+using SkyApm.Tracing;
 
-namespace SkyWalking.Diagnostics.EntityFrameworkCore
+namespace SkyApm.Diagnostics.EntityFrameworkCore
 {
     public class EntityFrameworkCoreTracingDiagnosticProcessor : ITracingDiagnosticProcessor
     {

src/SkyWalking.Diagnostics.EntityFrameworkCore/EntityFrameworkCoreSegmentContextFactory.cs → src/SkyApm.Diagnostics.EntityFrameworkCore/EntityFrameworkCoreSegmentContextFactory.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,11 +18,11 @@
 
 using System.Collections.Generic;
 using System.Data.Common;
-using SkyWalking.Common;
-using SkyWalking.Tracing;
-using SkyWalking.Tracing.Segments;
+using SkyApm.Common;
+using SkyApm.Tracing;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Diagnostics.EntityFrameworkCore
+namespace SkyApm.Diagnostics.EntityFrameworkCore
 {
     public class EntityFrameworkCoreSegmentContextFactory : IEntityFrameworkCoreSegmentContextFactory
     {

src/SkyWalking.Diagnostics.EntityFrameworkCore/IEntityFrameworkCoreSegmentContextFactory.cs → src/SkyApm.Diagnostics.EntityFrameworkCore/IEntityFrameworkCoreSegmentContextFactory.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -17,9 +17,9 @@
  */
 
 using System.Data.Common;
-using SkyWalking.Tracing.Segments;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Diagnostics.EntityFrameworkCore
+namespace SkyApm.Diagnostics.EntityFrameworkCore
 {
     public interface IEntityFrameworkCoreSegmentContextFactory
     {

src/SkyWalking.Diagnostics.EntityFrameworkCore/IEntityFrameworkCoreSpanMetadataProvider.cs → src/SkyApm.Diagnostics.EntityFrameworkCore/IEntityFrameworkCoreSpanMetadataProvider.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System.Data.Common;
 
-namespace SkyWalking.Diagnostics.EntityFrameworkCore
+namespace SkyApm.Diagnostics.EntityFrameworkCore
 {
     public interface IEntityFrameworkCoreSpanMetadataProvider
     {

src/SkyWalking.Diagnostics.EntityFrameworkCore/SkyWalking.Diagnostics.EntityFrameworkCore.csproj → src/SkyApm.Diagnostics.EntityFrameworkCore/SkyApm.Diagnostics.EntityFrameworkCore.csproj

@@ -8,16 +8,16 @@
     <AssemblyTitle>$(PackagePrefix).Diagnostics.EntityFrameworkCore</AssemblyTitle>
     <PackageId>$(PackagePrefix).Diagnostics.EntityFrameworkCore</PackageId>
     <PackageTags>$(PackagePrefix);APM;EntityFrameworkCore;EF</PackageTags>
-    <Description>SkyWalking.Diagnostics.EntityFrameworkCore notifies of EF requests.</Description>
-    <RootNamespace>SkyWalking.Diagnostics.EntityFrameworkCore</RootNamespace>
+    <Description>SkyApm.Diagnostics.EntityFrameworkCore notifies of EF requests.</Description>
+    <RootNamespace>SkyApm.Diagnostics.EntityFrameworkCore</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.0" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SkyWalking.Abstractions\SkyWalking.Abstractions.csproj" />
-    <ProjectReference Include="..\SkyWalking.Core\SkyWalking.Core.csproj" />
-    <ProjectReference Include="..\SkyWalking.Utilities.DependencyInjection\SkyWalking.Utilities.DependencyInjection.csproj" />
+    <ProjectReference Include="..\SkyApm.Abstractions\SkyApm.Abstractions.csproj" />
+    <ProjectReference Include="..\SkyApm.Core\SkyApm.Core.csproj" />
+    <ProjectReference Include="..\SkyApm.Utilities.DependencyInjection\SkyApm.Utilities.DependencyInjection.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file

src/SkyWalking.Diagnostics.EntityFrameworkCore/SkyWalkingBuilderExtensions.cs → src/SkyApm.Diagnostics.EntityFrameworkCore/SkyWalkingBuilderExtensions.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,13 +18,13 @@
 
 using System;
 using Microsoft.Extensions.DependencyInjection;
-using SkyWalking.Utilities.DependencyInjection;
+using SkyApm.Utilities.DependencyInjection;
 
-namespace SkyWalking.Diagnostics.EntityFrameworkCore
+namespace SkyApm.Diagnostics.EntityFrameworkCore
 {
     public static class SkyWalkingBuilderExtensions
     {
-        public static SkyWalkingExtensions AddEntityFrameworkCore(this SkyWalkingExtensions extensions, Action<DatabaseProviderBuilder> optionAction)
+        public static SkyApmExtensions AddEntityFrameworkCore(this SkyApmExtensions extensions, Action<DatabaseProviderBuilder> optionAction)
         {
             if (extensions == null)
             {

src/SkyWalking.Diagnostics.HttpClient/HttpClientDiagnosticProcessor.cs → src/SkyApm.Diagnostics.HttpClient/HttpClientDiagnosticProcessor.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,11 +18,11 @@
 
 using System;
 using System.Net.Http;
-using SkyWalking.Common;
-using SkyWalking.Tracing;
-using SkyWalking.Tracing.Segments;
+using SkyApm.Common;
+using SkyApm.Tracing;
+using SkyApm.Tracing.Segments;
 
-namespace SkyWalking.Diagnostics.HttpClient
+namespace SkyApm.Diagnostics.HttpClient
 {
     public class HttpClientTracingDiagnosticProcessor : ITracingDiagnosticProcessor
     {

src/SkyWalking.Diagnostics.HttpClient/HttpClientICarrierHeaderCollection.cs → src/SkyApm.Diagnostics.HttpClient/HttpClientICarrierHeaderCollection.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -20,9 +20,9 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Net.Http;
-using SkyWalking.Tracing;
+using SkyApm.Tracing;
 
-namespace SkyWalking.Diagnostics.HttpClient
+namespace SkyApm.Diagnostics.HttpClient
 {
     public class HttpClientICarrierHeaderCollection : ICarrierHeaderCollection
     {

src/SkyWalking.Diagnostics.HttpClient/SkyWalking.Diagnostics.HttpClient.csproj → src/SkyApm.Diagnostics.HttpClient/SkyApm.Diagnostics.HttpClient.csproj

@@ -11,12 +11,12 @@
     <PackageTags>SkyWalking;APM;Diagnostics;HttpClient</PackageTags>
     <PackageReleaseNotes>
     </PackageReleaseNotes>
-    <RootNamespace>SkyWalking.Diagnostics.HttpClient</RootNamespace>
+    <RootNamespace>SkyApm.Diagnostics.HttpClient</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SkyWalking.Abstractions\SkyWalking.Abstractions.csproj" />
-    <ProjectReference Include="..\SkyWalking.Core\SkyWalking.Core.csproj" />
-    <ProjectReference Include="..\SkyWalking.Utilities.DependencyInjection\SkyWalking.Utilities.DependencyInjection.csproj" />
+    <ProjectReference Include="..\SkyApm.Abstractions\SkyApm.Abstractions.csproj" />
+    <ProjectReference Include="..\SkyApm.Core\SkyApm.Core.csproj" />
+    <ProjectReference Include="..\SkyApm.Utilities.DependencyInjection\SkyApm.Utilities.DependencyInjection.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file

src/SkyWalking.Diagnostics.HttpClient/SkyWalkingBuilderExtensions.cs → src/SkyApm.Diagnostics.HttpClient/SkyWalkingBuilderExtensions.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,13 +18,13 @@
 
 using System;
 using Microsoft.Extensions.DependencyInjection;
-using SkyWalking.Utilities.DependencyInjection;
+using SkyApm.Utilities.DependencyInjection;
 
-namespace SkyWalking.Diagnostics.HttpClient
+namespace SkyApm.Diagnostics.HttpClient
 {
     public static class SkyWalkingBuilderExtensions
     {
-        public static SkyWalkingExtensions AddHttpClient(this SkyWalkingExtensions extensions)
+        public static SkyApmExtensions AddHttpClient(this SkyApmExtensions extensions)
         {
             if (extensions == null)
             {

src/SkyWalking.Diagnostics.SqlClient/SkyWalking.Diagnostics.SqlClient.csproj → src/SkyApm.Diagnostics.SqlClient/SkyApm.Diagnostics.SqlClient.csproj

@@ -9,12 +9,12 @@
     <PackageTags>SkyWalking;APM;Diagnostics;SqlClient</PackageTags>
     <PackageReleaseNotes>
     </PackageReleaseNotes>
-    <RootNamespace>SkyWalking.Diagnostics.SqlClient</RootNamespace>
+    <RootNamespace>SkyApm.Diagnostics.SqlClient</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SkyWalking.Abstractions\SkyWalking.Abstractions.csproj" />
-    <ProjectReference Include="..\SkyWalking.Core\SkyWalking.Core.csproj" />
-    <ProjectReference Include="..\SkyWalking.Utilities.DependencyInjection\SkyWalking.Utilities.DependencyInjection.csproj" />
+    <ProjectReference Include="..\SkyApm.Abstractions\SkyApm.Abstractions.csproj" />
+    <ProjectReference Include="..\SkyApm.Core\SkyApm.Core.csproj" />
+    <ProjectReference Include="..\SkyApm.Utilities.DependencyInjection\SkyApm.Utilities.DependencyInjection.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="System.Data.SqlClient" Version="4.4.0" PrivateAssets="All" />

src/SkyWalking.Diagnostics.SqlClient/SkyWalkingBuilderExtensions.cs → src/SkyApm.Diagnostics.SqlClient/SkyWalkingBuilderExtensions.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,13 +18,13 @@
 
 using System;
 using Microsoft.Extensions.DependencyInjection;
-using SkyWalking.Utilities.DependencyInjection;
+using SkyApm.Utilities.DependencyInjection;
 
-namespace SkyWalking.Diagnostics.SqlClient
+namespace SkyApm.Diagnostics.SqlClient
 {
     public static class SkyWalkingBuilderExtensions
     {
-        public static SkyWalkingExtensions AddSqlClient(this SkyWalkingExtensions extensions)
+        public static SkyApmExtensions AddSqlClient(this SkyApmExtensions extensions)
         {
             if (extensions == null)
             {

src/SkyWalking.Diagnostics.SqlClient/SqlClientDiagnosticProcessor.cs → src/SkyApm.Diagnostics.SqlClient/SqlClientDiagnosticProcessor.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,9 +19,9 @@
 using System;
 using System.Data.SqlClient;
 using System.Linq;
-using SkyWalking.Tracing;
+using SkyApm.Tracing;
 
-namespace SkyWalking.Diagnostics.SqlClient
+namespace SkyApm.Diagnostics.SqlClient
 {
     public class SqlClientTracingDiagnosticProcessor : ITracingDiagnosticProcessor
     {

src/SkyWalking.Diagnostics.SqlClient/SqlClientDiagnosticStrings.cs → src/SkyApm.Diagnostics.SqlClient/SqlClientDiagnosticStrings.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.Diagnostics.SqlClient
+namespace SkyApm.Diagnostics.SqlClient
 {
     internal static class SqlClientDiagnosticStrings
     {

cli/SkyWalking.DotNet.CLI/AppCommandResolver.cs → src/SkyApm.DotNet.CLI/AppCommandResolver.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,7 +19,7 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.CommandLineUtils;
 
-namespace SkyWalking.DotNet.CLI
+namespace SkyApm.DotNet.CLI
 {
     public class AppCommandResolver: IAppCommandResolver
     {

cli/SkyWalking.DotNet.CLI/Command/ConfigCommand.cs → src/SkyApm.DotNet.CLI/Command/ConfigCommand.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -21,12 +21,12 @@ using System.Collections.Generic;
 using System.IO;
 using Microsoft.Extensions.CommandLineUtils;
 using Newtonsoft.Json;
-using SkyWalking.DotNet.CLI.Extensions;
+using SkyApm.DotNet.CLI.Extensions;
 
 // ReSharper disable ConvertToLocalFunction
 
 // ReSharper disable StringLiteralTypo
-namespace SkyWalking.DotNet.CLI.Command
+namespace SkyApm.DotNet.CLI.Command
 {
     public class ConfigCommand : IAppCommand
     {
@@ -34,34 +34,36 @@ namespace SkyWalking.DotNet.CLI.Command
 
         public void Execute(CommandLineApplication command)
         {
-            command.Description = "Generate config file for SkyWalking .NET Core Agent";
+            command.Description = "Generate config file for SkyApm-dotnet Agent.";
             command.HelpOption();
 
-            var applicationCodeArgument = command.Argument(
-                "Application Code", "[Required]The application name in SkyWalking");
-            var gRPCServerArgument = command.Argument(
-                "gRPC collector", "[Optional]The gRPC collector address, default 'localhost:11800'");
+            var serviceNameArgument = command.Argument(
+                "service", "[Required] The ServiceName in SkyAPM");
+            var serversArgument = command.Argument(
+                "servers", "[Optional] The servers address, default 'localhost:11800'");
 
-            var environmentOption = command.Option("-e|--Environment", "Follow the app's environment.Framework-defined values include Development, Staging, and Production",
+            var environmentOption = command.Option("-e|--Environment",
+                "Follow the app's environment.Framework-defined values include Development, Staging, and Production",
                 CommandOptionType.SingleValue);
 
             command.OnExecute(() =>
             {
-                if (string.IsNullOrEmpty(applicationCodeArgument.Value))
+                if (string.IsNullOrEmpty(serviceNameArgument.Value))
                 {
-                    Console.WriteLine("Invalid ApplicationCode");
+                    Console.WriteLine("Invalid ServiceName.");
                     return 1;
                 }
 
-                Generate(applicationCodeArgument.Value, gRPCServerArgument.Value, environmentOption.Value());
+                Generate(serviceNameArgument.Value, serversArgument.Value, environmentOption.Value());
 
                 return 0;
             });
         }
 
-        private void Generate(string applicationCode, string gRPCServer, string environment)
+        private void Generate(string serviceName, string servers, string environment)
         {
-            Func<string, string> configFileName = env => string.IsNullOrEmpty(env) ? "skywalking.json" : $"skywalking.{env}.json";
+            Func<string, string> configFileName =
+                env => string.IsNullOrEmpty(env) ? "skyapm.json" : $"skyapm.{env}.json";
 
             var configFilePath = Path.Combine(Directory.GetCurrentDirectory(), configFileName(environment));
 
@@ -73,38 +75,47 @@ namespace SkyWalking.DotNet.CLI.Command
                 return;
             }
 
-            gRPCServer = gRPCServer ?? "localhost:11800";
+            servers = servers ?? "localhost:11800";
 
             var gRPCConfig = new Dictionary<string, dynamic>
             {
-                {"Servers", gRPCServer},
-                {"Timeout", 2000},
-                {"ConnectTimeout", 10000}
+                {"Servers", servers},
+                {"Timeout", 10000},
+                {"ConnectTimeout", 10000},
+                {"ReportTimeout", 600000}
             };
 
             var transportConfig = new Dictionary<string, dynamic>
             {
                 {"Interval", 3000},
-                {"PendingSegmentLimit", 30000},
-                {"PendingSegmentTimeout", 1000},
+                {"ProtocolVersion", "v6"},
+                {"QueueSize", 30000},
+                {"BatchSize", 3000},
                 {"gRPC", gRPCConfig}
             };
 
             var loggingConfig = new Dictionary<string, dynamic>
             {
                 {"Level", "Information"},
-                {"FilePath", Path.Combine("logs", "SkyWalking-{Date}.log")}
+                {"FilePath", Path.Combine("logs", "skyapm-{Date}.log")}
             };
 
             var samplingConfig = new Dictionary<string, dynamic>
             {
-                {"SamplePer3Secs", -1}
+                {"SamplePer3Secs", -1},
+                {"Percentage", -1d}
             };
 
-            var swConfig = new Dictionary<string, dynamic>
+            var HeaderVersionsConfig = new string[]
             {
-                {"ApplicationCode", applicationCode},
-                {"SpanLimitPerSegment", 300},
+                "sw6"
+            };
+
+            var skyAPMConfig = new Dictionary<string, dynamic>
+            {
+                {"ServiceName", serviceName},
+                {"Namespace", string.Empty},
+                {"HeaderVersions", HeaderVersionsConfig},
                 {"Sampling", samplingConfig},
                 {"Logging", loggingConfig},
                 {"Transport", transportConfig}
@@ -112,7 +123,7 @@ namespace SkyWalking.DotNet.CLI.Command
 
             var rootConfig = new Dictionary<string, dynamic>
             {
-                {"SkyWalking", swConfig}
+                {"SkyWalking", skyAPMConfig}
             };
 
             using (var writer = configFile.CreateText())

cli/SkyWalking.DotNet.CLI/Command/InstallCommand.cs → src/SkyApm.DotNet.CLI/Command/InstallCommand.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -21,17 +21,17 @@ using System.Collections.Generic;
 using System.IO;
 using Microsoft.Extensions.CommandLineUtils;
 using Newtonsoft.Json;
-using SkyWalking.DotNet.CLI.Extensions;
-using SkyWalking.DotNet.CLI.Utils;
+using SkyApm.DotNet.CLI.Utils;
+using SkyApm.DotNet.CLI.Extensions;
 
 // ReSharper disable CommentTypo
 // ReSharper disable IdentifierTypo
 // ReSharper disable StringLiteralTypo
-namespace SkyWalking.DotNet.CLI.Command
+namespace SkyApm.DotNet.CLI.Command
 {
     public class InstallCommand : IAppCommand
     {
-        private const string git_hosting_startup = "https://github.com/OpenSkywalking/skywalking-netcore-hosting-startup.git";
+        private const string git_hosting_startup = "https://github.com/SkyAPM/skywalking-netcore-hosting-startup.git";
         private const string manifest_proj = "SkyWalking.Runtime.Store.csproj";
         private const string invalid_node_name = "SkyWalking.Runtime.Store/1.0.0";
 

cli/SkyWalking.DotNet.CLI/CommandLineApplicationFactory.cs → src/SkyApm.DotNet.CLI/CommandLineApplicationFactory.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -17,9 +17,9 @@
  */
 
 using Microsoft.Extensions.CommandLineUtils;
-using SkyWalking.DotNet.CLI.Extensions;
+using SkyApm.DotNet.CLI.Extensions;
 
-namespace SkyWalking.DotNet.CLI
+namespace SkyApm.DotNet.CLI
 {
     public class CommandLineApplicationFactory
     {
@@ -34,10 +34,10 @@ namespace SkyWalking.DotNet.CLI
         {
             var app = new CommandLineApplication
             {
-                Name = "dotnet skywalking",
-                FullName = "Apache SkyWalking .NET Core Agent Command Line Tool",
+                Name = "skyapm",
+                FullName = "SkyAPM .NET Core Agent Command Line Tool",
                 Description =
-                    "Install SkyWalking .NET Core Agent and generate config file."
+                    "Generate SkyAPM config file."
             };
 
             app.HelpOption();

cli/SkyWalking.DotNet.CLI/Extensions/CommandLineApplicationExtensions.cs → src/SkyApm.DotNet.CLI/Extensions/CommandLineApplicationExtensions.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -20,7 +20,7 @@ using System;
 using System.Reflection;
 using Microsoft.Extensions.CommandLineUtils;
 
-namespace SkyWalking.DotNet.CLI.Extensions
+namespace SkyApm.DotNet.CLI.Extensions
 {
     internal static class CommandLineApplicationExtensions
     {

cli/SkyWalking.DotNet.CLI/Extensions/ProcessExtensions.cs → src/SkyApm.DotNet.CLI/Extensions/ProcessExtensions.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System.Diagnostics;
 
-namespace SkyWalking.DotNet.CLI.Extensions
+namespace SkyApm.DotNet.CLI.Extensions
 {
     public static class ProcessExtensions
     {

cli/SkyWalking.DotNet.CLI/IAppCommand.cs → src/SkyApm.DotNet.CLI/IAppCommand.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using Microsoft.Extensions.CommandLineUtils;
 
-namespace SkyWalking.DotNet
+namespace SkyApm.DotNet
 {
     public interface IAppCommand
     {

cli/SkyWalking.DotNet.CLI/IAppCommandResolver.cs → src/SkyApm.DotNet.CLI/IAppCommandResolver.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using Microsoft.Extensions.CommandLineUtils;
 
-namespace SkyWalking.DotNet.CLI
+namespace SkyApm.DotNet.CLI
 {
     public interface IAppCommandResolver
     {

cli/SkyWalking.DotNet.CLI/Program.cs → src/SkyApm.DotNet.CLI/Program.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,10 +19,10 @@
 using System;
 using Microsoft.Extensions.CommandLineUtils;
 using Microsoft.Extensions.DependencyInjection;
-using SkyWalking.DotNet.CLI.Command;
-using SkyWalking.DotNet.CLI.Utils;
+using SkyApm.DotNet.CLI.Command;
+using SkyApm.DotNet.CLI.Utils;
 
-namespace SkyWalking.DotNet.CLI
+namespace SkyApm.DotNet.CLI
 {
     class Program
     {
@@ -61,7 +61,7 @@ namespace SkyWalking.DotNet.CLI
             services.AddSingleton<PlatformInformationArbiter>();
             services.AddSingleton<DirectoryProvider>();
             services.AddSingleton<ShellProcessFactory>();
-            services.AddSingleton<IAppCommand, InstallCommand>();
+            //services.AddSingleton<IAppCommand, InstallCommand>();
             services.AddSingleton<IAppCommand, ConfigCommand>();
             return services.BuildServiceProvider();
         }

cli/SkyWalking.DotNet.CLI/SkyWalking.DotNet.CLI.csproj → src/SkyApm.DotNet.CLI/SkyApm.DotNet.CLI.csproj

@@ -8,7 +8,7 @@
         <AssemblyName>$(PackagePrefix).DotNet.CLI</AssemblyName>
         <PackageId>$(PackagePrefix).DotNet.CLI</PackageId>
         <PackageTags>SkyWalking;APM;CLI</PackageTags>
-        <RootNamespace>SkyWalking.DotNet.CLI</RootNamespace>
+        <RootNamespace>SkyApm.DotNet.CLI</RootNamespace>
         <OutputType>Exe</OutputType>
         <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
         <IsPackable>true</IsPackable>

cli/SkyWalking.DotNet.CLI/Utils/ConsoleUtils.cs → src/SkyApm.DotNet.CLI/Utils/ConsoleUtils.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,7 +18,7 @@
 
 using System;
 
-namespace SkyWalking.DotNet.CLI.Utils
+namespace SkyApm.DotNet.CLI.Utils
 {
     public static class ConsoleUtils
     {
@@ -32,11 +32,6 @@ namespace SkyWalking.DotNet.CLI.Utils
 
         public static void WriteWelcome()
         {
-            Console.WriteLine("*********************************************************************");
-            Console.WriteLine("*                                                                   *");
-            Console.WriteLine("*                   Welcome to Apache SkyWalking                    *");
-            Console.WriteLine("*                                                                   *");
-            Console.WriteLine("*********************************************************************");
         }
     }
 }
\ No newline at end of file

cli/SkyWalking.DotNet.CLI/Utils/DirectoryProvider.cs → src/SkyApm.DotNet.CLI/Utils/DirectoryProvider.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -22,7 +22,7 @@ using System.IO;
 // ReSharper disable IdentifierTypo
 // ReSharper disable MemberCanBePrivate.Global
 
-namespace SkyWalking.DotNet.CLI.Utils
+namespace SkyApm.DotNet.CLI.Utils
 {
     public class DirectoryProvider
     {

cli/SkyWalking.DotNet.CLI/Utils/PlatformInformationArbiter.cs → src/SkyApm.DotNet.CLI/Utils/PlatformInformationArbiter.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,7 +19,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace SkyWalking.DotNet.CLI.Utils
+namespace SkyApm.DotNet.CLI.Utils
 {
     public class PlatformInformationArbiter
     {

cli/SkyWalking.DotNet.CLI/Utils/ShellProcess.cs → src/SkyApm.DotNet.CLI/Utils/ShellProcess.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,7 +19,7 @@
 using System;
 using System.Diagnostics;
 
-namespace SkyWalking.DotNet.CLI.Utils
+namespace SkyApm.DotNet.CLI.Utils
 {
     public class ShellProcess
     {

cli/SkyWalking.DotNet.CLI/Utils/ShellProcessFactory.cs → src/SkyApm.DotNet.CLI/Utils/ShellProcessFactory.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.DotNet.CLI.Utils
+namespace SkyApm.DotNet.CLI.Utils
 {
     public class ShellProcessFactory
     {

src/SkyWalking.Transport.Grpc.Protocol/SkyWalking.Transport.Grpc.Protocol.csproj → src/SkyApm.Transport.Grpc.Protocol/SkyApm.Transport.Grpc.Protocol.csproj

@@ -11,6 +11,7 @@
         <PackageReleaseNotes>
         </PackageReleaseNotes>
         <TargetFramework>netstandard2.0</TargetFramework>
+        <RootNamespace>SkyApm.Transport.Grpc.Protocol</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>

src/SkyWalking.Transport.Grpc/Common/AsyncLock.cs → src/SkyApm.Transport.Grpc/Common/AsyncLock.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -20,7 +20,7 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace SkyWalking.Transport.Grpc.Common
+namespace SkyApm.Transport.Grpc.Common
 {
     internal class AsyncLock
     {

src/SkyWalking.Transport.Grpc/Common/Call.cs → src/SkyApm.Transport.Grpc/Common/Call.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,9 +18,9 @@
 
 using System;
 using System.Threading.Tasks;
-using SkyWalking.Logging;
+using SkyApm.Logging;
 
-namespace SkyWalking.Transport.Grpc.Common
+namespace SkyApm.Transport.Grpc.Common
 {
     internal class Call
     {

src/SkyWalking.Transport.Grpc/Common/ExceptionHelpers.cs → src/SkyApm.Transport.Grpc/Common/ExceptionHelpers.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,7 +16,7 @@
  *
  */
 
-namespace SkyWalking.Transport.Grpc.Common
+namespace SkyApm.Transport.Grpc.Common
 {
     internal static class ExceptionHelpers
     {

src/SkyWalking.Transport.Grpc/Common/SegmentV5Helpers.cs → src/SkyApm.Transport.Grpc/Common/SegmentV5Helpers.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,10 +19,10 @@
 using System;
 using System.Linq;
 using Google.Protobuf;
-using SkyWalking.Common;
+using SkyApm.Common;
 using SkyWalking.NetworkProtocol;
 
-namespace SkyWalking.Transport.Grpc.Common
+namespace SkyApm.Transport.Grpc.Common
 {
     internal static class SegmentV5Helpers
     {

src/SkyWalking.Transport.Grpc/Common/SegmentV6Helpers.cs → src/SkyApm.Transport.Grpc/Common/SegmentV6Helpers.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,10 +19,10 @@
 using System;
 using System.Linq;
 using Google.Protobuf;
-using SkyWalking.Common;
+using SkyApm.Common;
 using SkyWalking.NetworkProtocol;
 
-namespace SkyWalking.Transport.Grpc.Common
+namespace SkyApm.Transport.Grpc.Common
 {
     internal static class SegmentV6Helpers
     {

src/SkyWalking.Transport.Grpc/ConnectionManager.cs → src/SkyApm.Transport.Grpc/ConnectionManager.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -20,11 +20,11 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Grpc.Core;
-using SkyWalking.Config;
-using SkyWalking.Logging;
-using SkyWalking.Transport.Grpc.Common;
+using SkyApm.Config;
+using SkyApm.Logging;
+using SkyApm.Transport.Grpc.Common;
 
-namespace SkyWalking.Transport.Grpc
+namespace SkyApm.Transport.Grpc
 {
     public class ConnectionManager
     {

src/SkyWalking.Transport.Grpc/GrpcConfig.cs → src/SkyApm.Transport.Grpc/GrpcConfig.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -17,9 +17,9 @@
  */
 
 using System;
-using SkyWalking.Config;
+using SkyApm.Config;
 
-namespace SkyWalking.Transport.Grpc
+namespace SkyApm.Transport.Grpc
 {
     [Config("SkyWalking", "Transport", "gRPC")]
     public class GrpcConfig

src/SkyWalking.Transport.Grpc/SegmentReporter.cs → src/SkyApm.Transport.Grpc/SegmentReporter.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,12 +19,12 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using SkyWalking.Config;
-using SkyWalking.Logging;
-using SegmentReporterV5 = SkyWalking.Transport.Grpc.V5.SegmentReporter;
-using SegmentReporterV6 = SkyWalking.Transport.Grpc.V6.SegmentReporter;
+using SkyApm.Config;
+using SkyApm.Logging;
+using SegmentReporterV5 = SkyApm.Transport.Grpc.V5.SegmentReporter;
+using SegmentReporterV6 = SkyApm.Transport.Grpc.V6.SegmentReporter;
 
-namespace SkyWalking.Transport.Grpc
+namespace SkyApm.Transport.Grpc
 {
     public class SegmentReporter : ISegmentReporter
     {
@@ -36,8 +36,8 @@ namespace SkyWalking.Transport.Grpc
             ILoggerFactory loggerFactory)
         {
             _transportConfig = configAccessor.Get<TransportConfig>();
-            _segmentReporterV5 = new SegmentReporterV5(connectionManager, configAccessor, loggerFactory);
-            _segmentReporterV6 = new SegmentReporterV6(connectionManager, configAccessor, loggerFactory);
+            _segmentReporterV5 = new V5.SegmentReporter(connectionManager, configAccessor, loggerFactory);
+            _segmentReporterV6 = new V6.SegmentReporter(connectionManager, configAccessor, loggerFactory);
         }
 
         public async Task ReportAsync(IReadOnlyCollection<SegmentRequest> segmentRequests,

src/SkyWalking.Transport.Grpc/SkyWalking.Transport.Grpc.csproj → src/SkyApm.Transport.Grpc/SkyApm.Transport.Grpc.csproj

@@ -10,11 +10,12 @@
         <PackageReleaseNotes>
         </PackageReleaseNotes>
         <TargetFramework>netstandard2.0</TargetFramework>
+        <RootNamespace>SkyApm.Transport.Grpc</RootNamespace>
     </PropertyGroup>
     
     <ItemGroup>
-      <ProjectReference Include="..\SkyWalking.Abstractions\SkyWalking.Abstractions.csproj" />
-      <ProjectReference Include="..\SkyWalking.Transport.Grpc.Protocol\SkyWalking.Transport.Grpc.Protocol.csproj" />
+      <ProjectReference Include="..\SkyApm.Abstractions\SkyApm.Abstractions.csproj" />
+      <ProjectReference Include="..\SkyApm.Transport.Grpc.Protocol\SkyApm.Transport.Grpc.Protocol.csproj" />
     </ItemGroup>
 
 </Project>

src/SkyWalking.Transport.Grpc/V5/SegmentReporter.cs → src/SkyApm.Transport.Grpc/V5/SegmentReporter.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -21,12 +21,12 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
-using SkyWalking.Config;
-using SkyWalking.Logging;
+using SkyApm.Config;
+using SkyApm.Logging;
 using SkyWalking.NetworkProtocol;
-using SkyWalking.Transport.Grpc.Common;
+using SkyApm.Transport.Grpc.Common;
 
-namespace SkyWalking.Transport.Grpc.V5
+namespace SkyApm.Transport.Grpc.V5
 {
     internal class SegmentReporter : ISegmentReporter
     {

src/SkyWalking.Transport.Grpc/V5/SkyWalkingClientV5.cs → src/SkyApm.Transport.Grpc/V5/SkyApmClientV5.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,26 +19,26 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using SkyWalking.Common;
-using SkyWalking.Config;
-using SkyWalking.Logging;
+using SkyApm.Common;
+using SkyApm.Config;
+using SkyApm.Logging;
 using SkyWalking.NetworkProtocol;
-using SkyWalking.Transport.Grpc.Common;
+using SkyApm.Transport.Grpc.Common;
 
-namespace SkyWalking.Transport.Grpc.V5
+namespace SkyApm.Transport.Grpc.V5
 {
-    public class SkyWalkingClientV5 : ISkyWalkingClientV5
+    public class SkyApmClientV5 : ISkyApmClientV5
     {
         private readonly ConnectionManager _connectionManager;
         private readonly ILogger _logger;
         private readonly GrpcConfig _config;
 
-        public SkyWalkingClientV5(ConnectionManager connectionManager, IConfigAccessor configAccessor,
+        public SkyApmClientV5(ConnectionManager connectionManager, IConfigAccessor configAccessor,
             ILoggerFactory loggerFactory)
         {
             _connectionManager = connectionManager;
             _config = configAccessor.Get<GrpcConfig>();
-            _logger = loggerFactory.CreateLogger(typeof(SkyWalkingClientV5));
+            _logger = loggerFactory.CreateLogger(typeof(SkyApmClientV5));
         }
 
         public async Task<NullableValue> RegisterApplicationAsync(string applicationCode,

src/SkyWalking.Transport.Grpc/V6/ConnectService.cs → src/SkyApm.Transport.Grpc/V6/ConnectService.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,9 +19,9 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using SkyWalking.Logging;
+using SkyApm.Logging;
 
-namespace SkyWalking.Transport.Grpc.V6
+namespace SkyApm.Transport.Grpc.V6
 {
     public class ConnectService: ExecutionService
     {

src/SkyWalking.Transport.Grpc/V6/PingCaller.cs → src/SkyApm.Transport.Grpc/V6/PingCaller.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,12 +19,12 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using SkyWalking.Config;
-using SkyWalking.Logging;
+using SkyApm.Config;
+using SkyApm.Logging;
 using SkyWalking.NetworkProtocol;
-using SkyWalking.Transport.Grpc.Common;
+using SkyApm.Transport.Grpc.Common;
 
-namespace SkyWalking.Transport.Grpc.V6
+namespace SkyApm.Transport.Grpc.V6
 {
     public class PingCaller : IPingCaller
     {

src/SkyWalking.Transport.Grpc/V6/SegmentReporter.cs → src/SkyApm.Transport.Grpc/V6/SegmentReporter.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -21,12 +21,12 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
-using SkyWalking.Config;
-using SkyWalking.Logging;
+using SkyApm.Config;
+using SkyApm.Logging;
 using SkyWalking.NetworkProtocol;
-using SkyWalking.Transport.Grpc.Common;
+using SkyApm.Transport.Grpc.Common;
 
-namespace SkyWalking.Transport.Grpc.V6
+namespace SkyApm.Transport.Grpc.V6
 {
     internal class SegmentReporter : ISegmentReporter
     {

src/SkyWalking.Transport.Grpc/V6/ServiceRegister.cs → src/SkyApm.Transport.Grpc/V6/ServiceRegister.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,13 +19,13 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using SkyWalking.Common;
-using SkyWalking.Config;
-using SkyWalking.Logging;
+using SkyApm.Common;
+using SkyApm.Config;
+using SkyApm.Logging;
 using SkyWalking.NetworkProtocol;
-using SkyWalking.Transport.Grpc.Common;
+using SkyApm.Transport.Grpc.Common;
 
-namespace SkyWalking.Transport.Grpc.V6
+namespace SkyApm.Transport.Grpc.V6
 {
     public class ServiceRegister : IServiceRegister
     {

src/SkyWalking.Utilities.Configuration/ConfigAccessor.cs → src/SkyApm.Utilities.Configuration/ConfigAccessor.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -20,14 +20,15 @@ using System;
 using System.Linq.Expressions;
 using System.Reflection;
 using Microsoft.Extensions.Configuration;
-using SkyWalking.Config;
+using SkyApm.Config;
 
 // ReSharper disable StringLiteralTypo
-namespace SkyWalking.Utilities.Configuration
+namespace SkyApm.Utilities.Configuration
 {
     public class ConfigAccessor : IConfigAccessor
     {
-        private const string CONFIG_FILE_PATH = "SKYWALKING__CONFIG__PATH";
+        private const string CONFIG_FILE_PATH_COMPATIBLE = "SKYWALKING__CONFIG__PATH";
+        private const string CONFIG_FILE_PATH = "SKYAPM__CONFIG__PATH";
         private readonly IConfiguration _configuration;
 
         public ConfigAccessor(IEnvironmentProvider environmentProvider)
@@ -39,7 +40,14 @@ namespace SkyWalking.Utilities.Configuration
             builder.AddJsonFile("appsettings.json", true).AddJsonFile($"appsettings.{environmentProvider.EnvironmentName}.json", true);
 
             builder.AddJsonFile("skywalking.json", true).AddJsonFile($"skywalking.{environmentProvider.EnvironmentName}.json", true);
+            
+            builder.AddJsonFile("skyapm.json", true).AddJsonFile($"skyapm.{environmentProvider.EnvironmentName}.json", true);
 
+            if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable(CONFIG_FILE_PATH_COMPATIBLE)))
+            {
+                builder.AddJsonFile(Environment.GetEnvironmentVariable(CONFIG_FILE_PATH_COMPATIBLE), false);
+            }
+            
             if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable(CONFIG_FILE_PATH)))
             {
                 builder.AddJsonFile(Environment.GetEnvironmentVariable(CONFIG_FILE_PATH), false);

src/SkyWalking.Utilities.Configuration/ConfigSectionExtensions.cs → src/SkyApm.Utilities.Configuration/ConfigSectionExtensions.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -17,9 +17,9 @@
  */
 
 using System.Linq;
-using SkyWalking.Config;
+using SkyApm.Config;
 
-namespace SkyWalking.Utilities.Configuration
+namespace SkyApm.Utilities.Configuration
 {
     public static class ConfigSectionExtensions
     {

src/SkyWalking.Utilities.Configuration/ConfigurationBuilderExtensions.cs → src/SkyApm.Utilities.Configuration/ConfigurationBuilderExtensions.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,22 +19,22 @@
 using System.Collections.Generic;
 using System.IO;
 using Microsoft.Extensions.Configuration;
-using SkyWalking.Config;
+using SkyApm.Config;
 
-namespace SkyWalking.Utilities.Configuration
+namespace SkyApm.Utilities.Configuration
 {
     internal static class ConfigurationBuilderExtensions
     {
         public static IConfigurationBuilder AddSkyWalkingDefaultConfig(this IConfigurationBuilder builder)
         {
-            var defaultLogFile = Path.Combine("logs", "SkyWalking-{Date}.log");
+            var defaultLogFile = Path.Combine("logs", "skyapm-{Date}.log");
             var defaultConfig = new Dictionary<string, string>
             {
                 {"SkyWalking:Namespace", string.Empty},
-                {"SkyWalking:ApplicationCode", "My_Service"},
-                {"SkyWalking:SpanLimitPerSegment", "300"},
+                {"SkyWalking:ServiceName", "My_Service"},
                 {"SkyWalking:HeaderVersions:0", HeaderVersions.SW6},
                 {"SkyWalking:Sampling:SamplePer3Secs", "-1"},
+                {"SkyWalking:Sampling:Percentage", "-1"},
                 {"SkyWalking:Logging:Level", "Information"},
                 {"SkyWalking:Logging:FilePath", defaultLogFile},
                 {"SkyWalking:Transport:Interval", "3000"},

src/SkyWalking.Utilities.Configuration/SkyWalking.Utilities.Configuration.csproj → src/SkyApm.Utilities.Configuration/SkyApm.Utilities.Configuration.csproj

-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\..\build\common.props" />
     <PropertyGroup>
@@ -10,11 +10,8 @@
         <PackageTags>SkyWalking;APM;Diagnostics</PackageTags>
         <PackageReleaseNotes>
         </PackageReleaseNotes>
-        <RootNamespace>SkyWalking.Utilities.Configuration</RootNamespace>
+        <RootNamespace>SkyApm.Utilities.Configuration</RootNamespace>
     </PropertyGroup>
-    <ItemGroup>
-      <ProjectReference Include="..\SkyWalking.Abstractions\SkyWalking.Abstractions.csproj" />
-    </ItemGroup>
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.0.0" />
@@ -22,4 +19,8 @@
         <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
     </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\SkyApm.Abstractions\SkyApm.Abstractions.csproj" />
+    </ItemGroup>
 </Project>

src/SkyWalking.Utilities.DependencyInjection/ServiceCollectionExtensions.cs → src/SkyApm.Utilities.DependencyInjection/ServiceCollectionExtensions.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,13 +18,13 @@
 
 using Microsoft.Extensions.DependencyInjection;
 
-namespace SkyWalking.Utilities.DependencyInjection
+namespace SkyApm.Utilities.DependencyInjection
 {
     public static class ServiceCollectionExtensions
     {
-        public static SkyWalkingExtensions AddSkyWalkingExtensions(this IServiceCollection services)
+        public static SkyApmExtensions AddSkyApmExtensions(this IServiceCollection services)
         {
-            return new SkyWalkingExtensions(services);
+            return new SkyApmExtensions(services);
         }
     }
 }
\ No newline at end of file

src/SkyWalking.Utilities.DependencyInjection/SkyWalking.Utilities.DependencyInjection.csproj → src/SkyApm.Utilities.DependencyInjection/SkyApm.Utilities.DependencyInjection.csproj

@@ -9,10 +9,10 @@
     <PackageTags>SkyWalking;APM;Diagnostics</PackageTags>
     <PackageReleaseNotes>
     </PackageReleaseNotes>
-    <RootNamespace>SkyWalking.Utilities.DependencyInjection</RootNamespace>
+    <RootNamespace>SkyApm.Utilities.DependencyInjection</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SkyWalking.Core\SkyWalking.Core.csproj" />
+    <ProjectReference Include="..\SkyApm.Core\SkyApm.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />

src/SkyWalking.Utilities.DependencyInjection/SkyWalkingExtensions.cs → src/SkyApm.Utilities.DependencyInjection/SkyApmExtensions.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,13 +18,13 @@
 
 using Microsoft.Extensions.DependencyInjection;
 
-namespace SkyWalking.Utilities.DependencyInjection
+namespace SkyApm.Utilities.DependencyInjection
 {
-    public class SkyWalkingExtensions
+    public class SkyApmExtensions
     {
         public IServiceCollection Services { get; }
 
-        public SkyWalkingExtensions(IServiceCollection services)
+        public SkyApmExtensions(IServiceCollection services)
         {
             Services = services;
         }

src/SkyWalking.Utilities.Logging/DefaultLogger.cs → src/SkyApm.Utilities.Logging/DefaultLogger.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -18,12 +18,12 @@
 
 using System;
 using Microsoft.Extensions.Logging;
-using ILogger = SkyWalking.Logging.ILogger;
+using ILogger = SkyApm.Logging.ILogger;
 using MSLogger = Microsoft.Extensions.Logging.ILogger;
 
-namespace SkyWalking.Utilities.Logging
+namespace SkyApm.Utilities.Logging
 {
-    internal class DefaultLogger : ILogger
+    internal class DefaultLogger : SkyApm.Logging.ILogger
     {
         private readonly MSLogger _readLogger;
 

src/SkyWalking.Utilities.Logging/DefaultLoggerFactory.cs → src/SkyApm.Utilities.Logging/DefaultLoggerFactory.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -19,15 +19,15 @@
 using System;
 using Serilog;
 using Serilog.Events;
-using SkyWalking.Config;
 using Microsoft.Extensions.Logging;
-using ILogger = SkyWalking.Logging.ILogger;
-using ILoggerFactory = SkyWalking.Logging.ILoggerFactory;
+using SkyApm.Config;
+using ILogger = SkyApm.Logging.ILogger;
+using ILoggerFactory = SkyApm.Logging.ILoggerFactory;
 using MSLoggerFactory = Microsoft.Extensions.Logging.LoggerFactory;
 
-namespace SkyWalking.Utilities.Logging
+namespace SkyApm.Utilities.Logging
 {
-    public class DefaultLoggerFactory : ILoggerFactory
+    public class DefaultLoggerFactory : SkyApm.Logging.ILoggerFactory
     {
         private const string outputTemplate =
             @"{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{ServiceName}] [{Level}] {SourceContext} : {Message}{NewLine}{Exception}";
@@ -51,7 +51,7 @@ namespace SkyWalking.Utilities.Logging
                     31, null, false, false, TimeSpan.FromMilliseconds(500)).CreateLogger());
         }
 
-        public ILogger CreateLogger(Type type)
+        public SkyApm.Logging.ILogger CreateLogger(Type type)
         {
             return new DefaultLogger(_loggerFactory.CreateLogger(type));
         }

src/SkyWalking.Utilities.Logging/LoggingConfig.cs → src/SkyApm.Utilities.Logging/LoggingConfig.cs

 /*
- * Licensed to the OpenSkywalking under one or more
+ * 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 OpenSkywalking licenses this file to You under the Apache License, Version 2.0
+ * 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
  *
@@ -16,9 +16,9 @@
  *
  */
 
-using SkyWalking.Config;
+using SkyApm.Config;
 
-namespace SkyWalking.Utilities.Logging
+namespace SkyApm.Utilities.Logging
 {
     [Config("SkyWalking", "Logging")]
     public class LoggingConfig

src/SkyWalking.Utilities.Logging/SkyWalking.Utilities.Logging.csproj → src/SkyApm.Utilities.Logging/SkyApm.Utilities.Logging.csproj

-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\..\build\common.props" />
     <PropertyGroup>
@@ -10,17 +10,17 @@
         <PackageTags>SkyWalking;APM;Diagnostics</PackageTags>
         <PackageReleaseNotes>
         </PackageReleaseNotes>
-        <RootNamespace>SkyWalking.Utilities.Logging</RootNamespace>
+        <RootNamespace>SkyApm.Utilities.Logging</RootNamespace>
     </PropertyGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\SkyWalking.Abstractions\SkyWalking.Abstractions.csproj" />
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
         <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
         <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
     </ItemGroup>
 
+    <ItemGroup>
+      <ProjectReference Include="..\SkyApm.Abstractions\SkyApm.Abstractions.csproj" />
+    </ItemGroup>
+
 </Project>

test/SkyWalking.Core.Tests/Diagnostics/FakeDiagnosticListener.cs

-using System.Diagnostics;
-
-namespace SkyWalking.Core.Tests.Diagnostics
-{
-    public class FakeDiagnosticListener : DiagnosticListener
-    {
-        public const string ListenerName = "SkyWalking.Core.Tests.Diagnostics";
-
-        public const string Executing = "Executing";
-
-        public const string Executed = "Executed";
-        
-        public FakeDiagnosticListener() : base(ListenerName)
-        {
-        }
-    }
-}
\ No newline at end of file

test/SkyWalking.Core.Tests/Diagnostics/FakeDiagnosticListenerData.cs

-using System;
-
-namespace SkyWalking.Core.Tests.Diagnostics
-{
-    public class FakeDiagnosticListenerData
-    {
-        public string Name { get; set; }
-        
-        public DateTime Timestamp { get; set; }
-    }
-}
\ No newline at end of file

test/SkyWalking.Core.Tests/Diagnostics/FakeSkyWalkingDiagnosticProcessor.cs

-using System;
-using SkyWalking.Diagnostics;
-using Xunit;
-    
-namespace SkyWalking.Core.Tests.Diagnostics
-{
-    public class FakeTracingDiagnosticProcessor : ITracingDiagnosticProcessor
-    {
-        public string ListenerName { get; } = FakeDiagnosticListener.ListenerName;
-        
-        public DateTime Timestamp { get; set; }
-
-        [DiagnosticName(FakeDiagnosticListener.Executing)]
-        public void Executing(
-            [PropertyAttribute(Name = "Name")] string eventName, 
-            [Property] DateTime Timestamp)
-        {
-            Assert.Equal("Executing", eventName);
-            this.Timestamp = Timestamp;
-        }
-
-        [DiagnosticName(FakeDiagnosticListener.Executed)]
-        public void Executed([Object] FakeDiagnosticListenerData data)
-        {
-            Assert.Equal("Executed", data.Name);
-            Timestamp = data.Timestamp;
-        }
-    }
-}
\ No newline at end of file

test/SkyWalking.Core.Tests/Diagnostics/TracingDiagnosticProcessorObserverTests.cs

-using System;
-using System.Diagnostics;
-using SkyWalking.Diagnostics;
-using SkyWalking.Logging;
-using Xunit;
-
-namespace SkyWalking.Core.Tests.Diagnostics
-{
-    public class TracingDiagnosticProcessorObserverTests
-    {
-        [Fact]
-        public void Property_Binder_Invoke_Test()
-        {
-            var listener = new FakeDiagnosticListener();
-            var fakeProcessor = new FakeTracingDiagnosticProcessor();
-            var observer = new TracingDiagnosticProcessorObserver(new ITracingDiagnosticProcessor[] {fakeProcessor},new NullLoggerFactory());
-            DiagnosticListener.AllListeners.Subscribe(observer);
-
-            var timeStamp = DateTime.Now;
-            listener.Write(FakeDiagnosticListener.Executing,
-                new
-                {
-                    Name = FakeDiagnosticListener.Executing,
-                    Timestamp = timeStamp
-                });
-
-            Assert.Equal(timeStamp, fakeProcessor.Timestamp);
-        }
-
-        [Fact]
-        public void Object_Binder_Invoke_Test()
-        {
-            var listener = new FakeDiagnosticListener();
-            var fakeProcessor = new FakeTracingDiagnosticProcessor();
-            var observer = new TracingDiagnosticProcessorObserver(new ITracingDiagnosticProcessor[] {fakeProcessor},
-                new NullLoggerFactory());
-            DiagnosticListener.AllListeners.Subscribe(observer);
-
-            var timeStamp = DateTime.Now;
-
-            listener.Write(FakeDiagnosticListener.Executed,
-                new FakeDiagnosticListenerData
-                {
-                    Name = FakeDiagnosticListener.Executed,
-                    Timestamp = timeStamp
-                });
-
-            Assert.Equal(timeStamp, fakeProcessor.Timestamp);
-        }
-    }
-}
\ No newline at end of file

test/SkyWalking.Core.Tests/SkyWalking.Core.Tests.csproj

-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\SkyWalking.Abstractions\SkyWalking.Abstractions.csproj" />
-    <ProjectReference Include="..\..\src\SkyWalking.Core\SkyWalking.Core.csproj" />
-  </ItemGroup>
-</Project>
\ No newline at end of file

test/SkyWalking.Core.Tests/Utils/AtomicIntegerTests.cs

-using System;
-using SkyWalking.Common;
-using Xunit;
-
-namespace SkyWalking.Core.Tests.Utils
-{
-    public class AtomicIntegerTests
-    {
-        [Fact]
-        public void Add_Test()
-        {
-            var atomicInteger = new AtomicInteger();
-            var result = atomicInteger.Add(2);
-            Assert.Equal(2, result);
-        }
-
-        [Fact]
-        public void Increment_Test()
-        {
-            var atomicInteger = new AtomicInteger(5);
-            var result = atomicInteger.Increment();
-            Assert.Equal(6, result);
-        }
-        
-        [Fact]
-        public void Decrement_Test()
-        {
-            var atomicInteger = new AtomicInteger(5);
-            var result = atomicInteger.Decrement();
-            Assert.Equal(4, result);
-        }
-
-        [Fact]
-        public void Operator_Add_Test()
-        {
-            var atomicInteger = new AtomicInteger(5);
-            var result = atomicInteger + 2;
-            Assert.Equal<int>(7, result);
-        }
-        
-        [Fact]
-        public void Operator_Sub_Test()
-        {
-            var atomicInteger = new AtomicInteger(5);
-            var result = atomicInteger - 2;
-            Assert.Equal<int>(3, result);
-        }
-
-        [Fact]
-        public void Equals_Test()
-        {
-            AtomicInteger atomicInteger = 5;
-            Assert.True(atomicInteger.Equals(5));
-        }
-        
-        [Fact]
-        public void Operator_Equals_Test()
-        {
-            AtomicInteger atomicInteger = 5;
-            Assert.True(atomicInteger == 5);
-            Assert.False(atomicInteger != 5);
-        }
-
-        [Fact]
-        public void Set_Value()
-        {
-            AtomicInteger atomicInteger = 5;
-            atomicInteger.Value = 10;
-            Assert.Equal(10, atomicInteger.Value);
-        }
-    }
-}
\ No newline at end of file