fix

Author: Litarnus

src/Options.php

@@ -1022,6 +1022,7 @@ private function configureOptions(OptionsResolver $resolver): void
         $resolver->setAllowedTypes('server_name', 'string');
         $resolver->setAllowedTypes('before_send', ['callable']);
         $resolver->setAllowedTypes('before_send_transaction', ['callable']);
+        $resolver->setAllowedTypes('before_send_check_in', ['callable']);
         $resolver->setAllowedTypes('before_send_log', 'callable');
         $resolver->setAllowedTypes('before_send_metric', ['callable']);
         $resolver->setAllowedTypes('ignore_exceptions', 'string[]');

tests/Metrics/TraceMetricsTest.php

@@ -14,7 +14,7 @@
 use Sentry\Options;
 use Sentry\State\HubAdapter;
 
-use function Sentry\traceMetrics;
+use function Sentry\metrics;
 
 final class TraceMetricsTest extends TestCase
 {
@@ -26,9 +26,9 @@ protected function setUp(): void
 
     public function testCounterMetrics(): void
     {
-        traceMetrics()->count('test-count', 2, ['foo' => 'bar']);
-        traceMetrics()->count('test-count', 2, ['foo' => 'bar']);
-        traceMetrics()->flush();
+        metrics()->count('test-count', 2, ['foo' => 'bar']);
+        metrics()->count('test-count', 2, ['foo' => 'bar']);
+        metrics()->flush();
 
         $this->assertCount(1, StubTransport::$events);
         $event = StubTransport::$events[0];
@@ -43,8 +43,8 @@ public function testCounterMetrics(): void
 
     public function testGaugeMetrics(): void
     {
-        traceMetrics()->gauge('test-gauge', 10, ['foo' => 'bar']);
-        traceMetrics()->flush();
+        metrics()->gauge('test-gauge', 10, ['foo' => 'bar']);
+        metrics()->flush();
 
         $this->assertCount(1, StubTransport::$events);
         $event = StubTransport::$events[0];
@@ -59,8 +59,8 @@ public function testGaugeMetrics(): void
 
     public function testDistributionMetrics(): void
     {
-        traceMetrics()->distribution('test-distribution', 10, ['foo' => 'bar']);
-        traceMetrics()->flush();
+        metrics()->distribution('test-distribution', 10, ['foo' => 'bar']);
+        metrics()->flush();
         $this->assertCount(1, StubTransport::$events);
         $event = StubTransport::$events[0];
         $this->assertCount(1, $event->getMetrics());
@@ -75,9 +75,9 @@ public function testDistributionMetrics(): void
     public function testMetricsBufferFull(): void
     {
         for ($i = 0; $i < MetricsAggregator::METRICS_BUFFER_SIZE + 100; ++$i) {
-            traceMetrics()->count('test', 1, ['foo' => 'bar']);
+            metrics()->count('test', 1, ['foo' => 'bar']);
         }
-        traceMetrics()->flush();
+        metrics()->flush();
         $this->assertCount(1, StubTransport::$events);
         $event = StubTransport::$events[0];
         $metrics = $event->getMetrics();
@@ -90,8 +90,8 @@ public function testEnableMetrics(): void
             'enable_metrics' => false,
         ]), StubTransport::getInstance()));
 
-        traceMetrics()->count('test-count', 2, ['foo' => 'bar']);
-        traceMetrics()->flush();
+        metrics()->count('test-count', 2, ['foo' => 'bar']);
+        metrics()->flush();
 
         $this->assertEmpty(StubTransport::$events);
     }
@@ -106,8 +106,8 @@ public function testBeforeSendMetricAltersContent()
             },
         ]), StubTransport::getInstance()));
 
-        traceMetrics()->count('test-count', 2, ['foo' => 'bar']);
-        traceMetrics()->flush();
+        metrics()->count('test-count', 2, ['foo' => 'bar']);
+        metrics()->flush();
 
         $this->assertCount(1, StubTransport::$events);
         $event = StubTransport::$events[0];
@@ -119,8 +119,8 @@ public function testBeforeSendMetricAltersContent()
 
     public function testIntType()
     {
-        traceMetrics()->count('test-count', 2, ['foo' => 'bar']);
-        traceMetrics()->flush();
+        metrics()->count('test-count', 2, ['foo' => 'bar']);
+        metrics()->flush();
 
         $this->assertCount(1, StubTransport::$events);
         $event = StubTransport::$events[0];
@@ -134,8 +134,8 @@ public function testIntType()
 
     public function testFloatType(): void
     {
-        traceMetrics()->gauge('test-gauge', 10.50, ['foo' => 'bar']);
-        traceMetrics()->flush();
+        metrics()->gauge('test-gauge', 10.50, ['foo' => 'bar']);
+        metrics()->flush();
 
         $this->assertCount(1, StubTransport::$events);
         $event = StubTransport::$events[0];
@@ -150,8 +150,8 @@ public function testFloatType(): void
     public function testInvalidTypeIsDiscarded(): void
     {
         // @phpstan-ignore-next-line
-        traceMetrics()->count('test-count', 'test-value');
-        traceMetrics()->flush();
+        metrics()->count('test-count', 'test-value');
+        metrics()->flush();
 
         $this->assertEmpty(StubTransport::$events);
     }

tests/OptionsTest.php

@@ -268,13 +268,6 @@ static function (): void {},
             'enableStrictTraceContinuation',
         ];
 
-        yield [
-            'strict_trace_propagation',
-            true,
-            'isStrictTracePropagationEnabled',
-            'enableStrictTracePropagation',
-        ];
-
         yield [
             'before_breadcrumb',
             static function (): void {},