remove attachment event type

Author: Litarnus

src/Attachment/ByteAttachment.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sentry\Attachment;
 
 /**

src/Attachment/FileAttachment.php

@@ -1,13 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sentry\Attachment;
 
 /**
  * Represents a file that is readable by using a path.
  */
 class FileAttachment extends Attachment
 {
-
     /**
      * @var string
      */

src/Event.php

@@ -247,11 +247,6 @@ public static function createLogs(?EventId $eventId = null): self
         return new self($eventId, EventType::logs());
     }
 
-    public static function createAttachments(?EventId $eventId = null): self
-    {
-        return new self($eventId, EventType::attachment());
-    }
-
     /**
      * Gets the ID of this event.
      */

src/EventType.php

@@ -64,7 +64,7 @@ public static function cases(): array
             self::transaction(),
             self::checkIn(),
             self::logs(),
-            self::attachment()
+            self::attachment(),
         ];
     }
 

src/Serializer/EnvelopItems/AttachmentItem.php

@@ -10,28 +10,6 @@
 
 class AttachmentItem implements EnvelopeItemInterface
 {
-    /**
-     * {@inheritDoc}
-     */
-    public static function toEnvelopeItem(Event $event)
-    {
-        $attachments = $event->getAttachments();
-
-        $items = [];
-
-        foreach ($attachments as $attachment) {
-            $header = [
-                'filename' => $attachment->getFilename(),
-                'content_type' => $attachment->getContentType(),
-                'attachment_type' => 'event.attachment',
-            ];
-
-            $items[] = \sprintf("%s\n%s", JSON::encode($header), file_get_contents($attachment->getFilename()));
-        }
-
-        return $items;
-    }
-
     public static function toAttachmentItem(Attachment $attachment): ?string
     {
         $data = $attachment->getData();
@@ -64,4 +42,14 @@ public static function totalAttachmentSize(array $attachments): int
 
         return $sum;
     }
+
+    public static function toEnvelopeItem(Event $event): ?string
+    {
+        $result = [];
+        foreach ($event->getAttachments() as $attachment) {
+            $result[] = self::toAttachmentItem($attachment);
+        }
+
+        return implode("\n", $result);
+    }
 }

src/Serializer/EnvelopItems/EnvelopeItemInterface.php

@@ -11,9 +11,5 @@
  */
 interface EnvelopeItemInterface
 {
-    /**
-     * @param Event $event
-     * @return ?string|string[]
-     */
-    public static function toEnvelopeItem(Event $event);
+    public static function toEnvelopeItem(Event $event): ?string;
 }

src/Serializer/PayloadSerializer.php

@@ -66,12 +66,14 @@ public function serialize(Event $event): string
         switch ($event->getType()) {
             case EventType::event():
                 $items[] = EventItem::toEnvelopeItem($event);
+                $items[] = AttachmentItem::toEnvelopeItem($event);
                 break;
             case EventType::transaction():
                 $items[] = TransactionItem::toEnvelopeItem($event);
                 if ($event->getSdkMetadata('profile') !== null) {
                     $items[] = ProfileItem::toEnvelopeItem($event);
                 }
+                $items[] = AttachmentItem::toEnvelopeItem($event);
                 break;
             case EventType::checkIn():
                 $items[] = CheckInItem::toEnvelopeItem($event);
@@ -81,13 +83,6 @@ public function serialize(Event $event): string
                 break;
         }
 
-        // If attachments are exceeding the limit, then we drop all attachments
-        if (AttachmentItem::totalAttachmentSize($event->getAttachments()) <= self::MAX_ATTACHMENT_SIZE) {
-            foreach ($event->getAttachments() as $attachment) {
-                $items[] = AttachmentItem::toAttachmentItem($attachment);
-            }
-        }
-
         return \sprintf("%s\n%s", JSON::encode($envelopeHeader), implode("\n", array_filter($items)));
     }
 }

src/State/HubAdapter.php

@@ -4,6 +4,7 @@
 
 namespace Sentry\State;
 
+use Sentry\Attachment\Attachment;
 use Sentry\Breadcrumb;
 use Sentry\CheckInStatus;
 use Sentry\ClientInterface;
@@ -155,6 +156,14 @@ public function addBreadcrumb(Breadcrumb $breadcrumb): bool
         return SentrySdk::getCurrentHub()->addBreadcrumb($breadcrumb);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public function addAttachment(Attachment $attachment): bool
+    {
+        return SentrySdk::getCurrentHub()->addAttachment($attachment);
+    }
+
     /**
      * {@inheritdoc}
      */

src/State/HubInterface.php

@@ -154,5 +154,8 @@ public function getSpan(): ?Span;
      */
     public function setSpan(?Span $span): HubInterface;
 
+    /**
+     * Records a new attachment that will be attached to error and transaction events.
+     */
     public function addAttachment(Attachment $attachment): bool;
 }

src/State/Scope.php

@@ -8,6 +8,7 @@
 use Sentry\Breadcrumb;
 use Sentry\Event;
 use Sentry\EventHint;
+use Sentry\EventType;
 use Sentry\Options;
 use Sentry\Severity;
 use Sentry\Tracing\DynamicSamplingContext;
@@ -418,8 +419,10 @@ public function applyToEvent(Event $event, ?EventHint $hint = null, ?Options $op
             $hint = new EventHint();
         }
 
-        if (empty($event->getAttachments())) {
-            $event->setAttachments($this->attachments);
+        if ($event->getType() === EventType::event() || $event->getType() === EventType::transaction()) {
+            if (empty($event->getAttachments())) {
+                $event->setAttachments($this->attachments);
+            }
         }
 
         foreach (array_merge(self::$globalEventProcessors, $this->eventProcessors) as $processor) {