From aba32a2dd9511f5c7e9bd5094c6aae68a0206b2b Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Wed, 8 Nov 2023 15:03:54 -0700
Subject: [PATCH] Bug 1863769 - Try to improve diagnostics for AAB upload
 (#254)

* Bug 1863769 - Try to improve diagnostics for AAB upload

* bump version
---
 CHANGELOG.md                    |  8 ++++++++
 mozapkpublisher/common/store.py | 26 ++++++++++++++++++--------
 version.txt                     |  2 +-
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0aed8b..7b4d631 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [6.3.0] - 2023-11-08
+
+### Removed
+* Amazon Store support
+
+### Fixed
+* Better diagnostics during AAB upload
+
 ## [6.2.1] - 2023-09-21
 
 ### Fixed
diff --git a/mozapkpublisher/common/store.py b/mozapkpublisher/common/store.py
index 096810f..99d2086 100644
--- a/mozapkpublisher/common/store.py
+++ b/mozapkpublisher/common/store.py
@@ -104,16 +104,26 @@ def upload_apk(self, apk):
             raise
 
     def upload_aab(self, aab):
+        # try to get extra network diagnostics during upload
+        debuglevel = httplib2.debuglevel
+        httplib2.debuglevel = 4
+
         aab_path = aab.name
         logger.info('Uploading "{}" ...'.format(aab_path))
-        response = self._edit_resource.bundles().upload(
-            editId=self._edit_id,
-            packageName=self._package_name,
-            media_body=aab_path,
-            media_mime_type='application/octet-stream',
-        ).execute()
-        logger.info('"{}" uploaded'.format(aab_path))
-        logger.debug('Upload response: {}'.format(response))
+        try:
+            response = self._edit_resource.bundles().upload(
+                editId=self._edit_id,
+                packageName=self._package_name,
+                media_body=aab_path,
+                media_mime_type='application/octet-stream',
+            ).execute()
+            logger.info('"{}" uploaded'.format(aab_path))
+            logger.debug('Upload response: {}'.format(response))
+        except Exception:
+            logger.exception("caught exception in upload_aab:")
+            raise
+        finally:
+            httplib2.debuglevel = debuglevel
 
     def _update_track(self, track, version_codes, rollout_percentage=None):
         if track == 'rollout' and rollout_percentage is None:
diff --git a/version.txt b/version.txt
index 024b066..798e389 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-6.2.1
+6.3.0