bundle analysis: calculate bundle's total gzip size correctly (#803)

Author: JerrySentry

graphql_api/tests/test_commit.py

@@ -1276,7 +1276,7 @@ def test_bundle_analysis_report(self, get_storage_service):
                             "highSpeed": 0,
                         },
                         "size": {
-                            "gzip": 1,
+                            "gzip": 0,
                             "uncompress": 1500,
                         },
                     },
@@ -1934,3 +1934,102 @@ def test_fetch_commit_status_pending(self):
         commit = data["owner"]["repository"]["commit"]
         assert commit["coverageStatus"] == CommitStatus.PENDING.value
         assert commit["bundleStatus"] == CommitStatus.PENDING.value
+
+    @patch("graphql_api.dataloader.bundle_analysis.get_appropriate_storage_service")
+    def test_bundle_analysis_report_gzip_size_total(self, get_storage_service):
+        storage = MemoryStorageService({})
+        get_storage_service.return_value = storage
+
+        head_commit_report = CommitReportFactory(
+            commit=self.commit, report_type=CommitReport.ReportType.BUNDLE_ANALYSIS
+        )
+
+        with open(
+            "./services/tests/samples/head_bundle_report_with_gzip_size.sqlite", "rb"
+        ) as f:
+            storage_path = StoragePaths.bundle_report.path(
+                repo_key=ArchiveService.get_archive_hash(self.repo),
+                report_key=head_commit_report.external_id,
+            )
+            storage.write_file(get_bucket_name(), storage_path, f)
+
+        query = """
+            query FetchCommit($org: String!, $repo: String!, $commit: String!) {
+                owner(username: $org) {
+                    repository(name: $repo) {
+                        ... on Repository {
+                            commit(id: $commit) {
+                                bundleAnalysisReport {
+                                    __typename
+                                    ... on BundleAnalysisReport {
+                                        bundles {
+                                            name
+                                            bundleData {
+                                                size {
+                                                    gzip
+                                                    uncompress
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        """
+
+        variables = {
+            "org": self.org.username,
+            "repo": self.repo.name,
+            "commit": self.commit.commitid,
+        }
+        data = self.gql_request(query, variables=variables)
+        commit = data["owner"]["repository"]["commit"]
+
+        assert commit["bundleAnalysisReport"] == {
+            "__typename": "BundleAnalysisReport",
+            "bundles": [
+                {
+                    # All assets non compressible
+                    "name": "b1",
+                    "bundleData": {
+                        "size": {
+                            "gzip": 20,
+                            "uncompress": 20,
+                        },
+                    },
+                },
+                {
+                    # Some assets non compressible
+                    "name": "b2",
+                    "bundleData": {
+                        "size": {
+                            "gzip": 198,
+                            "uncompress": 200,
+                        },
+                    },
+                },
+                {
+                    # All assets non compressible
+                    "name": "b3",
+                    "bundleData": {
+                        "size": {
+                            "gzip": 1495,
+                            "uncompress": 1500,
+                        },
+                    },
+                },
+                {
+                    # All assets non compressible
+                    "name": "b5",
+                    "bundleData": {
+                        "size": {
+                            "gzip": 199995,
+                            "uncompress": 200000,
+                        },
+                    },
+                },
+            ],
+        }

graphql_api/types/bundle_analysis/base.py

@@ -146,7 +146,10 @@ def resolve_asset(
 def resolve_bundle_data(
     bundle_report: BundleReport, info: GraphQLResolveInfo
 ) -> BundleData:
-    return BundleData(bundle_report.size_total)
+    return BundleData(
+        bundle_report.size_total,
+        bundle_report.gzip_size_total,
+    )
 
 
 @bundle_report_bindable.field("measurements")

requirements.in

@@ -20,7 +20,7 @@ factory-boy
 fakeredis
 freezegun
 https://github.com/codecov/opentelem-python/archive/refs/tags/v0.0.4a1.tar.gz#egg=codecovopentelem
-https://github.com/codecov/shared/archive/42f83ec717e632c543cc6ceab8fc3cc39eccc5be.tar.gz#egg=shared
+https://github.com/codecov/shared/archive/87495b40c8e0af14a9d093946aa3cac2094b1de8.tar.gz#egg=shared
 google-cloud-pubsub
 gunicorn>=22.0.0
 https://github.com/photocrowd/django-cursor-pagination/archive/f560902696b0c8509e4d95c10ba0d62700181d84.tar.gz

requirements.txt

@@ -417,7 +417,7 @@ sentry-sdk[celery]==2.13.0
     #   shared
 setproctitle==1.1.10
     # via -r requirements.in
-shared @ https://github.com/codecov/shared/archive/42f83ec717e632c543cc6ceab8fc3cc39eccc5be.tar.gz
+shared @ https://github.com/codecov/shared/archive/87495b40c8e0af14a9d093946aa3cac2094b1de8.tar.gz
     # via -r requirements.in
 simplejson==3.17.2
     # via -r requirements.in

services/bundle_analysis.py

@@ -263,6 +263,10 @@ def asset(self, name: str) -> Optional[AssetReport]:
     def size_total(self) -> int:
         return self.report.total_size(**self.filters)
 
+    @cached_property
+    def gzip_size_total(self) -> int:
+        return self.report.total_gzip_size(**self.filters)
+
     @cached_property
     def module_extensions(self) -> List[str]:
         extensions = set()