From 07f4596fd9be636482f28a6581c0e5208d5ecd70 Mon Sep 17 00:00:00 2001
From: Alex Normand <alex.normand@datadoghq.com>
Date: Tue, 29 Mar 2022 18:22:22 -0700
Subject: [PATCH] Move call to inject context into SQL Comments Further Down

---
 contrib/database/sql/conn.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/contrib/database/sql/conn.go b/contrib/database/sql/conn.go
index c7d681f838..35ac43f9af 100644
--- a/contrib/database/sql/conn.go
+++ b/contrib/database/sql/conn.go
@@ -251,11 +251,6 @@ func (tp *traceParams) tryStartTrace(ctx context.Context, qtype queryType, query
 	resource := string(qtype)
 	if query != "" {
 		resource = query
-		err := tracer.Inject(span.Context(), sqlCommentCarrier)
-		if err != nil {
-			// this should never happen
-			fmt.Fprintf(os.Stderr, "contrib/database/sql: failed to inject query comments: %v\n", err)
-		}
 	}
 	span.SetTag("sql.query_type", string(qtype))
 	span.SetTag(ext.ResourceName, resource)
@@ -268,5 +263,11 @@ func (tp *traceParams) tryStartTrace(ctx context.Context, qtype queryType, query
 		}
 	}
 
+	err = tracer.Inject(span.Context(), sqlCommentCarrier)
+	if err != nil {
+		// this should never happen
+		fmt.Fprintf(os.Stderr, "contrib/database/sql: failed to inject query comments: %v\n", err)
+	}
+
 	return span
 }