Test now uses clearThreadServiceName

Author: kr-igor

dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java

@@ -189,6 +189,12 @@ public void setProduceCheckpoint(String type, String target) {
 
   @Override
   public void setThreadServiceName(Long threadId, String serviceName) {
+    // setting service name to null == removing the value
+    if (serviceName == null) {
+      clearThreadServiceName(threadId);
+      return;
+    }
+
     threadServiceNames.put(threadId, serviceName);
   }
 

dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy

@@ -83,10 +83,10 @@ class DataStreamsWritingTest extends DDCoreSpecification {
     dataStreams.add(new StatsPoint([], 9, 0, 10, timeSource.currentTimeNanos, 0, 0, 0, serviceNameOverride))
     dataStreams.trackBacklog(new LinkedHashMap<>(["partition": "1", "topic": "testTopic", "type": "kafka_produce"]), 130)
     timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS)
-    dataStreams.setThreadServiceName(Thread.currentThread().getId(), null)
     // force flush
     dataStreams.report()
     dataStreams.close()
+    dataStreams.clearThreadServiceName(Thread.currentThread().getId())
     then:
     conditions.eventually {
       assert requestBodies.size() == 1