Merge branch 'main' of github.com:codecov/codecov-api

Author: nora-shap

Makefile

@@ -19,6 +19,11 @@ export CODECOV_TOKEN=${CODECOV_UPLOAD_TOKEN}
 API_DOMAIN ?= api
 PROXY_NETWORK ?= api_default
 
+# We allow this to be overridden so that we can run `pytest` from this directory
+# but have the junit file use paths relative to a parent directory. This will
+# help us move to a monorepo.
+PYTEST_ROOTDIR ?= "."
+
 # Codecov CLI version to use
 CODECOV_CLI_VERSION := 9.0.4
 
@@ -30,13 +35,13 @@ check-for-migration-conflicts:
 	python manage.py check_for_migration_conflicts
 
 test:
-	COVERAGE_CORE=sysmon pytest --cov=./ --junitxml=junit.xml -o junit_family=legacy
+	COVERAGE_CORE=sysmon pytest --cov=./ --junitxml=junit.xml -o junit_family=legacy -c pytest.ini --rootdir=${PYTEST_ROOTDIR}
 
 test.unit:
-	COVERAGE_CORE=sysmon pytest --cov=./ -m "not integration" --cov-report=xml:unit.coverage.xml --junitxml=unit.junit.xml -o junit_family=legacy
+	COVERAGE_CORE=sysmon pytest --cov=./ -m "not integration" --cov-report=xml:unit.coverage.xml --junitxml=unit.junit.xml -o junit_family=legacy -c pytest.ini --rootdir=${PYTEST_ROOTDIR}
 
 test.integration:
-	COVERAGE_CORE=sysmon pytest --cov=./ -m "integration" --cov-report=xml:integration.coverage.xml --junitxml=integration.junit.xml -o junit_family=legacy
+	COVERAGE_CORE=sysmon pytest --cov=./ -m "integration" --cov-report=xml:integration.coverage.xml --junitxml=integration.junit.xml -o junit_family=legacy -c pytest.ini --rootdir=${PYTEST_ROOTDIR}
 
 lint:
 	make lint.install
@@ -211,7 +216,7 @@ test_env.container_check_db:
 	while ! nc -vz timescale 5432; do sleep 1; echo "waiting for timescale"; done
 
 test_env.run_unit:
-	docker compose exec api make test.unit
+	docker compose exec api make test.unit PYTEST_ROOTDIR=${PYTEST_ROOTDIR}
 
 test_env.run_integration:
 	# docker compose exec api make test.integration

core/commands/repository/interactors/activate_measurements.py

@@ -20,11 +20,9 @@ def execute(
         )
 
         dataset, created = Dataset.objects.get_or_create(
-            name=measurement_type.value,
-            repository_id=repo.pk,
+            name=measurement_type.value, repository_id=repo.pk
         )
-
         if created:
-            trigger_backfill(dataset)
+            trigger_backfill([dataset])
 
         return dataset

core/commands/repository/interactors/tests/test_activate_measurements.py

@@ -5,8 +5,6 @@
 from asgiref.sync import async_to_sync
 from django.conf import settings
 from django.test import TestCase, override_settings
-from django.utils import timezone
-from freezegun import freeze_time
 from shared.django_apps.core.tests.factories import (
     CommitFactory,
     OwnerFactory,
@@ -98,7 +96,6 @@ def test_creates_coverage_dataset(self, backfill_dataset):
         ).exists()
 
     @patch("services.task.TaskService.backfill_dataset")
-    @freeze_time("2022-01-01T00:00:00")
     def test_triggers_task(self, backfill_dataset):
         CommitFactory(repository=self.repo, timestamp=datetime(2000, 1, 1, 1, 1, 1))
         CommitFactory(repository=self.repo, timestamp=datetime(2021, 12, 31, 1, 1, 1))
@@ -109,8 +106,8 @@ def test_triggers_task(self, backfill_dataset):
         ).first()
         backfill_dataset.assert_called_once_with(
             dataset,
-            start_date=timezone.datetime(2000, 1, 1),
-            end_date=timezone.datetime(2022, 1, 1),
+            start_date=datetime(2000, 1, 1, 1, 1, 1),
+            end_date=datetime(2021, 12, 31, 1, 1, 1),
         )
 
     @patch("services.task.TaskService.backfill_dataset")

graphql_api/types/bundle_analysis/base.py

