Merge 584a8f7 into 4712364

st0012 · web-flow · commit 92302a9e9f6a · 2021-08-26T13:21:41.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,11 @@
-## Unreleased
+## 4.7.0
 
 ### Features
 
 - Add `monotonic_active_support_logger` [#1531](https://github.com/getsentry/sentry-ruby/pull/1531)
 - Support after-retry reporting to `sentry-sidekiq` [#1532](https://github.com/getsentry/sentry-ruby/pull/1532)
 - Generate Security Header Endpoint with `Sentry.csp_report_uri` from dsn [#1507](https://github.com/getsentry/sentry-ruby/pull/1507)
+- Allow passing backtrace into `Sentry.capture_message` [#1550](https://github.com/getsentry/sentry-ruby/pull/1550)
 
 ### Bug Fixes
 
diff --git a/sentry-ruby/lib/sentry/client.rb b/sentry-ruby/lib/sentry/client.rb
@@ -57,10 +57,10 @@ def event_from_exception(exception, hint = {})
       end
     end
 
-    def event_from_message(message, hint = {})
+    def event_from_message(message, hint = {}, backtrace: nil)
       integration_meta = Sentry.integrations[hint[:integration]]
       event = Event.new(configuration: configuration, integration_meta: integration_meta, message: message)
-      event.add_threads_interface(backtrace: caller)
+      event.add_threads_interface(backtrace: backtrace || caller)
       event
     end
 
diff --git a/sentry-ruby/lib/sentry/hub.rb b/sentry-ruby/lib/sentry/hub.rb
@@ -108,7 +108,8 @@ def capture_message(message, **options, &block)
 
       options[:hint] ||= {}
       options[:hint][:message] = message
-      event = current_client.event_from_message(message, options[:hint])
+      backtrace = options.delete(:backtrace)
+      event = current_client.event_from_message(message, options[:hint], backtrace: backtrace)
       capture_event(event, **options, &block)
     end
 
diff --git a/sentry-ruby/spec/sentry/hub_spec.rb b/sentry-ruby/spec/sentry/hub_spec.rb
@@ -143,6 +143,18 @@
       end.to change { transport.events.count }.by(1)
     end
 
+    it "takes backtrace option" do
+      event = subject.capture_message(message, backtrace: ["#{__FILE__}:10:in `foo'"])
+      event_hash = event.to_hash
+      expect(event_hash.dig(:threads, :values, 0, :stacktrace, :frames, 0, :function)).to eq("foo")
+    end
+
+    it "assigns default backtrace with caller" do
+      event = subject.capture_message(message)
+      event_hash = event.to_hash
+      expect(event_hash.dig(:threads, :values, 0, :stacktrace, :frames, 0, :function)).to eq("<main>")
+    end
+
     it_behaves_like "capture_helper" do
       let(:capture_helper) { :capture_message }
       let(:capture_subject) { message }
