fixes

Author: amarziali

dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/PromiseObjectInstrumentation.java

@@ -8,6 +8,7 @@
 import datadog.trace.bootstrap.ContextStore;
 import datadog.trace.bootstrap.InstrumentationContext;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge;
 import datadog.trace.instrumentation.scala.PromiseHelper;
 import net.bytebuddy.asm.Advice;
 import scala.concurrent.impl.CallbackRunnable;
@@ -44,7 +45,7 @@ public static <T> void afterResolve(@Advice.Return(readOnly = false) Try<T> reso
         final Context existing = contextStore.get(resolved);
         Try<T> next =
             PromiseHelper.getTry(
-                resolved, span, existing != null ? AgentSpan.fromContext(existing) : null);
+                resolved, span, existing != null ? Java8BytecodeBridge.spanFromContext(existing) : null);
         if (next != resolved) {
           contextStore.put(next, span);
           resolved = next;

dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/ScalaPromiseModule.java

@@ -57,14 +57,16 @@ public String[] helperClassNames() {
 
   @Override
   public List<Instrumenter> typeInstrumentations() {
+    final InstrumenterConfig config = InstrumenterConfig.get();
     final List<Instrumenter> instrumenters = new ArrayList<>(3);
     instrumenters.add(new CallbackRunnableInstrumentation());
-    instrumenters.add(new FutureObjectInstrumentation());
+    if (config.isIntegrationEnabled(singleton("scala_future_object"), true)) {
+      instrumenters.add(new FutureObjectInstrumentation());
+    }
     // Only enable this if integrations have been enabled and the extra "integration"
     // scala_promise_completion_priority has been enabled specifically
-    if (InstrumenterConfig.get()
-        .isIntegrationEnabled(
-            Collections.singletonList("scala_promise_completion_priority"), false)) {
+    if (config.isIntegrationEnabled(
+        Collections.singletonList("scala_promise_completion_priority"), false)) {
       instrumenters.add(new PromiseObjectInstrumentation());
     }
     return instrumenters;