Use ComponentId instead of ComponentName (#498)

SkyAPM · Aug 19, 2022 · 596b357 · 596b357
1 parent 51fc719
commit 596b357
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/...m.Diagnostics.EntityFrameworkCore.Npgsql/NpgsqlEntityFrameworkCoreSpanMetadataProvider.cs b/...m.Diagnostics.EntityFrameworkCore.Npgsql/NpgsqlEntityFrameworkCoreSpanMetadataProvider.cs
@@ -16,13 +16,14 @@
  *
  */
 
+using SkyApm.Common;
 using System.Data.Common;
 
 namespace SkyApm.Diagnostics.EntityFrameworkCore
 {
     public class NpgsqlEntityFrameworkCoreSpanMetadataProvider : IEntityFrameworkCoreSpanMetadataProvider
     {
-        public string Component { get; } = Common.Components.NPGSQL_ENTITYFRAMEWORKCORE_POSTGRESQL.GetStringValue();
+        public StringOrIntValue Component { get; } = Common.Components.NPGSQL_ENTITYFRAMEWORKCORE_POSTGRESQL;
 
         public bool Match(DbConnection connection)
         {

diff --git a/...gnostics.EntityFrameworkCore.Pomelo.MySql/MySqlEntityFrameworkCoreSpanMetadataProvider.cs b/...gnostics.EntityFrameworkCore.Pomelo.MySql/MySqlEntityFrameworkCoreSpanMetadataProvider.cs
@@ -16,13 +16,14 @@
  *
  */
 
+using SkyApm.Common;
 using System.Data.Common;
 
 namespace SkyApm.Diagnostics.EntityFrameworkCore
 {
     public class MySqlEntityFrameworkCoreSpanMetadataProvider : IEntityFrameworkCoreSpanMetadataProvider
     {
-        public string Component { get; } = Common.Components.POMELO_ENTITYFRAMEWORKCORE_MYSQL.GetStringValue();
+        public StringOrIntValue Component { get; } = Common.Components.POMELO_ENTITYFRAMEWORKCORE_MYSQL;
 
         public bool Match(DbConnection connection)
         {

diff --git a/...m.Diagnostics.EntityFrameworkCore.Sqlite/SqliteEntityFrameworkCoreSpanMetadataProvider.cs b/...m.Diagnostics.EntityFrameworkCore.Sqlite/SqliteEntityFrameworkCoreSpanMetadataProvider.cs
@@ -16,13 +16,14 @@
  *
  */
 
+using SkyApm.Common;
 using System.Data.Common;
 
 namespace SkyApm.Diagnostics.EntityFrameworkCore
 {
     public class SqliteEntityFrameworkCoreSpanMetadataProvider : IEntityFrameworkCoreSpanMetadataProvider
     {
-        public string Component { get; } = Common.Components.ENTITYFRAMEWORKCORE_SQLITE.GetStringValue();
+        public StringOrIntValue Component { get; } = Common.Components.ENTITYFRAMEWORKCORE_SQLITE;
 
         public bool Match(DbConnection connection)
         {

diff --git a/src/SkyApm.Diagnostics.EntityFrameworkCore/EntityFrameworkCoreSegmentContextFactory.cs b/src/SkyApm.Diagnostics.EntityFrameworkCore/EntityFrameworkCoreSegmentContextFactory.cs
@@ -70,7 +70,7 @@ private SegmentContext CreateExitSegment(string operationName, DbCommand dbComma
         {
             var context = _tracingContext.CreateExitSegmentContext(operationName,
                 metadataProvider.GetPeer(dbCommand.Connection));
-            context.Span.Component = new StringOrIntValue(metadataProvider.Component);
+            context.Span.Component = metadataProvider.Component;
             return context;
         }
 

diff --git a/src/SkyApm.Diagnostics.EntityFrameworkCore/IEntityFrameworkCoreSpanMetadataProvider.cs b/src/SkyApm.Diagnostics.EntityFrameworkCore/IEntityFrameworkCoreSpanMetadataProvider.cs
@@ -16,13 +16,14 @@
  *
  */
 
+using SkyApm.Common;
 using System.Data.Common;
 
 namespace SkyApm.Diagnostics.EntityFrameworkCore
 {
     public interface IEntityFrameworkCoreSpanMetadataProvider
     {
-        string Component { get; }
+        StringOrIntValue Component { get; }
 
         bool Match(DbConnection connection);