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).
+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" %>

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
     {