Merge branch 'master' of https://github.com/OpenSkywalking/skywalking-netcore

docs/skywalking.json.cn.md

+# SkyWalking Config 配置说明
+
+# ApplicationCode
+
+应用名称
+
+# SpanLimitPerSegment
+
+每段限制
+
+## Sampling 
+
+采样配置节点
+
+1. SamplePer3Secs 每3秒采样数
+
+## Logging
+
+SkyWalking日志配置节点
+
+1. Level  日志级别
+2. FilePath 日志保存路径
+
+## Transport
+
+传输配置节点
+
+1. Interval 每多少毫秒刷新
+2. PendingSegmentLimit  排队限制
+3. PendingSegmentTimeout 排队超时毫秒，超时时排队的数据会被丢弃
+
+### gRPC
+
+gRPC配置节点
+
+1. Servers gRPC地址，多个用逗号","
+2. Timeout 创建gRPC链接的超时时间，毫秒
+3. ConnectTimeout gRPC最长链接时间，毫秒
+
+# skywalking.json 示例
+```
+{
+  "SkyWalking": {
+    "ApplicationCode": "app",
+    "SpanLimitPerSegment": 300,
+    "Sampling": {
+      "SamplePer3Secs": -1
+    },
+    "Logging": {
+      "Level": "Information",
+      "FilePath": "logs\\SkyWalking-{Date}.log"
+    },
+    "Transport": {
+      "Interval": 3000,
+      "PendingSegmentLimit": 30000,
+      "PendingSegmentTimeout": 1000,
+      "gRPC": {
+        "Servers": "localhost:11800",
+        "Timeout": 2000,
+        "ConnectTimeout": 10000
+      }
+    }
+  }
+}
+```

docs/skywalking.json.md

+# SkyWalking Configuration
+
+# ApplicationCode
+
+App name displayed.
+
+# SpanLimitPerSegment
+
+"Span" Limit Per Segment Max.
+
+## Sampling 
+
+Sample Configuration Section
+
+1. SamplePer3Secs, Sample Per 3 Seconds
+
+## Logging
+
+SkyWalking Logging Configuration Section
+
+1. Level, defalut:Information
+2. FilePath, defalut:logs\\SkyWalking-{Date}.log
+
+## Transport 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 
+
+gRPC Configuration Section
+
+1. Servers, gRPC Service address,Multiple addresses separated by commas (",")
+2. Timeout, Timeout for creating a link,(unit:Millisecond)
+3. ConnectTimeout, gRPC Connectioning timed out,(unit:Millisecond)
+
+# skywalking.json sample
+```
+{
+  "SkyWalking": {
+    "ApplicationCode": "app",
+    "SpanLimitPerSegment": 300,
+    "Sampling": {
+      "SamplePer3Secs": -1
+    },
+    "Logging": {
+      "Level": "Information",
+      "FilePath": "logs\\SkyWalking-{Date}.log"
+    },
+    "Transport": {
+      "Interval": 3000,
+      "PendingSegmentLimit": 30000,
+      "PendingSegmentTimeout": 1000,
+      "gRPC": {
+        "Servers": "localhost:11800",
+        "Timeout": 2000,
+        "ConnectTimeout": 10000
+      }
+    }
+  }
+}
+```

sample/SkyWalking.Sample.AspNet/SkyWalking.Sample.AspNet.csproj

@@ -12,6 +12,18 @@
     <AssemblyName>SkyWalking.Sample.AspNet</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>4.0</OldToolsVersion>
+    <UseIISExpress>true</UseIISExpress>
+    <Use64BitIISExpress />
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -106,6 +118,9 @@
       <Name>SkyWalking.AspNet</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="skywalking.json" />
+  </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')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -114,6 +129,25 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Grpc.Core.1.12.0\build\net45\Grpc.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Grpc.Core.1.12.0\build\net45\Grpc.Core.targets'))" />
   </Target>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349C5851-65DF-11DA-9384-00065B846F21}">
+        <WebProjectProperties>
+          <UseIIS>True</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>0</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>http://localhost:6768/</IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
          Other similar extension points exist, see Microsoft.Common.targets.
     <Target Name="BeforeBuild">

sample/SkyWalking.Sample.AspNet/Web.config

@@ -7,10 +7,6 @@ http://www.mono-project.com/Config_system.web and
 http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
 -->
 <configuration>
-  <appSettings>
-    <add key="ApplicationCode" value="aspnet-sample"/>
-    <add key="DirectServers" value="localhost:11800"/>
-   </appSettings>
   <system.web>
     <compilation debug="true" targetFramework="4.5">
       <assemblies />

sample/SkyWalking.Sample.AspNet/skywalking.json

