fix code smell (#471)

SkyAPM · May 1, 2022 · d967fe3 · d967fe3
1 parent 85e05cd
commit d967fe3
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 28 deletions.
diff --git a/...kyApm.Core/Diagnostics/AnonymousObject.cs → ...e/Diagnostics/AnonymousObjectAttribute.cs b/...kyApm.Core/Diagnostics/AnonymousObject.cs → ...e/Diagnostics/AnonymousObjectAttribute.cs
@@ -18,7 +18,7 @@
 
 namespace SkyApm.Diagnostics
 {
-    public class AnonymousObject : ParameterBinder
+    public class AnonymousObjectAttribute : ParameterBinderAttribute
     {
         public override object Resolve(object value)
         {

diff --git a/...SkyApm.Core/Diagnostics/DiagnosticName.cs → ...re/Diagnostics/DiagnosticNameAttribute.cs b/...SkyApm.Core/Diagnostics/DiagnosticName.cs → ...re/Diagnostics/DiagnosticNameAttribute.cs
@@ -20,11 +20,11 @@
 
 namespace SkyApm.Diagnostics
 {
-    public class DiagnosticName :Attribute
+    public class DiagnosticNameAttribute :Attribute
     {
         public string Name { get; }
 
-        public DiagnosticName(string name)
+        public DiagnosticNameAttribute(string name)
         {
             Name = name;
         }

diff --git a/src/SkyApm.Core/Diagnostics/ObjectAttribute.cs b/src/SkyApm.Core/Diagnostics/ObjectAttribute.cs
@@ -20,7 +20,7 @@
 
 namespace SkyApm.Diagnostics
 {
-    public class ObjectAttribute : ParameterBinder
+    public class ObjectAttribute : ParameterBinderAttribute
     {
         public Type TargetType { get; set; }
 

diff --git a/...kyApm.Core/Diagnostics/ParameterBinder.cs → ...e/Diagnostics/ParameterBinderAttribute.cs b/...kyApm.Core/Diagnostics/ParameterBinder.cs → ...e/Diagnostics/ParameterBinderAttribute.cs
@@ -20,7 +20,7 @@
 
 namespace SkyApm.Diagnostics
 {
-    public abstract class ParameterBinder : Attribute, IParameterResolver
+    public abstract class ParameterBinderAttribute : Attribute, IParameterResolver
     {
         public abstract object Resolve(object value);
     }

diff --git a/src/SkyApm.Core/Diagnostics/PropertyAttribute.cs b/src/SkyApm.Core/Diagnostics/PropertyAttribute.cs
@@ -20,7 +20,7 @@
 
 namespace SkyApm.Diagnostics
 {
-    public class PropertyAttribute : ParameterBinder
+    public class PropertyAttribute : ParameterBinderAttribute
     {
         public string Name { get; set; }
 

diff --git a/src/SkyApm.Core/Diagnostics/TracingDiagnosticMethod.cs b/src/SkyApm.Core/Diagnostics/TracingDiagnosticMethod.cs
@@ -61,7 +61,7 @@ private static IEnumerable<IParameterResolver> GetParameterResolvers(MethodInfo
         {
             foreach (var parameter in methodInfo.GetParameters())
             {
-                var binder = parameter.GetCustomAttribute<ParameterBinder>();
+                var binder = parameter.GetCustomAttribute<ParameterBinderAttribute>();
                 if (binder != null)
                 {
                     if(binder is ObjectAttribute objectBinder)

diff --git a/src/SkyApm.Core/Diagnostics/TracingDiagnosticMethodCollection.cs b/src/SkyApm.Core/Diagnostics/TracingDiagnosticMethodCollection.cs
@@ -31,7 +31,7 @@ public TracingDiagnosticMethodCollection(ITracingDiagnosticProcessor tracingDiag
             _methods = new List<TracingDiagnosticMethod>();
             foreach (var method in tracingDiagnosticProcessor.GetType().GetMethods())
             {
-                var diagnosticName = method.GetCustomAttribute<DiagnosticName>();
+                var diagnosticName = method.GetCustomAttribute<DiagnosticNameAttribute>();
                 if(diagnosticName==null)
                     continue;
                 _methods.Add(new TracingDiagnosticMethod(tracingDiagnosticProcessor, method, diagnosticName.Name));

diff --git a/src/SkyApm.Diagnostics.FreeSql/FreeSqlTracingDiagnosticProcessor.cs b/src/SkyApm.Diagnostics.FreeSql/FreeSqlTracingDiagnosticProcessor.cs
@@ -105,7 +105,7 @@ public void SyncStructureAfter([Object] SyncStructureAfterEventArgs eventData)
             var context = _localSegmentContextAccessor.Context;
             if (context != null)
             {
-                if (string.IsNullOrEmpty(eventData.Sql) == false)
+                if (!string.IsNullOrEmpty(eventData.Sql))
                     context.Span.AddTag(Common.Tags.DB_STATEMENT, eventData.Sql);
                 if (eventData?.Exception != null)
                     context.Span.ErrorOccurred(eventData.Exception, _tracingConfig);
@@ -127,7 +127,7 @@ public void CommandAfter([Object] CommandAfterEventArgs eventData)
             var context = _localSegmentContextAccessor.Context;
             if (context != null)
             {
-                if (string.IsNullOrEmpty(eventData.Log) == false)
+                if (!string.IsNullOrEmpty(eventData.Log))
                     context.Span.AddTag(Common.Tags.DB_STATEMENT, eventData.Log);
                 if (eventData?.Exception != null)
                     context.Span.ErrorOccurred(eventData.Exception, _tracingConfig);
@@ -149,7 +149,7 @@ public void TraceAfterUnitOfWork([Object] TraceAfterEventArgs eventData)
             var context = _localSegmentContextAccessor.Context;
             if (context != null)
             {
-                if (string.IsNullOrEmpty(eventData.Remark) == false)
+                if (!string.IsNullOrEmpty(eventData.Remark))
                     context.Span.AddTag(Common.Tags.DB_STATEMENT, eventData.Remark);
                 if (eventData?.Exception != null)
                     context.Span.ErrorOccurred(eventData.Exception, _tracingConfig);

diff --git a/src/SkyApm.Diagnostics.Grpc/Client/ClientDiagnosticInterceptor.cs b/src/SkyApm.Diagnostics.Grpc/Client/ClientDiagnosticInterceptor.cs
@@ -54,7 +54,7 @@ public override AsyncUnaryCall<TResponse> AsyncUnaryCall<TRequest, TResponse>(TR
                     catch (Exception ex)
                     {
                         _processor.DiagnosticUnhandledException(ex);
-                        throw ex;
+                        throw;
                     }
                 });
                 return new AsyncUnaryCall<TResponse>(responseAsync, response.ResponseHeadersAsync, response.GetStatus, response.GetTrailers, response.Dispose);
@@ -101,7 +101,7 @@ public T Call<T, TRequest, TResponse>(ClientInterceptorContext<TRequest, TRespon
             catch (Exception ex)
             {
                 _processor.DiagnosticUnhandledException(ex);
-                throw ex;
+                throw;
             }
         }
     }

diff --git a/src/SkyApm.Diagnostics.Grpc/Server/ServerDiagnosticInterceptor.cs b/src/SkyApm.Diagnostics.Grpc/Server/ServerDiagnosticInterceptor.cs
@@ -36,38 +36,37 @@ public override async Task<TResponse> UnaryServerHandler<TRequest, TResponse>(TR
         {
              _processor.BeginRequest(context);
 
-            return await Handler<TRequest, TResponse>(context, async () =>
+            return await Handler(context, async () =>
             {
                 return await continuation(request, context);
             });
         }
 
         public override async Task<TResponse> ClientStreamingServerHandler<TRequest, TResponse>(IAsyncStreamReader<TRequest> requestStream, ServerCallContext context, ClientStreamingServerMethod<TRequest, TResponse> continuation)
         {
-            return await Handler<TRequest, TResponse>(context, async () =>
+            return await Handler(context, async () =>
             {
                 return await continuation(requestStream, context);
             });
         }
 
         public override async Task ServerStreamingServerHandler<TRequest, TResponse>(TRequest request, IServerStreamWriter<TResponse> responseStream, ServerCallContext context, ServerStreamingServerMethod<TRequest, TResponse> continuation)
         {
-            await Handler<TRequest>(context, async () =>
+            await Handler(context, async () =>
             {
                 await continuation(request, responseStream, context);
             });
         }
 
         public override async Task DuplexStreamingServerHandler<TRequest, TResponse>(IAsyncStreamReader<TRequest> requestStream, IServerStreamWriter<TResponse> responseStream, ServerCallContext context, DuplexStreamingServerMethod<TRequest, TResponse> continuation)
         {
-            await Handler<TRequest>(context, async () =>
+            await Handler(context, async () =>
             {
                 await continuation(requestStream, responseStream, context);
             });
         }
 
-        private async Task Handler<TRequest>(ServerCallContext context, Func<Task> func) 
-            where TRequest : class
+        private async Task Handler(ServerCallContext context, Func<Task> func)
         {
             _processor.BeginRequest(context);
             try
@@ -78,12 +77,11 @@ private async Task Handler<TRequest>(ServerCallContext context, Func<Task> func)
             catch (Exception ex)
             {
                 _processor.DiagnosticUnhandledException(ex);
-                throw ex;
+                throw;
             }
         }
 
-        private async Task<TResponse> Handler<TRequest, TResponse>(ServerCallContext context, Func<Task<TResponse>> func)
-            where TRequest : class
+        private async Task<TResponse> Handler<TResponse>(ServerCallContext context, Func<Task<TResponse>> func)
             where TResponse : class
         {
             _processor.BeginRequest(context);
@@ -96,7 +94,7 @@ private async Task<TResponse> Handler<TRequest, TResponse>(ServerCallContext con
             catch (Exception ex)
             {
                 _processor.DiagnosticUnhandledException(ex);
-                throw ex;
+                throw;
             }
         }
     }

diff --git a/src/SkyApm.Diagnostics.MongoDB/DiagnosticsActivityEventSubscriber.cs b/src/SkyApm.Diagnostics.MongoDB/DiagnosticsActivityEventSubscriber.cs
@@ -27,7 +27,7 @@ namespace SkyApm.Diagnostics.MongoDB
 {
     public class DiagnosticsActivityEventSubscriber : IEventSubscriber
     {
-        public static DiagnosticSource diagnosticSource = new DiagnosticListener("MongoSourceListener");
+        private static DiagnosticSource diagnosticSource = new DiagnosticListener("MongoSourceListener");
         internal static readonly AssemblyName AssemblyName = typeof(DiagnosticsActivityEventSubscriber).Assembly.GetName();
         internal static readonly string ActivitySourceName = AssemblyName.Name;
         internal static readonly Version Version = AssemblyName.Version;
@@ -71,10 +71,7 @@ private void Handle(CommandStartedEvent @event)
                 return;
             }
             var activity = new Activity("MongoActivity");
-            if (activity == null)
-            {
-                return;
-            }
+
             _activityMap.TryAdd(@event.RequestId, activity);
             diagnosticSource.StartActivity(activity, @event);
         }