Added instrumentation for netfx SqlClient.

OpenTelemetry.sln

@@ -101,6 +101,38 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentati
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests", "test\OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests\OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj", "{7C4026CA-6434-4762-8B77-D657EAEE1325}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{F1D0972B-38CF-49C2-9F4B-4C5DE02FB71D}"
+	ProjectSection(SolutionItems) = preProject
+		.github\CODEOWNERS = .github\CODEOWNERS
+		.github\PULL_REQUEST_TEMPLATE.md = .github\PULL_REQUEST_TEMPLATE.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{A533C800-3DC3-4D04-90A7-0CE7A1E6BDB3}"
+	ProjectSection(SolutionItems) = preProject
+		.github\ISSUE_TEMPLATE\bug_report.md = .github\ISSUE_TEMPLATE\bug_report.md
+		.github\ISSUE_TEMPLATE\feature_request.md = .github\ISSUE_TEMPLATE\feature_request.md
+		.github\ISSUE_TEMPLATE\question.md = .github\ISSUE_TEMPLATE\question.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{E69578EB-B456-4062-A645-877CD964528B}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\dotnet-core-linux.yml = .github\workflows\dotnet-core-linux.yml
+		.github\workflows\dotnet-core-win.yml = .github\workflows\dotnet-core-win.yml
+		.github\workflows\dotnet-core.yml = .github\workflows\dotnet-core.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C1542297-8763-4DF4-957C-489ED771C21D}"
+	ProjectSection(SolutionItems) = preProject
+		src\Directory.Build.props = src\Directory.Build.props
+		src\Directory.Build.targets = src\Directory.Build.targets
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D2E73927-5966-445C-94E9-EFE6F269C8D5}"
+	ProjectSection(SolutionItems) = preProject
+		test\Directory.Build.props = test\Directory.Build.props
+		test\Directory.Build.targets = test\Directory.Build.targets
+	EndProjectSection
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.GrpcClient.Tests", "test\OpenTelemetry.Instrumentation.GrpcClient.Tests\OpenTelemetry.Instrumentation.GrpcClient.Tests.csproj", "{305E9DFD-E73B-4A28-8769-795C25551020}"
 EndProject
 Global
@@ -243,6 +275,10 @@ Global
 		{47318988-CA8B-4C81-B55D-2FA11D295A49} = {E359BB2B-9AEC-497D-B321-7DF2450C3B8E}
 		{25C06046-C7D0-46B4-AAAC-90C50C43DE7A} = {E359BB2B-9AEC-497D-B321-7DF2450C3B8E}
 		{9A4E3A68-904B-4835-A3C8-F664B73098DB} = {E359BB2B-9AEC-497D-B321-7DF2450C3B8E}
