Merge branch 'main' into rvinnakota/add-ip-address-sentry

Author: rohitvinnakota-codecov

graphql_api/tests/test_bundle_analysis_measurements.py

@@ -1,3 +1,12 @@
+enum BundleAnalysisMeasurementsAssetType {
+    REPORT_SIZE
+    JAVASCRIPT_SIZE
+    STYLESHEET_SIZE
+    FONT_SIZE
+    IMAGE_SIZE
+    ASSET_SIZE
+}
+
 type BundleSize {
   gzip: Int!
   uncompress: Int!
@@ -26,6 +35,12 @@ type BundleAsset {
   moduleExtensions: [String!]!
   modules: [BundleModule]!
   bundleData: BundleData!
+  measurements(
+    interval: MeasurementInterval!
+    before: DateTime!
+    after: DateTime!
+    branch: String
+  ): BundleAnalysisMeasurements
 }
 
 type BundleReport {
@@ -37,4 +52,20 @@ type BundleReport {
   assets(filters: BundleAnalysisReportFilters): [BundleAsset]!
   asset(name: String!): BundleAsset
   bundleData: BundleData!
+  measurements(
+    interval: MeasurementInterval!
+    before: DateTime!
+    after: DateTime!
+    branch: String
+    orderingDirection: OrderingDirection
+    filters: BundleAnalysisMeasurementsSetFilters
+  ): [BundleAnalysisMeasurements!]
 }
+
+type BundleAnalysisMeasurements{
+    assetType: BundleAnalysisMeasurementsAssetType!
+    name: String
+    size: BundleData
+    change: BundleData
+    measurements: [Measurement!]
+}

graphql_api/types/bundle_analysis/base.graphql

@@ -1,15 +1,23 @@
+from datetime import datetime
 from typing import List, Mapping, Optional
 
-from ariadne import ObjectType
+from ariadne import ObjectType, convert_kwargs_to_snake_case
+from graphql import GraphQLResolveInfo
 
+from codecov.db import sync_to_async
+from graphql_api.types.enums import OrderingDirection
 from services.bundle_analysis import (
     AssetReport,
+    BundleAnalysisMeasurementData,
+    BundleAnalysisMeasurementsAssetType,
+    BundleAnalysisMeasurementsService,
     BundleData,
     BundleLoadTime,
     BundleReport,
     BundleSize,
     ModuleReport,
 )
+from timeseries.models import Interval
 
 bundle_data_bindable = ObjectType("BundleData")
 bundle_module_bindable = ObjectType("BundleModule")
@@ -21,108 +29,192 @@
 
 
 @bundle_data_bindable.field("size")
-def resolve_bundle_size(bundle_data: BundleData, info) -> BundleSize:
+def resolve_bundle_size(
+    bundle_data: BundleData, info: GraphQLResolveInfo
+) -> BundleSize:
     return bundle_data.size
 
 
 @bundle_data_bindable.field("loadTime")
-def resolve_bundle_load_time(bundle_data: BundleData, info) -> BundleLoadTime:
+def resolve_bundle_load_time(
+    bundle_data: BundleData, info: GraphQLResolveInfo
+) -> BundleLoadTime:
     return bundle_data.load_time
 
 
 # ============= Bundle Module Bindable =============
 
 
 @bundle_module_bindable.field("name")
-def resolve_bundle_module_name(bundle_module: ModuleReport, info) -> str:
+def resolve_bundle_module_name(
+    bundle_module: ModuleReport, info: GraphQLResolveInfo
+) -> str:
     return bundle_module.name
 
 
 @bundle_module_bindable.field("bundleData")
-def resolve_bundle_module_bundle_data(bundle_module: ModuleReport, info) -> int:
+def resolve_bundle_module_bundle_data(
+    bundle_module: ModuleReport, info: GraphQLResolveInfo
+) -> BundleData:
     return BundleData(bundle_module.size_total)
 
 
 # ============= Bundle Asset Bindable =============
 
 
 @bundle_asset_bindable.field("name")
-def resolve_bundle_asset_name(bundle_asset: AssetReport, info) -> str:
+def resolve_bundle_asset_name(
+    bundle_asset: AssetReport, info: GraphQLResolveInfo
+) -> str:
     return bundle_asset.name
 
 
 @bundle_asset_bindable.field("normalizedName")
-def resolve_normalized_name(bundle_asset: AssetReport, info) -> str:
+def resolve_normalized_name(bundle_asset: AssetReport, info: GraphQLResolveInfo) -> str:
     return bundle_asset.normalized_name
 
 
 @bundle_asset_bindable.field("extension")
-def resolve_extension(bundle_asset: AssetReport, info) -> str:
+def resolve_extension(bundle_asset: AssetReport, info: GraphQLResolveInfo) -> str:
     return bundle_asset.extension
 
 
 @bundle_asset_bindable.field("bundleData")
-def resolve_bundle_asset_bundle_data(bundle_asset: AssetReport, info) -> BundleData:
+def resolve_bundle_asset_bundle_data(
+    bundle_asset: AssetReport, info: GraphQLResolveInfo
+) -> BundleData:
     return BundleData(bundle_asset.size_total)
 
 
 @bundle_asset_bindable.field("modules")
-def resolve_modules(bundle_asset: AssetReport, info) -> List[ModuleReport]:
+def resolve_modules(
+    bundle_asset: AssetReport, info: GraphQLResolveInfo
+) -> List[ModuleReport]:
     return bundle_asset.modules
 
 
 @bundle_asset_bindable.field("moduleExtensions")
 def resolve_bundle_asset_module_extensions(
-    bundle_asset: AssetReport, info
+    bundle_asset: AssetReport, info: GraphQLResolveInfo
 ) -> List[str]:
     return bundle_asset.module_extensions
 
 
+@bundle_asset_bindable.field("measurements")
+@convert_kwargs_to_snake_case
+@sync_to_async
+def resolve_asset_report_measurements(
+    bundle_asset: AssetReport,
+    info: GraphQLResolveInfo,
+    interval: Interval,
+    before: datetime,
+    after: datetime,
+    branch: Optional[str] = None,
+) -> Optional[BundleAnalysisMeasurementData]:
+    bundle_analysis_measurements = BundleAnalysisMeasurementsService(
+        repository=info.context["commit"].repository,
+        interval=interval,
+        after=after,
+        before=before,
+        branch=branch,
+    )
+    return bundle_analysis_measurements.compute_asset(bundle_asset)
+
+
 # ============= Bundle Report Bindable =============
 
 
 @bundle_report_bindable.field("name")
-def resolve_name(bundle_report: BundleReport, info) -> str:
+def resolve_name(bundle_report: BundleReport, info: GraphQLResolveInfo) -> str:
     return bundle_report.name
 
 
 # TODO: depreacted with Issue 1199
 @bundle_report_bindable.field("sizeTotal")
-def resolve_size_total(bundle_report: BundleReport, info) -> int:
+def resolve_size_total(bundle_report: BundleReport, info: GraphQLResolveInfo) -> int:
     return bundle_report.size_total
 
 
 # TODO: depreacted with Issue 1199
 @bundle_report_bindable.field("loadTimeTotal")
-def resolve_load_time_total(bundle_report: BundleReport, info) -> float:
+def resolve_load_time_total(
+    bundle_report: BundleReport, info: GraphQLResolveInfo
+) -> float:
     return bundle_report.load_time_total
 
 
 @bundle_report_bindable.field("moduleExtensions")
-def resolve_module_extensions(bundle_report: BundleReport, info) -> List[str]:
+def resolve_module_extensions(
+    bundle_report: BundleReport, info: GraphQLResolveInfo
+) -> List[str]:
     return bundle_report.module_extensions
 
 
 @bundle_report_bindable.field("moduleCount")
-def resolve_module_count(bundle_report: BundleReport, info) -> int:
+def resolve_module_count(bundle_report: BundleReport, info: GraphQLResolveInfo) -> int:
     return bundle_report.module_count
 
 
 @bundle_report_bindable.field("assets")
 def resolve_assets(
     bundle_report: BundleReport,
-    info,
+    info: GraphQLResolveInfo,
     filters: Optional[Mapping] = None,
 ) -> List[AssetReport]:
     extensions_filter = filters.get("moduleExtensions", None) if filters else None
     return list(bundle_report.assets(extensions_filter))
 
 
 @bundle_report_bindable.field("asset")
-def resolve_asset(bundle_report: BundleReport, info, name: str) -> AssetReport:
+def resolve_asset(
+    bundle_report: BundleReport, info: GraphQLResolveInfo, name: str
+) -> Optional[AssetReport]:
     return bundle_report.asset(name)
 
 
 @bundle_report_bindable.field("bundleData")
-def resolve_bundle_data(bundle_report: BundleReport, info) -> BundleData:
+def resolve_bundle_data(
+    bundle_report: BundleReport, info: GraphQLResolveInfo
+) -> BundleData:
     return BundleData(bundle_report.size_total)
+
+
+@bundle_report_bindable.field("measurements")
+@convert_kwargs_to_snake_case
+@sync_to_async
+def resolve_bundle_report_measurements(
+    bundle_report: BundleReport,
+    info: GraphQLResolveInfo,
+    interval: Interval,
+    before: datetime,
+    after: datetime,
+    branch: Optional[str] = None,
+    filters: Mapping = {},
+    ordering_direction: Optional[OrderingDirection] = OrderingDirection.ASC,
+) -> List[BundleAnalysisMeasurementData]:
+    if not filters.get("asset_types", []):
+        measurable_names = [item for item in list(BundleAnalysisMeasurementsAssetType)]
+    else:
+        measurable_names = [
+            BundleAnalysisMeasurementsAssetType[item] for item in filters["asset_types"]
+        ]
+
+    bundle_analysis_measurements = BundleAnalysisMeasurementsService(
+        repository=info.context["commit"].repository,
+        interval=interval,
+        after=after,
+        before=before,
+        branch=branch,
+    )
+
+    measurements = []
+    for name in measurable_names:
+        measurements.extend(
+            bundle_analysis_measurements.compute_report(bundle_report, asset_type=name)
+        )
+
+    return sorted(
+        measurements,
+        key=lambda c: c.asset_type,
+        reverse=ordering_direction == OrderingDirection.DESC,
+    )

graphql_api/types/bundle_analysis/base.py

@@ -198,6 +198,8 @@ def resolve_bundle_analysis_report(
             "request"
         ].bundle_analysis_head_report_db_path = bundle_analysis_report.report.db_path
 
+    info.context["commit"] = commit
+
     return bundle_analysis_report
 
 

graphql_api/types/commit/commit.py

@@ -1,3 +1,7 @@
 input BundleAnalysisReportFilters {
   moduleExtensions: [String!]
+}
+
+input BundleAnalysisMeasurementsSetFilters {
+    assetTypes: [BundleAnalysisMeasurementsAssetType!]
 }