[Instrumentation.MySql] fix sql text incomplete (#424)

* fix sql text incomplete
open-telemetry · Jun 28, 2022 · 00ac360 · 00ac360
1 parent 73d733f
commit 00ac360
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/src/OpenTelemetry.Instrumentation.MySqlData/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.MySqlData/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Fix incomplete db.statement when the length>300
+  [(#424)](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/424)
+
 ## 1.0.0-beta.2
 
 * Going forward the NuGet package will be

diff --git a/src/OpenTelemetry.Instrumentation.MySqlData/MySqlDataInstrumentation.cs b/src/OpenTelemetry.Instrumentation.MySqlData/MySqlDataInstrumentation.cs
@@ -84,6 +84,9 @@ public override void TraceEvent(TraceEventCache eventCache, string source, Trace
                         this.ErrorExecuteCommand(this.GetMySqlErrorException(args[2]));
                         break;
                     case MySqlTraceEventType.QueryNormalized:
+                        // Should use QueryNormalized event when it exists. Because cmdText in QueryOpened event is incomplete when cmdText.length>300
+                        // args: [driverId, threadId, normalized_query]
+                        this.OverwriteDbStatement(this.GetCommand(args[0], args[2]));
                         break;
                     default:
                         MySqlDataInstrumentationEventSource.Log.UnknownMySqlTraceEventType(id, string.Format(format, args));
@@ -125,6 +128,28 @@ private void BeforeExecuteCommand(MySqlDataTraceCommand command)
             }
         }
 
+        private void OverwriteDbStatement(MySqlDataTraceCommand command)
+        {
+            var activity = Activity.Current;
+            if (activity == null)
+            {
+                return;
+            }
+
+            if (activity.Source != MySqlActivitySourceHelper.ActivitySource)
+            {
+                return;
+            }
+
+            if (activity.IsAllDataRequested)
+            {
+                if (this.options.SetDbStatement)
+                {
+                    activity.SetTag(SemanticConventions.AttributeDbStatement, command.SqlText);
+                }
+            }
+        }
+
         private void AfterExecuteCommand()
         {
             var activity = Activity.Current;