PR feedback

Litarnus · Litarnus · commit ab49ab64548b · 2025-11-27T14:57:15.000+01:00
diff --git a/src/Event.php b/src/Event.php
@@ -7,7 +7,7 @@
 use Sentry\Context\OsContext;
 use Sentry\Context\RuntimeContext;
 use Sentry\Logs\Log;
-use Sentry\Metrics\Types\AbstractType;
+use Sentry\Metrics\Types\Metric;
 use Sentry\Profiling\Profile;
 use Sentry\Tracing\Span;
 
@@ -73,7 +73,7 @@ final class Event
     private $logs = [];
 
     /**
-     * @var AbstractType[]
+     * @var Metric[]
      */
     private $metrics = [];
 
@@ -449,15 +449,15 @@ public function setLogs(array $logs): self
     }
 
     /**
-     * @return AbstractType[]
+     * @return Metric[]
      */
     public function getMetrics(): array
     {
         return $this->metrics;
     }
 
     /**
-     * @param AbstractType[] $metrics
+     * @param Metric[] $metrics
      */
     public function setMetrics(array $metrics): self
     {
diff --git a/src/EventType.php b/src/EventType.php
@@ -72,6 +72,7 @@ public function requiresEventId(): bool
     {
         switch ($this) {
             case self::metrics():
+            case self::logs():
                 return false;
             default:
                 return true;
diff --git a/src/Metrics/Metrics.php b/src/Metrics/Metrics.php
@@ -7,6 +7,7 @@
 use Sentry\EventId;
 use Sentry\Tracing\SpanContext;
 
+use Sentry\Unit;
 use function Sentry\trace;
 
 class_alias(Unit::class, '\Sentry\Metrics\MetricsUnit');
diff --git a/src/Metrics/MetricsAggregator.php b/src/Metrics/MetricsAggregator.php
@@ -7,10 +7,10 @@
 use Sentry\Client;
 use Sentry\Event;
 use Sentry\EventId;
-use Sentry\Metrics\Types\AbstractType;
-use Sentry\Metrics\Types\CounterType;
-use Sentry\Metrics\Types\DistributionType;
-use Sentry\Metrics\Types\GaugeType;
+use Sentry\Metrics\Types\CounterMetric;
+use Sentry\Metrics\Types\DistributionMetric;
+use Sentry\Metrics\Types\GaugeMetric;
+use Sentry\Metrics\Types\Metric;
 use Sentry\SentrySdk;
 use Sentry\State\Scope;
 use Sentry\Util\RingBuffer;
@@ -26,7 +26,7 @@ final class MetricsAggregator
     public const METRICS_BUFFER_SIZE = 1000;
 
     /**
-     * @var RingBuffer<AbstractType>
+     * @var RingBuffer<Metric>
      */
     private $metrics;
 
@@ -36,9 +36,9 @@ public function __construct()
     }
 
     private const METRIC_TYPES = [
-        CounterType::TYPE => CounterType::class,
-        DistributionType::TYPE => DistributionType::class,
-        GaugeType::TYPE => GaugeType::class,
+        CounterMetric::TYPE => CounterMetric::class,
+        DistributionMetric::TYPE => DistributionMetric::class,
+        GaugeMetric::TYPE => GaugeMetric::class,
     ];
 
     /**
@@ -66,8 +66,26 @@ public function add(
                 'sentry.sdk.name' => $client->getSdkIdentifier(),
                 'sentry.sdk.version' => $client->getSdkVersion(),
                 'sentry.environment' => $options->getEnvironment() ?? Event::DEFAULT_ENVIRONMENT,
+                'server.address' => $options->getServerName(),
             ];
 
+            if ($options->shouldSendDefaultPii()) {
+                $hub->configureScope(function (Scope $scope) use (&$defaultAttributes) {
+                    $user = $scope->getUser();
+                    if ($user !== null) {
+                        if ($user->getId() !== null) {
+                            $defaultAttributes['user.id'] = $user->getId();
+                        }
+                        if ($user->getEmail() !== null) {
+                            $defaultAttributes['user.email'] = $user->getEmail();
+                        }
+                        if ($user->getUsername() !== null) {
+                            $defaultAttributes['user.name'] = $user->getUsername();
+                        }
+                    }
+                });
+            }
+
             $release = $options->getRelease();
             if ($release !== null) {
                 $defaultAttributes['sentry.release'] = $release;
@@ -92,7 +110,7 @@ public function add(
         }
 
         $metricTypeClass = self::METRIC_TYPES[$type];
-        /** @var AbstractType $metric */
+        /** @var Metric $metric */
         /** @phpstan-ignore-next-line */
         $metric = new $metricTypeClass($name, $value, $traceId, $spanId, $attributes, microtime(true), $unit);
 
diff --git a/src/Metrics/TraceMetrics.php b/src/Metrics/TraceMetrics.php
@@ -5,9 +5,10 @@
 namespace Sentry\Metrics;
 
 use Sentry\EventId;
-use Sentry\Metrics\Types\CounterType;
-use Sentry\Metrics\Types\DistributionType;
-use Sentry\Metrics\Types\GaugeType;
+use Sentry\Metrics\Types\CounterMetric;
+use Sentry\Metrics\Types\DistributionMetric;
+use Sentry\Metrics\Types\GaugeMetric;
+use Sentry\Unit;
 
 class TraceMetrics
 {
@@ -46,7 +47,7 @@ public function count(
         ?Unit $unit = null
     ): void {
         $this->aggregator->add(
-            CounterType::TYPE,
+            CounterMetric::TYPE,
             $name,
             $value,
             $attributes,
@@ -65,7 +66,7 @@ public function distribution(
         ?Unit $unit = null
     ): void {
         $this->aggregator->add(
-            DistributionType::TYPE,
+            DistributionMetric::TYPE,
             $name,
             $value,
             $attributes,
@@ -84,7 +85,7 @@ public function gauge(
         ?Unit $unit = null
     ): void {
         $this->aggregator->add(
-            GaugeType::TYPE,
+            GaugeMetric::TYPE,
             $name,
             $value,
             $attributes,
diff --git a/src/Metrics/Types/CounterMetric.php b/src/Metrics/Types/CounterMetric.php
@@ -4,14 +4,14 @@
 
 namespace Sentry\Metrics\Types;
 
-use Sentry\Metrics\Unit;
 use Sentry\Tracing\SpanId;
 use Sentry\Tracing\TraceId;
+use Sentry\Unit;
 
 /**
  * @internal
  */
-final class CounterType extends AbstractType
+final class CounterMetric extends Metric
 {
     /**
      * @var string
diff --git a/src/Metrics/Types/DistributionMetric.php b/src/Metrics/Types/DistributionMetric.php
@@ -4,14 +4,14 @@
 
 namespace Sentry\Metrics\Types;
 
-use Sentry\Metrics\Unit;
+use Sentry\Unit;
 use Sentry\Tracing\SpanId;
 use Sentry\Tracing\TraceId;
 
 /**
  * @internal
  */
-final class DistributionType extends AbstractType
+final class DistributionMetric extends Metric
 {
     /**
      * @var string
diff --git a/src/Metrics/Types/GaugeMetric.php b/src/Metrics/Types/GaugeMetric.php
@@ -4,14 +4,14 @@
 
 namespace Sentry\Metrics\Types;
 
-use Sentry\Metrics\Unit;
 use Sentry\Tracing\SpanId;
 use Sentry\Tracing\TraceId;
+use Sentry\Unit;
 
 /**
  * @internal
  */
-final class GaugeType extends AbstractType
+final class GaugeMetric extends Metric
 {
     /**
      * @var string
diff --git a/src/Metrics/Types/Metric.php b/src/Metrics/Types/Metric.php
@@ -5,14 +5,14 @@
 namespace Sentry\Metrics\Types;
 
 use Sentry\Attributes\AttributeBag;
-use Sentry\Metrics\Unit;
 use Sentry\Tracing\SpanId;
 use Sentry\Tracing\TraceId;
+use Sentry\Unit;
 
 /**
  * @internal
  */
-abstract class AbstractType
+abstract class Metric
 {
     /**
      * @var string
diff --git a/src/Options.php b/src/Options.php
@@ -10,7 +10,7 @@
 use Sentry\Integration\ErrorListenerIntegration;
 use Sentry\Integration\IntegrationInterface;
 use Sentry\Logs\Log;
-use Sentry\Metrics\Types\AbstractType;
+use Sentry\Metrics\Types\Metric;
 use Sentry\Transport\TransportInterface;
 use Symfony\Component\OptionsResolver\Options as SymfonyOptions;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -1317,7 +1317,7 @@ private function configureOptions(OptionsResolver $resolver): void
             'before_send_metrics' => static function (Event $metrics): ?Event {
                 return null;
             },
-            'before_send_metric' => static function (AbstractType $metric): AbstractType {
+            'before_send_metric' => static function (Metric $metric): Metric {
                 return $metric;
             },
             'trace_propagation_targets' => null,
diff --git a/src/Serializer/EnvelopItems/MetricsItem.php b/src/Serializer/EnvelopItems/MetricsItem.php
@@ -7,7 +7,7 @@
 use Sentry\Attributes\Attribute;
 use Sentry\Event;
 use Sentry\EventType;
-use Sentry\Metrics\Types\AbstractType;
+use Sentry\Metrics\Types\Metric;
 use Sentry\Util\JSON;
 
 /**
@@ -29,7 +29,7 @@ public static function toEnvelopeItem(Event $event): string
             "%s\n%s",
             JSON::encode($header),
             JSON::encode([
-                'items' => array_map(static function (AbstractType $metric): array {
+                'items' => array_map(static function (Metric $metric): array {
                     return [
                         'timestamp' => $metric->getTimestamp(),
                         'trace_id' => (string) $metric->getTraceId(),
diff --git a/src/Serializer/PayloadSerializer.php b/src/Serializer/PayloadSerializer.php
@@ -47,7 +47,7 @@ public function serialize(Event $event): string
         ];
 
         if ($event->getType()->requiresEventId()) {
-            $envelopeHeader = ['event_id' => (string) $event->getId()] + $envelopeHeader;
+            $envelopeHeader['event_id'] = (string) $event->getId();
         }
 
         $dynamicSamplingContext = $event->getSdkMetadata('dynamic_sampling_context');
diff --git a/src/Tracing/Span.php b/src/Tracing/Span.php
@@ -5,7 +5,7 @@
 namespace Sentry\Tracing;
 
 use Sentry\EventId;
-use Sentry\Metrics\Unit;
+use Sentry\Unit;
 use Sentry\SentrySdk;
 use Sentry\State\Scope;
 
diff --git a/src/Unit.php b/src/Unit.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sentry\Metrics;
+namespace Sentry;
 
 final class Unit implements \Stringable
 {
diff --git a/tests/Metrics/TraceMetricsTest.php b/tests/Metrics/TraceMetricsTest.php
@@ -7,10 +7,10 @@
 use PHPUnit\Framework\TestCase;
 use Sentry\Client;
 use Sentry\Metrics\MetricsAggregator;
-use Sentry\Metrics\Types\AbstractType;
-use Sentry\Metrics\Types\CounterType;
-use Sentry\Metrics\Types\DistributionType;
-use Sentry\Metrics\Types\GaugeType;
+use Sentry\Metrics\Types\Metric;
+use Sentry\Metrics\Types\CounterMetric;
+use Sentry\Metrics\Types\DistributionMetric;
+use Sentry\Metrics\Types\GaugeMetric;
 use Sentry\Options;
 use Sentry\State\HubAdapter;
 
@@ -36,7 +36,7 @@ public function testCounterMetrics(): void
         $metrics = $event->getMetrics();
         $metric = $metrics[0];
         $this->assertEquals('test-count', $metric->getName());
-        $this->assertEquals(CounterType::TYPE, $metric->getType());
+        $this->assertEquals(CounterMetric::TYPE, $metric->getType());
         $this->assertEquals(2, $metric->getValue());
         $this->assertArrayHasKey('foo', $metric->getAttributes()->toSimpleArray());
     }
@@ -52,7 +52,7 @@ public function testGaugeMetrics(): void
         $metrics = $event->getMetrics();
         $metric = $metrics[0];
         $this->assertEquals('test-gauge', $metric->getName());
-        $this->assertEquals(GaugeType::TYPE, $metric->getType());
+        $this->assertEquals(GaugeMetric::TYPE, $metric->getType());
         $this->assertEquals(10, $metric->getValue());
         $this->assertArrayHasKey('foo', $metric->getAttributes()->toSimpleArray());
     }
@@ -67,7 +67,7 @@ public function testDistributionMetrics(): void
         $metrics = $event->getMetrics();
         $metric = $metrics[0];
         $this->assertEquals('test-distribution', $metric->getName());
-        $this->assertEquals(DistributionType::TYPE, $metric->getType());
+        $this->assertEquals(DistributionMetric::TYPE, $metric->getType());
         $this->assertEquals(10, $metric->getValue());
         $this->assertArrayHasKey('foo', $metric->getAttributes()->toSimpleArray());
     }
@@ -99,7 +99,7 @@ public function testEnableMetrics(): void
     public function testBeforeSendMetricAltersContent()
     {
         HubAdapter::getInstance()->bindClient(new Client(new Options([
-            'before_send_metric' => static function (AbstractType $metric) {
+            'before_send_metric' => static function (Metric $metric) {
                 $metric->setValue(99999);
 
                 return $metric;
diff --git a/tests/Serializer/PayloadSerializerTest.php b/tests/Serializer/PayloadSerializerTest.php

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ public function requiresEventId(): bool`
`72`	`72`	`{`
`73`	`73`	`switch ($this) {`
`74`	`74`	`case self::metrics():`
	`75`	`+ case self::logs():`
`75`	`76`	`return false;`
`76`	`77`	`default:`
`77`	`78`	`return true;`