+		{A533C800-3DC3-4D04-90A7-0CE7A1E6BDB3} = {F1D0972B-38CF-49C2-9F4B-4C5DE02FB71D}
+		{E69578EB-B456-4062-A645-877CD964528B} = {F1D0972B-38CF-49C2-9F4B-4C5DE02FB71D}
+		{C1542297-8763-4DF4-957C-489ED771C21D} = {7CB2F02E-03FA-4FFF-89A5-C51F107623FD}
+		{D2E73927-5966-445C-94E9-EFE6F269C8D5} = {7CB2F02E-03FA-4FFF-89A5-C51F107623FD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {55639B5C-0770-4A22-AB56-859604650521}

src/OpenTelemetry.Api/Trace/SpanAttributeConstants.cs

@@ -40,9 +40,10 @@ public static class SpanAttributeConstants
         public const string HttpRouteKey = "http.route";
         public const string HttpFlavorKey = "http.flavor";
 
-        public const string DatabaseTypeKey = "db.type";
-        public const string DatabaseInstanceKey = "db.instance";
+        public const string DatabaseSystemKey = "db.system";
+        public const string DatabaseNameKey = "db.name";
         public const string DatabaseStatementKey = "db.statement";
+        public const string DatabaseStatementTypeKey = "db.statement_type";
 
         public const string RpcSystem = "rpc.system";
         public const string RpcService = "rpc.service";

src/OpenTelemetry.Api/Trace/SpanExtensions.cs

@@ -207,34 +207,34 @@ public static TelemetrySpan PutHttpFlavorAttribute(this TelemetrySpan span, stri
         }
 
         /// <summary>
-        /// Helper method that populates database type
-        /// to https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/data-database.md.
+        /// Helper method that populates database system
+        /// to https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/semantic_conventions/database.md.
         /// </summary>
         /// <param name="span">Span to fill out.</param>
-        /// <param name="type">Database type.</param>
+        /// <param name="system">Database system.</param>
         /// <returns>Span with populated properties.</returns>
-        public static TelemetrySpan PutDatabaseTypeAttribute(this TelemetrySpan span, string type)
+        public static TelemetrySpan PutDatabaseSystemAttribute(this TelemetrySpan span, string system)
         {
-            span.SetAttribute(SpanAttributeConstants.DatabaseTypeKey, type);
+            span.SetAttribute(SpanAttributeConstants.DatabaseSystemKey, system);
             return span;
         }
 
         /// <summary>
-        /// Helper method that populates database instance
-        /// to https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/data-database.md.
+        /// Helper method that populates database name
+        /// to https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/semantic_conventions/database.md.
         /// </summary>
         /// <param name="span">Span to fill out.</param>
-        /// <param name="instance">Database instance.</param>
+        /// <param name="name">Database name.</param>
         /// <returns>Span with populated properties.</returns>
-        public static TelemetrySpan PutDatabaseInstanceAttribute(this TelemetrySpan span, string instance)
+        public static TelemetrySpan PutDatabaseNameAttribute(this TelemetrySpan span, string name)
         {
-            span.SetAttribute(SpanAttributeConstants.DatabaseInstanceKey, instance);
+            span.SetAttribute(SpanAttributeConstants.DatabaseNameKey, name);
             return span;
         }
 
         /// <summary>
         /// Helper method that populates database statement
-        /// to https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/data-database.md.
+        /// to https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/semantic_conventions/database.md.
         /// </summary>
         /// <param name="span">Span to fill out.</param>
         /// <param name="statement">Database statement.</param>

src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerActivityExtensions.cs

@@ -98,7 +98,7 @@ public static JaegerSpan ToJaegerSpan(this Activity activity)
                 PooledList<JaegerTag>.Add(ref jaegerTags.Tags, new JaegerTag("library.name", JaegerTagType.STRING, vStr: activitySource.Name));
                 if (!string.IsNullOrEmpty(activitySource.Version))
                 {
-                    PooledList<JaegerTag>.Add(ref jaegerTags.Tags, new JaegerTag("library.version", JaegerTagType.STRING, vStr: activitySource.Name));
+                    PooledList<JaegerTag>.Add(ref jaegerTags.Tags, new JaegerTag("library.version", JaegerTagType.STRING, vStr: activitySource.Version));
                 }
             }
 

src/OpenTelemetry.Instrumentation.AspNet.Win/Implementation/HttpInListener.cs

