From 5239736d144af18eb9b779163a240c1e47b1dcb1 Mon Sep 17 00:00:00 2001
From: renaudboutet <support@logmatic.io>
Date: Wed, 24 May 2017 09:21:41 +0200
Subject: [PATCH] small fixes due to ES instrumentation

---
 dd-java-agent/src/main/resources/otarules.btm            | 3 +--
 dd-trace/src/main/java/com/datadoghq/trace/DDTracer.java | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dd-java-agent/src/main/resources/otarules.btm b/dd-java-agent/src/main/resources/otarules.btm
index 949e1706ed..a72408cc41 100644
--- a/dd-java-agent/src/main/resources/otarules.btm
+++ b/dd-java-agent/src/main/resources/otarules.btm
@@ -1,4 +1,4 @@
-# --------------------------------------------------------
+	# --------------------------------------------------------
 # Instrument mongo client
 RULE Mongo Client instrumentation
 CLASS com.mongodb.MongoClientOptions$Builder
@@ -81,7 +81,6 @@ AT ENTRY
 IF currentSpan() == null
 DO
     span = getTracer().buildSpan($2.getClass().getSimpleName())
-        .asChildOf()
         .withTag(io.opentracing.tag.Tags.SPAN_KIND.getKey(), io.opentracing.tag.Tags.SPAN_KIND_CLIENT)
         .start();
 #    decorator.onRequest(span);
diff --git a/dd-trace/src/main/java/com/datadoghq/trace/DDTracer.java b/dd-trace/src/main/java/com/datadoghq/trace/DDTracer.java
index 3044be3a39..7494f6670e 100644
--- a/dd-trace/src/main/java/com/datadoghq/trace/DDTracer.java
+++ b/dd-trace/src/main/java/com/datadoghq/trace/DDTracer.java
@@ -238,7 +238,7 @@ public class DDTracer implements io.opentracing.Tracer {
         }
 
         public DDTracer.DDSpanBuilder asChildOf(Span span) {
-            return asChildOf(span.context());
+            return asChildOf(span==null? null : span.context());
         }
 
         public DDTracer.DDSpanBuilder asChildOf(SpanContext spanContext) {