Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
CAP
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tsai
CAP
Commits
8b190232
Commit
8b190232
authored
Feb 13, 2019
by
Lemon
Committed by
吴晟 Wu Sheng
Feb 13, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Package release (#144)
* Rename PackagePrefix from `SkyWalking` to `SkyAPM` * Delete MySql.Data
parent
4eacdb09
Changes
24
Hide whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
74 additions
and
361 deletions
+74
-361
common.props
build/common.props
+4
-3
SkyWalking.DotNet.CLI.csproj
cli/SkyWalking.DotNet.CLI/SkyWalking.DotNet.CLI.csproj
+6
-6
skywalking-netcore.sln
skywalking-netcore.sln
+0
-7
SkyWalking.Abstractions.csproj
src/SkyWalking.Abstractions/SkyWalking.Abstractions.csproj
+4
-4
SkyWalking.AspNet.csproj
src/SkyWalking.AspNet/SkyWalking.AspNet.csproj
+4
-4
SkyWalking.Core.csproj
src/SkyWalking.Core/SkyWalking.Core.csproj
+4
-4
SkyWalking.Diagnostics.AspNetCore.csproj
...stics.AspNetCore/SkyWalking.Diagnostics.AspNetCore.csproj
+4
-4
SkyWalking.Diagnostics.CAP.csproj
...Walking.Diagnostics.CAP/SkyWalking.Diagnostics.CAP.csproj
+4
-4
SkyWalking.Diagnostics.EntityFrameworkCore.Npgsql.csproj
.../SkyWalking.Diagnostics.EntityFrameworkCore.Npgsql.csproj
+4
-4
SkyWalking.Diagnostics.EntityFrameworkCore.Pomelo.MySql.csproj
...lking.Diagnostics.EntityFrameworkCore.Pomelo.MySql.csproj
+4
-4
SkyWalking.Diagnostics.EntityFrameworkCore.Sqlite.csproj
.../SkyWalking.Diagnostics.EntityFrameworkCore.Sqlite.csproj
+4
-4
SkyWalking.Diagnostics.EntityFrameworkCore.csproj
...orkCore/SkyWalking.Diagnostics.EntityFrameworkCore.csproj
+4
-4
SkyWalking.Diagnostics.HttpClient.csproj
...stics.HttpClient/SkyWalking.Diagnostics.HttpClient.csproj
+4
-4
MySqlDataDiagnosticProcessor.cs
...ing.Diagnostics.MySqlData/MySqlDataDiagnosticProcessor.cs
+0
-163
MySqlDataDiagnosticStrings.cs
...lking.Diagnostics.MySqlData/MySqlDataDiagnosticStrings.cs
+0
-27
MySqlDataTraceCommand.cs
...SkyWalking.Diagnostics.MySqlData/MySqlDataTraceCommand.cs
+0
-33
SkyWalking.Diagnostics.MySqlData.csproj
...nostics.MySqlData/SkyWalking.Diagnostics.MySqlData.csproj
+0
-17
SkyWalkingBuilderExtensions.cs
...king.Diagnostics.MySqlData/SkyWalkingBuilderExtensions.cs
+0
-41
SkyWalking.Diagnostics.SqlClient.csproj
...nostics.SqlClient/SkyWalking.Diagnostics.SqlClient.csproj
+4
-4
SkyWalking.Transport.Grpc.Protocol.csproj
...t.Grpc.Protocol/SkyWalking.Transport.Grpc.Protocol.csproj
+4
-4
SkyWalking.Transport.Grpc.csproj
...kyWalking.Transport.Grpc/SkyWalking.Transport.Grpc.csproj
+4
-4
SkyWalking.Utilities.Configuration.csproj
...s.Configuration/SkyWalking.Utilities.Configuration.csproj
+4
-4
SkyWalking.Utilities.DependencyInjection.csproj
...Injection/SkyWalking.Utilities.DependencyInjection.csproj
+4
-4
SkyWalking.Utilities.Logging.csproj
...ing.Utilities.Logging/SkyWalking.Utilities.Logging.csproj
+4
-4
No files found.
build/common.props
View file @
8b190232
<Project>
<Import Project="version.props" />
<PropertyGroup>
<Authors>Skyapm Team</Authors>
<Product>Skyapm-dotnet</Product>
<owners>Skyapm</owners>
<Authors>SkyAPM Team</Authors>
<Product>SkyAPM</Product>
<owners>SkyAPM</owners>
<PackagePrefix>SkyAPM</PackagePrefix>
<PackageIconUrl>https://avatars2.githubusercontent.com/u/32165127</PackageIconUrl>
<PackageProjectUrl>https://github.com/SkyAPM/SkyAPM-dotnet</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/SkyAPM/SkyAPM-dotnet/blob/master/LICENSE</PackageLicenseUrl>
...
...
cli/SkyWalking.DotNet.CLI/SkyWalking.DotNet.CLI.csproj
View file @
8b190232
...
...
@@ -3,23 +3,23 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<Description>
SkyWalking
dotnet global tool.</Description>
<AssemblyTitle>
SkyWalking
.DotNet.CLI</AssemblyTitle>
<AssemblyName>
SkyWalking
.DotNet.CLI</AssemblyName>
<PackageId>
SkyWalking
.DotNet.CLI</PackageId>
<Description>
$(PackagePrefix)
dotnet global tool.</Description>
<AssemblyTitle>
$(PackagePrefix)
.DotNet.CLI</AssemblyTitle>
<AssemblyName>
$(PackagePrefix)
.DotNet.CLI</AssemblyName>
<PackageId>
$(PackagePrefix)
.DotNet.CLI</PackageId>
<PackageTags>SkyWalking;APM;CLI</PackageTags>
<RootNamespace>SkyWalking.DotNet.CLI</RootNamespace>
<OutputType>Exe</OutputType>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<IsPackable>true</IsPackable>
<PackAsTool>true</PackAsTool>
<ToolCommandName>dotnet-sky
walking
</ToolCommandName>
<ToolCommandName>dotnet-sky
apm
</ToolCommandName>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.
2
.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.
0
.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
</ItemGroup>
...
...
skywalking-netcore.sln
View file @
8b190232
...
...
@@ -83,8 +83,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.Agent.AspNetCore
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.DotNet.CLI", "cli\SkyWalking.DotNet.CLI\SkyWalking.DotNet.CLI.csproj", "{412E5D7D-9448-4C65-8EC7-26F6D5C49865}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyWalking.Diagnostics.MySqlData", "src\SkyWalking.Diagnostics.MySqlData\SkyWalking.Diagnostics.MySqlData.csproj", "{A66B2179-9F35-4B52-9457-F60ED257BA60}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkyWalking.Transport.Grpc.Protocol", "src\SkyWalking.Transport.Grpc.Protocol\SkyWalking.Transport.Grpc.Protocol.csproj", "{BAF5C1ED-09C4-4B32-8190-47D16265F01E}"
EndProject
Global
...
...
@@ -177,10 +175,6 @@ Global
{412E5D7D-9448-4C65-8EC7-26F6D5C49865}.Debug|Any CPU.Build.0 = Debug|Any CPU
{412E5D7D-9448-4C65-8EC7-26F6D5C49865}.Release|Any CPU.ActiveCfg = Release|Any CPU
{412E5D7D-9448-4C65-8EC7-26F6D5C49865}.Release|Any CPU.Build.0 = Release|Any CPU
{A66B2179-9F35-4B52-9457-F60ED257BA60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A66B2179-9F35-4B52-9457-F60ED257BA60}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A66B2179-9F35-4B52-9457-F60ED257BA60}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A66B2179-9F35-4B52-9457-F60ED257BA60}.Release|Any CPU.Build.0 = Release|Any CPU
{BAF5C1ED-09C4-4B32-8190-47D16265F01E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BAF5C1ED-09C4-4B32-8190-47D16265F01E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BAF5C1ED-09C4-4B32-8190-47D16265F01E}.Release|Any CPU.ActiveCfg = Release|Any CPU
...
...
@@ -218,7 +212,6 @@ Global
{AEB61F19-3DBB-411E-A67E-93007B96E160} = {4BD917BC-D579-4C75-9939-41BF012A4EE2}
{5CB2889E-33DD-4326-9403-4977849E065D} = {EF6194B2-9ACB-49B9-8049-DD6AFAEB0399}
{412E5D7D-9448-4C65-8EC7-26F6D5C49865} = {A238D227-433B-461E-8C57-73B147E0F672}
{A66B2179-9F35-4B52-9457-F60ED257BA60} = {79ED86A5-E9B9-49B2-9354-C911C079D03E}
{BAF5C1ED-09C4-4B32-8190-47D16265F01E} = {CBFF7EE0-69D7-4D6A-9BBD-8E567FF4D810}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
...
...
src/SkyWalking.Abstractions/SkyWalking.Abstractions.csproj
View file @
8b190232
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<Description>
SkyWalking
Core abstractions and interfaces for apm agent.</Description>
<AssemblyTitle>
SkyWalking
.Abstractions</AssemblyTitle>
<AssemblyName>
SkyWalking
.Abstractions</AssemblyName>
<PackageId>
SkyWalking
.Abstractions</PackageId>
<Description>
$(Product)
Core abstractions and interfaces for apm agent.</Description>
<AssemblyTitle>
$(PackagePrefix)
.Abstractions</AssemblyTitle>
<AssemblyName>
$(PackagePrefix)
.Abstractions</AssemblyName>
<PackageId>
$(PackagePrefix)
.Abstractions</PackageId>
<PackageTags>SkyWalking;APM</PackageTags>
<PackageReleaseNotes>
</PackageReleaseNotes>
...
...
src/SkyWalking.AspNet/SkyWalking.AspNet.csproj
View file @
8b190232
...
...
@@ -4,11 +4,11 @@
<TargetFrameworks>net461;net462;net47;net471</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<AssemblyName>
SkyWalking
.AspNet</AssemblyName>
<AssemblyTitle>
SkyWalking
.AspNet</AssemblyTitle>
<PackageId>
SkyWalking
.AspNet</PackageId>
<AssemblyName>
$(PackagePrefix)
.AspNet</AssemblyName>
<AssemblyTitle>
$(PackagePrefix)
.AspNet</AssemblyTitle>
<PackageId>
$(PackagePrefix)
.AspNet</PackageId>
<PackageTags>SkyWalking;APM;Tracing</PackageTags>
<Description>
SkyWalking
ASP.NET Agent.</Description>
<Description>
$(PackagePrefix)
ASP.NET Agent.</Description>
<RootNamespace>SkyWalking.AspNet</RootNamespace>
</PropertyGroup>
<ItemGroup>
...
...
src/SkyWalking.Core/SkyWalking.Core.csproj
View file @
8b190232
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<Description>
SkyWalking
core components.</Description>
<AssemblyTitle>
SkyWalking
.Core</AssemblyTitle>
<AssemblyName>
SkyWalking
.Core</AssemblyName>
<PackageId>
SkyWalking
.Core</PackageId>
<Description>
$(Product)
core components.</Description>
<AssemblyTitle>
$(PackagePrefix)
.Core</AssemblyTitle>
<AssemblyName>
$(PackagePrefix)
.Core</AssemblyName>
<PackageId>
$(PackagePrefix)
.Core</PackageId>
<PackageTags>SkyWalking;APM</PackageTags>
<PackageReleaseNotes>
</PackageReleaseNotes>
...
...
src/SkyWalking.Diagnostics.AspNetCore/SkyWalking.Diagnostics.AspNetCore.csproj
View file @
8b190232
...
...
@@ -3,11 +3,11 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<Description>
SkyWalking
.Diagnostics.AspNetCore notifies Web Http requests.</Description>
<AssemblyTitle>
SkyWalking
.Diagnostics.AspNetCore</AssemblyTitle>
<Description>
$(PackagePrefix)
.Diagnostics.AspNetCore notifies Web Http requests.</Description>
<AssemblyTitle>
$(PackagePrefix)
.Diagnostics.AspNetCore</AssemblyTitle>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>
SkyWalking
.Diagnostics.AspNetCore</AssemblyName>
<PackageId>
SkyWalking
.Diagnostics.AspNetCore</PackageId>
<AssemblyName>
$(PackagePrefix)
.Diagnostics.AspNetCore</AssemblyName>
<PackageId>
$(PackagePrefix)
.Diagnostics.AspNetCore</PackageId>
<PackageTags>SkyWalking;APM;Diagnostics;AspNetCore</PackageTags>
<PackageReleaseNotes>
</PackageReleaseNotes>
...
...
src/SkyWalking.Diagnostics.CAP/SkyWalking.Diagnostics.CAP.csproj
View file @
8b190232
...
...
@@ -7,10 +7,10 @@
</PropertyGroup>
<PropertyGroup>
<Description>
SkyWalking
.Diagnostics.CAP notifies of CAP messages.</Description>
<AssemblyTitle>
SkyWalking
.Diagnostics.CAP</AssemblyTitle>
<AssemblyName>
SkyWalking
.Diagnostics.CAP</AssemblyName>
<PackageId>
SkyWalking
.Diagnostics.CAP</PackageId>
<Description>
$(PackagePrefix)
.Diagnostics.CAP notifies of CAP messages.</Description>
<AssemblyTitle>
$(PackagePrefix)
.Diagnostics.CAP</AssemblyTitle>
<AssemblyName>
$(PackagePrefix)
.Diagnostics.CAP</AssemblyName>
<PackageId>
$(PackagePrefix)
.Diagnostics.CAP</PackageId>
<PackageTags>SkyWalking;APM;CAP</PackageTags>
<RootNamespace>SkyWalking.Diagnostics.CAP</RootNamespace>
</PropertyGroup>
...
...
src/SkyWalking.Diagnostics.EntityFrameworkCore.Npgsql/SkyWalking.Diagnostics.EntityFrameworkCore.Npgsql.csproj
View file @
8b190232
...
...
@@ -4,11 +4,11 @@
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<AssemblyName>
SkyWalking
.Diagnostics.EntityFrameworkCore.Npgsql</AssemblyName>
<AssemblyTitle>
SkyWalking
.Diagnostics.EntityFrameworkCore.Npgsql</AssemblyTitle>
<PackageId>
SkyWalking
.Diagnostics.EntityFrameworkCore.Npgsql</PackageId>
<AssemblyName>
$(PackagePrefix)
.Diagnostics.EntityFrameworkCore.Npgsql</AssemblyName>
<AssemblyTitle>
$(PackagePrefix)
.Diagnostics.EntityFrameworkCore.Npgsql</AssemblyTitle>
<PackageId>
$(PackagePrefix)
.Diagnostics.EntityFrameworkCore.Npgsql</PackageId>
<PackageTags>SkyWalking;APM;EntityFrameworkCore;EF</PackageTags>
<Description>
SkyWalking
.Diagnostics.EntityFrameworkCore.Npgsql notifies of EF requests.</Description>
<Description>
$(PackagePrefix)
.Diagnostics.EntityFrameworkCore.Npgsql notifies of EF requests.</Description>
<RootNamespace>SkyWalking.Diagnostics.EntityFrameworkCore</RootNamespace>
</PropertyGroup>
<ItemGroup>
...
...
src/SkyWalking.Diagnostics.EntityFrameworkCore.Pomelo.MySql/SkyWalking.Diagnostics.EntityFrameworkCore.Pomelo.MySql.csproj
View file @
8b190232
...
...
@@ -4,11 +4,11 @@
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<AssemblyName>
SkyWalking
.Diagnostics.EntityFrameworkCore.Pomelo.MySql</AssemblyName>
<AssemblyTitle>
SkyWalking
.Diagnostics.EntityFrameworkCore.Pomelo.MySql</AssemblyTitle>
<PackageId>
SkyWalking
.Diagnostics.EntityFrameworkCore.Pomelo.MySql</PackageId>
<AssemblyName>
$(PackagePrefix)
.Diagnostics.EntityFrameworkCore.Pomelo.MySql</AssemblyName>
<AssemblyTitle>
$(PackagePrefix)
.Diagnostics.EntityFrameworkCore.Pomelo.MySql</AssemblyTitle>
<PackageId>
$(PackagePrefix)
.Diagnostics.EntityFrameworkCore.Pomelo.MySql</PackageId>
<PackageTags>SkyWalking;APM;EntityFrameworkCore;EF</PackageTags>
<Description>
SkyWalking
.Diagnostics.EntityFrameworkCore.Pomelo.MySql notifies of EF requests.</Description>
<Description>
$(PackagePrefix)
.Diagnostics.EntityFrameworkCore.Pomelo.MySql notifies of EF requests.</Description>
<RootNamespace>SkyWalking.Diagnostics.EntityFrameworkCore</RootNamespace>
</PropertyGroup>
<ItemGroup>
...
...
src/SkyWalking.Diagnostics.EntityFrameworkCore.Sqlite/SkyWalking.Diagnostics.EntityFrameworkCore.Sqlite.csproj
View file @
8b190232
...
...
@@ -4,11 +4,11 @@
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<AssemblyName>
SkyWalking
.Diagnostics.EntityFrameworkCore.Sqlite</AssemblyName>
<AssemblyTitle>
SkyWalking
.Diagnostics.EntityFrameworkCore.Sqlite</AssemblyTitle>
<PackageId>
SkyWalking
.Diagnostics.EntityFrameworkCore.Sqlite</PackageId>
<AssemblyName>
$(PackagePrefix)
.Diagnostics.EntityFrameworkCore.Sqlite</AssemblyName>
<AssemblyTitle>
$(PackagePrefix)
.Diagnostics.EntityFrameworkCore.Sqlite</AssemblyTitle>
<PackageId>
$(PackagePrefix)
.Diagnostics.EntityFrameworkCore.Sqlite</PackageId>
<PackageTags>SkyWalking;APM;EntityFrameworkCore;EF</PackageTags>
<Description>
SkyWalking
.Diagnostics.EntityFrameworkCore.Sqlite notifies of EF requests.</Description>
<Description>
$(PackagePrefix)
.Diagnostics.EntityFrameworkCore.Sqlite notifies of EF requests.</Description>
<RootNamespace>SkyWalking.Diagnostics.EntityFrameworkCore</RootNamespace>
</PropertyGroup>
<ItemGroup>
...
...
src/SkyWalking.Diagnostics.EntityFrameworkCore/SkyWalking.Diagnostics.EntityFrameworkCore.csproj
View file @
8b190232
...
...
@@ -4,10 +4,10 @@
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<AssemblyName>
SkyWalking
.Diagnostics.EntityFrameworkCore</AssemblyName>
<AssemblyTitle>
SkyWalking
.Diagnostics.EntityFrameworkCore</AssemblyTitle>
<PackageId>
SkyWalking
.Diagnostics.EntityFrameworkCore</PackageId>
<PackageTags>
SkyWalking
;APM;EntityFrameworkCore;EF</PackageTags>
<AssemblyName>
$(PackagePrefix)
.Diagnostics.EntityFrameworkCore</AssemblyName>
<AssemblyTitle>
$(PackagePrefix)
.Diagnostics.EntityFrameworkCore</AssemblyTitle>
<PackageId>
$(PackagePrefix)
.Diagnostics.EntityFrameworkCore</PackageId>
<PackageTags>
$(PackagePrefix)
;APM;EntityFrameworkCore;EF</PackageTags>
<Description>SkyWalking.Diagnostics.EntityFrameworkCore notifies of EF requests.</Description>
<RootNamespace>SkyWalking.Diagnostics.EntityFrameworkCore</RootNamespace>
</PropertyGroup>
...
...
src/SkyWalking.Diagnostics.HttpClient/SkyWalking.Diagnostics.HttpClient.csproj
View file @
8b190232
...
...
@@ -3,11 +3,11 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<Description>
SkyWalking
.Diagnostics.HttpClient notifies outgoing Http requests.</Description>
<AssemblyTitle>
SkyWalking
.Diagnostics.HttpClient</AssemblyTitle>
<Description>
$(PackagePrefix)
.Diagnostics.HttpClient notifies outgoing Http requests.</Description>
<AssemblyTitle>
$(PackagePrefix)
.Diagnostics.HttpClient</AssemblyTitle>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>
SkyWalking
.Diagnostics.HttpClient</AssemblyName>
<PackageId>
SkyWalking
.Diagnostics.HttpClient</PackageId>
<AssemblyName>
$(PackagePrefix)
.Diagnostics.HttpClient</AssemblyName>
<PackageId>
$(PackagePrefix)
.Diagnostics.HttpClient</PackageId>
<PackageTags>SkyWalking;APM;Diagnostics;HttpClient</PackageTags>
<PackageReleaseNotes>
</PackageReleaseNotes>
...
...
src/SkyWalking.Diagnostics.MySqlData/MySqlDataDiagnosticProcessor.cs
deleted
100644 → 0
View file @
4eacdb09
/*
* 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 OpenSkywalking 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
deleted
100644 → 0
View file @
4eacdb09
/*
* 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 OpenSkywalking 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
deleted
100644 → 0
View file @
4eacdb09
/*
* 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 OpenSkywalking 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
deleted
100644 → 0
View file @
4eacdb09
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MySql.Data" Version="6.10.7" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SkyWalking.Abstractions\SkyWalking.Abstractions.csproj" />
<ProjectReference Include="..\SkyWalking.Core\SkyWalking.Core.csproj" />
<ProjectReference Include="..\SkyWalking.Utilities.DependencyInjection\SkyWalking.Utilities.DependencyInjection.csproj" />
</ItemGroup>
</Project>
src/SkyWalking.Diagnostics.MySqlData/SkyWalkingBuilderExtensions.cs
deleted
100644 → 0
View file @
4eacdb09
/*
* 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 OpenSkywalking 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
src/SkyWalking.Diagnostics.SqlClient/SkyWalking.Diagnostics.SqlClient.csproj
View file @
8b190232
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<Description>
SkyWalking
.Diagnostics.SqlClient notifies outgoing SqlClient requests.</Description>
<AssemblyTitle>
SkyWalking
.Diagnostics.SqlClient</AssemblyTitle>
<Description>
$(PackagePrefix)
.Diagnostics.SqlClient notifies outgoing SqlClient requests.</Description>
<AssemblyTitle>
$(PackagePrefix)
.Diagnostics.SqlClient</AssemblyTitle>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>
SkyWalking
.Diagnostics.SqlClient</AssemblyName>
<PackageId>
SkyWalking
.Diagnostics.SqlClient</PackageId>
<AssemblyName>
$(PackagePrefix)
.Diagnostics.SqlClient</AssemblyName>
<PackageId>
$(PackagePrefix)
.Diagnostics.SqlClient</PackageId>
<PackageTags>SkyWalking;APM;Diagnostics;SqlClient</PackageTags>
<PackageReleaseNotes>
</PackageReleaseNotes>
...
...
src/SkyWalking.Transport.Grpc.Protocol/SkyWalking.Transport.Grpc.Protocol.csproj
View file @
8b190232
...
...
@@ -3,10 +3,10 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<Description>
SkyWalking
gRPC data transmitter.</Description>
<AssemblyTitle>
SkyWalking
.Transport.Grpc.Protocol</AssemblyTitle>
<AssemblyName>
SkyWalking
.Transport.Grpc.Protocol</AssemblyName>
<PackageId>
SkyWalking
.Transport.Grpc.Protocol</PackageId>
<Description>
$(Product)
gRPC data transmitter.</Description>
<AssemblyTitle>
$(PackagePrefix)
.Transport.Grpc.Protocol</AssemblyTitle>
<AssemblyName>
$(PackagePrefix)
.Transport.Grpc.Protocol</AssemblyName>
<PackageId>
$(PackagePrefix)
.Transport.Grpc.Protocol</PackageId>
<PackageTags>SkyWalking;Grpc</PackageTags>
<PackageReleaseNotes>
</PackageReleaseNotes>
...
...
src/SkyWalking.Transport.Grpc/SkyWalking.Transport.Grpc.csproj
View file @
8b190232
...
...
@@ -2,10 +2,10 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<Description>
SkyWalking
gRPC data transmitter.</Description>
<AssemblyTitle>
SkyWalking
.Transport.Grpc</AssemblyTitle>
<AssemblyName>
SkyWalking
.Transport.Grpc</AssemblyName>
<PackageId>
SkyWalking
.Transport.Grpc</PackageId>
<Description>
$(Product)
gRPC data transmitter.</Description>
<AssemblyTitle>
$(PackagePrefix)
.Transport.Grpc</AssemblyTitle>
<AssemblyName>
$(PackagePrefix)
.Transport.Grpc</AssemblyName>
<PackageId>
$(PackagePrefix)
.Transport.Grpc</PackageId>
<PackageTags>SkyWalking;Grpc</PackageTags>
<PackageReleaseNotes>
</PackageReleaseNotes>
...
...
src/SkyWalking.Utilities.Configuration/SkyWalking.Utilities.Configuration.csproj
View file @
8b190232
...
...
@@ -2,11 +2,11 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<Description>
SkyWalking
configuration extensions.</Description>
<AssemblyTitle>
SkyWalking
.Utilities.Configuration</AssemblyTitle>
<Description>
$(Product)
configuration extensions.</Description>
<AssemblyTitle>
$(PackagePrefix)
.Utilities.Configuration</AssemblyTitle>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>
SkyWalking
.Utilities.Configuration</AssemblyName>
<PackageId>
SkyWalking
.Utilities.Configuration</PackageId>
<AssemblyName>
$(PackagePrefix)
.Utilities.Configuration</AssemblyName>
<PackageId>
$(PackagePrefix)
.Utilities.Configuration</PackageId>
<PackageTags>SkyWalking;APM;Diagnostics</PackageTags>
<PackageReleaseNotes>
</PackageReleaseNotes>
...
...
src/SkyWalking.Utilities.DependencyInjection/SkyWalking.Utilities.DependencyInjection.csproj
View file @
8b190232
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<Description>Microsoft.Utilities.DependencyInjection (IServiceCollection) support for
SkyWalking
.</Description>
<AssemblyTitle>
SkyWalking
.Utilities.DependencyInjection</AssemblyTitle>
<Description>Microsoft.Utilities.DependencyInjection (IServiceCollection) support for
$(Product)
.</Description>
<AssemblyTitle>
$(PackagePrefix)
.Utilities.DependencyInjection</AssemblyTitle>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>
SkyWalking
.Utilities.DependencyInjection</AssemblyName>
<PackageId>
SkyWalking
.Utilities.DependencyInjection</PackageId>
<AssemblyName>
$(PackagePrefix)
.Utilities.DependencyInjection</AssemblyName>
<PackageId>
$(PackagePrefix)
.Utilities.DependencyInjection</PackageId>
<PackageTags>SkyWalking;APM;Diagnostics</PackageTags>
<PackageReleaseNotes>
</PackageReleaseNotes>
...
...
src/SkyWalking.Utilities.Logging/SkyWalking.Utilities.Logging.csproj
View file @
8b190232
...
...
@@ -2,11 +2,11 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<Description>Microsoft.Utilities.Logging support for
SkyWalking
.</Description>
<AssemblyTitle>
SkyWalking
.Utilities.Logging</AssemblyTitle>
<Description>Microsoft.Utilities.Logging support for
$(Product)
.</Description>
<AssemblyTitle>
$(PackagePrefix)
.Utilities.Logging</AssemblyTitle>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>
SkyWalking
.Utilities.Logging</AssemblyName>
<PackageId>
SkyWalking
.Utilities.Logging</PackageId>
<AssemblyName>
$(PackagePrefix)
.Utilities.Logging</AssemblyName>
<PackageId>
$(PackagePrefix)
.Utilities.Logging</PackageId>
<PackageTags>SkyWalking;APM;Diagnostics</PackageTags>
<PackageReleaseNotes>
</PackageReleaseNotes>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment