From 66258eac686a5fd571742353f03f8fb3c5f98c98 Mon Sep 17 00:00:00 2001
From: Andrzej Bisewski <152981096+andrzejbisewski@users.noreply.github.com>
Date: Wed, 20 Aug 2025 17:10:16 +0200
Subject: [PATCH] [ROMEO-457] Fix NoMethodError in sentry integration

---
 CHANGELOG.md               | 4 ++++
 lib/eventboss/publisher.rb | 4 ++--
 lib/eventboss/version.rb   | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1da7010..6f2af3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.9.7]
+
+- Fix undefined method 'set_data' for nil span in Sentry integration
+
 ## [1.9.6]
 
 ### Added
diff --git a/lib/eventboss/publisher.rb b/lib/eventboss/publisher.rb
index d539618..fdeea7c 100644
--- a/lib/eventboss/publisher.rb
+++ b/lib/eventboss/publisher.rb
@@ -37,11 +37,11 @@ def with_sentry_span
       queue_name = Queue.build_name(destination: source, event_name: event_name, env: Eventboss.env, source_app: source)
 
       ::Sentry.with_child_span(op: 'queue.publish', description: "Eventboss push #{source}/#{event_name}") do |span|
-        span.set_data(::Sentry::Span::DataConventions::MESSAGING_DESTINATION_NAME, ::Eventboss::Sentry::Context.queue_name_for_sentry(queue_name))
+        span.set_data(::Sentry::Span::DataConventions::MESSAGING_DESTINATION_NAME, ::Eventboss::Sentry::Context.queue_name_for_sentry(queue_name)) if span
 
         message = yield
 
-        span.set_data(::Sentry::Span::DataConventions::MESSAGING_MESSAGE_ID, message.message_id)
+        span.set_data(::Sentry::Span::DataConventions::MESSAGING_MESSAGE_ID, message.message_id) if span
         message
       end
     end
diff --git a/lib/eventboss/version.rb b/lib/eventboss/version.rb
index ec1f59d..3ef73d1 100644
--- a/lib/eventboss/version.rb
+++ b/lib/eventboss/version.rb
@@ -1,3 +1,3 @@
 module Eventboss
-  VERSION = "1.9.6"
+  VERSION = "1.9.7"
 end