chore(core): Clean up

Author: PerfectSlayer

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

@@ -1557,7 +1557,7 @@ private DDSpanContext buildSpanContext() {
 
       String parentServiceName = null;
       // Propagate internal trace.
-      // Note: if we are not in the context of distributed tracing and we are starting the first
+      // Note: if we are not in the context of distributed tracing, and we are starting the first
       // root span, parentContext will be null at this point.
       if (parentContext instanceof DDSpanContext) {
         final DDSpanContext ddsc = (DDSpanContext) parentContext;
@@ -1738,9 +1738,7 @@ private DDSpanContext buildSpanContext() {
       context.setAllTags(tags);
       context.setAllTags(coreTags);
       context.setAllTags(rootSpanTags);
-      if (contextualTags != null) {
-        context.setAllTags(contextualTags);
-      }
+      context.setAllTags(contextualTags);
       return context;
     }
   }