Move call to inject context into SQL Comments Further Down

DataDog · Mar 30, 2022 · 07f4596 · 07f4596
1 parent f844cc0
commit 07f4596
Showing 1 changed file with 6 additions and 5 deletions.
diff --git 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
 }