Refactor integration loading

DataDog · Nov 27, 2018 · 11e1b1d · 11e1b1d
1 parent 4801264
commit 11e1b1d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/DDTrace/Integrations/Guzzle/v5/GuzzleIntegration.php b/src/DDTrace/Integrations/Guzzle/v5/GuzzleIntegration.php
@@ -11,9 +11,8 @@ class GuzzleIntegration extends Integration
 {
     const CLASS_NAME = 'GuzzleHttp\Client';
 
-    public static function load()
+    protected static function loadIntegration()
     {
-        parent::load();
         self::traceMethod('send', function (Span $span, array $args) {
             $span->setTag('http.method', $args[0]->getMethod());
         });

diff --git a/src/DDTrace/Integrations/Integration.php b/src/DDTrace/Integrations/Integration.php
@@ -14,14 +14,18 @@ public static function load()
     {
         if (!extension_loaded('ddtrace')) {
             trigger_error('The ddtrace extension is required to trace ' . static::CLASS_NAME, E_USER_WARNING);
-            return;
+            return false;
         }
         if (!class_exists(static::CLASS_NAME)) {
             trigger_error(static::CLASS_NAME . ' is not loaded and cannot be traced', E_USER_WARNING);
-            return;
+            return false;
         }
+        static::loadIntegration();
+        return true;
     }
 
+    abstract protected static function loadIntegration();
+
     /**
      * @param string $method
      * @param \Closure $spanMutator

diff --git a/tests/Integration/Integrations/Guzzle/v5/GuzzleIntegrationTest.php b/tests/Integration/Integrations/Guzzle/v5/GuzzleIntegrationTest.php
@@ -16,7 +16,9 @@ final class GuzzleIntegrationTest extends IntegrationTestCase
 
     public static function setUpBeforeClass()
     {
-        GuzzleIntegration::load();
+        if(!GuzzleIntegration::load()) {
+            self::markTestSkipped('Guzzle required to run tests.');
+        }
     }
 
     protected function setUp()