@@ -139,9 +139,9 @@ def resolve_modules(
     return bundle_asset.modules
 
 
-@sentry_sdk.trace
 @bundle_asset_bindable.field("measurements")
 @sync_to_async
+@sentry_sdk.trace
 def resolve_asset_report_measurements(
     bundle_asset: AssetReport,
     info: GraphQLResolveInfo,
@@ -188,8 +188,8 @@ def resolve_assets(
     return list(bundle_report.assets())
 
 
-@sentry_sdk.trace
 @bundle_report_bindable.field("assetsPaginated")
+@sentry_sdk.trace
 def resolve_assets_paginated(
     bundle_report: BundleReport,
     info: GraphQLResolveInfo,
@@ -283,9 +283,9 @@ def resolve_bundle_report_filtered(
     )
 
 
-@sentry_sdk.trace
 @bundle_report_bindable.field("measurements")
 @sync_to_async
+@sentry_sdk.trace
 def resolve_bundle_report_measurements(
     bundle_report: BundleReport,
     info: GraphQLResolveInfo,

graphql_api/types/commit/commit.py

@@ -103,8 +103,8 @@ def resolve_list_uploads(commit: Commit, info, **kwargs):
     )
 
 
-@sentry_sdk.trace
 @commit_bindable.field("compareWithParent")
+@sentry_sdk.trace
 async def resolve_compare_with_parent(commit: Commit, info, **kwargs):
     if not commit.parent_commit_id:
         return MissingBaseCommit()
@@ -286,16 +286,16 @@ async def resolve_total_uploads(commit, info):
     return await command.get_uploads_number(commit)
 
 
-@sentry_sdk.trace
 @commit_bindable.field("bundleStatus")
 @sync_to_async
+@sentry_sdk.trace
 def resolve_bundle_status(commit: Commit, info) -> Optional[CommitStatus]:
     return commit_status(commit, CommitReport.ReportType.BUNDLE_ANALYSIS)
 
 
-@sentry_sdk.trace
 @commit_bindable.field("coverageStatus")
 @sync_to_async
+@sentry_sdk.trace
 def resolve_coverage_status(commit: Commit, info) -> Optional[CommitStatus]:
     return commit_status(commit, CommitReport.ReportType.COVERAGE)
 
@@ -313,25 +313,25 @@ def resolve_commit_bundle_analysis(commit, info):
 ### Commit Coverage Bindable ###
 
 
-@sentry_sdk.trace
 @commit_coverage_analytics_bindable.field("totals")
+@sentry_sdk.trace
 def resolve_coverage_totals(
     commit: Commit, info: GraphQLResolveInfo
 ) -> Optional[ReportTotals]:
     command = info.context["executor"].get_command("commit")
     return command.fetch_totals(commit)
 
 
-@sentry_sdk.trace
 @commit_coverage_analytics_bindable.field("flagNames")
 @sync_to_async
+@sentry_sdk.trace
 def resolve_coverage_flags(commit: Commit, info: GraphQLResolveInfo) -> list[str]:
     return commit.full_report.get_flag_names() if commit.full_report else []
 
 
-@sentry_sdk.trace
 @commit_coverage_analytics_bindable.field("coverageFile")
 @sync_to_async
+@sentry_sdk.trace
 def resolve_coverage_file(commit, info, path, flags=None, components=None):
     fallback_file, paths = None, []
     if components:
@@ -358,9 +358,9 @@ def resolve_coverage_file(commit, info, path, flags=None, components=None):
     }
 
 
-@sentry_sdk.trace
 @commit_coverage_analytics_bindable.field("components")
 @sync_to_async
+@sentry_sdk.trace
 def resolve_coverage_components(commit: Commit, info, filters=None) -> List[Component]:
     info.context["component_commit"] = commit
     current_owner = info.context["request"].current_owner
@@ -377,9 +377,9 @@ def resolve_coverage_components(commit: Commit, info, filters=None) -> List[Comp
 ### Commit Bundle Analysis Bindable ###
 
 
-@sentry_sdk.trace
 @commit_bundle_analysis_bindable.field("bundleAnalysisCompareWithParent")
 @sync_to_async
+@sentry_sdk.trace
 def resolve_commit_bundle_analysis_compare_with_parent(
     commit: Commit, info: GraphQLResolveInfo
 ) -> Union[BundleAnalysisComparison, Any]:
@@ -406,9 +406,9 @@ def resolve_commit_bundle_analysis_compare_with_parent(
     return bundle_analysis_comparison
 
 
-@sentry_sdk.trace
 @commit_bundle_analysis_bindable.field("bundleAnalysisReport")
 @sync_to_async
+@sentry_sdk.trace
 def resolve_commit_bundle_analysis_report(commit: Commit, info) -> BundleAnalysisReport:
     bundle_analysis_report = load_bundle_analysis_report(commit)
 

graphql_api/types/comparison/comparison.py

@@ -156,8 +156,8 @@ async def resolve_head_totals(
         return head_commit.commitreport.reportleveltotals
 
 
-@sentry_sdk.trace
 @comparison_bindable.field("patchTotals")
+@sentry_sdk.trace
 def resolve_patch_totals(
     comparison: ComparisonReport, info: GraphQLResolveInfo
 ) -> dict:
@@ -174,9 +174,9 @@ def resolve_patch_totals(
     return {**totals, "coverage": coverage}
 
 
-@sentry_sdk.trace
 @comparison_bindable.field("flagComparisons")
 @sync_to_async
+@sentry_sdk.trace
 def resolve_flag_comparisons(
     comparison: ComparisonReport, info: GraphQLResolveInfo, filters=None
 ) -> List[FlagComparison]:
@@ -193,9 +193,9 @@ def resolve_flag_comparisons(
     return list(all_flags)
 
 
-@sentry_sdk.trace
 @comparison_bindable.field("componentComparisons")
 @sync_to_async
+@sentry_sdk.trace
 def resolve_component_comparisons(
     comparison_report: ComparisonReport, info: GraphQLResolveInfo, filters=None
 ) -> List[ComponentComparison]:
@@ -242,9 +242,9 @@ def resolve_flag_comparisons_count(
     return get_flag_comparisons(comparison.commit_comparison).count()
 
 
-@sentry_sdk.trace
 @comparison_bindable.field("hasDifferentNumberOfHeadAndBaseReports")
 @sync_to_async
+@sentry_sdk.trace
 def resolve_has_different_number_of_head_and_base_reports(
     comparison: ComparisonReport,
     info: GraphQLResolveInfo,

graphql_api/types/coverage_analytics/coverage_analytics.py

@@ -53,8 +53,8 @@ def resolve_coverage_analytics_result_type(
     return None
 
 
-@sentry_sdk.trace
 @coverage_analytics_bindable.field("percentCovered")
+@sentry_sdk.trace
 def resolve_percent_covered(
     parent: CoverageAnalyticsProps, info: GraphQLResolveInfo
 ) -> Optional[float]:
@@ -118,9 +118,9 @@ async def resolve_measurements(
     return measurements
 
 
-@sentry_sdk.trace
 @coverage_analytics_bindable.field("components")
 @sync_to_async
+@sentry_sdk.trace
 def resolve_components_measurements(
     parent: CoverageAnalyticsProps,
     info: GraphQLResolveInfo,
@@ -253,9 +253,9 @@ def resolve_components_count(
     return len(repo_yaml_components)
 
 
-@sentry_sdk.trace
 @coverage_analytics_bindable.field("flags")
 @sync_to_async
+@sentry_sdk.trace
 def resolve_flags(
     parent: CoverageAnalyticsProps,
     info: GraphQLResolveInfo,

graphql_api/types/impacted_file/impacted_file.py

@@ -63,9 +63,9 @@ def resolve_hashed_path(impacted_file: ImpactedFile, info) -> str:
     return md5_path.hexdigest()
 
 
-@sentry_sdk.trace
 @impacted_file_bindable.field("segments")
 @sync_to_async
+@sentry_sdk.trace
 def resolve_segments(
     impacted_file: ImpactedFile, info, filters=None
 ) -> Union[UnknownPath, ProviderError, SegmentComparisons]:

graphql_api/types/pull/pull.py

@@ -59,8 +59,8 @@ def is_first_pull_request(pull: Pull) -> bool:
     return pull.repository.pull_requests.order_by("id").first() == pull
 
 
-@sentry_sdk.trace
 @pull_bindable.field("compareWithBase")
+@sentry_sdk.trace
 async def resolve_compare_with_base(
     pull: Pull, info: GraphQLResolveInfo, **kwargs: Any
 ) -> Union[CommitComparison, Any]:
@@ -90,9 +90,9 @@ async def resolve_compare_with_base(
         return ComparisonReport(commit_comparison)
 
 
-@sentry_sdk.trace
 @pull_bindable.field("bundleAnalysisCompareWithBase")
 @sync_to_async
+@sentry_sdk.trace
 def resolve_bundle_analysis_compare_with_base(
     pull: Pull, info: GraphQLResolveInfo, **kwargs: Any
 ) -> Union[BundleAnalysisComparison, Any]:

pyproject.toml

@@ -74,4 +74,4 @@ dev-dependencies = [
 ]
 
 [tool.uv.sources]
-shared = { git = "https://github.com/codecov/shared", rev = "290557e977c4ff60d5d9dcb9ee54afea1c1df83f" }
+shared = { git = "https://github.com/codecov/shared", rev = "af74ab881368fa0e8ea3777404443ac4c525835a" }