Merge branch 'main' into cherry-pick-ce-commit-b17b4848afef3dd1c0acca…

…2814a44b3d095189c1
Multiwoven · Dec 10, 2024 · ba36616 · ba36616
2 parents 5e58195 + dc58bf7
commit ba36616
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 32 deletions.
diff --git a/integrations/Gemfile.lock b/integrations/Gemfile.lock
@@ -4,14 +4,7 @@ GIT
   specs:
     ruby-odbc (0.999992)
 
-<<<<<<< HEAD
-PATH
-  remote: .
-  specs:
-    multiwoven-integrations (0.15.8)
-=======
     multiwoven-integrations (0.15.10)
->>>>>>> b17b4848 (chore(CE): Update mailchimp catalog (#688))
       MailchimpMarketing
       activesupport
       async-websocket

diff --git a/integrations/lib/multiwoven/integrations/core/utils.rb b/integrations/lib/multiwoven/integrations/core/utils.rb
@@ -61,11 +61,11 @@ def log_request_response(level, request, response)
         )
       end
 
-      def create_log_message(context, type, exception)
+      def create_log_message(context, type, message)
         Integrations::Protocol::LogMessage.new(
           name: context,
           level: type,
-          message: exception.message
+          message: message
         ).to_multiwoven_message
       end
 
@@ -74,7 +74,7 @@ def handle_exception(exception, meta = {})
           "#{hash_to_string(meta)}: #{exception.message}"
         )
         report_exception(exception, meta)
-        create_log_message(meta[:context], meta[:type], exception)
+        create_log_message(meta[:context], meta[:type], exception.message)
       end
 
       def hash_to_string(hash)

diff --git a/integrations/lib/multiwoven/integrations/rollout.rb b/integrations/lib/multiwoven/integrations/rollout.rb
@@ -2,11 +2,7 @@
 
 module Multiwoven
   module Integrations
-<<<<<<< HEAD
-    VERSION = "0.15.8"
-=======
     VERSION = "0.15.10"
->>>>>>> b17b4848 (chore(CE): Update mailchimp catalog (#688))
 
     ENABLED_SOURCES = %w[
       Snowflake

diff --git a/integrations/lib/multiwoven/integrations/source/databrics_model/client.rb b/integrations/lib/multiwoven/integrations/source/databrics_model/client.rb
@@ -65,7 +65,7 @@ def process_response(response)
           data = JSON.parse(response.body)
           [RecordMessage.new(data: data, emitted_at: Time.now.to_i).to_multiwoven_message]
         else
-          create_log_message("DATABRICKS MODEL:RUN_MODEL", "error", "request failed")
+          create_log_message("DATABRICKS MODEL:RUN_MODEL", "error", "request failed: #{response.body}")
         end
       end
 

diff --git a/integrations/lib/multiwoven/integrations/source/http_model/client.rb b/integrations/lib/multiwoven/integrations/source/http_model/client.rb
@@ -72,7 +72,7 @@ def process_response(response)
           data = JSON.parse(response.body)
           [RecordMessage.new(data: data, emitted_at: Time.now.to_i).to_multiwoven_message]
         else
-          create_log_message("HTTP MODEL:RUN_MODEL", "error", "request failed")
+          create_log_message("HTTP MODEL:RUN_MODEL", "error", "request failed: #{response.body}")
         end
       end
 

diff --git a/release-notes.md b/release-notes.md
@@ -2,27 +2,23 @@
 
 All notable changes to this project will be documented in this file.
 
-## [0.36.0] - 2024-12-02
+## [0.37.0] - 2024-12-06
 
 ### 🐛 Bug Fixes
 
-- *(CE)* Bigquery test sync failure (#505)
-- *(CE)* Get http request method from connection config (#507)
+- *(CE)* Audit logs serializer fix (#510)
 
 ### ⚙️ Miscellaneous Tasks
 
-- *(CE)* Update server gem 0.15.6 (#493)
-- *(CE)* Update audit_log serializer (#492)
-- *(CE)* Update action names for models controller (#495)
-- *(CE)* Update action names for connectors definitions controller (#496)
-- *(CE)* Model changes for file upload (#497)
-- *(CE)* Remove audit log from sync runs controller (#498)
-- *(CE)* Remove audit log from sync records controller (#499)
-- *(CE)* Remove audit log from reports controller (#500)
-- *(CE)* Update action name to schedule syncs controller (#502)
-- *(CE)* Update action name to sync controller (#503)
-- *(CE)* Update action names for connectors controller (#504)
-- *(CE)* Add data app and auditLogs resources (#501)
-- *(CE)* Upgrade integration gem 0.15.7 (#506)
+- *(CE)* Remove audit logs from users controller (#509)
+- *(CE)* Update audit log for schedule syncs controller (#513)
+- *(CE)* Update audit logs for catalogs controller (#514)
+- *(CE)* Update audit logs for connectors controller (#515)
+- *(CE)* Update audit logs for models controller (#516)
+- *(CE)* Update audit logs for syncs controller (#517)
+- *(CE)* Add multiple_choice feedback type (#512)
+- *(CE)* Add catalog and schedule sync resources (#511)
+- *(CE)* Update HTTP model header (#519)
+- *(CE)* Update Server Gem 0.15.8 (#518)
 
 <!-- generated by git-cliff -->