Merged with master.

Author: AlexeyKuznetsov-DD

dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java

@@ -1187,7 +1187,7 @@ void processTagsAndBaggage(
       TagsPostProcessorFactory.lazyProcessor().processTags(unsafeTags, this, restrictedSpan);
 
       // Links
-      if (injectLinksAsTags) {
+      if (injectLinksAsTags || spanLinksAsTag) {
         String linksTag = DDSpanLink.toTag(restrictedSpan.getLinks());
         if (linksTag != null) {
           unsafeTags.set(SPAN_LINKS, linksTag);