diff --git a/static/app/views/performance/traceDetails/traceDrawer/details/span/eapSections/cacheLifecycle.tsx b/static/app/views/performance/traceDetails/traceDrawer/details/span/eapSections/cacheLifecycle.tsx index 973704daf93e..66ffdc5e5a83 100644 --- a/static/app/views/performance/traceDetails/traceDrawer/details/span/eapSections/cacheLifecycle.tsx +++ b/static/app/views/performance/traceDetails/traceDrawer/details/span/eapSections/cacheLifecycle.tsx @@ -2,7 +2,7 @@ import {Fragment, useState} from 'react'; import {useTheme} from '@emotion/react'; import type {Location} from 'history'; -import {Tag} from '@sentry/scraps/badge'; +import {FeatureBadge, Tag} from '@sentry/scraps/badge'; import {LinkButton} from '@sentry/scraps/button'; import {InfoText} from '@sentry/scraps/info'; import {Flex, Grid, Stack} from '@sentry/scraps/layout'; @@ -191,28 +191,21 @@ function LifecycleFoldSection({ children: React.ReactNode; tag?: React.ReactNode; }) { - const title = ( - - ); - return ( - {title} - {tag} - - ) : ( - title - ) + + + + {tag} + } > {children} diff --git a/static/app/views/performance/traceDetails/traceDrawer/details/span/eapSections/serverRendering.spec.tsx b/static/app/views/performance/traceDetails/traceDrawer/details/span/eapSections/serverRendering.spec.tsx index 69950d08e6b4..7e430dde4f45 100644 --- a/static/app/views/performance/traceDetails/traceDrawer/details/span/eapSections/serverRendering.spec.tsx +++ b/static/app/views/performance/traceDetails/traceDrawer/details/span/eapSections/serverRendering.spec.tsx @@ -93,7 +93,7 @@ describe('ServerRenderingSection', () => { links: [makeLink('cache_origin')], }); - expect(screen.getByText('Server Rendering')).toBeInTheDocument(); + expect(screen.getByText('Server rendering')).toBeInTheDocument(); expect(screen.getByText('Static')).toBeInTheDocument(); expect(screen.getByText('Whole page')).toBeInTheDocument(); expect(screen.getByText('Rendered earlier and reused')).toBeInTheDocument(); diff --git a/static/app/views/performance/traceDetails/traceDrawer/details/span/eapSections/serverRendering.tsx b/static/app/views/performance/traceDetails/traceDrawer/details/span/eapSections/serverRendering.tsx index 280455161714..632eeb6e5b6b 100644 --- a/static/app/views/performance/traceDetails/traceDrawer/details/span/eapSections/serverRendering.tsx +++ b/static/app/views/performance/traceDetails/traceDrawer/details/span/eapSections/serverRendering.tsx @@ -1,7 +1,7 @@ import {IconOpen} from '@sentry/icons/open'; import type {Location} from 'history'; -import {Tag} from '@sentry/scraps/badge'; +import {FeatureBadge, Tag} from '@sentry/scraps/badge'; import {Button} from '@sentry/scraps/button'; import {Flex, Stack} from '@sentry/scraps/layout'; import {Link} from '@sentry/scraps/link'; @@ -116,11 +116,12 @@ function SectionTitle({type}: {type: ServerRenderingType | undefined}) { return ( + {type ? {TYPE_LABELS[type]} : null} ); diff --git a/static/app/views/performance/traceDetails/traceDrawer/details/span/index.tsx b/static/app/views/performance/traceDetails/traceDrawer/details/span/index.tsx index 5272e9c689aa..1752e2e7573a 100644 --- a/static/app/views/performance/traceDetails/traceDrawer/details/span/index.tsx +++ b/static/app/views/performance/traceDetails/traceDrawer/details/span/index.tsx @@ -410,28 +410,24 @@ function EAPSpanNodeDetailsContent({ avgSpanDuration={avgSpanDuration} hideNodeActions={hideNodeActions} /> - {organization.features.includes('performance-trace-cache-lifecycle') ? ( - - - - - ) : null} + + , org = organization) { - return TraceTree.FromTrace(makeEAPTrace([pageload]), {replay: null, organization: org}); +function buildTree(pageload: ReturnType) { + return TraceTree.FromTrace(makeEAPTrace([pageload]), {replay: null, organization}); } function getPageload(tree: TraceTree) { @@ -161,10 +159,4 @@ eap trace root expect(tree.root.findChild(isServerRenderNode)).toBeNull(); }); - - it('adds no placeholder without the feature', () => { - const tree = buildTree(makePageload('static'), OrganizationFixture()); - - expect(tree.root.findChild(isServerRenderNode)).toBeNull(); - }); }); diff --git a/static/app/views/performance/traceDetails/traceModels/traceTree.tsx b/static/app/views/performance/traceDetails/traceModels/traceTree.tsx index 5ecb4ba03275..8891a764b2df 100644 --- a/static/app/views/performance/traceDetails/traceModels/traceTree.tsx +++ b/static/app/views/performance/traceDetails/traceModels/traceTree.tsx @@ -576,9 +576,7 @@ export class TraceTree extends TraceTreeEventDispatcher { tree.indicators.sort((a, b) => a.start - b.start); - if (options.organization.features.includes('performance-trace-cache-lifecycle')) { - TraceTree.AddServerRenderPlaceholders(tree.root); - } + TraceTree.AddServerRenderPlaceholders(tree.root); TraceTree.ApplyPreferences(tree.root, options);