Logging more info

app/presenters/blob_presenter.rb

@@ -122,22 +122,18 @@ class BlobPresenter < Gitlab::View::Presenter::Delegated
 
   def transformed_blob_data
     @transformed_blob ||= if blob.path.ends_with?('.ipynb')
-                            begin
-                              new_blob = IpynbDiff.transform(blob.data,
-                                                             raise_errors: true,
-                                                             options: { include_metadata: false, cell_decorator: :percent })
-                            rescue IpynbDiff::InvalidNotebookError => e
-                              Gitlab::ErrorTracking.track_and_raise_for_dev_exception(e, issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/344676')
-                              return blob.data
-                            end
-
-                            if new_blob
-                              Gitlab::AppLogger.info('IPYNBDIFF_BLOB_GENERATED')
-                              new_blob
-                            else
-                              Gitlab::AppLogger.info('IPYNBDIFF_BLOB_NIL')
-                              blob.data
-                            end
+                            new_blob = IpynbDiff.transform(blob.data,
+                                                           raise_errors: true,
+                                                           options: { include_metadata: false, cell_decorator: :percent })
+
+                            Gitlab::AppLogger.info(new_blob ? 'IPYNBDIFF_BLOB_GENERATED' : 'IPYNBDIFF_BLOB_NIL')
+
+                            new_blob
                           end
+
+    @transformed_blob ||= blob.data
+  rescue IpynbDiff::InvalidNotebookError => e
+    Gitlab::ErrorTracking.track_and_raise_for_dev_exception(e, issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/344676')
+    blob.data
   end
 end

lib/gitlab/diff/file.rb

@@ -456,21 +456,18 @@ module Gitlab
         from = old_blob_lazy&.data
         to = new_blob_lazy&.data
 
-        begin
-          new_diff = IpynbDiff.diff(from, to,
-                                    diff_opts: { context: 5, include_diff_info: true },
-                                    transform_options: { cell_decorator: :percent },
-                                    raise_if_invalid_notebook: true)
-
-          if new_diff
-            diff.diff = new_diff.scan(/.*\n/)[2..-1].join('')
-            Gitlab::AppLogger.info("IPYNB_DIFF_GENERATED")
-          else
-            Gitlab::AppLogger.info("IPYNB_DIFF_NIL")
-          end
-        rescue IpynbDiff::InvalidNotebookError => e
-          Gitlab::ErrorTracking.track_and_raise_for_dev_exception(e, issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/344676')
-        end
+        new_diff = IpynbDiff.diff(from, to,
+                                  diff_opts: { context: 5, include_diff_info: true },
+                                  transform_options: { cell_decorator: :percent },
+                                  raise_if_invalid_notebook: true)
+
+        diff.diff = new_diff.scan(/.*\n/)[2..-1].join('') if new_diff
+
+        Gitlab::AppLogger.info({ message: new_diff ? 'IPYNB_DIFF_GENERATED' : 'IPYNB_DIFF_NIL',
+                                 from: from&.to_s, to: to&.to_s })
+
+      rescue IpynbDiff::InvalidNotebookError => e
+        Gitlab::ErrorTracking.track_and_raise_for_dev_exception(e, issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/344676')
       end
 
       def alternate_viewer_class