Add build_config handling to size comparison (#99558)

Adds `build_configuration` handling for comparisons. Also adds an error
response to to the compare post endpoint to block invalid compares, but
we'll make sure to not allow builds to be compared in the frontend if
they can't be, just an extra level of safety

Resolves EME-250

Author: rbro112

src/sentry/preprod/api/endpoints/size_analysis/project_preprod_size_analysis_compare.py

@@ -273,6 +273,11 @@ def post(
             extra={"head_artifact_id": head_artifact_id, "base_artifact_id": base_artifact_id},
         )
 
+        if head_artifact.build_configuration != base_artifact.build_configuration:
+            return Response(
+                {"error": "Head and base build configurations must be the same."}, status=400
+            )
+
         head_size_metrics_qs = PreprodArtifactSizeMetrics.objects.filter(
             preprod_artifact_id__in=[head_artifact.id],
             preprod_artifact__project=project,

src/sentry/preprod/size_analysis/tasks.py

@@ -61,6 +61,13 @@ def compare_preprod_artifact_size_analysis(
     # Run all comparisons with artifact as head
     base_artifact = artifact.get_base_artifact_for_commit().first()
     if base_artifact:
+        if artifact.build_configuration != base_artifact.build_configuration:
+            logger.info(
+                "preprod.size_analysis.compare.artifact_different_build_configurations",
+                extra={"head_artifact_id": artifact_id, "base_artifact_id": base_artifact.id},
+            )
+            return
+
         base_size_metrics_qs = PreprodArtifactSizeMetrics.objects.filter(
             preprod_artifact_id__in=[base_artifact.id],
             preprod_artifact__project__organization_id=org_id,
@@ -112,6 +119,13 @@ def compare_preprod_artifact_size_analysis(
     # Also run comparisons with artifact as base
     head_artifacts = artifact.get_head_artifacts_for_commit()
     for head_artifact in head_artifacts:
+        if head_artifact.build_configuration != artifact.build_configuration:
+            logger.info(
+                "preprod.size_analysis.compare.head_artifact_different_build_configurations",
+                extra={"head_artifact_id": head_artifact.id, "base_artifact_id": artifact_id},
+            )
+            continue
+
         head_size_metrics_qs = PreprodArtifactSizeMetrics.objects.filter(
             preprod_artifact_id__in=[head_artifact.id],
             preprod_artifact__project__organization_id=org_id,
@@ -195,6 +209,14 @@ def manual_size_analysis_comparison(
         )
         return
 
+    # Should never be hit as we block this in manual compare endpoint, but safety check just in case
+    if head_artifact.build_configuration != base_artifact.build_configuration:
+        logger.info(
+            "preprod.size_analysis.compare.manual.different_build_configurations",
+            extra={"head_artifact_id": head_artifact.id, "base_artifact_id": base_artifact.id},
+        )
+        return
+
     head_size_metrics_qs = PreprodArtifactSizeMetrics.objects.filter(
         preprod_artifact_id__in=[head_artifact.id],
         preprod_artifact__project__organization_id=org_id,

tests/sentry/preprod/api/endpoints/size_analysis/test_project_preprod_size_analysis_compare.py

@@ -8,6 +8,7 @@
     PreprodArtifact,
     PreprodArtifactSizeComparison,
     PreprodArtifactSizeMetrics,
+    PreprodBuildConfiguration,
 )
 from sentry.testutils.cases import APITestCase
 
@@ -640,3 +641,24 @@ def test_get_comparison_multiple_metrics(self):
         assert watch_comparison_data["head_size_metric_id"] == head_watch_metric.id
         assert watch_comparison_data["base_size_metric_id"] == base_watch_metric.id
         assert watch_comparison_data["comparison_id"] == watch_comparison.id
+
+    @override_settings(SENTRY_FEATURES={"organizations:preprod-frontend-routes": True})
+    def test_post_comparison_different_build_configurations(self):
+        """Test POST endpoint returns 400 when artifacts have different build configurations"""
+        # Create a build configuration for the base artifact
+        debug_config = PreprodBuildConfiguration.objects.create(project=self.project, name="debug")
+
+        # Update base artifact to have different build configuration
+        self.base_artifact.build_configuration = debug_config
+        self.base_artifact.save()
+
+        # Head artifact will have None/default, base will have debug config
+        response = self.get_error_response(
+            self.organization.slug,
+            self.project.slug,
+            self.head_artifact.id,
+            self.base_artifact.id,
+            method="post",
+            status_code=400,
+        )
+        assert response.data["error"] == "Head and base build configurations must be the same."

tests/sentry/preprod/size_analysis/test_size_analysis_tasks.py

@@ -9,6 +9,7 @@
     PreprodArtifact,
     PreprodArtifactSizeComparison,
     PreprodArtifactSizeMetrics,
+    PreprodBuildConfiguration,
 )
 from sentry.preprod.size_analysis.tasks import (
     _run_size_analysis_comparison,
@@ -371,6 +372,136 @@ def test_compare_preprod_artifact_size_analysis_cannot_compare_metrics(self):
             # Should not call _run_size_analysis_comparison due to incompatible metrics
             mock_run_comparison.assert_not_called()
 
+    def test_compare_preprod_artifact_size_analysis_different_build_configurations_as_head(self):
+        """Test compare_preprod_artifact_size_analysis with different build configurations when artifact is head."""
+        # Create commit comparisons
+        head_commit = CommitComparison.objects.create(
+            organization_id=self.organization.id,
+            head_sha="a" * 40,
+            base_sha="b" * 40,
+            provider="github",
+            head_repo_name="owner/repo",
+            base_repo_name="owner/repo",
+        )
+        base_commit = CommitComparison.objects.create(
+            organization_id=self.organization.id,
+            head_sha="b" * 40,
+            base_sha="c" * 40,
+            provider="github",
+            head_repo_name="owner/repo",
+            base_repo_name="owner/repo",
+        )
+
+        # Create build configurations
+        debug_config = PreprodBuildConfiguration.objects.create(project=self.project, name="debug")
+        release_config = PreprodBuildConfiguration.objects.create(
+            project=self.project, name="release"
+        )
+
+        # Create artifacts with different build configurations
+        head_artifact = PreprodArtifact.objects.create(
+            project=self.project,
+            commit_comparison=head_commit,
+            app_id="com.example.app",
+            build_version="1.0.0",
+            build_number=1,
+            build_configuration=debug_config,
+            state=PreprodArtifact.ArtifactState.PROCESSED,
+        )
+        base_artifact = PreprodArtifact.objects.create(
+            project=self.project,
+            commit_comparison=base_commit,
+            app_id="com.example.app",
+            build_version="1.0.0",
+            build_number=1,
+            build_configuration=release_config,
+            state=PreprodArtifact.ArtifactState.PROCESSED,
+        )
+
+        with (
+            patch(
+                "sentry.preprod.size_analysis.tasks._run_size_analysis_comparison"
+            ) as mock_run_comparison,
+            patch("sentry.preprod.size_analysis.tasks.logger") as mock_logger,
+        ):
+            compare_preprod_artifact_size_analysis(
+                project_id=self.project.id,
+                org_id=self.organization.id,
+                artifact_id=head_artifact.id,
+            )
+
+            # Should log different build configurations and not run comparison
+            mock_logger.info.assert_called_with(
+                "preprod.size_analysis.compare.artifact_different_build_configurations",
+                extra={"head_artifact_id": head_artifact.id, "base_artifact_id": base_artifact.id},
+            )
+            mock_run_comparison.assert_not_called()
+
+    def test_compare_preprod_artifact_size_analysis_different_build_configurations_as_base(self):
+        """Test compare_preprod_artifact_size_analysis with different build configurations when artifact is base."""
+        # Create commit comparison
+        base_commit = CommitComparison.objects.create(
+            organization_id=self.organization.id,
+            head_sha="a" * 40,
+            base_sha="b" * 40,
+            provider="github",
+            head_repo_name="owner/repo",
+            base_repo_name="owner/repo",
+        )
+        head_commit = CommitComparison.objects.create(
+            organization_id=self.organization.id,
+            head_sha="c" * 40,
+            base_sha="a" * 40,
+            provider="github",
+            head_repo_name="owner/repo",
+            base_repo_name="owner/repo",
+        )
+
+        # Create build configurations
+        debug_config = PreprodBuildConfiguration.objects.create(project=self.project, name="debug")
+        release_config = PreprodBuildConfiguration.objects.create(
+            project=self.project, name="release"
+        )
+
+        # Create artifacts with different build configurations
+        base_artifact = PreprodArtifact.objects.create(
+            project=self.project,
+            commit_comparison=base_commit,
+            app_id="com.example.app",
+            build_version="1.0.0",
+            build_number=1,
+            build_configuration=debug_config,
+            state=PreprodArtifact.ArtifactState.PROCESSED,
+        )
+        head_artifact = PreprodArtifact.objects.create(
+            project=self.project,
+            commit_comparison=head_commit,
+            app_id="com.example.app",
+            build_version="1.0.0",
+            build_number=1,
+            build_configuration=release_config,
+            state=PreprodArtifact.ArtifactState.PROCESSED,
+        )
+
+        with (
+            patch(
+                "sentry.preprod.size_analysis.tasks._run_size_analysis_comparison"
+            ) as mock_run_comparison,
+            patch("sentry.preprod.size_analysis.tasks.logger") as mock_logger,
+        ):
+            compare_preprod_artifact_size_analysis(
+                project_id=self.project.id,
+                org_id=self.organization.id,
+                artifact_id=base_artifact.id,
+            )
+
+            # Should log different build configurations and not run comparison
+            mock_logger.info.assert_called_with(
+                "preprod.size_analysis.compare.head_artifact_different_build_configurations",
+                extra={"head_artifact_id": head_artifact.id, "base_artifact_id": base_artifact.id},
+            )
+            mock_run_comparison.assert_not_called()
+
 
 class ManualSizeAnalysisComparisonTest(TestCase):
     def setUp(self):