diff --git a/ddtrace/tracer/sqlcomment_test.go b/ddtrace/tracer/sqlcomment_test.go
index ad83f9c6fe..a9738f02a1 100644
--- a/ddtrace/tracer/sqlcomment_test.go
+++ b/ddtrace/tracer/sqlcomment_test.go
@@ -13,44 +13,75 @@ func TestQueryTextCarrier(t *testing.T) {
 	testCases := []struct {
 		name      string
 		query     string
-		tags      map[string]string
+		options   []InjectionOption
 		commented string
 	}{
 		{
-			name:      "query with tag list",
+			name:      "all tags injected",
 			query:     "SELECT * from FOO",
-			tags:      map[string]string{"operation": "checkout"},
-			commented: "/*ddsid='10',ddsp='2',ddtid='10',ot-baggage-operation='checkout'*/ SELECT * from FOO",
+			options:   []InjectionOption{WithParentVersionKey("ddsv"), WithEnvironmentKey("dde"), WithServiceNameKey("ddsn"), WithSpanIDKey("ddsid"), WithTraceIDKey("ddtid"), WithSamplingPriorityKey("ddsp")},
+			commented: "/*dde='test-env',ddsid='10',ddsn='whiskey-service',ddsp='2',ddsv='1.0.0',ddtid='10'*/ SELECT * from FOO",
 		},
 		{
-			name:      "empty query",
+			name:      "empty query, all tags injected",
 			query:     "",
-			tags:      map[string]string{"operation": "elmer's glue"},
-			commented: "",
+			options:   []InjectionOption{WithParentVersionKey("ddsv"), WithEnvironmentKey("dde"), WithServiceNameKey("ddsn"), WithSpanIDKey("ddsid"), WithTraceIDKey("ddtis"), WithSamplingPriorityKey("ddsp")},
+			commented: "/*dde='test-env',ddsid='10',ddsn='whiskey-service',ddsp='2',ddsv='1.0.0',ddtis='10'*/",
 		},
 		{
 			name:      "query with existing comment",
 			query:     "SELECT * from FOO -- test query",
-			tags:      map[string]string{"operation": "elmer's glue"},
-			commented: "/*ddsid='10',ddsp='2',ddtid='10',ot-baggage-operation='elmer%27s%20glue'*/ SELECT * from FOO -- test query",
+			options:   []InjectionOption{WithParentVersionKey("ddsv"), WithEnvironmentKey("dde"), WithServiceNameKey("ddsn"), WithSpanIDKey("ddsid"), WithTraceIDKey("ddtis"), WithSamplingPriorityKey("ddsp")},
+			commented: "/*dde='test-env',ddsid='10',ddsn='whiskey-service',ddsp='2',ddsv='1.0.0',ddtis='10'*/ SELECT * from FOO -- test query",
+		},
+		{
+			name:      "only parent version tag",
+			query:     "SELECT * from FOO",
+			options:   []InjectionOption{WithParentVersionKey("ddsv")},
+			commented: "/*ddsv='1.0.0'*/ SELECT * from FOO",
+		},
+		{
+			name:      "only env tag",
+			query:     "SELECT * from FOO",
+			options:   []InjectionOption{WithEnvironmentKey("dde")},
+			commented: "/*dde='test-env'*/ SELECT * from FOO",
+		},
+		{
+			name:      "only service name tag",
+			query:     "SELECT * from FOO",
+			options:   []InjectionOption{WithServiceNameKey("ddsn")},
+			commented: "/*ddsn='whiskey-service'*/ SELECT * from FOO",
+		},
+		{
+			name:      "only trace id tag",
+			query:     "SELECT * from FOO",
+			options:   []InjectionOption{WithTraceIDKey("ddtid")},
+			commented: "/*ddtid='10'*/ SELECT * from FOO",
+		},
+		{
+			name:      "only span id tag",
+			query:     "SELECT * from FOO",
+			options:   []InjectionOption{WithSpanIDKey("ddsid")},
+			commented: "/*ddsid='10'*/ SELECT * from FOO",
+		},
+		{
+			name:      "only sampling priority tag",
+			query:     "SELECT * from FOO",
+			options:   []InjectionOption{WithSamplingPriorityKey("ddsp")},
+			commented: "/*ddsp='2'*/ SELECT * from FOO",
 		},
 	}
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			propagator := NewPropagator(&PropagatorConfig{})
-			tracer := newTracer(WithPropagator(propagator))
-
-			root := tracer.StartSpan("web.request", WithSpanID(10)).(*span)
-			for k, v := range tc.tags {
-				root.SetBaggageItem(k, v)
-			}
+			tracer := newTracer(WithService("whiskey-service"), WithEnv("test-env"), WithServiceVersion("1.0.0"))
 
+			root := tracer.StartSpan("db.call", WithSpanID(10), ServiceName("whiskey-db")).(*span)
 			root.SetTag(ext.SamplingPriority, 2)
 			ctx := root.Context()
 
 			carrier := SQLCommentCarrier{}
-			err := tracer.Inject(ctx, &carrier)
+			err := tracer.InjectWithOptions(ctx, &carrier, tc.options...)
 			require.NoError(t, err)
 
 			assert.Equal(t, tc.commented, carrier.CommentedQuery(tc.query))
diff --git a/ddtrace/tracer/textmap.go b/ddtrace/tracer/textmap.go
index cc081fded1..5ef4463f12 100644
--- a/ddtrace/tracer/textmap.go
+++ b/ddtrace/tracer/textmap.go
@@ -205,7 +205,9 @@ func (i *experimentalInjector) injectTextMapWithOptions(spanCtx ddtrace.SpanCont
 	}
 
 	if cfg.ServiceNameKey != "" {
-		writer.Set(cfg.ServiceNameKey, globalconfig.ServiceName())
+		if globalconfig.ServiceName() != "" {
+			writer.Set(cfg.ServiceNameKey, globalconfig.ServiceName())
+		}
 	}
 
 	return nil
diff --git a/ddtrace/tracer/tracer.go b/ddtrace/tracer/tracer.go
index 5fd645116d..37cfb8d5d7 100644
--- a/ddtrace/tracer/tracer.go
+++ b/ddtrace/tracer/tracer.go
@@ -432,7 +432,10 @@ func (t *tracer) StartSpan(operationName string, options ...ddtrace.StartSpanOpt
 	if t.config.version != "" {
 		if t.config.universalVersion || (!t.config.universalVersion && span.Service == t.config.serviceName) {
 			span.setMeta(ext.Version, t.config.version)
-		} else {
+		}
+		// If the span has a different service than the global service, attribute and set the config version as the
+		// parent version
+		if span.Service != t.config.serviceName {
 			span.setMeta(ext.ParentVersion, t.config.version)
 		}
 	}