Merge branch 'master' into jcallender/aci/organize-defaults-code

Author: saponifi3d

.github/CODEOWNERS

@@ -610,6 +610,7 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /static/app/gettingStartedDocs/                                                  @getsentry/value-discovery
 /static/app/types/project.tsx                                                    @getsentry/value-discovery
 /static/app/views/onboarding/                                                    @getsentry/value-discovery
+/tests/acceptance/test_scm_onboarding.py                                         @getsentry/value-discovery
 /tests/js/fixtures/detectedPlatform.ts                                           @getsentry/value-discovery
 /static/app/views/projectInstall/                                                @getsentry/value-discovery
 /src/sentry/onboarding_tasks/                                                    @getsentry/value-discovery

package.json

@@ -171,7 +171,7 @@
     "echarts-for-react": "3.0.6",
     "esbuild": "0.25.10",
     "focus-trap": "7.6.5",
-    "framer-motion": "12.23.12",
+    "framer-motion": "12.38.0",
     "fuse.js": "^6.6.2",
     "gettext-parser": "7.0.1",
     "gl-matrix": "3.4.4",

pnpm-lock.yaml

@@ -920,8 +920,3 @@ def serialize(  # type: ignore[override]
         )
 
         return context
-
-
-# Backwards-compatible aliases for getsentry
-DetailedOrganizationSerializer = OrganizationSerializer
-DetailedOrganizationSerializerWithProjectsAndTeams = OrganizationWithProjectsAndTeamsSerializer

src/sentry/api/serializers/models/organization.py

