PLAT-3476_remove_statsd_from_talis_php (#18)

techfromsage · Apr 9, 2020 · cc87360 · cc87360
1 parent 75ea5c6
commit cc87360
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 60 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,6 @@
   "require": {
     "php": ">=5.3.0",
     "monolog/monolog": ">=1.13.1",
-    "domnikl/statsd": ">=1.0.2 <2.0.0",
     "psr/log": ">=1.0.0",
     "firebase/php-jwt": "^3.0",
     "doctrine/common": "^2.5",

diff --git a/src/Talis/Persona/Client/Base.php b/src/Talis/Persona/Client/Base.php
@@ -4,17 +4,13 @@
 
 use Monolog\Logger;
 use Guzzle\Http\Exception\RequestException;
-use \Domnikl\Statsd\Connection\Socket;
-use \Domnikl\Statsd\Connection\Blackhole;
 use \Guzzle\Http\Client as GuzzleClient;
 use \Talis\Persona\Client\ClientVersionCache;
 
 abstract class Base
 {
     use ClientVersionCache;
 
-    const STATSD_CONN = 'STATSD_CONN';
-    const STATSD_PREFIX = 'STATSD_PREFIX';
     const LOGGER_NAME = 'PERSONA';
     const PERSONA_API_VERSION = '3';
 
@@ -24,12 +20,6 @@ abstract class Base
      */
     protected $config = null;
 
-    /**
-     * StatsD client
-     * @var \Domnikl\Statsd\Client
-     */
-    private $statsD;
-
     /**
      * @var \Psr\Log\LoggerInterface
      */
@@ -97,35 +87,6 @@ public function __construct(array $config)
         $this->phpVersion = phpversion();
     }
 
-    /**
-     * Lazy-load statsD
-     * @return \Domnikl\Statsd\Client
-     */
-    public function getStatsD()
-    {
-        if (is_null($this->statsD)) {
-            $connStr = getenv(self::STATSD_CONN);
-
-            if (!empty($connStr) && !empty(strpos($connStr, ':'))) {
-                list($host, $port) = explode(':', $connStr);
-                $conn = new Socket($host, $port);
-            } else {
-                $conn = new Blackhole();
-            }
-
-            $this->statsD = new \Domnikl\Statsd\Client($conn);
-            $prefix = getenv(self::STATSD_PREFIX);
-
-            if (empty($prefix)) {
-                $prefix = 'persona.php.client';
-            }
-
-            $this->statsD->setNamespace($prefix);
-        }
-
-        return $this->statsD;
-    }
-
     /**
      * Checks the supplied config, verifies that all required parameters are present and
      * contain a non null value;

diff --git a/src/Talis/Persona/Client/Signing.php b/src/Talis/Persona/Client/Signing.php
@@ -25,8 +25,6 @@ protected function checkConfig(array $config)
      */
     public function presignUrl($url, $secret, $expiry = null)
     {
-        $this->getStatsD()->increment('presignUrl');
-
         if (empty($url) || empty($secret)) {
             throw new \InvalidArgumentException('invalid url or secret');
         }
@@ -44,9 +42,7 @@ public function presignUrl($url, $secret, $expiry = null)
             $url .= $expParam;
         }
 
-        $this->getStatsD()->startTiming('presignUrl.sign');
         $sig = $this->getSignature($url, $secret);
-        $this->getStatsD()->endTiming('presignUrl.sign');
 
         $sigParam = strpos($url, '?') === false ? "?signature=$sig" : "&signature=$sig";
 
@@ -83,11 +79,9 @@ public function isPresignedUrlValid($url, $secret)
         $signature = $this->getSignature($urlWithoutSignature, $secret);
 
         if ($query['signature'] === $signature) {
-            $this->getStatsD()->increment('presignUrl.valid');
             return true;
         }
 
-        $this->getStatsD()->increment('presignUrl.invalid');
         return false;
     }
 

diff --git a/src/Talis/Persona/Client/Tokens.php b/src/Talis/Persona/Client/Tokens.php
@@ -202,17 +202,7 @@ protected function retrievePublicKeyFromPersona()
     protected function validateTokenUsingPersona($token, array $scopes = [])
     {
         // verify against persona
-        $this->getStatsD()->increment('validateToken.cache.miss');
-
-        $this->getStatsD()->startTiming('validateToken.rest.get');
         $success = $this->personaCheckTokenIsValid($token, $scopes);
-        $this->getStatsD()->endTiming('validateToken.rest.get');
-
-        if ($success === ValidationResults::SUCCESS) {
-            $this->getStatsD()->increment('validateToken.rest.valid');
-        } else {
-            $this->getStatsD()->increment('validateToken.rest.invalid');
-        }
 
         return $success;
     }
@@ -233,8 +223,6 @@ protected function validateTokenUsingPersona($token, array $scopes = [])
      */
     public function obtainNewToken($clientId, $clientSecret, array $params = [])
     {
-        $this->getStatsD()->increment('obtainNewToken');
-
         if (empty($clientId) || empty($clientSecret)) {
             throw new \Exception('You must specify clientId, and clientSecret to obtain a new token');
         }
@@ -257,9 +245,7 @@ public function obtainNewToken($clientId, $clientSecret, array $params = [])
         }
 
         $url = $this->getPersonaHost() . $this->config['persona_oauth_route'];
-        $this->getStatsD()->startTiming('obtainNewToken.rest.get');
         $token = $this->personaObtainNewToken($url, $query);
-        $this->getStatsD()->endTiming('obtainNewToken.rest.get');
 
         $this->cacheToken($clientId, $token);
         return $token;