Refactor code & add gauges

composer.json

@@ -48,7 +48,8 @@
     },
     "autoload": {
         "files": [
-            "src/functions.php"
+            "src/functions.php",
+            "src/functions_experimental.php"
         ],
         "psr-4": {
             "Sentry\\": "src/"

src/Metrics/Metrics.php

@@ -0,0 +1,134 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sentry\Metrics;
+
+use Sentry\Event;
+use Sentry\EventId;
+use Sentry\SentrySdk;
+
+class Metrics
+{
+    /**
+     * @var self|null
+     */
+    private static $instance;
+
+    private function __construct()
+    {
+    }
+
+    public static function getInstance(): self
+    {
+        if (self::$instance === null) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * @param int|float $value
+     * @param string[]  $tags
+     */
+    public function incr(string $name, $value, array $tags): ?EventId
+    {
+        $client = SentrySdk::getCurrentHub()->getClient();
+
+        if ($client === null) {
+            return null;
+        }
+
+        $event = Event::createMetric();
+        $metric = [
+            'timestamp' => time(),
+            'width' => 0,
+            'name' => 'c:custom/' . $name . '@none',
+            'type' => 'c',
+            'value' => $value,
+            'tags' => $tags,
+        ];
+        $event->setMetric($metric);
+
+        return $client->captureEvent($event);
+    }
+
+    /**
+     * @param int|float $value
+     * @param string[]  $tags
+     */
+    public function distribution(string $name, $value, array $tags, ?string $unit = null): ?EventId
+    {
+        $client = SentrySdk::getCurrentHub()->getClient();
+
+        if ($client === null) {
+            return null;
+        }
+
+        $event = Event::createMetric();
+        $metric = [
+            'timestamp' => time(),
+            'width' => 0,
+            'name' => 'd:custom/' . $name . '@' . ($unit ?? 'none'),
+            'type' => 'd',
+            'value' => $value,
+            'tags' => $tags,
+        ];
+        $event->setMetric($metric);
+
+        return $client->captureEvent($event);
+    }
+
+    /**
+     * @param int|float $value
+     * @param string[]  $tags
+     */
+    public function set(string $name, $value, array $tags): ?EventId
+    {
+        $client = SentrySdk::getCurrentHub()->getClient();
+
+        if ($client === null) {
+            return null;
+        }
+
+        $event = Event::createMetric();
+        $metric = [
+            'timestamp' => time(),
+            'width' => 0,
+            'name' => 's:custom/' . $name . '@none',
+            'type' => 's',
+            'value' => $value,
+            'tags' => $tags,
+        ];
+        $event->setMetric($metric);
+
+        return $client->captureEvent($event);
+    }
+
+    /**
+     * @param int|float $value
+     * @param string[]  $tags
+     */
+    public function gauge(string $name, $value, array $tags): ?EventId
+    {
+        $client = SentrySdk::getCurrentHub()->getClient();
+
+        if ($client === null) {
+            return null;
+        }
+
+        $event = Event::createMetric();
+        $metric = [
+            'timestamp' => time(),
+            'width' => 0,
+            'name' => 'g:custom/' . $name . '@none',
+            'type' => 'g',
+            'value' => $value,
+            'tags' => $tags,
+        ];
+        $event->setMetric($metric);
+
+        return $client->captureEvent($event);
+    }
+}

src/State/Hub.php

@@ -319,84 +319,6 @@ public function getTransaction(): ?Transaction
         return $this->getScope()->getTransaction();
     }
 
-    /**
-     * @param int|float $value
-     * @param string[]  $tags
-     */
-    public function metricsIncr(string $name, $value, array $tags): ?EventId
-    {
-        $client = $this->getClient();
-
-        if ($client === null) {
-            return null;
-        }
-
-        $event = Event::createMetric();
-        $metric = [
-            'timestamp' => time(),
-            'width' => 0,
-            'name' => 'c:custom/' . $name . '@none',
-            'type' => 'c',
-            'value' => $value,
-            'tags' => $tags,
-        ];
-        $event->setMetric($metric);
-
-        return $this->captureEvent($event);
-    }
-
-    /**
-     * @param int|float $value
-     * @param string[]  $tags
-     */
-    public function metricsDistribution(string $name, $value, array $tags, ?string $unit = null): ?EventId
-    {
-        $client = $this->getClient();
-
-        if ($client === null) {
-            return null;
-        }
-
-        $event = Event::createMetric();
-        $metric = [
-            'timestamp' => time(),
-            'width' => 0,
-            'name' => 'd:custom/' . $name . '@' . ($unit ?? 'none'),
-            'type' => 'd',
-            'value' => $value,
-            'tags' => $tags,
-        ];
-        $event->setMetric($metric);
-
-        return $this->captureEvent($event);
-    }
-
-    /**
-     * @param int|float $value
-     * @param string[]  $tags
-     */
-    public function metricsSet(string $name, $value, array $tags): ?EventId
-    {
-        $client = $this->getClient();
-
-        if ($client === null) {
-            return null;
-        }
-
-        $event = Event::createMetric();
-        $metric = [
-            'timestamp' => time(),
-            'width' => 0,
-            'name' => 's:custom/' . $name . '@none',
-            'type' => 's',
-            'value' => $value,
-            'tags' => $tags,
-        ];
-        $event->setMetric($metric);
-
-        return $this->captureEvent($event);
-    }
-
     /**
      * {@inheritdoc}
      */

src/functions.php

@@ -268,30 +268,3 @@ function continueTrace(string $sentryTrace, string $baggage): TransactionContext
 
     return TransactionContext::fromHeaders($sentryTrace, $baggage);
 }
-
-/**
- * @param int|float $value
- * @param string[]  $tags
- */
-function metricsIncr(string $key, $value, array $tags): ?EventId
-{
-    return SentrySdk::getCurrentHub()->metricsIncr($key, $value, $tags);
-}
-
-/**
- * @param int|float $value
- * @param string[]  $tags
- */
-function metricsDistribution(string $key, $value, array $tags, ?string $unit = null): ?EventId
-{
-    return SentrySdk::getCurrentHub()->metricsDistribution($key, $value, $tags, $unit);
-}
-
-/**
- * @param int|float $value
- * @param string[]  $tags
- */
-function metricsSet(string $key, $value, array $tags): ?EventId
-{
-    return SentrySdk::getCurrentHub()->metricsSet($key, $value, $tags);
-}

src/functions_experimental.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sentry;
+
+use Sentry\Metrics\Metrics;
+
+function metrics(): Metrics
+{
+    return Metrics::getInstance();
+}