Extract obfuscation behavior to function

pablomartinezbernardo · pablomartinezbernardo · commit 8e2b1b9ac9bb · 2024-06-20T16:45:17.000+02:00
diff --git a/src/DDTrace/Integrations/Memcached/MemcachedIntegration.php b/src/DDTrace/Integrations/Memcached/MemcachedIntegration.php
@@ -125,9 +125,7 @@ function (SpanData $span, $args, $retval) use ($integration, $command) {
                 }
                 if (!is_array($args[0])) {
                     $integration->setServerTags($span, $this);
-                    $queryParams = dd_trace_env_config("DD_TRACE_MEMCACHED_OBFUSCATION") ?
-                        Obfuscation::toObfuscatedString($args[0]) : $args[0];
-                    $span->meta['memcached.query'] = $command . ' ' . $queryParams;
+                    $span->meta['memcached.query'] = $command . ' ' . $integration->obfuscateIfNeeded($args[0]);
                 }
                 $span->peerServiceSources = DatabaseIntegrationHelper::PEER_SERVICE_SOURCES;
 
@@ -149,9 +147,7 @@ function (SpanData $span, $args, $retval) use ($integration, $command) {
                 }
                 if (!is_array($args[0])) {
                     $integration->setServerTags($span, $this);
-                    $queryParams = dd_trace_env_config("DD_TRACE_MEMCACHED_OBFUSCATION") ?
-                        Obfuscation::toObfuscatedString($args[0]) : $args[0];
-                    $span->meta['memcached.query'] = $command . ' ' . $queryParams;
+                    $span->meta['memcached.query'] = $command . ' ' . $integration->obfuscateIfNeeded($args[0]);
                     $span->meta['memcached.server_key'] = $args[0];
                 }
                 $span->peerServiceSources = DatabaseIntegrationHelper::PEER_SERVICE_SOURCES;
@@ -173,9 +169,7 @@ function (SpanData $span, $args, $retval) use ($integration, $command) {
                     $span->metrics[Tag::DB_ROW_COUNT] = isset($retval) ? (is_array($retval) ? count($retval) : 1) : 0;
                 }
                 $integration->setServerTags($span, $this);
-                $queryParams = dd_trace_env_config("DD_TRACE_MEMCACHED_OBFUSCATION") ?
-                    Obfuscation::toObfuscatedString($args[0], ',') : implode(',', $args[0]);
-                $span->meta['memcached.query'] = $command . ' ' . $queryParams;
+                $span->meta['memcached.query'] = $command . ' ' . $integration->obfuscateIfNeeded($args[0], ',');
                 $span->peerServiceSources = DatabaseIntegrationHelper::PEER_SERVICE_SOURCES;
                 $integration->markForTraceAnalytics($span, $command);
             }
@@ -195,9 +189,7 @@ function (SpanData $span, $args, $retval) use ($integration, $command) {
                 }
                 $span->meta['memcached.server_key'] = $args[0];
                 $integration->setServerTags($span, $this);
-                $queryParams = dd_trace_env_config("DD_TRACE_MEMCACHED_OBFUSCATION") ?
-                    Obfuscation::toObfuscatedString($args[1], ',') : implode(',', $args[1]);
-                $query = "$command " . $queryParams;
+                $query = "$command " . $integration->obfuscateIfNeeded($args[1], ',');
                 $span->meta['memcached.query'] = $query;
                 $span->peerServiceSources = DatabaseIntegrationHelper::PEER_SERVICE_SOURCES;
                 $integration->markForTraceAnalytics($span, $command);
@@ -271,4 +263,18 @@ public function markForTraceAnalytics(SpanData $span, $command)
             $this->addTraceAnalyticsIfEnabled($span);
         }
     }
+
+    /*
+     * Return either the obfuscated params or the params themselves, depending on the env var.
+     */
+    public function obfuscateIfNeeded($params, $glue = ' ')
+    {
+        if (dd_trace_env_config("DD_TRACE_MEMCACHED_OBFUSCATION")) {
+            return Obfuscation::toObfuscatedString($params, $glue);
+        } elseif (is_array($params)) {
+            return implode($glue, $params);
+        } else {
+            return $params;
+        }
+    }
 }
