From 782664be567f9f87bedcf56cf1e8e9d45cd7513b Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Mon, 24 Nov 2025 18:12:56 -0500
Subject: [PATCH] feat(settings): Remove vercel log drain feature flag

---
 .../project/projectKeys/credentials/index.tsx |  6 +-
 .../projectKeys/credentials/vercel.tsx        | 61 ++++++++-----------
 .../projectKeys/details/keySettings.tsx       |  4 --
 .../project/projectKeys/list/keyRow.tsx       |  5 --
 4 files changed, 27 insertions(+), 49 deletions(-)

diff --git a/static/app/views/settings/project/projectKeys/credentials/index.tsx b/static/app/views/settings/project/projectKeys/credentials/index.tsx
index 3a8dd1604dc96b..3385c5a642a3b4 100644
--- a/static/app/views/settings/project/projectKeys/credentials/index.tsx
+++ b/static/app/views/settings/project/projectKeys/credentials/index.tsx
@@ -25,7 +25,6 @@ type Props = {
   showSecretKey?: boolean;
   showSecurityEndpoint?: boolean;
   showUnreal?: boolean;
-  showVercelLogDrainEndpoint?: boolean;
 };
 
 type TabValue = 'otlp' | 'security' | 'minidump' | 'unreal' | 'vercel' | 'credentials';
