Skip to content

S
SkyAPM-dotnet

SkyAPM / SkyAPM-dotnet

通知 13
Star 1
Fork 0
S
SkyAPM-dotnet

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 117c9df7 编写于 作者: A Ahoo Wang 提交者： Lemon
浏览文件
操作

fix Span.AddTag null value bug (#184) 

1. fix SmartSqlTracingDiagnosticProcessor Span.AddTag null value bug
2. refactor SmartSqlTracingDiagnosticProcessor
上级 e20d9a37
隐藏空白更改
内联 并排
Showing with 46 addition and 42 deletion
src/SkyApm.Diagnostics.SmartSql/SmartSqlTracingDiagnosticProcessor.cs
浏览文件 @ 117c9df7
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data.Common;
using System.Text;
using SkyApm.Tracing;
using SkyApm.Tracing.Segments;
using SmartSql;
using SmartSql.Diagnostics;
......@@ -21,23 +23,42 @@ namespace SkyApm.Diagnostics.SmartSql
_tracingContext = tracingContext;
_localSegmentContextAccessor = localSegmentContextAccessor;
}
private void AddConnectionTag(SegmentContext context, DbConnection dbConnection)
{
if (dbConnection == null)
{
return;
}
if (dbConnection.DataSource != null)
{
context.Span.Peer = new Common.StringOrIntValue(dbConnection.DataSource);
}
if (dbConnection.Database != null)
{
context.Span.AddTag(Common.Tags.DB_INSTANCE, dbConnection.Database);
}
}
private SegmentContext CreateSmartSqlLocalSegmentContext(string operation)
{
var context = _tracingContext.CreateLocalSegmentContext(operation);
context.Span.SpanLayer = SpanLayer.DB;
context.Span.Component = Common.Components.SMART_SQL;
context.Span.AddTag(Common.Tags.DB_TYPE, "Sql");
return context;
}
#region BeginTransaction
[DiagnosticName(SmartSqlDiagnosticListenerExtensions.SMART_SQL_BEFORE_DB_SESSION_BEGINTRANSACTION)]
public void BeforeDbSessionBeginTransaction([Object]DbSessionBeginTransactionBeforeEventData eventData)
{
var context = _tracingContext.CreateLocalSegmentContext("BeginTransaction");
context.Span.SpanLayer = Tracing.Segments.SpanLayer.DB;
context.Span.Component = Common.Components.SMART_SQL;
context.Span.AddTag(Common.Tags.DB_TYPE, "Sql");
CreateSmartSqlLocalSegmentContext("BeginTransaction");
}
[DiagnosticName(SmartSqlDiagnosticListenerExtensions.SMART_SQL_AFTER_DB_SESSION_BEGINTRANSACTION)]
public void AfterDbSessionBeginTransaction([Object]DbSessionBeginTransactionAfterEventData eventData)
{
var context = _localSegmentContextAccessor.Context;
if (context != null)
{
context.Span.Peer = new Common.StringOrIntValue(eventData.DbSession.Connection?.DataSource);
context.Span.AddTag(Common.Tags.DB_INSTANCE, eventData.DbSession.Connection?.Database);
_tracingContext.Release(context);
}
}
......@@ -56,13 +77,10 @@ namespace SkyApm.Diagnostics.SmartSql
[DiagnosticName(SmartSqlDiagnosticListenerExtensions.SMART_SQL_BEFORE_DB_SESSION_COMMIT)]
public void BeforeDbSessionCommit([Object]DbSessionCommitBeforeEventData eventData)
{
var context = _tracingContext.CreateLocalSegmentContext(eventData.Operation);
context.Span.SpanLayer = Tracing.Segments.SpanLayer.DB;
context.Span.Component = Common.Components.SMART_SQL;
context.Span.Peer = new Common.StringOrIntValue(eventData.DbSession.Connection?.DataSource);
context.Span.AddTag(Common.Tags.DB_INSTANCE, eventData.DbSession.Connection?.Database);
context.Span.AddTag(Common.Tags.DB_TYPE, "Sql");
var context = CreateSmartSqlLocalSegmentContext(eventData.Operation);
AddConnectionTag(context, eventData.DbSession.Connection);
}
[DiagnosticName(SmartSqlDiagnosticListenerExtensions.SMART_SQL_AFTER_DB_SESSION_COMMIT)]
public void AfterDbSessionCommit([Object]DbSessionCommitAfterEventData eventData)
{
......@@ -87,12 +105,8 @@ namespace SkyApm.Diagnostics.SmartSql
[DiagnosticName(SmartSqlDiagnosticListenerExtensions.SMART_SQL_BEFORE_DB_SESSION_ROLLBACK)]
public void BeforeDbSessionRollback([Object]DbSessionRollbackBeforeEventData eventData)
{
var context = _tracingContext.CreateLocalSegmentContext(eventData.Operation);
context.Span.SpanLayer = Tracing.Segments.SpanLayer.DB;
context.Span.Component = Common.Components.SMART_SQL;
context.Span.Peer = new Common.StringOrIntValue(eventData.DbSession.Connection?.DataSource);
context.Span.AddTag(Common.Tags.DB_INSTANCE, eventData.DbSession.Connection?.Database);
context.Span.AddTag(Common.Tags.DB_TYPE, "Sql");
var context = CreateSmartSqlLocalSegmentContext(eventData.Operation);
AddConnectionTag(context, eventData.DbSession.Connection);
}
[DiagnosticName(SmartSqlDiagnosticListenerExtensions.SMART_SQL_AFTER_DB_SESSION_ROLLBACK)]
public void AfterDbSessionRollback([Object]DbSessionRollbackAfterEventData eventData)
......@@ -118,12 +132,8 @@ namespace SkyApm.Diagnostics.SmartSql
[DiagnosticName(SmartSqlDiagnosticListenerExtensions.SMART_SQL_BEFORE_DB_SESSION_DISPOSE)]
public void BeforeDbSessionDispose([Object]DbSessionDisposeBeforeEventData eventData)
{
var context = _tracingContext.CreateLocalSegmentContext(eventData.Operation);
context.Span.SpanLayer = Tracing.Segments.SpanLayer.DB;
context.Span.Component = Common.Components.SMART_SQL;
context.Span.Peer = new Common.StringOrIntValue(eventData.DbSession.Connection?.DataSource);
context.Span.AddTag(Common.Tags.DB_INSTANCE, eventData.DbSession.Connection?.Database);
context.Span.AddTag(Common.Tags.DB_TYPE, "Sql");
var context = CreateSmartSqlLocalSegmentContext(eventData.Operation);
AddConnectionTag(context, eventData.DbSession.Connection);
}
[DiagnosticName(SmartSqlDiagnosticListenerExtensions.SMART_SQL_AFTER_DB_SESSION_DISPOSE)]
public void AfterDbSessionDispose([Object]DbSessionDisposeAfterEventData eventData)
......@@ -149,10 +159,7 @@ namespace SkyApm.Diagnostics.SmartSql
[DiagnosticName(SmartSqlDiagnosticListenerExtensions.SMART_SQL_BEFORE_DB_SESSION_OPEN)]
public void BeforeDbSessionOpen([Object]DbSessionOpenBeforeEventData eventData)
{
var context = _tracingContext.CreateLocalSegmentContext(eventData.Operation);
context.Span.SpanLayer = Tracing.Segments.SpanLayer.DB;
context.Span.Component = Common.Components.SMART_SQL;
context.Span.AddTag(Common.Tags.DB_TYPE, "Sql");
CreateSmartSqlLocalSegmentContext(eventData.Operation);
}
[DiagnosticName(SmartSqlDiagnosticListenerExtensions.SMART_SQL_AFTER_DB_SESSION_OPEN)]
public void AfterDbSessionOpen([Object]DbSessionOpenAfterEventData eventData)
......@@ -160,8 +167,7 @@ namespace SkyApm.Diagnostics.SmartSql
var context = _localSegmentContextAccessor.Context;
if (context != null)
{
context.Span.Peer = new Common.StringOrIntValue(eventData.DbSession.Connection?.DataSource);
context.Span.AddTag(Common.Tags.DB_INSTANCE, eventData.DbSession.Connection?.Database);
AddConnectionTag(context, eventData.DbSession.Connection);
_tracingContext.Release(context);
}
}
......@@ -171,6 +177,7 @@ namespace SkyApm.Diagnostics.SmartSql
var context = _localSegmentContextAccessor.Context;
if (context != null)
{
AddConnectionTag(context, eventData.DbSession.Connection);
context.Span.ErrorOccurred(eventData.Exception);
_tracingContext.Release(context);
}
......@@ -185,10 +192,7 @@ namespace SkyApm.Diagnostics.SmartSql
[DiagnosticName(SmartSqlDiagnosticListenerExtensions.SMART_SQL_BEFORE_DB_SESSION_INVOKE)]
public void BeforeDbSessionInvoke([Object]DbSessionInvokeBeforeEventData eventData)
{
var context = _tracingContext.CreateLocalSegmentContext(ResolveOperationName(eventData.ExecutionContext));
context.Span.SpanLayer = Tracing.Segments.SpanLayer.DB;
context.Span.Component = Common.Components.SMART_SQL;
context.Span.AddTag(Common.Tags.DB_TYPE, "Sql");
CreateSmartSqlLocalSegmentContext(ResolveOperationName(eventData.ExecutionContext));
}
[DiagnosticName(SmartSqlDiagnosticListenerExtensions.SMART_SQL_AFTER_DB_SESSION_INVOKE)]
public void AfterDbSessionInvoke([Object]DbSessionInvokeAfterEventData eventData)
......@@ -221,10 +225,11 @@ namespace SkyApm.Diagnostics.SmartSql
[DiagnosticName(SmartSqlDiagnosticListenerExtensions.SMART_SQL_BEFORE_COMMAND_EXECUTER_EXECUTE)]
public void BeforeCommandExecuterExecute([Object]CommandExecuterExecuteBeforeEventData eventData)
{
var context = _tracingContext.CreateLocalSegmentContext(eventData.Operation);
context.Span.SpanLayer = Tracing.Segments.SpanLayer.DB;
context.Span.Component = Common.Components.SMART_SQL;
context.Span.AddTag(Common.Tags.DB_TYPE, "Sql");
var context = CreateSmartSqlLocalSegmentContext(eventData.Operation);
if (eventData.ExecutionContext.Request.RealSql != null)
{
context.Span.AddTag(Common.Tags.DB_STATEMENT, eventData.ExecutionContext.Request.RealSql);
}
}
[DiagnosticName(SmartSqlDiagnosticListenerExtensions.SMART_SQL_AFTER_COMMAND_EXECUTER_EXECUTE)]
public void AfterCommandExecuterExecute([Object]CommandExecuterExecuteAfterEventData eventData)
......@@ -232,9 +237,7 @@ namespace SkyApm.Diagnostics.SmartSql
var context = _localSegmentContextAccessor.Context;
if (context != null)
{
context.Span.Peer = new Common.StringOrIntValue(eventData.ExecutionContext.DbSession.Connection?.DataSource);
context.Span.AddTag(Common.Tags.DB_INSTANCE, eventData.ExecutionContext.DbSession.Connection?.Database);
context.Span.AddTag(Common.Tags.DB_STATEMENT, eventData.ExecutionContext.Request.RealSql);
AddConnectionTag(context, eventData.ExecutionContext.DbSession.Connection);
_tracingContext.Release(context);
}
}
......@@ -244,6 +247,7 @@ namespace SkyApm.Diagnostics.SmartSql
var context = _localSegmentContextAccessor.Context;
if (context != null)
{
AddConnectionTag(context, eventData.ExecutionContext.DbSession.Connection);
context.Span.ErrorOccurred(eventData.Exception);
_tracingContext.Release(context);
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或