@@ -141,6 +141,8 @@ def register_temporary_features(manager: FeatureManager) -> None:
     manager.add("organizations:integrations-perforce", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     manager.add("organizations:integrations-slack-staging", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     manager.add("organizations:scm-source-context", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # API-driven integration setup pipeline (per-provider rollout)
+    manager.add("organizations:integration-api-pipeline-github", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Project Management Integrations Feature Parity Flags
     manager.add("organizations:integrations-github_enterprise-project-management", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     manager.add("organizations:integrations-gitlab-project-management", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)

src/sentry/features/temporary.py

@@ -18,8 +18,6 @@ class ParameterizationRegex:
     name: str  # name of the pattern (also used as group name in combined regex)
     raw_pattern: str  # regex pattern w/o matching group name
     raw_pattern_experimental: str | None = None
-    lookbehind: str | None = None  # positive lookbehind prefix if needed
-    lookahead: str | None = None  # positive lookahead postfix if needed
     # Function which takes the matched value and returns the replacement value.
     replacement_callback: ParameterizationReplacementFunction | None = None
 
@@ -38,11 +36,9 @@ def experimental_pattern(self) -> str | None:
 
     def _get_pattern(self, raw_pattern: str) -> str:
         """
-        Returns the regex pattern with a named matching group and lookbehind/lookahead if needed.
+        Returns the regex pattern inside of a named matching group.
         """
-        prefix = rf"(?<={self.lookbehind})" if self.lookbehind else ""
-        postfix = rf"(?={self.lookahead})" if self.lookahead else ""
-        return rf"{prefix}(?P<{self.name}>{raw_pattern}){postfix}"
+        return rf"(?P<{self.name}>{raw_pattern})"
 
 
 def is_valid_ip(maybe_ip_str: str) -> bool:
@@ -311,23 +307,25 @@ def is_valid_ip(maybe_ip_str: str) -> bool:
     ParameterizationRegex(
         name="quoted_str",
         raw_pattern=r"""
-            '([^']+)' | "([^"]+)"
+            # Lookbehind to ensure we'll only match the value half of `<key>=<value>`-type key-value
+            # pairs, rather than all quoted strings
+            (?<=[=])
+            (
+                '([^']+)' |
+                "([^"]+)"
+            )
         """,
-        # Using an `=` lookbehind guarantees we'll only match the value half of key-value pairs,
-        # rather than all quoted strings
-        lookbehind="=",
     ),
     ParameterizationRegex(
         name="bool",
         raw_pattern=r"""
-            True |
-            true |
-            False |
-            false
+            # Lookbehind to ensure we'll only match the value half of `<key>=<value>`-type key-value
+            # pairs, rather than all instances of the words 'true' and 'false'
+            (?<=[=])
+            (
+                True | true | False | false
+            )
         """,
-        # Using an `=` lookbehind guarantees we'll only match the value half of key-value pairs,
-        # rather than all instances of the words 'true' and 'false'.
-        lookbehind="=",
     ),
 ]
 

src/sentry/grouping/parameterization.py

@@ -108,24 +108,24 @@ describe('IssueListActions', () => {
       expect(screen.queryByRole('button', {name: 'Archive'})).not.toBeInTheDocument();
     });
 
-    it('shows action buttons when any items are selected', () => {
+    it('shows action buttons when any items are selected', async () => {
       render(<WrappedComponent selectedIds={['1']} />);
 
-      expect(screen.getByRole('button', {name: 'Resolve'})).toBeEnabled();
+      expect(await screen.findByRole('button', {name: 'Resolve'})).toBeEnabled();
       expect(screen.getByRole('button', {name: 'Archive'})).toBeEnabled();
     });
 
-    it('shows select all checkbox as checked when all items are selected', () => {
+    it('shows select all checkbox as checked when all items are selected', async () => {
       render(<WrappedComponent selectedIds={['1', '2', '3']} />);
 
       // When all selected, label changes to "Deselect all"
-      expect(screen.getByRole('checkbox', {name: 'Deselect all'})).toBeChecked();
+      expect(await screen.findByRole('checkbox', {name: 'Deselect all'})).toBeChecked();
     });
 
-    it('shows select all checkbox as indeterminate when some items are selected', () => {
+    it('shows select all checkbox as indeterminate when some items are selected', async () => {
       render(<WrappedComponent selectedIds={['1']} />);
 
-      const checkbox = screen.getByRole('checkbox', {name: 'Select all'});
+      const checkbox = await screen.findByRole('checkbox', {name: 'Select all'});
       expect(checkbox).toBePartiallyChecked();
     });
   });

static/app/views/issueList/actions/index.spec.tsx

@@ -851,9 +851,8 @@ describe('desktop navigation', () => {
 
           await userEvent.hover(screen.getByRole('link', {name: 'Explore'}));
 
-          expect(
-            await within(secondaryNav).findByRole('link', {name: 'Traces'})
-          ).toBeInTheDocument();
+          // Re-query secondary nav because AnimatePresence remounts it with a new key
+          expect(await screen.findByRole('link', {name: 'Traces'})).toBeInTheDocument();
         });
 
         it('shows hovered group content in the peek view when sidebar is collapsed', async () => {

static/app/views/navigation/index.desktop.spec.tsx

@@ -125,15 +125,15 @@ describe('ExplorerPanel', () => {
   });
 
   describe('Feature Flag and Organization Checks', () => {
-    it('renders when feature flag and open membership are enabled', () => {
+    it('renders when feature flag and open membership are enabled', async () => {
       renderWithPanelContext(<ExplorerPanel />, true, {organization});
 
       expect(
-        screen.getByText(/Ask Seer anything about your application./)
+        await screen.findByText(/Ask Seer anything about your application./)
       ).toBeInTheDocument();
     });
 
-    it('does not render when feature flag is disabled', () => {
+    it('does not render when feature flag is disabled', async () => {
       const disabledOrg = OrganizationFixture({
         features: [],
         hideAiFeatures: false,
@@ -144,10 +144,10 @@ describe('ExplorerPanel', () => {
         organization: disabledOrg,
       });
 
-      expect(container).toBeEmptyDOMElement();
+      await waitFor(() => expect(container).toBeEmptyDOMElement());
     });
 
-    it('does not render when AI features are hidden', () => {
+    it('does not render when AI features are hidden', async () => {
       const disabledOrg = OrganizationFixture({
         features: ['seer-explorer'],
         hideAiFeatures: true,
@@ -158,10 +158,10 @@ describe('ExplorerPanel', () => {
         organization: disabledOrg,
       });
 
-      expect(container).toBeEmptyDOMElement();
+      await waitFor(() => expect(container).toBeEmptyDOMElement());
     });
 
-    it('does not render when open membership is disabled', () => {
+    it('does not render when open membership is disabled', async () => {
       const disabledOrg = OrganizationFixture({
         features: ['seer-explorer'],
         hideAiFeatures: false,
@@ -172,28 +172,30 @@ describe('ExplorerPanel', () => {
         organization: disabledOrg,
       });
 
-      expect(container).toBeEmptyDOMElement();
+      await waitFor(() => expect(container).toBeEmptyDOMElement());
     });
   });
 
   describe('Empty State', () => {
-    it('shows empty state when no messages exist', () => {
+    it('shows empty state when no messages exist', async () => {
       renderWithPanelContext(<ExplorerPanel />, true, {organization});
 
       expect(
-        screen.getByText(/Ask Seer anything about your application./)
+        await screen.findByText(/Ask Seer anything about your application./)
       ).toBeInTheDocument();
     });
 
-    it('shows input section in empty state', () => {
+    it('shows input section in empty state', async () => {
       renderWithPanelContext(<ExplorerPanel />, true, {organization});
 
       expect(
-        screen.getByPlaceholderText('Type your message or / command and press Enter ↵')
+        await screen.findByPlaceholderText(
+          'Type your message or / command and press Enter ↵'
+        )
       ).toBeInTheDocument();
     });
 
-    it('shows error when hook returns isError=true', () => {
+    it('shows error when hook returns isError=true', async () => {
       const useSeerExplorerSpy = jest
         .spyOn(useSeerExplorerModule, 'useSeerExplorer')
         .mockReturnValue({
@@ -220,7 +222,7 @@ describe('ExplorerPanel', () => {
       renderWithPanelContext(<ExplorerPanel />, true, {organization});
 
       expect(
-        screen.getByText('Error loading this session (ID=123).')
+        await screen.findByText('Error loading this session (ID=123).')
       ).toBeInTheDocument();
       expect(
         screen.queryByText(/Ask Seer anything about your application./)
@@ -231,7 +233,7 @@ describe('ExplorerPanel', () => {
   });
 
   describe('Messages Display', () => {
-    it('renders messages when session data exists', () => {
+    it('renders messages when session data exists', async () => {
       const mockSessionData = {
         blocks: [
           {
@@ -283,7 +285,7 @@ describe('ExplorerPanel', () => {
 
       renderWithPanelContext(<ExplorerPanel />, true, {organization});
 
-      expect(screen.getByText('What is this error?')).toBeInTheDocument();
+      expect(await screen.findByText('What is this error?')).toBeInTheDocument();
       expect(
         screen.getByText('This error indicates a null pointer exception.')
       ).toBeInTheDocument();
@@ -533,19 +535,21 @@ describe('ExplorerPanel', () => {
       openMembership: true,
     });
 
-    it('does not render the toggle when the feature flag is disabled', () => {
+    it('does not render the toggle when the feature flag is disabled', async () => {
       renderWithPanelContext(<ExplorerPanel />, true, {organization});
 
+      // Wait for effects to settle before asserting absence
+      await screen.findByTestId('seer-explorer-input');
       expect(
         screen.queryByRole('checkbox', {name: 'Toggle context engine'})
       ).not.toBeInTheDocument();
     });
 
-    it('renders the toggle when the feature flag is enabled', () => {
+    it('renders the toggle when the feature flag is enabled', async () => {
       renderWithPanelContext(<ExplorerPanel />, true, {organization: orgWithFlag});
 
       expect(
-        screen.getByRole('checkbox', {name: 'Toggle context engine'})
+        await screen.findByRole('checkbox', {name: 'Toggle context engine'})
       ).toBeInTheDocument();
     });
 
@@ -623,20 +627,20 @@ describe('ExplorerPanel', () => {
   });
 
   describe('Visibility Control', () => {
-    it('renders when isVisible=true', () => {
+    it('renders when isVisible=true', async () => {
       renderWithPanelContext(<ExplorerPanel />, true, {organization});
 
-      expect(screen.getByTestId('seer-explorer-input')).toBeInTheDocument();
+      expect(await screen.findByTestId('seer-explorer-input')).toBeInTheDocument();
     });
 
-    it('can handle visibility changes', () => {
+    it('can handle visibility changes', async () => {
       const {rerenderWithOpen} = renderWithPanelContext(<ExplorerPanel />, false, {
         organization,
       });
 
       rerenderWithOpen(true);
 
-      expect(screen.getByTestId('seer-explorer-input')).toBeInTheDocument();
+      expect(await screen.findByTestId('seer-explorer-input')).toBeInTheDocument();
     });
   });
 });

static/app/views/seerExplorer/explorerPanel.spec.tsx

@@ -416,9 +416,10 @@ describe('listDisplayNames', () => {
 });
 
 describe('isByteCategory', () => {
-  it('verifies isByteCategory function handles both ATTACHMENTS and LOG_BYTE', () => {
+  it('verifies isByteCategory function handles ATTACHMENTS, LOG_BYTE, and TRACE_METRIC_BYTE', () => {
     expect(isByteCategory(DataCategory.ATTACHMENTS)).toBe(true);
     expect(isByteCategory(DataCategory.LOG_BYTE)).toBe(true);
+    expect(isByteCategory(DataCategory.TRACE_METRIC_BYTE)).toBe(true);
     expect(isByteCategory(DataCategory.ERRORS)).toBe(false);
     expect(isByteCategory(DataCategory.TRANSACTIONS)).toBe(false);
   });