Skip to content

feat(relay): Managed Relay for all (front-end) #98688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 8, 2025
Merged

feat(relay): Managed Relay for all (front-end) #98688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ddefc1
Remove disabled relay message and Powericon (upsell)
tobias-wilfert Sep 3, 2025
8e8fe48
Remove second layer or disabled relay feature message.
tobias-wilfert Sep 3, 2025
dd37f38
Remove hook and feature fixture.
tobias-wilfert Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion static/app/types/hooks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,6 @@ export type FeatureDisabledHooks = {
'feature-disabled:project-selector-all-projects': FeatureDisabledHook;
'feature-disabled:project-selector-checkbox': FeatureDisabledHook;
'feature-disabled:rate-limits': FeatureDisabledHook;
'feature-disabled:relay': FeatureDisabledHook;
'feature-disabled:replay-sidebar-item': FeatureDisabledHook;
'feature-disabled:sso-basic': FeatureDisabledHook;
'feature-disabled:sso-saml2': FeatureDisabledHook;
Expand Down
29 changes: 1 addition & 28 deletions static/app/views/settings/organizationRelay/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,7 @@
import Feature from 'sentry/components/acl/feature';
import FeatureDisabled from 'sentry/components/acl/featureDisabled';
import Panel from 'sentry/components/panels/panel';
import PanelBody from 'sentry/components/panels/panelBody';
import {t} from 'sentry/locale';
import useOrganization from 'sentry/utils/useOrganization';

import {RelayWrapper} from './relayWrapper';

function OrganizationRelay() {
const organization = useOrganization();
return (
<Feature
organization={organization}
features="relay"
hookName="feature-disabled:relay"
renderDisabled={p => (
<Panel>
<PanelBody withPadding>
<FeatureDisabled
features={p.features}
hideHelpToggle
featureName={t('Relay')}
/>
</PanelBody>
</Panel>
)}
>
<RelayWrapper />
</Feature>
);
return <RelayWrapper />;
}

export default OrganizationRelay;
82 changes: 0 additions & 82 deletions static/gsApp/components/features/disabledRelay.tsx
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions static/gsApp/components/labelWithPowerIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import type {Subscription} from 'getsentry/types';
import {isEnterprise} from 'getsentry/utils/billing';

const SSO = 'sso';
const RELAY = 'relay';
const ALLOCATIONS = 'allocations-upsell';
const TEAM_ROLES = 'team-roles-upsell';

Expand All @@ -37,11 +36,6 @@ const POWER_FEATURE_CONFIG = [
features: ['sso-saml2'],
partial: true,
},
{
id: RELAY,
features: ['relay'],
partial: false,
},
{
id: ALLOCATIONS,
features: ['spend-allocations'],
Expand Down
2 changes: 0 additions & 2 deletions static/gsApp/registerHooks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import DisabledDataForwarding from 'getsentry/components/features/disabledDataFo
import DisabledDateRange from 'getsentry/components/features/disabledDateRange';
import DisabledDiscardGroup from 'getsentry/components/features/disabledDiscardGroup';
import DisabledRateLimits from 'getsentry/components/features/disabledRateLimits';
import DisabledRelay from 'getsentry/components/features/disabledRelay';
import DisabledSelectorItems from 'getsentry/components/features/disabledSelectorItems';
import ExploreDateRangeQueryLimitFooter from 'getsentry/components/features/exploreDateRangeQueryLimitFooter';
import InsightsDateRangeQueryLimitFooter from 'getsentry/components/features/insightsDateRangeQueryLimitFooter';
Expand Down Expand Up @@ -267,7 +266,6 @@ const GETSENTRY_HOOKS: Partial<Hooks> = {

'feature-disabled:discard-groups': p => <DisabledDiscardGroup {...p} />,
'feature-disabled:data-forwarding': p => <DisabledDataForwarding {...p} />,
'feature-disabled:relay': p => <DisabledRelay {...p} />,
'feature-disabled:rate-limits': p => <DisabledRateLimits {...p} />,
'feature-disabled:sso-basic': p => <DisabledAuthProvider {...p} />,
'feature-disabled:sso-saml2': p => <DisabledAuthProvider {...p} />,
Expand Down
5 changes: 0 additions & 5 deletions tests/js/getsentry-test/fixtures/featureList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,6 @@ export function FeatureListFixture(): Record<string, Feature> {
description:
'Configure custom Symbol Servers, Amazon S3 buckets, or GCS buckets for debug files.',
},
relay: {
name: 'Relay',
description:
'Use Relay as middle layer for on premise data scrubbing before sending data to Sentry.',
},
'app-store-connect-multiple': {
name: 'Multiple App Store Connect apps',
description: 'Add multiple Apple App Store Connect apps per project',
Expand Down
Loading