fix

Author: Litarnus

src/ClientReport/ClientReportAggregator.php

@@ -43,9 +43,9 @@ public function add(DataCategory $category, Reason $reason, int $quantity): void
                     'reason' => $reason,
                     'quantity' => $quantity,
                 ]);
-
-                return;
             }
+
+            return;
         }
         $this->reports[$category][$reason] = ($this->reports[$category][$reason] ?? 0) + $quantity;
     }

src/Event.php

@@ -214,7 +214,7 @@ final class Event
     /**
      * @var ClientReport[]
      */
-    private $clientReports;
+    private $clientReports = [];
 
     private function __construct(?EventId $eventId, EventType $eventType)
     {

src/Logs/LogsAggregator.php

@@ -39,7 +39,7 @@ public function add(
         array $attributes = []
     ): void {
         if (\count($this->logs) > 5) {
-            ClientReportAggregator::getInstance()->add(DataCategory::logBytes(), Reason::bufferOverflow(), 1);
+            ClientReportAggregator::getInstance()->add(DataCategory::logItem(), Reason::bufferOverflow(), 1);
 
             return;
         }

src/Transport/DataCategory.php

@@ -44,7 +44,7 @@ public static function logItem(): self
 
     public static function logBytes(): self
     {
-        return self::getInstance('log_bytes');
+        return self::getInstance('log_byte');
     }
 
     public static function profile(): self

tests/ClientReport/ClientReportAggregatorTest.php

@@ -8,8 +8,11 @@
 use Sentry\Client;
 use Sentry\ClientReport\ClientReportAggregator;
 use Sentry\ClientReport\Reason;
+use Sentry\Logs\LogLevel;
+use Sentry\Logs\LogsAggregator;
 use Sentry\Options;
 use Sentry\SentrySdk;
+use Sentry\State\Hub;
 use Sentry\Tests\StubLogger;
 use Sentry\Tests\StubTransport;
 use Sentry\Transport\DataCategory;
@@ -84,4 +87,50 @@ public function testZeroQuantityDiscarded(): void
         $this->assertCount(1, StubLogger::$logs);
         $this->assertSame(['level' => 'debug', 'message' => 'Dropping Client report with category={category} and reason={} because quantity is zero or negative ({quantity})', 'context' => ['category' => 'profile', 'reason' => 'event_processor', 'quantity' => 0]], StubLogger::$logs[0]);
     }
+
+    public function testNegativeQuantityDiscardedWhenNoClientIsBound(): void
+    {
+        SentrySdk::setCurrentHub(new Hub());
+
+        ClientReportAggregator::getInstance()->add(DataCategory::profile(), Reason::eventProcessor(), -10);
+
+        SentrySdk::setCurrentHub(new Hub(new Client(new Options([
+            'logger' => StubLogger::getInstance(),
+        ]), StubTransport::getInstance())));
+
+        ClientReportAggregator::getInstance()->flush();
+
+        $this->assertEmpty(StubTransport::$events);
+        $this->assertEmpty(StubLogger::$logs);
+    }
+
+    public function testLogCategoriesAreCanonical(): void
+    {
+        $this->assertSame('log_item', DataCategory::logItem()->getValue());
+        $this->assertSame('log_byte', DataCategory::logBytes()->getValue());
+    }
+
+    public function testLogOverflowReportsLogItemCount(): void
+    {
+        SentrySdk::init()->bindClient(new Client(new Options([
+            'enable_logs' => true,
+        ]), StubTransport::getInstance()));
+
+        $logsAggregator = new LogsAggregator();
+
+        for ($i = 0; $i < 8; ++$i) {
+            $logsAggregator->add(LogLevel::info(), 'Log %d', [$i]);
+        }
+
+        ClientReportAggregator::getInstance()->flush();
+
+        $this->assertCount(1, StubTransport::$events);
+        $reports = StubTransport::$events[0]->getClientReports();
+        $this->assertCount(1, $reports);
+
+        $report = $reports[0];
+        $this->assertSame(DataCategory::logItem()->getValue(), $report->getCategory());
+        $this->assertSame(Reason::bufferOverflow()->getValue(), $report->getReason());
+        $this->assertSame(2, $report->getQuantity());
+    }
 }

tests/Serializer/PayloadSerializerTest.php

@@ -474,6 +474,34 @@ public static function serializeAsEnvelopeDataProvider(): iterable
 TEXT
         ];
 
+        $event = Event::createClientReport();
+
+        yield [
+            $event,
+            <<<TEXT
+{}
+{"type":"client_report"}
+{"timestamp":1597790835,"discarded_events":[]}
+TEXT
+            ,
+        ];
+
+        $event = Event::createClientReport();
+        $event->setClientReports([
+            new ClientReport('log_item', 'buffer_overflow', 1),
+            new ClientReport('log_byte', 'buffer_overflow', 256),
+        ]);
+
+        yield [
+            $event,
+            <<<TEXT
+{}
+{"type":"client_report"}
+{"timestamp":1597790835,"discarded_events":[{"category":"log_item","reason":"buffer_overflow","quantity":1},{"category":"log_byte","reason":"buffer_overflow","quantity":256}]}
+TEXT
+            ,
+        ];
+
         $event = Event::createClientReport();
         $event->setClientReports([
             new ClientReport('error', 'before_send', 10),