Add error logging for integration failures in AbstractIntegrationHandler

- Introduced logging of integration failures to capture detailed error information.
- Enhanced error handling by logging the form ID and integration ID along with the exception data.

These changes improve the observability of integration processes, aiding in debugging and monitoring.

api/app/Integrations/Handlers/AbstractIntegrationHandler.php

@@ -10,6 +10,7 @@ use App\Service\Forms\FormSubmissionFormatter;
 use App\Service\Forms\FormLogicConditionChecker;
 use Illuminate\Http\Client\RequestException;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
 use Vinkla\Hashids\Facades\Hashids;
 
 abstract class AbstractIntegrationHandler
@@ -74,6 +75,10 @@ abstract class AbstractIntegrationHandler
                 'status' => FormIntegrationsEvent::STATUS_ERROR,
                 'data' => $this->extractEventDataFromException($e),
             ]);
+            Log::error('Integration failed', array_merge([
+                'form_id' => $this->form->id,
+                'integration_id' => $this->formIntegration->id,
+            ], $this->extractEventDataFromException($e)));
         }
     }
 

api/app/Notifications/Forms/FormEmailNotification.php

@@ -106,7 +106,14 @@ class FormEmailNotification extends Notification
             return $this->integrationData->sender_email;
         }
 
-        return config('mail.from.address');
+        $baseEmail = config('mail.from.address');
+        if (!config('app.self_hosted')) {
+            // Insert timestamp before the @ to prevent email grouping
+            $parts = explode('@', $baseEmail);
+            return $parts[0] . '+' . time() . '@' . $parts[1];
+        }
+
+        return $baseEmail;
     }
 
     private function getSenderName(): string
@@ -155,6 +162,9 @@ class FormEmailNotification extends Notification
         // Add our custom Message-ID as X-Custom-Message-ID
         $message->getHeaders()->addTextHeader('X-Custom-Message-ID', $messageId);
 
+        // Add X-Entity-Ref-ID header for Google+ notifications
+        $message->getHeaders()->addTextHeader('X-Entity-Ref-ID', $messageId);
+
         // Add References header
         $message->getHeaders()->addTextHeader('References', $references);