@@ -174,7 +173,6 @@ function ProjectKeyCredentials({
   showSecretKey = false,
   showOtlpTraces = false,
   showOtlpLogs = false,
-  showVercelLogDrainEndpoint = false,
   showSecurityEndpoint = true,
   showUnreal = true,
 }: Props) {
@@ -210,7 +208,7 @@ function ProjectKeyCredentials({
       {
         key: 'vercel',
         label: t('Vercel Drains'),
-        visible: showVercelLogDrainEndpoint || showOtlpTraces,
+        visible: true,
       },
     ];
     return tabs.filter(tab => tab.visible);
@@ -218,7 +216,6 @@ function ProjectKeyCredentials({
     showOtlpTraces,
     showOtlpLogs,
     showSecurityEndpoint,
-    showVercelLogDrainEndpoint,
     showMinidump,
     showUnreal,
     showPublicKey,
@@ -271,7 +268,6 @@ function ProjectKeyCredentials({
       case 'vercel':
         return (
           <VercelTab
-            showVercelLogDrainEndpoint={showVercelLogDrainEndpoint}
             integrationEndpoint={data.dsn.integration}
             publicKey={data.public}
             showOtlpTraces={showOtlpTraces}
diff --git a/static/app/views/settings/project/projectKeys/credentials/vercel.tsx b/static/app/views/settings/project/projectKeys/credentials/vercel.tsx
index d0d74a4c84aa78..4f15d81eaa5c5a 100644
--- a/static/app/views/settings/project/projectKeys/credentials/vercel.tsx
+++ b/static/app/views/settings/project/projectKeys/credentials/vercel.tsx
@@ -9,12 +9,10 @@ interface VercelTabProps {
   integrationEndpoint: string;
   publicKey: string;
   showOtlpTraces: boolean;
-  showVercelLogDrainEndpoint: boolean;
   tracesEndpoint: string;
 }
 
 export function VercelTab({
-  showVercelLogDrainEndpoint,
   integrationEndpoint,
   publicKey,
   showOtlpTraces,
@@ -22,40 +20,33 @@ export function VercelTab({
 }: VercelTabProps) {
   return (
     <Fragment>
-      {showVercelLogDrainEndpoint && (
-        <Fragment>
-          <FieldGroup
-            label={t('Vercel Log Drain Endpoint')}
-            help={tct(
-              'Use this endpoint to configure Vercel Log Drains. [link:Learn more]',
-              {
-                link: (
-                  <ExternalLink href="https://docs.sentry.io/product/drains/integration/vercel/#log-drains" />
-                ),
-              }
-            )}
-            inline={false}
-            flexibleControlStateSize
-          >
-            <TextCopyInput aria-label={t('Vercel Log Drain Endpoint')}>
-              {`${integrationEndpoint}vercel/logs`}
-            </TextCopyInput>
-          </FieldGroup>
+      <FieldGroup
+        label={t('Vercel Log Drain Endpoint')}
+        help={tct('Use this endpoint to configure Vercel Log Drains. [link:Learn more]', {
+          link: (
+            <ExternalLink href="https://docs.sentry.io/product/drains/integration/vercel/#log-drains" />
+          ),
+        })}
+        inline={false}
+        flexibleControlStateSize
+      >
+        <TextCopyInput aria-label={t('Vercel Log Drain Endpoint')}>
+          {`${integrationEndpoint}vercel/logs`}
+        </TextCopyInput>
+      </FieldGroup>
 
-          <FieldGroup
-            label={t('Log Drain Authentication Headers')}
-            help={t(
-              'Set these authentication headers when configuring your Vercel Log Drain.'
-            )}
-            inline={false}
-            flexibleControlStateSize
-          >
-            <TextCopyInput aria-label={t('Log Drain Authentication Header')}>
-              {`x-sentry-auth: sentry sentry_key=${publicKey}`}
-            </TextCopyInput>
-          </FieldGroup>
-        </Fragment>
-      )}
+      <FieldGroup
+        label={t('Log Drain Authentication Headers')}
+        help={t(
+          'Set these authentication headers when configuring your Vercel Log Drain.'
+        )}
+        inline={false}
+        flexibleControlStateSize
+      >
+        <TextCopyInput aria-label={t('Log Drain Authentication Header')}>
+          {`x-sentry-auth: sentry sentry_key=${publicKey}`}
+        </TextCopyInput>
+      </FieldGroup>
       {showOtlpTraces && (
         <Fragment>
           <FieldGroup
diff --git a/static/app/views/settings/project/projectKeys/details/keySettings.tsx b/static/app/views/settings/project/projectKeys/details/keySettings.tsx
index e80982a379f8f2..e04cf2fcefeadc 100644
--- a/static/app/views/settings/project/projectKeys/details/keySettings.tsx
+++ b/static/app/views/settings/project/projectKeys/details/keySettings.tsx
@@ -72,9 +72,6 @@ export function KeySettings({
   const showOtlpTraces =
     useOTelFriendlyUI() && organization.features.includes('relay-otlp-traces-endpoint');
   const showOtlpLogs = organization.features.includes('relay-otel-logs-endpoint');
-  const showVercelLogDrainEndpoint = organization.features.includes(
-    'relay-vercel-log-drain-endpoint'
-  );
 
   return (
     <Fragment>
@@ -156,7 +153,6 @@ export function KeySettings({
                   data={data}
                   showOtlpTraces={showOtlpTraces}
                   showOtlpLogs={showOtlpLogs}
-                  showVercelLogDrainEndpoint={showVercelLogDrainEndpoint}
                   showPublicKey
                   showSecretKey
                   showProjectId
diff --git a/static/app/views/settings/project/projectKeys/list/keyRow.tsx b/static/app/views/settings/project/projectKeys/list/keyRow.tsx
index 6fdf6cca794f68..8352768050e77e 100644
--- a/static/app/views/settings/project/projectKeys/list/keyRow.tsx
+++ b/static/app/views/settings/project/projectKeys/list/keyRow.tsx
@@ -50,9 +50,6 @@ function KeyRow({
   const showOtlpTraces =
     useOTelFriendlyUI() && organization.features.includes('relay-otlp-traces-endpoint');
   const showOtlpLogs = organization.features.includes('relay-otel-logs-endpoint');
-  const showVercelLogDrainEndpoint = organization.features.includes(
-    'relay-vercel-log-drain-endpoint'
-  );
 
   return (
     <Panel>
@@ -107,12 +104,10 @@ function KeyRow({
             data={data}
             showOtlpTraces={showOtlpTraces}
             showOtlpLogs={showOtlpLogs}
-            showVercelLogDrainEndpoint={showVercelLogDrainEndpoint}
             showMinidump={!isJsPlatform}
             showUnreal={!isJsPlatform}
             showSecurityEndpoint={!isJsPlatform}
           />
-
           {isBrowserJavaScript && (
             <LoaderScript
               projectKey={data}