mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-03 21:43:21 +00:00 
			
		
		
		
	missedmessage_emails: Add Sentry spans to worker thread.
This commit is contained in:
		
				
					committed by
					
						
						Tim Abbott
					
				
			
			
				
	
			
			
			
						parent
						
							9451d08bb9
						
					
				
				
					commit
					9d8d2d138b
				
			@@ -620,6 +620,7 @@ class MissedMessageWorker(QueueProcessingWorker):
 | 
			
		||||
    # The main thread, which handles the RabbitMQ connection and creates
 | 
			
		||||
    # database rows from them.
 | 
			
		||||
    @override
 | 
			
		||||
    @sentry_sdk.trace
 | 
			
		||||
    def consume(self, event: Dict[str, Any]) -> None:
 | 
			
		||||
        logging.debug("Processing missedmessage_emails event: %s", event)
 | 
			
		||||
        # When we consume an event, check if there are existing pending emails
 | 
			
		||||
@@ -693,6 +694,11 @@ class MissedMessageWorker(QueueProcessingWorker):
 | 
			
		||||
 | 
			
		||||
    def work(self) -> None:
 | 
			
		||||
        while True:
 | 
			
		||||
            with sentry_sdk.start_transaction(
 | 
			
		||||
                op="task",
 | 
			
		||||
                name=f"{self.queue_name} worker thread",
 | 
			
		||||
                custom_sampling_context={"queue": self.queue_name},
 | 
			
		||||
            ):
 | 
			
		||||
                flush_per_request_caches()
 | 
			
		||||
                reset_queries()
 | 
			
		||||
                try:
 | 
			
		||||
@@ -747,7 +753,10 @@ class MissedMessageWorker(QueueProcessingWorker):
 | 
			
		||||
                # re-checking the condition.
 | 
			
		||||
                return False
 | 
			
		||||
 | 
			
		||||
            with sentry_sdk.start_span(description="condvar wait") as span:
 | 
			
		||||
                span.set_data("timeout", timeout)
 | 
			
		||||
                was_notified = self.cv.wait_for(wait_condition, timeout=timeout)
 | 
			
		||||
                span.set_data("was_notified", was_notified)
 | 
			
		||||
 | 
			
		||||
        # Being notified means that we are in conditions (1) or
 | 
			
		||||
        # (2), above.  In neither case do we need to look at if
 | 
			
		||||
@@ -759,6 +768,7 @@ class MissedMessageWorker(QueueProcessingWorker):
 | 
			
		||||
 | 
			
		||||
        return False
 | 
			
		||||
 | 
			
		||||
    @sentry_sdk.trace
 | 
			
		||||
    def maybe_send_batched_emails(self) -> None:
 | 
			
		||||
        current_time = timezone_now()
 | 
			
		||||
 | 
			
		||||
@@ -782,6 +792,11 @@ class MissedMessageWorker(QueueProcessingWorker):
 | 
			
		||||
                    len(events),
 | 
			
		||||
                    user_profile_id,
 | 
			
		||||
                )
 | 
			
		||||
                with sentry_sdk.start_span(
 | 
			
		||||
                    description="sending missedmessage_emails to user"
 | 
			
		||||
                ) as span:
 | 
			
		||||
                    span.set_data("user_profile_id", user_profile_id)
 | 
			
		||||
                    span.set_data("event_count", len(events))
 | 
			
		||||
                    try:
 | 
			
		||||
                        # Because we process events in batches, an
 | 
			
		||||
                        # escaped exception here would lead to
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user