{steps.map((step, stepIndex) => {
const basisStep = getReferenceStep(steps, stepReference, stepIndex)
const previousStep = getReferenceStep(steps, FunnelStepReference.previous, stepIndex)
diff --git a/frontend/src/scenes/funnels/FunnelHistogram.scss b/frontend/src/scenes/funnels/FunnelHistogram.scss
index d07b541993718..e56336be344a7 100644
--- a/frontend/src/scenes/funnels/FunnelHistogram.scss
+++ b/frontend/src/scenes/funnels/FunnelHistogram.scss
@@ -1,4 +1,6 @@
-.funnel-histogram-outer-container {
+.FunnelHistogram {
+ flex: 1;
+
&.scrollable {
overflow-x: auto;
}
diff --git a/frontend/src/scenes/funnels/FunnelHistogram.tsx b/frontend/src/scenes/funnels/FunnelHistogram.tsx
index 66d2cd1549d10..183db4a358fd9 100644
--- a/frontend/src/scenes/funnels/FunnelHistogram.tsx
+++ b/frontend/src/scenes/funnels/FunnelHistogram.tsx
@@ -25,7 +25,7 @@ export function FunnelHistogram(): JSX.Element | null {
return (
humanFriendlyDuration(v, 2)}
/>
diff --git a/frontend/src/scenes/funnels/FunnelLineGraph.tsx b/frontend/src/scenes/funnels/FunnelLineGraph.tsx
index 9c38acdc17a7b..4b1efe973b922 100644
--- a/frontend/src/scenes/funnels/FunnelLineGraph.tsx
+++ b/frontend/src/scenes/funnels/FunnelLineGraph.tsx
@@ -17,7 +17,7 @@ const LineGraphWrapper = ({ inCardView, children }: { inCardView?: boolean; chil
return <>{children}
}
- return
{children}
+ return
{children}
}
export function FunnelLineGraph({
diff --git a/frontend/src/scenes/insights/EditorFilters/PathsExclusions.tsx b/frontend/src/scenes/insights/EditorFilters/PathsExclusions.tsx
index 7a38d4d004990..43b8f049772c1 100644
--- a/frontend/src/scenes/insights/EditorFilters/PathsExclusions.tsx
+++ b/frontend/src/scenes/insights/EditorFilters/PathsExclusions.tsx
@@ -4,6 +4,7 @@ import { pathsDataLogic } from 'scenes/paths/pathsDataLogic'
import { EventPropertyFilter, PropertyFilterType, PropertyOperator, EditorFilterProps } from '~/types'
import { PathItemFilters } from 'lib/components/PropertyFilters/PathItemFilters'
+import { keyForInsightLogicProps } from 'scenes/insights/sharedUtils'
export function PathsExclusions({ insightProps }: EditorFilterProps): JSX.Element {
const { pathsFilter, taxonomicGroupTypes } = useValues(pathsDataLogic(insightProps))
@@ -13,7 +14,7 @@ export function PathsExclusions({ insightProps }: EditorFilterProps): JSX.Elemen
return (
on any of the next {dateOptionPlurals[period ?? 'Day']}.
diff --git a/frontend/src/scenes/insights/Insight.scss b/frontend/src/scenes/insights/Insight.scss
index 5ac69e14f709c..72c588db18842 100644
--- a/frontend/src/scenes/insights/Insight.scss
+++ b/frontend/src/scenes/insights/Insight.scss
@@ -1,75 +1,6 @@
@import '../../styles/mixins';
-.insights-page {
- .insight-wrapper {
- &.insight-wrapper--singlecolumn {
- position: relative;
-
- @include screen($xl) {
- display: flex;
- overflow: hidden;
-
- .insights-container {
- flex: 1;
- overflow-x: auto;
- }
- }
- }
- }
-
- .insights-graph-container {
- margin-bottom: 1rem;
-
- .ant-card-head {
- border-bottom: 1px solid var(--border);
- min-height: unset;
- background-color: var(--bg-light);
- padding-left: 1rem;
- padding-right: 1rem;
-
- .ant-card-head-title {
- padding: 0;
- }
- }
-
- .ant-card-body {
- padding: 0;
- }
-
- .insights-graph-container-row {
- .insights-graph-container-row-left {
- width: 100%;
- }
-
- .insights-graph-container-row-right {
- height: min(calc(90vh - 16rem), 36rem); // same as .trends-insights-container
- max-width: 45%;
- min-width: 300px;
- width: fit-content;
- padding: 0 1rem 1rem 0;
- display: flex;
- align-items: center;
- }
- }
-
- .LineGraph {
- // hacky because container not respecting position: relative;
- width: calc(100% - 3rem);
- height: calc(100% - 3rem);
- }
- }
-
- .insight-title-container {
- display: flex;
- align-items: center;
-
- .insight-title-text {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- }
- }
-
+.Insight {
.retention-date-picker {
background-color: transparent;
border: 0;
@@ -78,14 +9,6 @@
color: var(--default);
}
}
-
- .insights-graph-header {
- margin-top: 0 !important;
- margin-bottom: 0 !important;
- padding-left: 1rem;
- padding-right: 1rem;
- min-height: 48px;
- }
}
.insight-metadata-tags {
diff --git a/frontend/src/scenes/insights/Insight.tsx b/frontend/src/scenes/insights/Insight.tsx
index 49d71470b3027..e7a88e959f8bd 100644
--- a/frontend/src/scenes/insights/Insight.tsx
+++ b/frontend/src/scenes/insights/Insight.tsx
@@ -57,7 +57,7 @@ export function Insight({ insightId }: InsightSceneProps): JSX.Element {
return (
-
+
{insightMode === ItemMode.Edit &&
}
diff --git a/frontend/src/scenes/insights/InsightNav/insightNavLogic.tsx b/frontend/src/scenes/insights/InsightNav/insightNavLogic.tsx
index 500e492003132..f77c23537e581 100644
--- a/frontend/src/scenes/insights/InsightNav/insightNavLogic.tsx
+++ b/frontend/src/scenes/insights/InsightNav/insightNavLogic.tsx
@@ -95,9 +95,12 @@ export const insightNavLogic = kea
([
}),
},
],
- userSelectedView: {
- setActiveView: (_, { view }) => view,
- },
+ userSelectedView: [
+ null as InsightType | null,
+ {
+ setActiveView: (_, { view }) => view,
+ },
+ ],
}),
selectors({
activeView: [
diff --git a/frontend/src/scenes/insights/InsightTooltip/InsightTooltip.tsx b/frontend/src/scenes/insights/InsightTooltip/InsightTooltip.tsx
index 93d7fa2653e4d..8025d203d7d5e 100644
--- a/frontend/src/scenes/insights/InsightTooltip/InsightTooltip.tsx
+++ b/frontend/src/scenes/insights/InsightTooltip/InsightTooltip.tsx
@@ -54,14 +54,12 @@ function renderDatumToTableCell(
// Value can be undefined if the datum's series doesn't have ANY value for the breakdown value being rendered
return (
- {
- color && (
- // eslint-disable-next-line react/forbid-dom-props
-
- ●
-
- ) /* eslint-disable-line react/forbid-dom-props */
- }
+ {color && (
+ // eslint-disable-next-line react/forbid-dom-props
+
+ ●
+
+ )}
{datumValue !== undefined
? formatAggregationValue(datumMathProperty, datumValue, renderCount, formatPropertyValueForDisplay)
: '–'}
@@ -156,7 +154,7 @@ export function InsightTooltip({
seriesColumnData?.count,
formatPropertyValueForDisplay,
renderCount,
- seriesColumnData.color
+ seriesColumnData?.color
)
},
})
diff --git a/frontend/src/scenes/insights/InsightTooltip/insightTooltipUtils.tsx b/frontend/src/scenes/insights/InsightTooltip/insightTooltipUtils.tsx
index 387a00ad9fd84..6794d6a112827 100644
--- a/frontend/src/scenes/insights/InsightTooltip/insightTooltipUtils.tsx
+++ b/frontend/src/scenes/insights/InsightTooltip/insightTooltipUtils.tsx
@@ -128,6 +128,9 @@ export function invertDataSource(seriesData: SeriesDatum[]): InvertedSeriesDatum
const datumKey = `${s.breakdown_value}-${s.compare_label}`
if (datumKey in flattenedData) {
flattenedData[datumKey].seriesData.push(s)
+ flattenedData[datumKey].seriesData = flattenedData[datumKey].seriesData.sort(
+ (a, b) => (b.action?.order ?? b.dataIndex) - (a.action?.order ?? a.dataIndex)
+ )
} else {
flattenedData[datumKey] = {
id: datumKey,
diff --git a/frontend/src/scenes/insights/Insights.stories.tsx b/frontend/src/scenes/insights/Insights.stories.tsx
index e21a3342167e4..1c8a87112cf04 100644
--- a/frontend/src/scenes/insights/Insights.stories.tsx
+++ b/frontend/src/scenes/insights/Insights.stories.tsx
@@ -84,6 +84,15 @@ TrendsLineBreakdownEdit.parameters = {
testOptions: { waitForSelector: '[data-attr=trend-line-graph] > canvas' },
}
+export const TrendsLineBreakdownLabels: Story = createInsightStory(
+ require('../../mocks/fixtures/api/projects/team_id/insights/trendsLineBreakdown.json'),
+ 'view',
+ true
+)
+TrendsLineBreakdownLabels.parameters = {
+ testOptions: { waitForSelector: '[data-attr=trend-line-graph] > canvas' },
+}
+
export const TrendsBar: Story = createInsightStory(
require('../../mocks/fixtures/api/projects/team_id/insights/trendsBar.json')
)
@@ -222,6 +231,13 @@ TrendsPieBreakdownEdit.parameters = {
testOptions: { waitForSelector: '[data-attr=trend-pie-graph] > canvas' },
}
+export const TrendsPieBreakdownLabels: Story = createInsightStory(
+ require('../../mocks/fixtures/api/projects/team_id/insights/trendsPieBreakdown.json'),
+ 'view',
+ true
+)
+TrendsPieBreakdownLabels.parameters = { testOptions: { waitForSelector: '[data-attr=trend-pie-graph] > canvas' } }
+
export const TrendsWorldMap: Story = createInsightStory(
require('../../mocks/fixtures/api/projects/team_id/insights/trendsWorldMap.json')
)
diff --git a/frontend/src/scenes/insights/__mocks__/createInsightScene.tsx b/frontend/src/scenes/insights/__mocks__/createInsightScene.tsx
index 7326a262550eb..016ae3005bc2b 100644
--- a/frontend/src/scenes/insights/__mocks__/createInsightScene.tsx
+++ b/frontend/src/scenes/insights/__mocks__/createInsightScene.tsx
@@ -9,7 +9,8 @@ import { StoryFn } from '@storybook/react'
let shortCounter = 0
export function createInsightStory(
insight: Partial
,
- mode: 'view' | 'edit' = 'view'
+ mode: 'view' | 'edit' = 'view',
+ showLegend: boolean = false
): StoryFn {
const count = shortCounter++
return function InsightStory() {
@@ -21,7 +22,15 @@ export function createInsightStory(
ctx.json({
count: 1,
results: [
- { ...insight, short_id: `${insight.short_id}${count}`, id: (insight.id ?? 0) + 1 + count },
+ {
+ ...insight,
+ short_id: `${insight.short_id}${count}`,
+ id: (insight.id ?? 0) + 1 + count,
+ filters: {
+ ...insight.filters,
+ show_legend: showLegend,
+ },
+ },
],
}),
],
diff --git a/frontend/src/scenes/insights/views/BoldNumber/BoldNumber.scss b/frontend/src/scenes/insights/views/BoldNumber/BoldNumber.scss
index b43f8c6bb0712..0691356cacf30 100644
--- a/frontend/src/scenes/insights/views/BoldNumber/BoldNumber.scss
+++ b/frontend/src/scenes/insights/views/BoldNumber/BoldNumber.scss
@@ -3,7 +3,11 @@
.BoldNumber {
width: 100%;
padding: 2rem 0 3rem;
- text-align: center;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+ flex: 1;
@include screen($md) {
padding: 3rem 0 5rem;
diff --git a/frontend/src/scenes/insights/views/Funnels/FunnelInsight.tsx b/frontend/src/scenes/insights/views/Funnels/FunnelInsight.tsx
deleted file mode 100644
index 6e44fe2dee2b6..0000000000000
--- a/frontend/src/scenes/insights/views/Funnels/FunnelInsight.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import clsx from 'clsx'
-import { useValues } from 'kea'
-import { Funnel } from 'scenes/funnels/Funnel'
-import { insightLogic } from 'scenes/insights/insightLogic'
-import { funnelDataLogic } from 'scenes/funnels/funnelDataLogic'
-import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
-
-export function FunnelInsight(): JSX.Element {
- const { insightLoading, insightProps } = useValues(insightLogic)
- const { isFunnelWithEnoughSteps } = useValues(insightVizDataLogic(insightProps))
- const { hasFunnelResults } = useValues(funnelDataLogic(insightProps))
-
- const nonEmptyState = (hasFunnelResults && isFunnelWithEnoughSteps) || insightLoading
-
- return (
-
-
-
- )
-}
diff --git a/frontend/src/scenes/insights/views/InsightsTable/InsightsTable.scss b/frontend/src/scenes/insights/views/InsightsTable/InsightsTable.scss
index 2d59cd226cc7a..1ce975beb6fd1 100644
--- a/frontend/src/scenes/insights/views/InsightsTable/InsightsTable.scss
+++ b/frontend/src/scenes/insights/views/InsightsTable/InsightsTable.scss
@@ -1,12 +1,3 @@
-.insights-table.LemonTable--embedded {
- border-top: 1px solid var(--border);
-}
-
-.InsightCard .insights-table {
- min-height: 100%;
- border-top: none;
-}
-
.series-name-wrapper-col {
display: flex;
align-items: center;
diff --git a/frontend/src/scenes/insights/views/InsightsTable/InsightsTable.tsx b/frontend/src/scenes/insights/views/InsightsTable/InsightsTable.tsx
index bf0c656c7135e..4af3720692485 100644
--- a/frontend/src/scenes/insights/views/InsightsTable/InsightsTable.tsx
+++ b/frontend/src/scenes/insights/views/InsightsTable/InsightsTable.tsx
@@ -229,7 +229,6 @@ export function InsightsTable({
loading={insightDataLoading}
emptyState="No insight results"
data-attr="insights-table-graph"
- className="insights-table"
useURLForSorting={insightMode !== ItemMode.Edit}
rowRibbonColor={isLegend ? (item) => getSeriesColor(item.seriesIndex, compare || false) : undefined}
firstColumnSticky
diff --git a/frontend/src/scenes/insights/views/LineGraph/LineGraph.tsx b/frontend/src/scenes/insights/views/LineGraph/LineGraph.tsx
index 51576c2496ec9..dd8cb8a418aa7 100644
--- a/frontend/src/scenes/insights/views/LineGraph/LineGraph.tsx
+++ b/frontend/src/scenes/insights/views/LineGraph/LineGraph.tsx
@@ -221,7 +221,6 @@ export interface LineGraphProps {
inSharedMode?: boolean
showPersonsModal?: boolean
tooltip?: TooltipConfig
- inCardView?: boolean
inSurveyView?: boolean
isArea?: boolean
incompletenessOffsetFromEnd?: number // Number of data points at end of dataset to replace with a dotted line. Only used in line graphs.
@@ -255,7 +254,6 @@ export function LineGraph_({
['data-attr']: dataAttr,
showPersonsModal = true,
compare = false,
- inCardView,
inSurveyView,
isArea = false,
incompletenessOffsetFromEnd = -1,
@@ -297,7 +295,6 @@ export function LineGraph_({
const isBackgroundBasedGraphType = [GraphType.Bar, GraphType.HorizontalBar].includes(type)
const isPercentStackView = !!supportsPercentStackView && !!showPercentStackView
const showAnnotations = isTrends && !isHorizontal && !hideAnnotations
- const shouldAutoResize = isHorizontal && !inCardView
// Remove tooltip element on unmount
useEffect(() => {
@@ -689,14 +686,6 @@ export function LineGraph_({
const height = dynamicHeight
const parentNode: any = scale.chart?.canvas?.parentNode
parentNode.style.height = `${height}px`
- } else if (shouldAutoResize) {
- // automatically resize the chart container to fit the number of rows
- const MIN_HEIGHT = 575
- const ROW_HEIGHT = 16
- const dynamicHeight = scale.ticks.length * ROW_HEIGHT
- const height = Math.max(dynamicHeight, MIN_HEIGHT)
- const parentNode: any = scale.chart?.canvas?.parentNode
- parentNode.style.height = `${height}px`
} else {
// display only as many bars, as we can fit labels
scale.max = scale.ticks.length
@@ -706,7 +695,7 @@ export function LineGraph_({
ticks: {
...tickOptions,
precision,
- autoSkip: !shouldAutoResize,
+ autoSkip: true,
callback: function _renderYLabel(_, i) {
const labelDescriptors = [
datasets?.[0]?.actions?.[i]?.custom_name ?? datasets?.[0]?.actions?.[i]?.name, // action name
@@ -736,10 +725,7 @@ export function LineGraph_({
}, [datasets, hiddenLegendKeys, isDarkModeOn, trendsFilter, formula, showValueOnSeries, showPercentStackView])
return (
-
+
{showAnnotations && myLineChart && chartWidth && chartHeight ? (
+
attrs.query.kind === NodeKind.DataTableNode,
+ resizeable: true,
startExpanded: true,
attributes: {
query: {
diff --git a/frontend/src/scenes/notebooks/Notebook/Notebook.scss b/frontend/src/scenes/notebooks/Notebook/Notebook.scss
index 5f7893e770de2..1ba202f5a0348 100644
--- a/frontend/src/scenes/notebooks/Notebook/Notebook.scss
+++ b/frontend/src/scenes/notebooks/Notebook/Notebook.scss
@@ -264,4 +264,13 @@
span::selection {
color: var(--primary);
}
+
+ // Overrides for insight controls
+
+ .InsightVizDisplay {
+ .InsightDisplayConfig {
+ padding: 0;
+ border-bottom-width: 0;
+ }
+ }
}
diff --git a/frontend/src/scenes/retention/RetentionContainer.scss b/frontend/src/scenes/retention/RetentionContainer.scss
deleted file mode 100644
index 3f450fa32e890..0000000000000
--- a/frontend/src/scenes/retention/RetentionContainer.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-.RetentionContainer {
- width: 100%;
-}
-
-// Here we override based on retention-container the graph-container styling, so
-// as to not change the global styling. We need the extra nesting to ensure we
-// are more specific than the other insights css
-.insights-page {
- .insights-graph-container {
- .RetentionContainer {
- .LineGraph {
- position: relative;
- margin-top: 0.5rem;
- margin-bottom: 1rem;
- height: 300px;
- width: 100%;
- }
- }
- }
-}
diff --git a/frontend/src/scenes/retention/RetentionContainer.tsx b/frontend/src/scenes/retention/RetentionContainer.tsx
index e12deb74dbf10..5cc0d78bb0bf4 100644
--- a/frontend/src/scenes/retention/RetentionContainer.tsx
+++ b/frontend/src/scenes/retention/RetentionContainer.tsx
@@ -1,6 +1,5 @@
import { RetentionLineGraph } from './RetentionLineGraph'
import { RetentionTable } from './RetentionTable'
-import './RetentionContainer.scss'
import { LemonDivider } from '@posthog/lemon-ui'
import { RetentionModal } from './RetentionModal'
@@ -12,14 +11,16 @@ export function RetentionContainer({
inSharedMode?: boolean
}): JSX.Element {
return (
-
+
{inCardView ? (
) : (
<>
-
+
+
+
-
+
diff --git a/frontend/src/scenes/trends/Trends.tsx b/frontend/src/scenes/trends/Trends.tsx
index 8938d477173f1..4e2cb0879ee83 100644
--- a/frontend/src/scenes/trends/Trends.tsx
+++ b/frontend/src/scenes/trends/Trends.tsx
@@ -61,19 +61,7 @@ export function TrendInsight({ view, context }: Props): JSX.Element {
return (
<>
- {series && (
-
- {renderViz()}
-
- )}
+ {series &&
{renderViz()}
}
{display !== ChartDisplayType.WorldMap && // the world map doesn't need this cta
breakdown &&
loadMoreBreakdownUrl && (
diff --git a/frontend/src/scenes/trends/viz/ActionsHorizontalBar.tsx b/frontend/src/scenes/trends/viz/ActionsHorizontalBar.tsx
index 017bde1423b7a..dfd1ce105f617 100644
--- a/frontend/src/scenes/trends/viz/ActionsHorizontalBar.tsx
+++ b/frontend/src/scenes/trends/viz/ActionsHorizontalBar.tsx
@@ -15,7 +15,7 @@ import { trendsDataLogic } from '../trendsDataLogic'
type DataSet = any
-export function ActionsHorizontalBar({ inCardView, showPersonsModal = true }: ChartParams): JSX.Element | null {
+export function ActionsHorizontalBar({ showPersonsModal = true }: ChartParams): JSX.Element | null {
const [data, setData] = useState
(null)
const [total, setTotal] = useState(0)
@@ -80,7 +80,6 @@ export function ActionsHorizontalBar({ inCardView, showPersonsModal = true }: Ch
trendsFilter={trendsFilter}
formula={formula}
showValueOnSeries={showValueOnSeries}
- inCardView={inCardView}
onClick={
!showPersonsModal || trendsFilter?.formula
? undefined
diff --git a/frontend/src/scenes/trends/viz/ActionsPie.scss b/frontend/src/scenes/trends/viz/ActionsPie.scss
index 779ebf8864291..47af0778a00bd 100644
--- a/frontend/src/scenes/trends/viz/ActionsPie.scss
+++ b/frontend/src/scenes/trends/viz/ActionsPie.scss
@@ -1,23 +1,25 @@
-.actions-pie-component {
- min-width: 33%;
+.ActionsPie {
+ flex: 1;
+ width: 100%;
height: 100%;
+ display: flex;
+ flex-direction: row;
+ gap: 0.5rem;
- // No padding at the top because usually there's whitespace between "Computed ..." and "Show legend"
- // More padding at the bottom to give the number some breathing room
- padding: 0 1rem 2rem;
+ .ActionsPie__component {
+ min-width: 33%;
+ flex: 1;
+ padding: 1rem;
- .InsightCard & {
- padding-top: 1rem;
- }
-
- .pie-chart {
- position: relative;
- width: 100%;
- height: calc(100% - 4.5rem); // 4.5rem is the height of the number below the chart
- transition: height 0.5s;
- }
+ .ActionsPie__chart {
+ position: relative;
+ width: 100%;
+ height: calc(100% - 4.5rem); // 4.5rem is the height of the number below the chart
+ transition: height 0.5s;
+ }
- h3 {
- letter-spacing: -0.025em;
+ h3 {
+ letter-spacing: -0.025em;
+ }
}
}
diff --git a/frontend/src/scenes/trends/viz/ActionsPie.tsx b/frontend/src/scenes/trends/viz/ActionsPie.tsx
index 01a53d16dbc3a..286f76650c55b 100644
--- a/frontend/src/scenes/trends/viz/ActionsPie.tsx
+++ b/frontend/src/scenes/trends/viz/ActionsPie.tsx
@@ -10,7 +10,6 @@ import { PropertyKeyInfo } from 'lib/components/PropertyKeyInfo'
import { urlsForDatasets } from '../persons-modal/persons-modal-utils'
import { PieChart } from 'scenes/insights/views/LineGraph/PieChart'
import { InsightLegend } from 'lib/components/InsightLegend/InsightLegend'
-import clsx from 'clsx'
import { cohortsModel } from '~/models/cohortsModel'
import { propertyDefinitionsModel } from '~/models/propertyDefinitionsModel'
import { formatBreakdownLabel } from 'scenes/insights/utils'
@@ -72,15 +71,9 @@ export function ActionsPie({ inSharedMode, inCardView, showPersonsModal = true }
return data ? (
data[0] && data[0].labels ? (
-
-
-
+
+
+
Any:
+ # https://docs.sentry.io/platforms/python/troubleshooting/#addressing-concurrency-issues
+ with Hub(Hub.current):
+ set_tag("temporal.execution_type", "activity")
+ set_tag("module", input.fn.__module__ + "." + input.fn.__qualname__)
+
+ activity_info = activity.info()
+ _set_common_workflow_tags(activity_info)
+ set_tag("temporal.activity.id", activity_info.activity_id)
+ set_tag("temporal.activity.type", activity_info.activity_type)
+ set_tag("temporal.activity.task_queue", activity_info.task_queue)
+ set_tag("temporal.workflow.namespace", activity_info.workflow_namespace)
+ set_tag("temporal.workflow.run_id", activity_info.workflow_run_id)
+ try:
+ return await super().execute_activity(input)
+ except Exception as e:
+ if len(input.args) == 1 and is_dataclass(input.args[0]):
+ team_id = getattr(input.args[0], "team_id", None)
+ if team_id:
+ set_tag("team_id", team_id)
+ set_context("temporal.activity.info", activity.info().__dict__)
+ capture_exception()
+ raise e
+
+
+class _SentryWorkflowInterceptor(WorkflowInboundInterceptor):
+ async def execute_workflow(self, input: ExecuteWorkflowInput) -> Any:
+ # https://docs.sentry.io/platforms/python/troubleshooting/#addressing-concurrency-issues
+ with Hub(Hub.current):
+ set_tag("temporal.execution_type", "workflow")
+ set_tag("module", input.run_fn.__module__ + "." + input.run_fn.__qualname__)
+ workflow_info = workflow.info()
+ _set_common_workflow_tags(workflow_info)
+ set_tag("temporal.workflow.task_queue", workflow_info.task_queue)
+ set_tag("temporal.workflow.namespace", workflow_info.namespace)
+ set_tag("temporal.workflow.run_id", workflow_info.run_id)
+ try:
+ return await super().execute_workflow(input)
+ except Exception as e:
+ if len(input.args) == 1 and is_dataclass(input.args[0]):
+ team_id = getattr(input.args[0], "team_id", None)
+ if team_id:
+ set_tag("team_id", team_id)
+ set_context("temporal.workflow.info", workflow.info().__dict__)
+
+ if not workflow.unsafe.is_replaying():
+ with workflow.unsafe.sandbox_unrestricted():
+ capture_exception()
+ raise e
+
+
+class SentryInterceptor(Interceptor):
+ """Temporal Interceptor class which will report workflow & activity exceptions to Sentry"""
+
+ def intercept_activity(self, next: ActivityInboundInterceptor) -> ActivityInboundInterceptor:
+ """Implementation of
+ :py:meth:`temporalio.worker.Interceptor.intercept_activity`.
+ """
+ return _SentryActivityInboundInterceptor(super().intercept_activity(next))
+
+ def workflow_interceptor_class(
+ self, input: WorkflowInterceptorClassInput
+ ) -> Optional[Type[WorkflowInboundInterceptor]]:
+ return _SentryWorkflowInterceptor
diff --git a/posthog/temporal/worker.py b/posthog/temporal/worker.py
index 81cc28cdfd685..05666379e45c6 100644
--- a/posthog/temporal/worker.py
+++ b/posthog/temporal/worker.py
@@ -7,6 +7,7 @@
from posthog.temporal.client import connect
from posthog.temporal.workflows import ACTIVITIES, WORKFLOWS
+from posthog.temporal.sentry import SentryInterceptor
async def start_worker(
@@ -36,6 +37,7 @@ async def start_worker(
activities=ACTIVITIES,
workflow_runner=UnsandboxedWorkflowRunner(),
graceful_shutdown_timeout=timedelta(minutes=5),
+ interceptors=[SentryInterceptor()],
)
# catch the TERM signal, and stop the worker gracefully