Clean Integration configuration (#2598)

Also avoid the extra Util\Common class and just stuff it into the global Integration.
DataDog · Apr 15, 2024 · 95a0831 · 95a0831
1 parent f6dab57
commit 95a0831
Show file tree

Hide file tree

Showing 47 changed files with 960 additions and 1,421 deletions.
diff --git a/src/DDTrace/Integrations/AMQP/AMQPIntegration.php b/src/DDTrace/Integrations/AMQP/AMQPIntegration.php
@@ -22,14 +22,6 @@ class AMQPIntegration extends Integration
     const SYSTEM = 'rabbitmq';
     protected $protocolVersion;
 
-    /**
-     * @return string The integration name.
-     */
-    public function getName()
-    {
-        return self::NAME;
-    }
-
     // Source: https://magp.ie/2015/09/30/convert-large-integer-to-hexadecimal-without-php-math-extension/
     public static function largeBaseConvert($numString, $fromBase, $toBase)
     {
@@ -454,7 +446,7 @@ public function setGenericTags(
         $span->meta[Tag::MQ_PROTOCOL_VERSION] = $this->protocolVersion;
 
         if ($exception) {
-            $this->setError($span, $exception);
+            $span->exception = $exception;
         }
     }
 

diff --git a/src/DDTrace/Integrations/AbstractIntegrationConfiguration.php b/src/DDTrace/Integrations/AbstractIntegrationConfiguration.php
diff --git a/src/DDTrace/Integrations/CakePHP/CakePHPIntegration.php b/src/DDTrace/Integrations/CakePHP/CakePHPIntegration.php
@@ -19,11 +19,11 @@ class CakePHPIntegration extends Integration
     public $parseRouteFn;
 
     /**
-     * @return string The integration name.
+     * {@inheritdoc}
      */
-    public function getName()
+    public function requiresExplicitTraceAnalyticsEnabling(): bool
     {
-        return self::NAME;
+        return false;
     }
 
     public function init(): int
@@ -54,7 +54,7 @@ public function init(): int
         $integration->handleExceptionFn = function ($This, $scope, $args) use ($integration) {
             $rootSpan = \DDTrace\root_span();
             if ($rootSpan !== null) {
-                $integration->setError($rootSpan, $args[0]);
+                $rootSpan->exception = $args[0];
             }
         };
 

diff --git a/src/DDTrace/Integrations/CodeIgniter/V2/CodeIgniterIntegration.php b/src/DDTrace/Integrations/CodeIgniter/V2/CodeIgniterIntegration.php
@@ -12,14 +12,6 @@ class CodeIgniterIntegration extends Integration
 {
     const NAME = 'codeigniter';
 
-    /**
-     * @return string The integration name.
-     */
-    public function getName()
-    {
-        return self::NAME;
-    }
-
     /**
      * Add instrumentation to CodeIgniter requests
      */

diff --git a/src/DDTrace/Integrations/Curl/CurlIntegration.php b/src/DDTrace/Integrations/Curl/CurlIntegration.php
@@ -29,11 +29,6 @@ final class CurlIntegration extends Integration
 {
     const NAME = 'curl';
 
-    public function getName()
-    {
-        return self::NAME;
-    }
-
     public function init(): int
     {
         if (!extension_loaded('curl')) {

diff --git a/src/DDTrace/Integrations/DefaultIntegrationConfiguration.php b/src/DDTrace/Integrations/DefaultIntegrationConfiguration.php
diff --git a/src/DDTrace/Integrations/Drupal/DrupalIntegration.php b/src/DDTrace/Integrations/Drupal/DrupalIntegration.php
@@ -23,9 +23,9 @@ class DrupalIntegration extends Integration
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function requiresExplicitTraceAnalyticsEnabling(): bool
     {
-        return self::NAME;
+        return false;
     }
 
     public function init(): int

diff --git a/src/DDTrace/Integrations/ElasticSearch/V1/ElasticSearchIntegration.php b/src/DDTrace/Integrations/ElasticSearch/V1/ElasticSearchIntegration.php
@@ -11,14 +11,6 @@ class ElasticSearchIntegration extends Integration
 {
     const NAME = 'elasticsearch';
 
-    /**
-     * @return string The integration name.
-     */
-    public function getName()
-    {
-        return self::NAME;
-    }
-
     /**
      * Add instrumentation to Elasticsearch requests
      */

diff --git a/src/DDTrace/Integrations/ElasticSearch/V8/ElasticSearchIntegration.php b/src/DDTrace/Integrations/ElasticSearch/V8/ElasticSearchIntegration.php
@@ -15,14 +15,6 @@ class ElasticSearchIntegration extends Integration
 
     public $logNextBody = false;
 
-    /**
-     * @return string The integration name.
-     */
-    public function getName()
-    {
-        return self::NAME;
-    }
-
     /**
      * Add instrumentation to Elasticsearch requests
      */

diff --git a/src/DDTrace/Integrations/Eloquent/EloquentIntegration.php b/src/DDTrace/Integrations/Eloquent/EloquentIntegration.php
@@ -16,14 +16,6 @@ class EloquentIntegration extends Integration
      */
     private $appName;
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return self::NAME;
-    }
-
     /**
      * {@inheritDoc}
      */

diff --git a/src/DDTrace/Integrations/Exec/ExecIntegration.php b/src/DDTrace/Integrations/Exec/ExecIntegration.php
@@ -24,11 +24,6 @@ class ExecIntegration extends Integration
     const REDACTED_BINARIES = array('md5' => null);
     const UNREDACTED_ENV_VARS = array('LD_PRELOAD' => null, 'LD_LIBRARY_PATH' => null, 'PATH' => null);
 
-    public function getName()
-    {
-        return self::NAME;
-    }
-
     public function init(): int
     {
         \DDTrace\install_hook(

diff --git a/src/DDTrace/Integrations/Frankenphp/FrankenphpIntegration.php b/src/DDTrace/Integrations/Frankenphp/FrankenphpIntegration.php
@@ -13,15 +13,10 @@ class FrankenphpIntegration extends Integration
 {
     const NAME = 'frankenphp';
 
-    public function getName()
-    {
-        return self::NAME;
-    }
-
     /**
      * {@inheritdoc}
      */
-    public function requiresExplicitTraceAnalyticsEnabling()
+    public function requiresExplicitTraceAnalyticsEnabling(): bool
     {
         return false;
     }

diff --git a/src/DDTrace/Integrations/Guzzle/GuzzleIntegration.php b/src/DDTrace/Integrations/Guzzle/GuzzleIntegration.php
@@ -14,11 +14,6 @@ class GuzzleIntegration extends Integration
 {
     const NAME = 'guzzle';
 
-    public function getName()
-    {
-        return self::NAME;
-    }
-
     public function init(): int
     {
         $integration = $this;