fix merge conflicts

README.md

@@ -2,7 +2,7 @@
 # G Suite for GMail
 
 Publisher: Splunk  
-Connector Version: 2.5.3  
+Connector Version: 2.5.4  
 Product Vendor: Google  
 Product Name: GMail  
 Product Version Supported (regex): ".\*"  

gsgmail.json

@@ -16,10 +16,10 @@
     "latest_tested_versions": [
         "Cloud, May 26, 2023"
     ],
-    "app_version": "2.5.3",
+    "app_version": "2.5.4",
     "product_version_regex": ".*",
     "license": "Copyright (c) 2017-2024 Splunk Inc.",
-    "utctime_updated": "2024-04-05T12:12:46.000000Z",
+    "utctime_updated": "2024-06-10T23:10:45.000000Z",
     "configuration": {
         "login_email": {
             "required": true,

gsgmail_connector.py

@@ -793,8 +793,6 @@ def _handle_on_poll(self, param):
 
         # if user_email param is not present use login_email
         config = self.get_config()
-        self.debug_print("\n PRINTING CONFIG : {0} ".format(config))
-        self.debug_print("\n PRINTING PARAM : {0} ".format(param))
 
         login_email = config['login_email']
         self.save_progress("login_email is {0}".format(login_email))

gsgmail_process_email.py

@@ -262,7 +262,6 @@ def _add_artifacts(self, cef_key, input_set, artifact_name, start_index, artifac
             artifact['source_data_identifier'] = start_index + added_artifacts
             artifact['cef'] = {cef_key: entry}
             artifact['name'] = artifact_name
-            self._base_connector.debug_print('Artifact:', artifact)
             artifacts.append(artifact)
             added_artifacts += 1
 
@@ -336,7 +335,7 @@ def _decode_uni_string(self, input_str, def_name):
             decoded_strings = [{'value': x[0], 'encoding': x[1]} for x in decoded_strings]
         except Exception as e:
             error_code, error_msg = self._get_error_message_from_exception(e)
-            self._base_connector.debug_print("Decoding: {0}. Error code: {1}. Error message: {2}".format(encoded_strings, error_code, error_msg))
+            self._base_connector.debug_print("Error code: {0}. Error message: {1}".format(error_code, error_msg))
             return def_name
 
         # convert to dict for safe access, if it's an empty list, the dict will be empty
@@ -654,7 +653,6 @@ def _handle_mail_object(self, mail, email_id, rfc822_email, tmp_dir, start_time_
 
                 self._parse_email_headers(parsed_mail, part, add_email_id=add_email_id)
 
-                self._base_connector.debug_print("part: {0}".format(part.__dict__))
                 self._base_connector.debug_print("part type", type(part))
                 if part.is_multipart():
                     self.check_and_update_eml(part)

release_notes/2.5.4.md

@@ -0,0 +1 @@
+* Remove unnecessary debug logging [PAPP-34119]