Skip to content

(do not review) staging test for trace funnels after merge #8119

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

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

(do not review) staging test for trace funnels after merge #8119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
43ca30e
feat: trace funnel queries
shivanshuraj1333 Jun 2, 2025
5a548d1
fix: update access
shivanshuraj1333 Jun 2, 2025
2b647dd
fix: fix queries
shivanshuraj1333 Jun 2, 2025
78ef1e7
fix: minor fix in handler
shivanshuraj1333 Jun 2, 2025
9e531ac
fix: update clauses
shivanshuraj1333 Jun 3, 2025
3b46c72
fix: update step overview queries
shivanshuraj1333 Jun 3, 2025
bfffe42
Merge branch 'main' into feat/issues/query/7210
shivanshuraj1333 Jun 3, 2025
2f74cef
Merge branch 'main' into feat/issues/query/7210
shivanshuraj1333 Jun 4, 2025
cadc599
Merge branch 'main' into feat/issues/query/7210
shivanshuraj1333 Jun 16, 2025
67f02c6
fix: add new api endpoints for analytics
shivanshuraj1333 Jun 16, 2025
e860548
chore: remove dev env check
ahmadshaheer May 12, 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
48 changes: 23 additions & 25 deletions frontend/src/container/TraceWaterfall/TraceWaterfallStates/Success/Success.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,30 +149,28 @@ function SpanOverview({
<Typography.Text className="service-name">
{span.serviceName}
</Typography.Text>
{!!span.serviceName &&
!!span.name &&
process.env.NODE_ENV === 'development' && (
<div className="add-funnel-button">
<span className="add-funnel-button__separator">·</span>
<Button
type="text"
size="small"
className="add-funnel-button__button"
onClick={(e): void => {
e.preventDefault();
e.stopPropagation();
handleAddSpanToFunnel(span);
}}
icon={
<img
className="add-funnel-button__icon"
src="/Icons/funnel-add.svg"
alt="funnel-icon"
/>
}
/>
</div>
)}
{!!span.serviceName && !!span.name && (
<div className="add-funnel-button">
<span className="add-funnel-button__separator">·</span>
<Button
type="text"
size="small"
className="add-funnel-button__button"
onClick={(e): void => {
e.preventDefault();
e.stopPropagation();
handleAddSpanToFunnel(span);
}}
icon={
<img
className="add-funnel-button__icon"
src="/Icons/funnel-add.svg"
alt="funnel-icon"
/>
}
/>
</div>
)}
</section>
</div>
</div>
Expand Down Expand Up @@ -475,7 +473,7 @@ function Success(props: ISuccessProps): JSX.Element {
virtualiserRef={virtualizerRef}
setColumnWidths={setTraceFlamegraphStatsWidth}
/>
{selectedSpanToAddToFunnel && process.env.NODE_ENV === 'development' && (
{selectedSpanToAddToFunnel && (
<AddSpanToFunnelModal
span={selectedSpanToAddToFunnel}
isOpen={isAddSpanToFunnelModalOpen}
Expand Down
22 changes: 9 additions & 13 deletions frontend/src/pages/TraceDetailV2/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,15 @@ export default function TraceDetailsPage(): JSX.Element {
key: 'trace-details',
children: <TraceDetailsV2 />,
},
...(process.env.NODE_ENV === 'development'
? [
{
label: (
<div className="tab-item">
<Cone className="funnel-icon" size={16} /> Funnels
</div>
),
key: 'funnels',
children: <div />,
},
]
: []),
{
label: (
<div className="tab-item">
<Cone className="funnel-icon" size={16} /> Funnels
</div>
),
key: 'funnels',
children: <div />,
},
{
label: (
<div className="tab-item">
Expand Down
3 changes: 1 addition & 2 deletions frontend/src/pages/TracesModulePage/TracesModulePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ function TracesModulePage(): JSX.Element {

const routes: TabRoutes[] = [
tracesExplorer,
// TODO(shaheer): remove this check after everything is ready
process.env.NODE_ENV === 'development' ? tracesFunnel(pathname) : null,
tracesFunnel(pathname),
tracesSaveView,
].filter(Boolean) as TabRoutes[];

Expand Down
Loading
Loading