@@ -40,12 +40,10 @@ public HttpInListener(string name, AspNetInstrumentationOptions options, Activit
 
         public override void OnStartActivity(Activity activity, object payload)
         {
-            const string EventNameSuffix = ".OnStartActivity";
-
             var context = HttpContext.Current;
             if (context == null)
             {
-                InstrumentationEventSource.Log.NullPayload(nameof(HttpInListener) + EventNameSuffix);
+                InstrumentationEventSource.Log.NullPayload(nameof(HttpInListener), nameof(this.OnStartActivity));
                 return;
             }
 
@@ -114,8 +112,6 @@ public override void OnStartActivity(Activity activity, object payload)
 
         public override void OnStopActivity(Activity activity, object payload)
         {
-            const string EventNameSuffix = ".OnStopActivity";
-
             Activity activityToEnrich = activity;
 
             if (!(this.options.TextFormat is TraceContextFormatActivity))
@@ -139,7 +135,7 @@ public override void OnStopActivity(Activity activity, object payload)
                 var context = HttpContext.Current;
                 if (context == null)
                 {
-                    InstrumentationEventSource.Log.NullPayload(nameof(HttpInListener) + EventNameSuffix);
+                    InstrumentationEventSource.Log.NullPayload(nameof(HttpInListener), nameof(this.OnStopActivity));
                     return;
                 }
 

src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs

@@ -48,12 +48,11 @@ public HttpInListener(string name, AspNetCoreInstrumentationOptions options, Act
 
         public override void OnStartActivity(Activity activity, object payload)
         {
-            const string EventNameSuffix = ".OnStartActivity";
             var context = this.startContextFetcher.Fetch(payload) as HttpContext;
 
             if (context == null)
             {
-                InstrumentationEventSource.Log.NullPayload(nameof(HttpInListener) + EventNameSuffix);
+                InstrumentationEventSource.Log.NullPayload(nameof(HttpInListener), nameof(this.OnStartActivity));
                 return;
             }
 
@@ -120,13 +119,11 @@ public override void OnStartActivity(Activity activity, object payload)
 
         public override void OnStopActivity(Activity activity, object payload)
         {
-            const string EventNameSuffix = ".OnStopActivity";
-
             if (activity.IsAllDataRequested)
             {
                 if (!(this.stopContextFetcher.Fetch(payload) is HttpContext context))
                 {
-                    InstrumentationEventSource.Log.NullPayload(nameof(HttpInListener) + EventNameSuffix);
+                    InstrumentationEventSource.Log.NullPayload(nameof(HttpInListener), nameof(this.OnStopActivity));
                     return;
                 }
 

src/OpenTelemetry.Instrumentation.Dependencies/Implementation/GrpcClientDiagnosticListener.cs

@@ -41,10 +41,9 @@ public GrpcClientDiagnosticListener(ActivitySourceAdapter activitySource)
 
         public override void OnStartActivity(Activity activity, object payload)
         {
-            const string EventNameSuffix = ".OnStartActivity";
             if (!(this.startRequestFetcher.Fetch(payload) is HttpRequestMessage request))
             {
-                InstrumentationEventSource.Log.NullPayload(nameof(GrpcClientDiagnosticListener) + EventNameSuffix);
+                InstrumentationEventSource.Log.NullPayload(nameof(GrpcClientDiagnosticListener), nameof(this.OnStartActivity));
                 return;
             }
 

src/OpenTelemetry.Instrumentation.Dependencies/Implementation/HttpHandlerDiagnosticListener.cs

@@ -62,10 +62,9 @@ public HttpHandlerDiagnosticListener(HttpClientInstrumentationOptions options, A
 
         public override void OnStartActivity(Activity activity, object payload)
         {
-            const string EventNameSuffix = ".OnStartActivity";
             if (!(this.startRequestFetcher.Fetch(payload) is HttpRequestMessage request))
             {
-                InstrumentationEventSource.Log.NullPayload(nameof(HttpHandlerDiagnosticListener) + EventNameSuffix);
+                InstrumentationEventSource.Log.NullPayload(nameof(HttpHandlerDiagnosticListener), nameof(this.OnStartActivity));
                 return;
             }
 
@@ -141,13 +140,11 @@ public override void OnStopActivity(Activity activity, object payload)
 
         public override void OnException(Activity activity, object payload)
         {
-            const string EventNameSuffix = ".OnException";
-
             if (activity.IsAllDataRequested)
             {
                 if (!(this.stopExceptionFetcher.Fetch(payload) is Exception exc))
                 {
-                    InstrumentationEventSource.Log.NullPayload(nameof(HttpHandlerDiagnosticListener) + EventNameSuffix);
+                    InstrumentationEventSource.Log.NullPayload(nameof(HttpHandlerDiagnosticListener), nameof(this.OnException));
                     return;
                 }
 

src/OpenTelemetry.Instrumentation.Dependencies/Implementation/SqlClientDiagnosticListener.cs

@@ -17,7 +17,6 @@
 using System.Data;
 using System.Diagnostics;
 using OpenTelemetry.Trace;
-using OpenTelemetry.Trace.Samplers;
 
 namespace OpenTelemetry.Instrumentation.Dependencies.Implementation
 {
@@ -32,7 +31,7 @@ internal class SqlClientDiagnosticListener : ListenerHandler
         internal const string SqlDataWriteCommandError = "System.Data.SqlClient.WriteCommandError";
         internal const string SqlMicrosoftWriteCommandError = "Microsoft.Data.SqlClient.WriteCommandError";
 
-        private const string DatabaseStatementTypeSpanAttributeKey = "db.statementType";
+        internal const string MicrosoftSqlServerDatabaseSystemName = "mssql";
 
         private readonly PropertyFetcher commandFetcher = new PropertyFetcher("Command");
         private readonly PropertyFetcher connectionFetcher = new PropertyFetcher("Connection");
@@ -66,7 +65,7 @@ public override void OnCustom(string name, Activity activity, object payload)
 
                         if (command == null)
                         {
-                            InstrumentationEventSource.Log.NullPayload($"{nameof(SqlClientDiagnosticListener)}-{name}");
+                            InstrumentationEventSource.Log.NullPayload(nameof(SqlClientDiagnosticListener), name);
                             return;
                         }
 
@@ -85,17 +84,16 @@ public override void OnCustom(string name, Activity activity, object payload)
                             var commandText = this.commandTextFetcher.Fetch(command);
 
                             activity.AddTag(SpanAttributeConstants.ComponentKey, "sql");
-                            activity.AddTag(SpanAttributeConstants.DatabaseTypeKey, "sql");
+                            activity.AddTag(SpanAttributeConstants.DatabaseSystemKey, MicrosoftSqlServerDatabaseSystemName);
                             activity.AddTag(SpanAttributeConstants.PeerServiceKey, (string)dataSource);
-                            activity.AddTag(SpanAttributeConstants.DatabaseInstanceKey, (string)database);
+                            activity.AddTag(SpanAttributeConstants.DatabaseNameKey, (string)database);
 
                             if (this.commandTypeFetcher.Fetch(command) is CommandType commandType)
                             {
-                                activity.AddTag(DatabaseStatementTypeSpanAttributeKey, commandType.ToString());
-
                                 switch (commandType)
                                 {
                                     case CommandType.StoredProcedure:
+                                        activity.AddTag(SpanAttributeConstants.DatabaseStatementTypeKey, nameof(CommandType.StoredProcedure));
                                         if (this.options.CaptureStoredProcedureCommandName)
                                         {
                                             activity.AddTag(SpanAttributeConstants.DatabaseStatementKey, (string)commandText);
@@ -104,12 +102,17 @@ public override void OnCustom(string name, Activity activity, object payload)
                                         break;
 
                                     case CommandType.Text:
+                                        activity.AddTag(SpanAttributeConstants.DatabaseStatementTypeKey, nameof(CommandType.Text));
                                         if (this.options.CaptureTextCommandContent)
                                         {
                                             activity.AddTag(SpanAttributeConstants.DatabaseStatementKey, (string)commandText);
                                         }
 
                                         break;
+
+                                    case CommandType.TableDirect:
+                                        activity.AddTag(SpanAttributeConstants.DatabaseStatementTypeKey, nameof(CommandType.TableDirect));
+                                        break;
                                 }
                             }
                         }
@@ -136,7 +139,7 @@ public override void OnCustom(string name, Activity activity, object payload)
                             }
                             else
                             {
-                                InstrumentationEventSource.Log.NullPayload($"{nameof(SqlClientDiagnosticListener)}-{name}");
+                                InstrumentationEventSource.Log.NullPayload(nameof(SqlClientDiagnosticListener), name);
                             }
                         }