+{
+  "SkyWalking": {
+    "ApplicationCode": "SkyWalking.Sample.AspNet",
+    "SpanLimitPerSegment": 300,
+    "Sampling": {
+      "SamplePer3Secs": -1
+    },
+    "Logging": {
+      "Level": "Information",
+      "FilePath": "logs\\SkyWalking-{Date}.log"
+    },
+    "Transport": {
+      "Interval": 3000,
+      "PendingSegmentLimit": 30000,
+      "PendingSegmentTimeout": 1000,
+      "gRPC": {
+        "Servers": "localhost:11800",
+        "Timeout": 2000,
+        "ConnectTimeout": 10000
+      }
+    }
+  }
+}
\ No newline at end of file

src/SkyWalking.Abstractions/Components/ComponentsDefine.cs

@@ -53,5 +53,7 @@ namespace SkyWalking.Components
         public static readonly IComponent InMemoryDatabase = new OfficialComponent(3014, "InMemoryDatabase");
         
         public static readonly IComponent AspNet = new OfficialComponent(3015, "AspNet");
+
+        public static readonly IComponent MySqlData = new OfficialComponent(3016, "MySql.Data");
     }
 }

src/SkyWalking.AspNet/SkyWalkingApplicationRequestCallback.cs

@@ -42,6 +42,13 @@ namespace SkyWalking.AspNet
         {
             var httpApplication = sender as HttpApplication;
             var httpContext = httpApplication.Context;
+
+            if(httpContext.Request.HttpMethod == "OPTIONS")
+            {
+                //asp.net Exclude OPTIONS request
+                return;
+            }
+
             var carrier = _contextCarrierFactory.Create();
             foreach (var item in carrier.Items)
                 item.HeadValue = httpContext.Request.Headers[item.HeadKey];
@@ -60,15 +67,21 @@ namespace SkyWalking.AspNet
 
         public void ApplicationOnEndRequest(object sender, EventArgs e)
         {
+            var httpApplication = sender as HttpApplication;
+            var httpContext = httpApplication.Context;
+
+            if (httpContext.Request.HttpMethod == "OPTIONS")
+            {
+                //asp.net Exclude OPTIONS request
+                return;
+            }
+
             var httpRequestSpan = ContextManager.ActiveSpan;
             if (httpRequestSpan == null)
             {
                 return;
             }
 
-            var httpApplication = sender as HttpApplication;
-            var httpContext = httpApplication.Context;
-
             var statusCode = httpContext.Response.StatusCode;
             if (statusCode >= 400)
             {

src/SkyWalking.Core/Context/Trace/TraceSegmentRef.cs

@@ -92,7 +92,7 @@ namespace SkyWalking.Context.Trace
                 int.TryParse(entryOperationName, out _entryOperationId);
             }
 
-            string parentOperationName = contextSnapshot.EntryOperationName;
+            string parentOperationName = contextSnapshot.ParentOperationName;
             if (parentOperationName.First() == '#')
             {
                 _parentOperationName = parentOperationName.Substring(1);

src/SkyWalking.Diagnostics.MySqlData/MySqlDataDiagnosticProcessor.cs

+/*
+ * Licensed to the OpenSkywalking under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using MySql.Data.MySqlClient;
+using SkyWalking.Components;
+using SkyWalking.Context;
+using SkyWalking.Context.Tag;
+using SkyWalking.Context.Trace;
+
+namespace SkyWalking.Diagnostics.MySqlData
+{
+    public class MySqlDataDiagnosticProcessor : DefaultTraceListener, ITracingDiagnosticProcessor
+    {
+        private Dictionary<long, MySqlConnectionStringBuilder> _dbConn =
+            new Dictionary<long, MySqlConnectionStringBuilder>();
+        public MySqlDataDiagnosticProcessor()
+        {
+            MySqlTrace.Listeners.Clear();
+            MySqlTrace.Listeners.Add(this);
+            MySqlTrace.Switch.Level = SourceLevels.Information;
+            MySqlTrace.QueryAnalysisEnabled = true;
+        }
+
+        private static string ResolveOperationName(MySqlDataTraceCommand sqlCommand)
+        {
+            var commandType = sqlCommand.SqlText?.Split(' ');
+            return $"{MySqlDataDiagnosticStrings.MySqlDataPrefix}{commandType?.FirstOrDefault()}";
+        }
+
+        public string ListenerName { get; } = MySqlDataDiagnosticStrings.DiagnosticListenerName;
+
+        public void BeforeExecuteCommand(MySqlDataTraceCommand sqlCommand)
+        {
+            var peer = sqlCommand.DbServer;
+            var span = ContextManager.CreateExitSpan(ResolveOperationName(sqlCommand), peer);
+            span.SetLayer(SpanLayer.DB);
+            span.SetComponent(ComponentsDefine.MySqlData);
+            Tags.DbType.Set(span, "MySql");
+            Tags.DbInstance.Set(span, sqlCommand.Database);
+            Tags.DbStatement.Set(span, sqlCommand.SqlText);
+        }
+
+        public void AfterExecuteCommand()
+        {
+            ContextManager.StopSpan();
+        }
+
+        public void ErrorExecuteCommand(Exception ex)
+        {
+            var span = ContextManager.ActiveSpan;
+            span?.ErrorOccurred();
+            span?.Log(ex);
+            span?.Log(DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(), new Dictionary<string, object>()
+            {
+                { "event", "error"},
+                { "error.kind", "MySqlException"},
+                { "message", ex.Message}
+            });
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="eventCache"></param>
+        /// <param name="source"></param>
+        /// <param name="eventType"></param>
+        /// <param name="id"></param>
+        /// <param name="format"></param>
+        /// <param name="args"></param>
+        public override void TraceEvent(TraceEventCache eventCache, string source, TraceEventType eventType, int id,
+            string format, params object[] args)
+        {
+            switch ((MySqlTraceEventType)id)
+            {
+                case MySqlTraceEventType.ConnectionOpened:
+                    var driverId = (long)args[0];
+                    var connStr = args[1].ToString();
+                    _dbConn[driverId] = new MySqlConnectionStringBuilder(connStr);
+                    break;
+                case MySqlTraceEventType.ConnectionClosed:
+                    //TODO
+                    break;
+                case MySqlTraceEventType.QueryOpened:
+                    BeforeExecuteCommand(GetCommand(args[0], args[2]));
+                    break;
+                case MySqlTraceEventType.ResultOpened:
+                    //TODO
+                    break;
+                case MySqlTraceEventType.ResultClosed:
+                    //TODO
+                    break;
+                case MySqlTraceEventType.QueryClosed:
+                    AfterExecuteCommand();
+                    break;
+                case MySqlTraceEventType.StatementPrepared:
+                    //TODO
+                    break;
+                case MySqlTraceEventType.StatementExecuted:
+                    //TODO
+                    break;
+                case MySqlTraceEventType.StatementClosed:
+                    //TODO
+                    break;
+                case MySqlTraceEventType.NonQuery:
+                    //TODO
+                    break;
+                case MySqlTraceEventType.UsageAdvisorWarning:
+                    //TODO
+                    break;
+                case MySqlTraceEventType.Warning:
+                    //TODO
+                    break;
+                case MySqlTraceEventType.Error:
+                    ErrorExecuteCommand(GetMySqlErrorException(args[1], args[2]));
+                    break;
+                case MySqlTraceEventType.QueryNormalized:
+                    //TODO
+                    break;
+            }
+        }
+
+
+        private MySqlDataTraceCommand GetCommand(object driverIdObj, object cmd)
+        {
+            var command = new MySqlDataTraceCommand();
+            if (_dbConn.TryGetValue((long)driverIdObj, out var database))
+            {
+                command.Database = database.Database;
+                command.DbServer = database.Server;
+            }
+
+            command.SqlText = (cmd == null ? "" : cmd.ToString());
+            return command;
+        }
+
+        private Exception GetMySqlErrorException(object errorCode, object errorMsg)
+        {
+            //TODO handle errorcode
+            return new Exception($"{errorMsg}");
+        }
+    }
+}

src/SkyWalking.Diagnostics.MySqlData/MySqlDataDiagnosticStrings.cs

+/*
+ * Licensed to the OpenSkywalking under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+namespace SkyWalking.Diagnostics.MySqlData
+{
+    internal static class MySqlDataDiagnosticStrings
+    {
+        public const string DiagnosticListenerName = "MySqlDiagnosticListener";
+
+        public const string MySqlDataPrefix = "mySqlData ";
+    }
+}
\ No newline at end of file

src/SkyWalking.Diagnostics.MySqlData/MySqlDataTraceCommand.cs

+/*
+ * Licensed to the OpenSkywalking under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SkyWalking.Diagnostics.MySqlData
+{
+    public class MySqlDataTraceCommand
+    {
+        public string Database { get; set; }
+
+        public string SqlText { get; set; }
+
+        public string DbServer { get; set; }
+    }
+}
\ No newline at end of file

src/SkyWalking.Diagnostics.MySqlData/SkyWalking.Diagnostics.MySqlData.csproj

+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MySql.Data" Version="6.10.7" />
+  </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" />
+  </ItemGroup>
+
+</Project>

src/SkyWalking.Diagnostics.MySqlData/SkyWalkingBuilderExtensions.cs

+/*
+ * Licensed to the OpenSkywalking under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.Extensions.DependencyInjection;
+using SkyWalking.Utilities.DependencyInjection;
+
+namespace SkyWalking.Diagnostics.MySqlData
+{
+    public static class SkyWalkingBuilderExtensions
+    {
+        public static SkyWalkingExtensions AddMySqlData(this SkyWalkingExtensions builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Services.AddSingleton<ITracingDiagnosticProcessor, MySqlDataDiagnosticProcessor>();
+
+            return builder;
+        }
+    }
+}
\ No newline at end of file