Merge branch 'main' into fix/query-range-validation-gaps

- Five ClickHouse errors that user SQL causes returned 500. They now
return 400 with a suggestion, as #13328 does for 170, 288, and 407: 386
(no common type), 215 (column neither in GROUP BY nor in an aggregate),
184 (aggregate where none is allowed, mostly an alias that shadows a
column in WHERE), 190 (arrays of different sizes), 427 (a regular
expression RE2 cannot compile).
- Code 48 stays a 500. A correlated subquery over a distributed table
raises it, but the code covers every unimplemented feature, so a mapping
could hide a fault in generated SQL.
- 215 and 386 can also come from a builder bug; that is the trade-off
#13328 made.
- `test_clickhouse_user_mistake_is_bad_request` raises each code with a
real query, plus a builder `REGEXP` filter.

.claude/rules/comments.md

@@ -4,9 +4,9 @@ Applies to everything in the repo — code, config, workflows.
 
 - **No unnecessary comments.** Do not comment where the code is self-explanatory; never restate what the code already says.
 - **Document only** non-obvious behavior, constraints, formats, and edge cases.
-- **Rationale goes in prose, not source.** Why a version is pinned, why a job exists, how a subsystem fits together — that belongs in the README or the PR.
-- **Never remove pre-existing comments** when editing code. The bar above applies to comments you write, not comments already there.
-- **Never talk to the reviewer.** No comments about where a change came from, what was changed, or why the change is correct — that belongs in the PR description and is noise the moment it merges.
+- **Rationale goes in prose, not source.** Why a job exists, how a subsystem fits together: that belongs in the README or the PR. Exception: a config entry that would look like a mistake without its reason (a pinned version, a trust or lint exclusion) keeps a short reason next to it.
+- **Never remove pre-existing comments** when editing code. The bar above applies to comments you write, not comments already there. When the code a comment describes changes, update the comment; when that code is deleted, delete the comment with it.
+- **Never talk to the reviewer.** No comments about where a change came from, what was changed, or why the change is correct — that belongs in the PR description and is noise the moment it merges. A banner a skill requires (the AI-owned banner on story mocks and `tests/e2e/drivers/`) tells maintainers how the file is made; keep it.
 - **Less is more.** When writing something intended for human consumption, (comment, commit message, reply to prompt) use as few words as possible. Pick every word meticulously to reduce the volume to a strict minimum. Be down to the point. Less is more.
 
 Language rules build on this one: [`go-comments`](go-comments.md), [`py-comments`](py-comments.md).

.claude/rules/frontend-state.md

@@ -0,0 +1,40 @@
+---
+paths:
+  - "frontend/src/**/*.ts"
+  - "frontend/src/**/*.tsx"
+---
+
+# Frontend state
+
+Pick the store by what the state is. Never add Redux or React Context for shared state; to move existing Redux or Context state, use the `migrate-state-management` skill ([`frontend/.claude/skills/migrate-state-management/SKILL.md`](../../frontend/.claude/skills/migrate-state-management/SKILL.md)).
+
+| State | Use | Never |
+|---|---|---|
+| Server / API data | React Query, generated hooks from `src/api/generated` | a copy in Redux, Context or Zustand |
+| Shareable: filters, time range, selection, page | nuqs (`useQueryState` with a parser) | Redux, Context, hand-parsed `useSearchParams` |
+| Global client state | a small Zustand store per domain | Redux, Context |
+| One component's UI state | `useState` / `useReducer` | any store |
+
+## Server state
+
+- Expose a query through a hook that returns its result plus memoized derived values. Never dispatch a response into another store.
+- **The query key holds every value the request reads.** A field change that alters the request (name, context, data type) must change the key; a lossy signature serves stale rows.
+
+## URL state
+
+- Keep the URL small (Chrome trims near 2k characters). No large datasets, no sensitive data.
+- **A rewrite touches only the params it owns.** Repairing or normalising one param keeps the rest (`activeLogId`, pagination) as they were.
+- **Links carry the current time range.** A row link, "open in new tab" and "copy link" land on the same period as an in-app click.
+- **A preset read from the URL applies once.** A later user change or reset must not re-apply it.
+
+## Zustand
+
+- One `create()` per module; split a large store into slice factories combined in that one `create()`.
+- Always read through a selector: `useDashboardStore((s) => s.isDashboardLocked)`, never `useDashboardStore()`.
+- Update only through `set`; never mutate state. State fields before actions in the store object.
+- Hooks never call `useStore.getState()` (`signoz/no-zustand-getstate-in-hooks`); export standalone actions instead.
+
+## Local and form state
+
+- **Editable state starts from saved data once.** Initialise the form from the saved value, then let the user own it; never re-derive it from saved data on each render.
+- **A mode switch owns its in-flight work.** While a request from one mode runs, disable the switch or drop the result when the mode changes, so it can't close or overwrite the new mode.

.claude/rules/frontend-tests.md

@@ -0,0 +1,20 @@
+---
+paths:
+  - "frontend/src/**/*.test.ts"
+  - "frontend/src/**/*.test.tsx"
+---
+
+# Frontend tests
+
+Examples and the harness API live in [`frontend/src/tests/README.md`](../../frontend/src/tests/README.md).
+
+- **Import from the harness.** `render`, `screen`, `userEvent`, `waitFor` and the rest come from `tests/test-utils`, never from `@testing-library/react`. The harness mounts the router, React Query, Redux, app context and preferences. When it can't do what a test needs, extend `tests/test-utils` instead of importing around it.
+- **Find elements by test ID.** Query with `getByTestId`/`findByTestId` on the `data-testid` or `testId` the component exposes, and add one to the component when it has none. Fall back to role or text only for markup the app doesn't own. A test ID matches exactly one element and survives copy and markup changes; `getByRole` computes the accessibility tree on every call and is the slowest query.
+- **Interact like a user.** `const user = userEvent.setup({ pointerEventsCheck: 0 })`, then an awaited `user.click`, `hover`, `keyboard` or `type`. `fireEvent` only for events `userEvent` has no equivalent for: scroll, resize, setting `scrollTop`.
+- **Fake timers per test only**, for debounce or throttle, with `userEvent.setup({ advanceTimers: (ms) => jest.advanceTimersByTime(ms) })`. Never global.
+- **Network through MSW.** The global server runs for every test; override per test with `server.use(...)` from `mocks-server/server`. Large fixtures go in `mocks-server/__mockdata__`.
+- **Router through the harness.** Pass `initialRoute`/`routePath` to `render` and assert with `getCurrentLocation()` from `lib/router/navigation`. Never mock `react-router`, `react-router-dom` or `lib/history`; when a test can't render at a route, use the `lib/router` spies in `tests/router-mocks`.
+- **Mock only business boundaries.** Local `jest.mock` for API modules, custom hooks and domain components. Never re-mock what the harness provides or what `jest.config.ts` maps (`uplot`, `@signozhq/icons`, `useSafeNavigate`, `logEvent`).
+- **Type mocks and fixtures.** `jest.mocked(fn)` for module mocks, `jest.fn() as jest.MockedFunction<T>` for a standalone mock you configure or assert on. Fixtures carry their real type, from `src/api/generated` where it exists. No `any`, no `as unknown as`. An inline `onX={jest.fn()}` on a typed prop that is never asserted needs no annotation.
+- **A test fails without its change.** Revert the change, or break the line under test, and run the test before you finish: it must fail. Assert the specific outcome (exact text, request payload, call arguments), never only that an element exists.
+- **No limit on tests per file.** Split a file when it mixes unrelated behaviour, not to hit a count.

.claude/rules/log-body.md

@@ -0,0 +1,15 @@
+---
+paths:
+  - "frontend/src/**/*.ts"
+  - "frontend/src/**/*.tsx"
+---
+
+# Log body
+
+`ILog.body` is `string | ILogBody`. On `use_json_body` tenants the API sends an object, and the collector wraps a plain-string body into `{ message }`. Every read goes through `frontend/src/lib/logs/logBody.ts`.
+
+- **Read with a getter, never directly.** `getBodyDisplay` for a list cell or a log line, `getBodyMessage` for the drawer header. Both accept `undefined` and collapse a `{message}`-only object to its message.
+- **Never cast or stringify a body inline.** No `as string`, no `String(log.body)`, no `JSON.stringify(log.body)`, no `typeof body === 'string' ? … : …` outside the module. The v5 converter collapses `{ message }` once with `extractOnlyMessageBody`; live logs and the dashboard list panel skip the converter, so their rows carry the raw object and only a getter renders them right.
+- **Resolve a selected field with `getLogFieldValue`** from `lib/logs/flatLogData.ts`, so a `body.<key>` column works on both string and object bodies. An object value renders as JSON and is not offered as an add-to-query filter.
+- **The drawer tree and field lookup are the only places that use the raw value.** Everything else renders a string from a getter.
+- **Review check.** A raw body value used outside a getter call, `extractOnlyMessageBody` in the converter, `flatLogData.ts` and `LogDetailedView/utils.tsx` is a finding.

.claude/rules/pull-requests.md

@@ -9,3 +9,6 @@
 - **Keep the commit body short and human readable** focused on decision made if any. Commit body must not re-iterate the changes done, skip if title is sufficient in conveying the change.
 - **Use convensional commit format** for commits and PR title.
 - **Do not amend the commits once pushed.** Always create a new commit once changes are pushed to remote.
+- **Review fixes are new commits too.** A force push hides what changed from human reviewers and makes Greptile post its findings again. Bring in `main` with a merge; only a stacked branch (`gh stack`) rebases, since the stack moves as a unit.
+- **Answer every Greptile thread.** Reply with the commit that fixes it (`Fixed in 4df6f3198d: <what changed>`) or the reason it stays, then resolve. Never resolve one with neither: Greptile withdraws a finding, and remembers it, only when told why.
+- **Leave human review threads to the author.** Fix the code they ask for, but never reply to or resolve a human reviewer's thread.

.claude/rules/storybook.md

@@ -10,6 +10,9 @@ Page stories are written with the `signoz-page-story` skill ([`.claude/skills/si
 - **A UI change lands with its story.** Any change that alters what a page renders — a new page, a new state, a new branch, a changed layout — updates the story of every page that renders it, or creates one where the page has none. Go through the `signoz-page-story` skill; never hand-write a page story outside it.
 - **New page, new story. New state, new control or variant.** The skill decides which: a control on a response, a variant worth linking to, or a `play` story for a state only a click reaches.
 - **A shared component is covered through its pages.** A change under `components/` or `container/` with no story of its own updates the stories of the pages that render it.
+- **Plays live with the mocks.** A `play` is a named function exported from `stories/__story_mockdata__/<page>.play.ts`, which is collapsed for review like the rest of the AI-owned mocks. The story file only names it: `play: openEditDrawer`. A story file that still holds play bodies moves them there the first time you edit it.
+- **A play passes for every control value.** Branch each check on the args it depends on (panel kind, data state, row count, hidden header). A value the page supports must never fail the play.
+- **Mocks answer every request a reachable state makes.** Selecting a row, opening a view or switching a tab that fetches more hits a handler, never the 501 catch-all.
 - **Already covered, say so.** When the existing story and its controls already reach the changed state, no story edit is needed; state that in the PR description.
 - **Opt out only when there is no visual diff.** Skip stories only when the change renders nothing differently: types, api clients, hooks with no UI branch, tests. Deleting a page deletes its stories.
 - **Prove it with a visual diff when asked.** Before/after screenshots and "did this touch other screens" go through `sbshot-visual-diff`, which can only show what a story renders.

.claude/skills/signoz-page-story/SKILL.md

@@ -115,8 +115,8 @@ await expect(toggle.getAttribute('aria-checked')).toBe(before);
 - **A variant earns a story only when it is worth linking to**: an empty workspace, a viewer, a page mid-load. Everything else stays a control.
 - **Endpoints the page owns go through `response.json`**, so the Data control covers loaded, loading and failed in one declaration. Endpoints the page cannot render without (ingestion detection, preferences, feature payloads) take a plain resolver so the shell survives the loading and error states.
 - **Query-param state starts from `route`** (`/logs?tab=explorer`). In-page param navigation works inside a story; a different pathname is blocked and reported by the overlay. A control for a param is worth it only when the param is a page mode someone would want to flip.
-- **File layout**: every story file for a page lives under `src/pages/<Page>/stories/`: `<Page>.stories.tsx`, `<Page>.stories.mocks.tsx`, payload builders in `stories/__story_mockdata__/<page>.ts`. Nothing page-specific in `src/storybook/controls/`. A page that is a tab strip over several routes gets one story file per tab, in its own folder under the module page (`LogsModulePage/Pipelines/stories/Pipelines.stories.tsx`), each with its own mocks and `__story_mockdata__/`; the builders more than one tab needs stay in the module page's own `stories/__story_mockdata__/` (`AlertList/stories/__story_mockdata__/alerts.ts`), which a tab reaches as `../../stories/__story_mockdata__/alerts`. Every one of them renders the module page, so the tab strip is there, and the `route` its mocks return decides which tab is open. A page's permission stories go one level further down, in `stories/authz/<Page>.authz.stories.tsx`, on the page's own mocks: see **Permission stories**.
-- **A state only a click reaches is a story with a `play` function**, not a control: a drawer, a modal, an edit mode the page holds in component state. Drive it with `userEvent` and the queries from `storybook/test`, take the first of a repeated row action, and wait on the state's own text. The page fetches before it renders a row, so the finder needs a timeout past the 1s default. A state the app drops again on its own, such as one keyed on an array identity that a refetch replaces, does not get a story: it would not survive being looked at. A _sequence_ of such states, a wizard's steps or a questionnaire's pages, is still a control: declare the steps in the mocks module and walk them from a `play` on the meta that destructures `mount`, which is what makes Storybook replay it on an arg change. See [references/controls.md](references/controls.md).
+- **File layout**: every story file for a page lives under `src/pages/<Page>/stories/`: `<Page>.stories.tsx`, `<Page>.stories.mocks.tsx`, payload builders in `stories/__story_mockdata__/<page>.ts`, play functions in `stories/__story_mockdata__/<page>.play.ts`. Nothing page-specific in `src/storybook/controls/`. A page that is a tab strip over several routes gets one story file per tab, in its own folder under the module page (`LogsModulePage/Pipelines/stories/Pipelines.stories.tsx`), each with its own mocks and `__story_mockdata__/`; the builders more than one tab needs stay in the module page's own `stories/__story_mockdata__/` (`AlertList/stories/__story_mockdata__/alerts.ts`), which a tab reaches as `../../stories/__story_mockdata__/alerts`. Every one of them renders the module page, so the tab strip is there, and the `route` its mocks return decides which tab is open. A page's permission stories go one level further down, in `stories/authz/<Page>.authz.stories.tsx`, on the page's own mocks: see **Permission stories**.
+- **A state only a click reaches is a story with a `play` function**, not a control: a drawer, a modal, an edit mode the page holds in component state. Drive it with `userEvent` and the queries from `storybook/test`, take the first of a repeated row action, and wait on the state's own text. The page fetches before it renders a row, so the finder needs a timeout past the 1s default. The play is a named function exported from `__story_mockdata__/<page>.play.ts` and the story file only names it (`play: openEditDrawer`), so the reviewer reads states, not clicks; a story file that still holds play bodies moves them there the first time you edit it. It branches every check on the args it depends on: a control value the page supports never fails it. A state the app drops again on its own, such as one keyed on an array identity that a refetch replaces, does not get a story: it would not survive being looked at. A _sequence_ of such states, a wizard's steps or a questionnaire's pages, is still a control: declare the steps in the mocks module and walk them from a `play` on the meta that destructures `mount`, which is what makes Storybook replay it on an arg change. See [references/controls.md](references/controls.md).
 - **The mocks are AI-owned and say so.** `<Page>.stories.mocks.tsx` and every file under a `__story_mockdata__/` open with this banner, above the imports:
 
   ```ts
@@ -143,6 +143,8 @@ await expect(toggle.getAttribute('aria-checked')).toBe(before);
 - [ ] a page tagged `authz` has its `Authz` folder: one story per permission it reads, each reached by `revoked`, none of them a role preset, and each one checked by the `disabled` state of what the permission gates
 - [ ] the mocks module and every `__story_mockdata__` file carry the AI-owned banner
 - [ ] every control flipped once, its effect seen on screen
+- [ ] every play passes with each control value its story exposes, and the story file holds no play body
+- [ ] every request a reachable state makes (a selected row, an opened view, a switched tab) has a handler
 - [ ] console clean: no `[storybook] no msw handler`, no 501, no msw unhandled request, no React warning
 - [ ] no navigation overlay on mount
 - [ ] `pnpm tsgo --noEmit`, `pnpm exec oxlint <files>`, `pnpm exec oxfmt --check <files>` all clean. The repo has no prettier: `pnpm exec prettier` prints a pass while exiting 254

.github/CODEOWNERS

@@ -24,7 +24,7 @@ go.mod @therealpandey
 /pkg/config/ @therealpandey
 /pkg/errors/ @therealpandey
 /pkg/factory/ @therealpandey
-/pkg/types/ @therealpandey
+/pkg/types/ @therealpandey @srikanthccv
 /pkg/valuer/ @therealpandey
 /cmd/ @therealpandey
 .golangci.yml @therealpandey
@@ -136,7 +136,7 @@ go.mod @therealpandey
 
 # Integration tests
 
-/tests/integration/ @therealpandey
+/tests/integration/ @therealpandey @srikanthccv
 
 # e2e tests
 /tests/e2e/ @AshwinBhatkal
@@ -302,3 +302,8 @@ go.mod @therealpandey
 /frontend/.storybook/ @H4ad
 /frontend/src/storybook/ @H4ad
 /.claude/skills/signoz-page-story/ @H4ad
+
+## AI Assistant
+/frontend/src/container/AIAssistant/ @SigNoz/nerve @SigNoz/frontend-maintainers
+/frontend/src/hooks/aiAssistant/ @SigNoz/nerve @SigNoz/frontend-maintainers
+/frontend/src/pages/AIAssistantPage/ @SigNoz/nerve @SigNoz/frontend-maintainers

.github/workflows/e2eci.yaml

@@ -67,7 +67,7 @@ jobs:
       matrix:
         project:
           - chromium
-        shard: [1, 2, 3, 4]
+        shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
     needs: changes
     if: needs.changes.outputs.e2e == 'true'
     runs-on: ubuntu-latest
@@ -162,7 +162,7 @@ jobs:
       - name: playwright-test
         run: |
           cd tests/e2e && \
-            pnpm playwright test --project=${{ matrix.project }} --shard=${{ matrix.shard }}/4
+            pnpm playwright test --project=${{ matrix.project }} --shard=${{ matrix.shard }}/10
       - name: teardown-stack
         if: always()
         run: |

frontend/.claude/skills/migrate-state-management/SKILL.md

@@ -146,5 +146,5 @@ Do not use Zustand, Redux, or Context for purely local UI state.
 
 ## Additional resources
 
-- Project rule: [.cursor/rules/state-management.mdc](../../rules/state-management.mdc)
+- Project rule: [.claude/rules/frontend-state.md](../../../../.claude/rules/frontend-state.md)
 - Detailed patterns and rationale: [reference.md](reference.md)

frontend/.cursor/rules/state-management.mdc

@@ -1,97 +0,0 @@
----
-globs: **/*.store.ts
-alwaysApply: false
----
-# State Management: React Query, nuqs, Zustand
-
-Use the following stack. Do **not** introduce or recommend Redux or React Context for shared/global state.
-
-## Server state → React Query
-
-- **Use for:** API responses, time-series data, caching, background refetch, retries, stale/refresh.
-- **Do not use Redux/Context** to store or mirror data that comes from React Query (e.g. do not dispatch API results into Redux).
-- Prefer generated React Query hooks from `frontend/src/api/generated` when available.
-- Keep server state in React Query; expose it via hooks that return the query result (and optionally memoized derived values). Do not duplicate it in Redux or Context.
-
-```tsx
-// ✅ GOOD: single source of truth from React Query
-export function useAppStateHook() {
-  const { data, isError } = useQuery(...)
-  const memoizedConfigs = useMemo(() => ({ ... }), [data?.configs])
-  return { configs: memoizedConfigs, isError, ... }
-}
-
-// ❌ BAD: copying React Query result into Redux
-dispatch({ type: UPDATE_LATEST_VERSION, payload: queryResponse.data })
-```
-
-## URL state → nuqs
-
-- **Use for:** shareable state, filters, time range, selected values, pagination, view state that belongs in the URL.
-- **Do not use Redux/Context** for state that should be shareable or reflected in the URL.
-- Use [nuqs](https://nuqs.dev/docs/basic-usage) for typed, type-safe URL search params. Avoid ad-hoc `useSearchParams` encoding/decoding.
-- Keep URL payload small; respect browser URL length limits (e.g. Chrome ~2k chars). Do not put large datasets or sensitive data in query params.
-
-```tsx
-// ✅ GOOD: nuqs for filters / time range / selection
-const [timeRange, setTimeRange] = useQueryState('timeRange', parseAsString.withDefault('1h'))
-const [page, setPage] = useQueryState('page', parseAsInteger.withDefault(1))
-
-// ❌ BAD: Redux/Context for shareable or URL-synced state
-const { timeRange } = useContext(SomeContext)
-```
-
-## Client state → Zustand
-
-- **Use for:** global/client state, cross-component state, feature flags, complex or large client objects (e.g. dashboard state, query builder state).
-- **Do not use Redux or React Context** for global or feature-level client state.
-- Prefer small, domain-scoped stores (e.g. DashboardStore, QueryBuilderStore).
-
-### Zustand best practices (align with eslint-plugin-zustand-rules)
-
-- **One store per module.** Do not define multiple `create()` calls in the same file; use one store per module (or compose slices into one store).
-- **Always use selectors.** Call the store hook with a selector so only the used slice triggers re-renders. Never use `useStore()` with no selector.
-
-```tsx
-// ✅ GOOD: selector — re-renders only when isDashboardLocked changes
-const isLocked = useDashboardStore(state => state.isDashboardLocked)
-
-// ❌ BAD: no selector — re-renders on any store change
-const state = useDashboardStore()
-```
-
-- **Never mutate state directly.** Update only via `set` or `setState` (or `getState()` + `set` for reads). No `state.foo = x` or `state.bears += 1` inside actions.
-
-```tsx
-// ✅ GOOD: use set
-increment: () => set(state => ({ bears: state.bears + 1 }))
-
-// ❌ BAD: direct mutation
-increment: () => { state.bears += 1 }
-```
-
-- **State properties before actions.** In the store object, list all state fields first, then action functions.
-- **Split into slices when state is large.** If a store has many top-level properties (e.g. more than 5–10), split into slice factories and combine with one `create()`.
-
-```tsx
-// ✅ GOOD: slices for large state
-const createBearSlice = set => ({ bears: 0, addBear: () => set(s => ({ bears: s.bears + 1 })) })
-const createFishSlice = set => ({ fish: 0, addFish: () => set(s => ({ fish: s.fish + 1 })) })
-const useStore = create(set => ({ ...createBearSlice(set), ...createFishSlice(set) }))
-```
-
-- **In projects using Zustand:** add `eslint-plugin-zustand-rules` and extend `plugin:zustand-rules/recommended` to enforce these rules automatically.
-
-## Local state → React state only
-
-- **Use useState/useReducer** for: component-local UI state, form inputs, toggles, hover state, data that never leaves the component.
-- Do not use Zustand, Redux, or Context for state that is purely local to one component or a small subtree.
-
-## Summary
-
-| State type        | Use              | Avoid              |
-|-------------------|------------------|--------------------|
-| Server / API      | React Query      | Redux, Context     |
-| URL / shareable   | nuqs             | Redux, Context     |
-| Global client     | Zustand          | Redux, Context     |
-| Local UI          | useState/useReducer | Zustand, Redux, Context |

frontend/.cursor/rules/testing-conventions.mdc

@@ -1,74 +0,0 @@
----
-description: Core testing conventions - imports, rendering, MSW, interactions, queries
-globs: **/*.test.{ts,tsx}
-alwaysApply: false
----
-
-# Testing Conventions
-
-## Imports
-
-Always import from the test harness, never directly from `@testing-library/react`:
-
-```ts
-import { render, screen, userEvent, waitFor } from 'tests/test-utils';
-import { server, rest } from 'mocks-server/server';
-```
-
-## Router
-
-Use the built-in router in `render`:
-
-```ts
-render(<Page />, undefined, { initialRoute: '/traces-explorer' });
-```
-
-Only mock `useLocation` / `useParams` if the test depends on their values.
-
-## MSW
-
-Global MSW server runs automatically. Override per-test:
-
-```ts
-server.use(
-  rest.get('*/api/v1/foo', (_req, res, ctx) =>
-    res(ctx.status(200), ctx.json({ ok: true })))
-);
-```
-
-Keep large response fixtures in `mocks-server/__mockdata_`.
-
-## Interactions
-
-- Prefer `userEvent` for real user interactions (click, type, select, tab).
-- Use `fireEvent` only for low-level events not covered by `userEvent` (e.g., scroll, resize). Wrap in `act(...)` if needed.
-- Always `await` interactions:
-
-```ts
-const user = userEvent.setup({ pointerEventsCheck: 0 });
-await user.click(screen.getByRole('button', { name: /save/i }));
-```
-
-## Timers
-
-No global fake timers. Per-test only, for debounce/throttle:
-
-```ts
-jest.useFakeTimers();
-const user = userEvent.setup({ advanceTimers: (ms) => jest.advanceTimersByTime(ms) });
-await user.type(screen.getByRole('textbox'), 'query');
-jest.advanceTimersByTime(400);
-jest.useRealTimers();
-```
-
-## Queries
-
-Prefer accessible queries: `getByRole` > `findByRole` > `getByLabelText` > visible text > `data-testid` (last resort).
-
-## Anti-patterns
-
-- Never import from `@testing-library/react` directly
-- Never use global fake timers
-- Never wrap `render` in `act(...)`
-- Never mock infra dependencies locally (router, react-query)
-- Limit to 3-5 focused tests per file

frontend/.cursor/rules/testing-mock-strategy.mdc

@@ -1,54 +0,0 @@
----
-description: When to use global vs local mocks in tests
-globs: **/*.test.{ts,tsx}
-alwaysApply: false
----
-
-# Mock Strategy
-
-## Use Global Mocks For
-
-High-frequency dependencies (20+ test files):
-- Core infrastructure: react-router-dom, react-query, antd
-- Browser APIs: ResizeObserver, matchMedia, localStorage
-- Utility libraries: date-fns, lodash
-
-Available global mock files (from jest.config.ts):
-- `uplot` -> `__mocks__/uplotMock.ts`
-
-## Use Local Mocks For
-
-- Business logic dependencies (API endpoints, custom hooks, domain components)
-- Test-specific behavior (different data per test, error scenarios, loading states)
-
-## Decision Tree
-
-```
-Used in 20+ test files?
-  YES -> Global mock
-  NO  -> Business logic or test-specific?
-    YES -> Local mock
-    NO  -> Consider global if usage grows
-```
-
-## Correct Usage
-
-```ts
-// Global mocks are already available - just import
-import { useLocation } from 'react-router-dom';
-
-// Local mocks for business logic
-jest.mock('../api/tracesService', () => ({
-  getTraces: jest.fn(() => mockTracesData),
-}));
-```
-
-## Anti-patterns
-
-```ts
-// Never re-mock globally mocked dependencies locally
-jest.mock('react-router-dom', () => ({ ... }));
-
-// Never put test-specific data in global mocks
-jest.mock('../api/tracesService', () => ({ getTraces: jest.fn(() => specificTestData) }));
-```

frontend/.cursor/rules/testing-type-safety.mdc

@@ -1,54 +0,0 @@
----
-description: TypeScript type safety requirements for Jest tests
-globs: **/*.test.{ts,tsx}
-alwaysApply: false
----
-
-# TypeScript Type Safety in Tests
-
-All Jest tests must be fully type-safe. Never use `any`.
-
-## Mock Function Typing
-
-```ts
-// Use jest.mocked for module mocks
-import useFoo from 'hooks/useFoo';
-jest.mock('hooks/useFoo');
-const mockUseFoo = jest.mocked(useFoo);
-
-// Use jest.MockedFunction for standalone mocks
-const mockFetch = jest.fn() as jest.MockedFunction<(id: number) => Promise<User>>;
-```
-
-## Mock Data
-
-Define interfaces for all mock data:
-
-```ts
-const mockUser: User = { id: 1, name: 'John', email: 'john@example.com' };
-
-const mockProps: ComponentProps = {
-  title: 'Test',
-  data: [mockUser],
-  onSelect: jest.fn() as jest.MockedFunction<(user: User) => void>,
-};
-```
-
-## Hook Mocking Pattern
-
-```ts
-import useFoo from 'hooks/useFoo';
-jest.mock('hooks/useFoo');
-const mockUseFoo = jest.mocked(useFoo);
-mockUseFoo.mockReturnValue(/* minimal shape */);
-```
-
-Prefer helpers (`rqSuccess`, `rqLoading`, `rqError`) for React Query results.
-
-## Checklist
-
-- All mock functions use `jest.MockedFunction<T>` or `jest.mocked()`
-- All mock data has proper interfaces
-- No `any` types in test files
-- Component props are typed
-- API response types are defined

frontend/.cursor/rules/ui-components-and-icons.mdc

@@ -1,19 +0,0 @@
----
-description: Prefer SigNoz UI and icons across frontend code
-globs: **/*.{ts,tsx,js,jsx}
-alwaysApply: true
----
-
-# UI Components and Icons Source of Truth
-
-For all frontend implementation work in this repository:
-
-- Always use UI primitives/components from `@signozhq/ui`.
-- Always use icons from `@signozhq/icons`.
-- Do not introduce new usage of icon libraries directly (for example `lucide-react`) in app code.
-- Do not mix multiple component systems for the same UI surface when an equivalent exists in `@signozhq/ui`.
-
-## Migration guidance
-
-- If touching a file that already uses non-`@signozhq/icons` icons, prefer migrating that file to `@signozhq/icons` as part of the same change when practical.
-- If a required component or icon is missing from SigNoz packages, call this out explicitly in the PR/summary before introducing alternatives.

frontend/.storybook/preview.tsx

@@ -143,7 +143,12 @@ const preview: Preview = {
 						'Logs',
 						['Explorer', 'Live Tail', 'Pipelines', 'Settings'],
 						'Traces',
-						['Explorer', 'Trace Details', 'Funnel Details'],
+						[
+							'Explorer',
+							['Overview', 'Span Drawer'],
+							'Trace Details',
+							'Funnel Details',
+						],
 						'Metrics',
 						['Explorer'],
 						'Infrastructure',

frontend/AGENTS.md

@@ -25,15 +25,24 @@ You are operating within a constrained context window and strict system prompts.
 - Never create barrel files.
 - When writing new css, prefer CSS Modules
   - Use ./docs/css-modules-guide.md as reference on how to write good CSS Modules.
+- UI primitives come from `@signozhq/ui` (subpath imports) and icons from `@signozhq/icons`. No new `antd` component or direct icon library (`lucide-react`) where `@signozhq/ui` has an equivalent; `signoz/no-antd-components` enforces part of this list.
+  - Exception: a control added beside `antd` siblings of the same kind (a tab in an `antd` tab strip) matches them until that surface migrates. Say so in the PR.
+  - When `@signozhq/ui` or `@signozhq/icons` lacks what you need, say so in the PR before reaching for another library.
 - Before styling a `@signozhq/ui` component, check its props in `node_modules/@signozhq/ui/dist/<component>/*.d.ts` for `className`/`style` support; some omit them. Avoid overriding the component's CSS vars unless explicitly needed.
 - When writing code that could need authorization checks, read ./src/lib/authz/README.md
+  - A flow that gains a request also gates on that request's permission: a rename that now reads the view first needs `read` as well as `update`.
+- Identity keys (legend groups, color groups, CSV headers, React keys) come from structured values, never from joined display text: `['us, east', 'prod']` and `['us', 'east, prod']` both join to `us, east, prod`.
+- A payload saved under another kind or schema copies only the fields that schema accepts, and drops bindings to columns the user removed. The server rejects unknown or stale fields, so the preview works and the save fails.
 
-3. FORCED VERIFICATION: Your internal tools mark file writes as successful even if the code does not compile. You are FORBIDDEN from reporting a task as complete until you have:
+3. FORCED VERIFICATION: Your internal tools mark file writes as successful even if the code does not compile. Run these checks once all changes of a task are done, never after each edit. You are FORBIDDEN from reporting a task as complete until you have:
 - Run `pnpm tsgo --noEmit`
 - Run `pnpm lint:js --quiet` to find critical errors
 - Run `pnpm oxlint <file1> <file2>` and fix all warnings
 - Run `pnpm build`
-- Find if the file has tests for it, or if there's `__test__` folder or the parent folder has tests, and run. 
+- Find if the file has tests for it, or if there's `__test__` folder or the parent folder has tests, and run. Run them before coding the change or after all changes, never in between.
+- For e2e, run only the specs you added or changed: the stack is heavy. Leave the full jest and e2e suites to CI unless the user asks.
+- For every test you added or changed, revert the change it covers and confirm the test fails
+- On a stacked branch (`gh stack`), run `pnpm tsgo --noEmit` on every branch above it before pushing: a renamed prop or moved export breaks them
 - Fixed ALL resulting errors
 
 4. BEHAVIOR CHANGE DETECTION: When modifying existing behavior:
@@ -41,6 +50,14 @@ You are operating within a constrained context window and strict system prompts.
 - Update test assertions to match new behavior
 - If no tests exist, add them BEFORE changing behavior
 
+## Repo Rules
+
+Claude Code loads `../.claude/rules/` on its own. Other agents read the matching file before editing:
+- Every file: [comments](../.claude/rules/comments.md), [pull requests](../.claude/rules/pull-requests.md)
+- `src/**/*.ts(x)` that holds state, a query, URL params or a form: [frontend state](../.claude/rules/frontend-state.md)
+- `*.test.ts(x)`: [frontend tests](../.claude/rules/frontend-tests.md)
+- `*.tsx` that changes what a page renders: [storybook](../.claude/rules/storybook.md)
+
 ## Context Management
 
 1. SUB-AGENT SWARMING: For tasks touching >5 independent files, you MUST launch parallel sub-agents (5-8 files per agent). Each agent gets its own context window. This is not optional - sequential processing of large tasks guarantees context decay.

frontend/package.json

@@ -80,7 +80,7 @@
     "crypto-js": "4.2.0",
     "d3-hierarchy": "3.1.2",
     "dayjs": "^1.10.7",
-    "dompurify": "3.4.15",
+    "dompurify": "3.4.17",
     "event-source-polyfill": "1.0.31",
     "eventemitter3": "5.0.1",
     "history": "4.10.1",
@@ -200,17 +200,17 @@
     "oxfmt": "0.73.0",
     "oxlint": "1.88.0",
     "oxlint-tsgolint": "7.0.2004",
-    "postcss": "8.5.26",
+    "postcss": "8.5.32",
     "postcss-scss": "4.0.9",
     "react-resizable": "3.0.4",
     "redux-mock-store": "1.5.4",
     "sass": "1.97.3",
-    "sharp": "0.35.4",
+    "sharp": "0.35.5",
     "storybook": "10.6.3",
     "stylelint": "17.15.0",
     "svgo": "4.1.0",
     "ts-jest": "29.4.15",
-    "typescript-plugin-css-modules": "5.2.0",
+    "typescript-plugin-css-modules": "5.3.0",
     "use-sync-external-store": "1.6.0",
     "vite-plugin-checker": "0.12.0",
     "vite-plugin-compression": "0.5.1",

frontend/pnpm-workspace.yaml

@@ -37,9 +37,9 @@ overrides:
  cookie@<0.7.0: '>=0.7.1 <1'
  # via: @grafana/data@11.6.15 (3.4.0/3.2.4 exact);
  #      @monaco-editor/react > monaco-editor@0.55.1 (3.2.7 exact)
- # remove: blocked. The direct dep is already on 3.4.15, but @grafana/data
+ # remove: blocked. The direct dep is already on 3.4.17, but @grafana/data
  #         (latest 13.1.0) and monaco-editor (latest 0.55.1) still pin vulnerable versions
- dompurify@<=3.4.12: '>=3.4.13 <4'
+ dompurify@<=3.4.16: '>=3.4.17 <4'
  # via: rolldown-vite@7.3.1 (esbuild ^0.27.0); ts-jest@29.4.9 (~0.27.4)
  # remove: blocked on rolldown-vite (7.3.1 is latest, still ^0.27.0);
  #         orval >=8.20.0 and ts-jest >=29.4.11 already fixed on their side
@@ -60,17 +60,10 @@ overrides:
  #      @commitlint/cli > @commitlint/load > cosmiconfig@9 (^4.1.0)
  # remove: blocked, both consumers cap js-yaml at ^4 and only 4.3.2 carries the fix
  'js-yaml@>=4.0.0 <4.3.2': '>=4.3.2 <5'
- # via: typescript-plugin-css-modules@5.2.0 (less ^4.2.0) > less@4.4.0 (image-size ~0.5.0)
- # remove: bump typescript-plugin-css-modules once it floors less itself; image-size has
- #         no patched release at all, so dropping the dep is the only fix — less@4.5.0 did
- less@<4.5.0: '>=4.5.0 <5'
- # via: direct dep postcss (nanoid ^3.3.17)
- # remove: blocked — postcss 8.5.26 (latest) caps nanoid at ^3, fix landed in 3.3.18
- nanoid@<3.3.18: '>=3.3.18 <4'
  # via: react-syntax-highlighter@15.5.0 (prismjs ^1.27.0 + refractor@3 ~1.27.0 tilde-pinned)
  # remove: bump react-syntax-highlighter to >=16.1.1 (prismjs ^1.30.0, refractor@5)
  prismjs@<1.30.0: '>=1.30.0 <2'
- # via: typescript-plugin-css-modules@5.2.0 > postcss-modules-local-by-default@4.2.0
+ # via: typescript-plugin-css-modules@5.3.0 > postcss-modules-local-by-default@4.2.0
  #      (postcss-selector-parser ^7.0.0)
  # remove: blocked, 4.2.0 is latest and the range is open, so the floor is what pulls the fix
  postcss-selector-parser@>=7.1.0 <7.1.3: '>=7.1.3 <8'

frontend/src/api/v5/queryRange/convertV5Response.ts

@@ -1,3 +1,4 @@
+import { extractOnlyMessageBody } from 'lib/logs/logBody';
 import { cloneDeep, isEmpty } from 'lodash-es';
 import { SuccessResponse, Warning } from 'types/api';
 import { MetricRangePayloadV3 } from 'types/api/metrics/getQueryRange';
@@ -281,19 +282,6 @@ function convertScalarWithFormatForWeb(
 	});
 }
 
-function extractOnlyMessageBody(body: unknown): unknown {
-	const isJsonBody = body && typeof body === 'object' && !Array.isArray(body);
-	if (isJsonBody) {
-		const keys = Object.keys(body);
-		const hasOnlyMessageKey = keys.length === 1 && keys[0] === 'message';
-		if (hasOnlyMessageKey) {
-			const { message } = body as { message: unknown };
-			return typeof message === 'string' ? message : JSON.stringify(message);
-		}
-	}
-	return body;
-}
-
 /**
  * Converts V5 RawData to legacy format
  */

frontend/src/components/DetailsPanel/DetailsPanelDrawer.module.scss

@@ -0,0 +1,17 @@
+.drawer {
+	overflow: hidden;
+	border-color: var(--l2-border);
+	background: var(--l2-background);
+	box-shadow: -4px 10px 16px 2px var(--l1-shadow);
+
+	&:focus,
+	&:focus-visible {
+		outline: none;
+	}
+}
+
+.body {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}

frontend/src/components/DetailsPanel/DetailsPanelDrawer.styles.scss

@@ -1,7 +0,0 @@
-.details-panel-drawer {
-	&__body {
-		display: flex;
-		flex-direction: column;
-		height: 100%;
-	}
-}

frontend/src/components/DetailsPanel/DetailsPanelDrawer.tsx

@@ -1,12 +1,15 @@
-import { DrawerWrapper } from '@signozhq/ui/drawer';
+import { Drawer, DrawerContent } from '@signozhq/ui/drawer';
+import cx from 'classnames';
+import { AnimatePresence } from 'motion/react';
 
-import './DetailsPanelDrawer.styles.scss';
+import styles from './DetailsPanelDrawer.module.scss';
 
 interface DetailsPanelDrawerProps {
 	isOpen: boolean;
 	onClose: () => void;
 	children: React.ReactNode;
 	className?: string;
+	testId?: string;
 }
 
 function DetailsPanelDrawer({
@@ -14,22 +17,41 @@ function DetailsPanelDrawer({
 	onClose,
 	children,
 	className,
+	testId,
 }: DetailsPanelDrawerProps): JSX.Element {
 	return (
-		<DrawerWrapper
+		<Drawer
 			open={isOpen}
 			onOpenChange={(open): void => {
 				if (!open) {
 					onClose();
 				}
 			}}
-			direction="right"
-			showOverlay={false}
-			className={`details-panel-drawer ${className || ''}`}
+			modal={false}
 		>
-			<div className="details-panel-drawer__body">{children}</div>
-		</DrawerWrapper>
+			<AnimatePresence>
+				{isOpen && (
+					<DrawerContent
+						forceMount
+						direction="right"
+						width="extra-wide"
+						showOverlay={false}
+						// Outside presses are left to the page, which knows what counts as inside.
+						onInteractOutside={(e): void => e.preventDefault()}
+						className={cx(styles.drawer, className)}
+						testId={testId}
+					>
+						<div className={styles.body}>{children}</div>
+					</DrawerContent>
+				)}
+			</AnimatePresence>
+		</Drawer>
 	);
 }
 
+DetailsPanelDrawer.defaultProps = {
+	className: undefined,
+	testId: undefined,
+};
+
 export default DetailsPanelDrawer;

frontend/src/components/HostMetricsDetail/WaitlistFragment/WaitlistFragment.tsx

@@ -29,8 +29,8 @@ export default function WaitlistFragment({
 
 		setIsSubmitting(true);
 
-		logEvent('Infra Monitoring: Get Early Access Clicked', {
-			entity_type: entityType,
+		logEvent('Infra Monitoring: Get early access clicked', {
+			entityType,
 			userEmail: user.email,
 		})
 			.then(() => {

frontend/src/components/LogDetail/index.tsx

@@ -9,7 +9,6 @@ import LogStateIndicator from 'components/Logs/LogStateIndicator/LogStateIndicat
 import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
 import QuerySearch from 'components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch';
 import { convertExpressionToFilters } from 'components/QueryBuilderV2/utils';
-import { FeatureKeys } from 'constants/features';
 import { LOCALSTORAGE } from 'constants/localStorage';
 import ContextView from 'container/LogDetailedView/ContextView/ContextView';
 import InfraMetrics from 'container/LogDetailedView/InfraMetrics/InfraMetrics';
@@ -23,6 +22,7 @@ import { useOptionsMenu } from 'container/OptionsMenu';
 import { FontSize } from 'container/OptionsMenu/types';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useIsDarkMode } from 'hooks/useDarkMode';
+import { getBodyMessage } from 'lib/logs/logBody';
 import { cloneDeep } from 'lodash-es';
 import {
 	ArrowDown,
@@ -33,8 +33,6 @@ import {
 	TextSelect,
 	X,
 } from '@signozhq/icons';
-import { useAppContext } from 'providers/App/App';
-import { ILogBody } from 'types/api/logs/log';
 import { Query, TagFilter } from 'types/api/queryBuilder/queryBuilderData';
 import { DataSource, StringOperators } from 'types/common/queryBuilder';
 
@@ -67,10 +65,6 @@ function LogDetailInner({
 	const [selectedView, setSelectedView] = useState<VIEWS>(selectedTab);
 
 	const [isFilterVisible, setIsFilterVisible] = useState<boolean>(false);
-	const { featureFlags } = useAppContext();
-	const isBodyJsonQueryEnabled =
-		featureFlags?.find((flag) => flag.name === FeatureKeys.USE_JSON_BODY)
-			?.active || false;
 
 	const [filters, setFilters] = useState<TagFilter | null>(null);
 	const [isEdit, setIsEdit] = useState<boolean>(false);
@@ -173,20 +167,7 @@ function LogDetailInner({
 		}
 	};
 
-	const logBody = useMemo(() => {
-		if (!isBodyJsonQueryEnabled) {
-			return (log?.body as string) ?? '';
-		}
-		// Feature enabled: body is always a map; message is always a string
-		const bodyObj = log?.body as ILogBody;
-		if (!bodyObj) {
-			return '';
-		}
-		if (bodyObj.message) {
-			return bodyObj.message;
-		}
-		return JSON.stringify(bodyObj);
-	}, [isBodyJsonQueryEnabled, log?.body]);
+	const logBody = useMemo(() => getBodyMessage(log?.body), [log?.body]);
 
 	const htmlBody = useMemo(
 		() => ({

frontend/src/components/Logs/AddToQueryHOC.tsx

@@ -4,6 +4,7 @@ import cx from 'classnames';
 import { OPERATORS } from 'constants/queryBuilder';
 import { FontSize } from 'container/OptionsMenu/types';
 import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
+import { ScalarFieldValue } from 'utils/stringUtils';
 
 import './AddToQueryHOC.styles.scss';
 
@@ -40,10 +41,10 @@ function AddToQueryHOC({
 
 export interface AddToQueryHOCProps {
 	fieldKey: string;
-	fieldValue: string;
+	fieldValue: ScalarFieldValue;
 	onAddToQuery: (
 		fieldKey: string,
-		fieldValue: string,
+		fieldValue: ScalarFieldValue,
 		operator: string,
 		dataType?: DataTypes,
 	) => void;

frontend/src/components/Logs/ListLogView/index.tsx

@@ -5,19 +5,19 @@ import cx from 'classnames';
 import { VIEW_TYPES } from 'components/LogDetail/constants';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
 import { ChangeViewFunctionType } from 'hooks/useHandleExplorerTabChange';
-import {
-	getBodyDisplayString,
-	getSanitizedLogBody,
-} from 'container/LogDetailedView/utils';
+import { getSanitizedLogBody } from 'container/LogDetailedView/utils';
 import { FontSize } from 'container/OptionsMenu/types';
 import { useCopyLogLink } from 'hooks/logs/useCopyLogLink';
+import { useIsBodyJsonEnabled } from 'hooks/logs/useIsBodyJsonEnabled';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 // utils
-import { FlatLogData } from 'lib/logs/flatLogData';
+import { FlatLogData, getLogFieldValue } from 'lib/logs/flatLogData';
+import { getBodyDisplay } from 'lib/logs/logBody';
 import { useTimezone } from 'providers/Timezone';
 // interfaces
 import { IField } from 'types/api/logs/fields';
 import { ILog } from 'types/api/logs/log';
+import { coerceToString, isScalarFieldValue } from 'utils/stringUtils';
 
 // components
 import AddToQueryHOC, { AddToQueryHOCProps } from '../AddToQueryHOC';
@@ -26,7 +26,6 @@ import LogStateIndicator from '../LogStateIndicator/LogStateIndicator';
 import { getLogIndicatorType } from '../LogStateIndicator/utils';
 // styles
 import { Container, LogContainer, LogText } from './styles';
-import { isValidLogField } from './util';
 
 import './ListLogView.styles.scss';
 
@@ -37,8 +36,9 @@ interface LogFieldProps {
 	fontSize: FontSize;
 }
 
-type LogSelectedFieldProps = Omit<LogFieldProps, 'linesPerRow'> &
-	Pick<AddToQueryHOCProps, 'onAddToQuery'>;
+type LogSelectedFieldProps = Omit<LogFieldProps, 'linesPerRow' | 'fieldValue'> &
+	Pick<AddToQueryHOCProps, 'fieldValue'> &
+	Partial<Pick<AddToQueryHOCProps, 'onAddToQuery'>>;
 
 function LogGeneralField({
 	fieldKey,
@@ -75,27 +75,35 @@ function LogSelectedField({
 	onAddToQuery,
 	fontSize,
 }: LogSelectedFieldProps): JSX.Element {
+	const fieldKeyText = (
+		<Typography.Text>
+			<span
+				style={{ color: blue[4] }}
+				className={cx('selected-log-field-key', fontSize)}
+			>
+				{fieldKey}
+			</span>
+		</Typography.Text>
+	);
+
 	return (
 		<div className="log-selected-fields">
-			<AddToQueryHOC
-				fieldKey={fieldKey}
-				fieldValue={fieldValue}
-				onAddToQuery={onAddToQuery}
-				fontSize={fontSize}
-			>
-				<Typography.Text>
-					<span
-						style={{ color: blue[4] }}
-						className={cx('selected-log-field-key', fontSize)}
-					>
-						{fieldKey}
-					</span>
-				</Typography.Text>
-			</AddToQueryHOC>
+			{onAddToQuery ? (
+				<AddToQueryHOC
+					fieldKey={fieldKey}
+					fieldValue={fieldValue}
+					onAddToQuery={onAddToQuery}
+					fontSize={fontSize}
+				>
+					{fieldKeyText}
+				</AddToQueryHOC>
+			) : (
+				fieldKeyText
+			)}
 			<Typography.Text truncate={1} className={cx('selected-log-kv', fontSize)}>
 				<span className={cx('selected-log-field-key', fontSize)}>{': '}</span>
 				<span className={cx('selected-log-value', fontSize)}>
-					{fieldValue || "''"}
+					{coerceToString(fieldValue) || "''"}
 				</span>
 			</Typography.Text>
 		</div>
@@ -130,6 +138,7 @@ function ListLogView({
 	onClearActiveLog,
 }: ListLogViewProps): JSX.Element {
 	const flattenLogData = useMemo(() => FlatLogData(logData), [logData]);
+	const isBodyJsonEnabled = useIsBodyJsonEnabled();
 
 	const { isHighlighted, isLogsExplorerPage, onLogCopy } = useCopyLogLink(
 		logData.id,
@@ -200,7 +209,7 @@ function ListLogView({
 							{updatedSelecedFields.some((field) => field.name === 'body') && (
 								<LogGeneralField
 									fieldKey="Log"
-									fieldValue={getBodyDisplayString(logData.body)}
+									fieldValue={getBodyDisplay(logData.body)}
 									linesPerRow={linesPerRow}
 									fontSize={fontSize}
 								/>
@@ -222,17 +231,22 @@ function ListLogView({
 
 							{updatedSelecedFields
 								.filter((field) => !['timestamp', 'body'].includes(field.name))
-								.map((field) =>
-									isValidLogField(flattenLogData[field.name] as never) ? (
+								.map((field) => {
+									const value = getLogFieldValue(logData, field.name, isBodyJsonEnabled);
+									if (value == null) {
+										return null;
+									}
+									const queryValue = isScalarFieldValue(value) ? value : undefined;
+									return (
 										<LogSelectedField
 											key={field.name}
 											fieldKey={field.name}
-											fieldValue={flattenLogData[field.name] as never}
-											onAddToQuery={onAddToQuery}
+											fieldValue={queryValue ?? coerceToString(value)}
+											onAddToQuery={queryValue === undefined ? undefined : onAddToQuery}
 											fontSize={fontSize}
 										/>
-									) : null,
-								)}
+									);
+								})}
 						</LogContainer>
 					</div>
 				</div>

frontend/src/components/Logs/ListLogView/util.ts

@@ -1 +0,0 @@
-export const isValidLogField = (value: never): boolean => value !== undefined;

frontend/src/components/Logs/RawLogView/index.tsx

@@ -9,16 +9,16 @@ import { Color } from '@signozhq/design-tokens';
 import { Tooltip } from 'antd';
 import { VIEW_TYPES } from 'components/LogDetail/constants';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
-import {
-	getBodyDisplayString,
-	getSanitizedLogBody,
-} from 'container/LogDetailedView/utils';
+import { getSanitizedLogBody } from 'container/LogDetailedView/utils';
 import { useCopyLogLink } from 'hooks/logs/useCopyLogLink';
+import { useIsBodyJsonEnabled } from 'hooks/logs/useIsBodyJsonEnabled';
 // hooks
 import { useIsDarkMode } from 'hooks/useDarkMode';
-import { FlatLogData } from 'lib/logs/flatLogData';
-import { isEmpty, isNumber, isUndefined } from 'lodash-es';
+import { getLogFieldValue } from 'lib/logs/flatLogData';
+import { getBodyDisplay } from 'lib/logs/logBody';
+import { isBoolean, isEmpty, isNumber, isUndefined } from 'lodash-es';
 import { useTimezone } from 'providers/Timezone';
+import { coerceToString } from 'utils/stringUtils';
 
 import LogLinesActionButtons from '../LogLinesActionButtons/LogLinesActionButtons';
 import LogStateIndicator from '../LogStateIndicator/LogStateIndicator';
@@ -46,7 +46,7 @@ function RawLogView({
 		isLogsExplorerPage,
 		onLogCopy,
 	} = useCopyLogLink(data.id);
-	const flattenLogData = useMemo(() => FlatLogData(data), [data]);
+	const isBodyJsonEnabled = useIsBodyJsonEnabled();
 
 	const isDarkMode = useIsDarkMode();
 	const isReadOnlyLog = !isLogsExplorerPage || isReadOnly;
@@ -60,15 +60,16 @@ function RawLogView({
 
 	const attributesValues = updatedSelecedFields
 		.filter((field) => !['timestamp', 'body'].includes(field.name))
-		.map((field) => flattenLogData[field.name])
+		.map((field) => getLogFieldValue(data, field.name, isBodyJsonEnabled))
 		.filter((attribute) => {
 			// loadash isEmpty doesnot work with numbers
-			if (isNumber(attribute)) {
+			if (isNumber(attribute) || isBoolean(attribute)) {
 				return true;
 			}
 
 			return !isUndefined(attribute) && !isEmpty(attribute);
-		});
+		})
+		.map((attribute) => coerceToString(attribute));
 
 	let attributesText = attributesValues.join(' | ');
 
@@ -102,7 +103,7 @@ function RawLogView({
 		// Check if body is selected
 		const showBody = selectedFields.some((field) => field.name === 'body');
 		if (showBody) {
-			parts.push(`${attributesText} ${getBodyDisplayString(data.body)}`);
+			parts.push(`${attributesText} ${getBodyDisplay(data.body)}`);
 		} else {
 			parts.push(attributesText);
 		}

frontend/src/components/Logs/TableView/__tests__/useLogsTableColumns.test.tsx

@@ -1,16 +1,20 @@
-import { renderHook } from '@testing-library/react';
 import { FontSize } from 'container/OptionsMenu/types';
+import { render, renderHook, screen } from 'tests/test-utils';
 import { IField } from 'types/api/logs/fields';
+import { ILog } from 'types/api/logs/log';
 
 import { useLogsTableColumns } from '../useLogsTableColumns';
 
 jest.mock('providers/Timezone', () => ({
+	__esModule: true,
+	...jest.requireActual('providers/Timezone'),
 	useTimezone: (): { formatTimezoneAdjustedTimestamp: jest.Mock } => ({
 		formatTimezoneAdjustedTimestamp: jest.fn(() => 'TS'),
 	}),
 }));
 
 jest.mock('providers/App/App', () => ({
+	...jest.requireActual('providers/App/App'),
 	useAppContext: (): { featureFlags: [] } => ({ featureFlags: [] }),
 }));
 
@@ -165,3 +169,36 @@ describe('useLogsTableColumns — selectColumns-order respected', () => {
 		expect(result.current.map((c) => c.id)).toStrictEqual(['state-indicator']);
 	});
 });
+
+describe('useLogsTableColumns — cell values', () => {
+	const asLog = (partial: Partial<ILog>): ILog => partial as unknown as ILog;
+
+	it('shows an empty body cell for a row without a body', () => {
+		const { result } = renderHook(() =>
+			useLogsTableColumns({
+				fields: [field('body', 'log')],
+				fontSize: FontSize.SMALL,
+			}),
+		);
+		const bodyCol = result.current.find((c) => c.id === 'log:body');
+
+		expect(bodyCol?.accessorFn?.(asLog({}))).toBe('');
+	});
+
+	it('renders an object-valued field as JSON, not [object Object]', () => {
+		const { result } = renderHook(() =>
+			useLogsTableColumns({
+				fields: [field('order')],
+				fontSize: FontSize.SMALL,
+			}),
+		);
+		const orderCol = result.current.find((c) => c.id === 'order');
+		const Cell = orderCol?.cell as (props: { value: unknown }) => JSX.Element;
+
+		render(<Cell value={{ id: 8412, coupons: ['WELCOME10'] }} />);
+
+		expect(
+			screen.getByText('{"id":8412,"coupons":["WELCOME10"]}'),
+		).toBeInTheDocument();
+	});
+});

frontend/src/components/Logs/TableView/useLogsTableColumns.tsx

@@ -2,18 +2,16 @@ import type { ReactElement } from 'react';
 import { useMemo } from 'react';
 import TanStackTable from 'components/TanStackTableView';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
-import { FeatureKeys } from 'constants/features';
-import {
-	getBodyDisplayString,
-	getSanitizedLogBody,
-} from 'container/LogDetailedView/utils';
+import { getSanitizedLogBody } from 'container/LogDetailedView/utils';
 import { FontSize } from 'container/OptionsMenu/types';
 import { buildCompositeKey } from 'container/OptionsMenu/utils';
+import { useIsBodyJsonEnabled } from 'hooks/logs/useIsBodyJsonEnabled';
 import { getLogFieldValue } from 'lib/logs/flatLogData';
-import { useAppContext } from 'providers/App/App';
+import { getBodyDisplay } from 'lib/logs/logBody';
 import { useTimezone } from 'providers/Timezone';
 import { IField } from 'types/api/logs/fields';
 import { ILog } from 'types/api/logs/log';
+import { coerceToString } from 'utils/stringUtils';
 
 import type { TableColumnDef } from '../../TanStackTableView/types';
 import LogStateIndicator from '../LogStateIndicator/LogStateIndicator';
@@ -28,10 +26,7 @@ export function useLogsTableColumns({
 	fontSize,
 }: UseLogsTableColumnsProps): TableColumnDef<ILog>[] {
 	const { formatTimezoneAdjustedTimestamp } = useTimezone();
-	const { featureFlags } = useAppContext();
-	const isBodyJsonEnabled =
-		featureFlags?.find((flag) => flag.name === FeatureKeys.USE_JSON_BODY)
-			?.active || false;
+	const isBodyJsonEnabled = useIsBodyJsonEnabled();
 
 	return useMemo<TableColumnDef<ILog>[]>(() => {
 		const stateIndicatorCol: TableColumnDef<ILog> = {
@@ -75,7 +70,7 @@ export function useLogsTableColumns({
 		const bodyCol: TableColumnDef<ILog> = {
 			id: buildCompositeKey('body', 'log'),
 			header: 'Body',
-			accessorFn: (log): string => getBodyDisplayString(log.body),
+			accessorFn: (log): string => getBodyDisplay(log.body),
 			canBeHidden: false,
 			enableRemove: false,
 			width: { default: '100%', min: 300 },
@@ -99,7 +94,7 @@ export function useLogsTableColumns({
 			enableRemove: true,
 			width: { min: 192 },
 			cell: ({ value }): ReactElement => (
-				<TanStackTable.Text>{String(value ?? '')}</TanStackTable.Text>
+				<TanStackTable.Text>{coerceToString(value)}</TanStackTable.Text>
 			),
 		});
 

frontend/src/components/LogsFormatOptionsMenu/LogsFormatOptionsMenu.styles.scss

@@ -18,71 +18,51 @@
 			right: -2px;
 			width: 240px;
 
+			[data-format-menu='back'],
+			[data-format-menu='font-option'],
+			[data-format-menu='font-size'],
+			[data-format-menu='edit-columns'] {
+				--button-justify-content: flex-start;
+			}
+
+			[data-format-menu='font-option'],
+			[data-format-menu='font-size'],
+			[data-format-menu='edit-columns'] {
+				--button-label-min-width: 100%;
+				--button-font-size: 13px;
+				--button-variant-link-font-weight: 400;
+				--button-size-line-height: 20px;
+			}
+
+			[data-format-menu='back'] {
+				text-transform: uppercase;
+			}
+
+			[data-format-menu='font-option'],
+			[data-format-menu='font-size'] {
+				text-transform: capitalize;
+			}
+
+			.menu-row {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				gap: 8px;
+			}
+
 			.font-size-dropdown {
 				display: flex;
 				flex-direction: column;
+				gap: 4px;
+				padding: 8px 12px;
 
-				.back-btn {
-					display: flex;
-					align-items: center;
-					gap: 4px;
-					padding: 12px;
-					border: none !important;
-					box-shadow: none !important;
-
-					.icon {
-						flex-shrink: 0;
-					}
-
-					.text {
-						color: var(--l1-foreground);
-						font-family: Inter;
-						font-size: 11px;
-						font-style: normal;
-						font-weight: 500;
-						line-height: 20px; /* 142.857% */
-						letter-spacing: 0.14px;
-						text-transform: uppercase;
-					}
-				}
-
-				.back-btn:hover {
-					background-color: unset !important;
+				.horizontal-line {
+					margin-inline: -12px;
 				}
 
 				.content {
 					display: flex;
 					flex-direction: column;
-					.option-btn {
-						display: flex;
-						align-items: center;
-						padding: 12px;
-						border: none !important;
-						box-shadow: none !important;
-						justify-content: space-between;
-
-						.icon {
-							flex-shrink: 0;
-						}
-						.text {
-							color: var(--l2-foreground);
-							font-family: Inter;
-							font-size: 13px;
-							font-style: normal;
-							font-weight: 400;
-							line-height: normal; /* 142.857% */
-							letter-spacing: 0.14px;
-							text-transform: capitalize;
-						}
-
-						.text:hover {
-							color: var(--l2-foreground);
-						}
-					}
-
-					.option-btn:hover {
-						background-color: unset !important;
-					}
 				}
 			}
 
@@ -102,31 +82,6 @@
 					letter-spacing: 0.88px;
 					text-transform: uppercase;
 				}
-
-				.value {
-					display: flex;
-					height: 20px;
-					padding: 4px 0px;
-					justify-content: space-between;
-					align-items: center;
-					border: none !important;
-					.font-value {
-						color: var(--l2-foreground);
-						font-family: Inter;
-						font-size: 13px;
-						font-style: normal;
-						font-weight: 400;
-						line-height: normal;
-						letter-spacing: 0.14px;
-						text-transform: capitalize;
-					}
-					.icon {
-					}
-				}
-
-				.value:hover {
-					background-color: unset !important;
-				}
 			}
 
 			.menu-container {
@@ -198,90 +153,10 @@
 						cursor: pointer;
 					}
 				}
-
-				.max-lines-per-row-input {
-					display: flex;
-
-					.ant-input-number-handler-wrap {
-						display: none;
-					}
-
-					.ant-input-number {
-						min-width: 36px;
-						width: auto;
-						border-right: none;
-						border-left: none;
-						border-top: 1px solid var(--l1-border);
-						border-bottom: 1px solid var(--l1-border);
-						text-align: center;
-						height: 26px;
-						border-radius: 0;
-
-						&:active,
-						&:focus {
-							border: none;
-							box-shadow: none;
-						}
-					}
-
-					.ant-input-number-focused {
-						box-shadow: none !important;
-					}
-
-					.ant-input-number-input-wrap {
-						input {
-							text-align: center;
-							font-size: 13px;
-
-							&:active,
-							&:focus {
-								border: none;
-							}
-						}
-
-						&:active,
-						&:focus {
-							border: none;
-						}
-					}
-
-					.periscope-btn {
-						box-shadow: none;
-						padding: 6px 12px;
-						height: 26px;
-
-						border-radius: 0px 1px 1px 0px;
-						background: var(--l3-background);
-					}
-				}
 			}
 
 			.edit-columns-container {
 				padding: 12px;
-
-				.edit-columns-btn {
-					display: flex;
-					width: 100%;
-					height: 20px;
-					padding: 4px 0px;
-					justify-content: space-between;
-					align-items: center;
-					border: none !important;
-
-					.edit-columns-text {
-						color: var(--l2-foreground);
-						font-family: Inter;
-						font-size: 13px;
-						font-style: normal;
-						font-weight: 400;
-						line-height: normal;
-						letter-spacing: 0.14px;
-					}
-				}
-
-				.edit-columns-btn:hover {
-					background-color: unset !important;
-				}
 			}
 
 			.add-new-column-container {

frontend/src/components/LogsFormatOptionsMenu/LogsFormatOptionsMenu.tsx

@@ -1,6 +1,7 @@
 import { useCallback, useEffect, useState } from 'react';
-import { Button, InputNumber, Popover, Tooltip } from 'antd';
-import { Typography } from '@signozhq/ui/typography';
+import { Popover, Tooltip } from 'antd';
+import { Button } from '@signozhq/ui/button';
+import { InputNumber } from '@signozhq/ui/input-number';
 import cx from 'classnames';
 import {
 	LogViewMode,
@@ -11,13 +12,15 @@ import {
 	Check,
 	ChevronLeft,
 	ChevronRight,
-	Minus,
-	Plus,
 	SlidersVertical,
 } from '@signozhq/icons';
 
 import './LogsFormatOptionsMenu.styles.scss';
 
+const MIN_LINES_PER_ROW = 1;
+const MAX_LINES_PER_ROW = 10;
+const FONT_SIZES = [FontSize.SMALL, FontSize.MEDIUM, FontSize.LARGE];
+
 interface LogsFormatOptionsMenuProps {
 	items: any;
 	selectedOptionFormat: any;
@@ -62,25 +65,11 @@ function OptionsMenu({
 		onChange(key);
 	};
 
-	const incrementMaxLinesPerRow = (): void => {
-		if (maxLinesPerRow < 10) {
-			setMaxLinesPerRow(maxLinesPerRow + 1);
-		}
-	};
-
-	const decrementMaxLinesPerRow = (): void => {
-		if (maxLinesPerRow > 1) {
-			setMaxLinesPerRow(maxLinesPerRow - 1);
-		}
-	};
-
-	const handleLinesPerRowChange = (maxLinesPerRow: number | null): void => {
-		if (
-			maxLinesPerRow &&
-			Number.isInteger(maxLinesNumber) &&
-			maxLinesPerRow > 1
-		) {
-			setMaxLinesPerRow(maxLinesPerRow);
+	const handleLinesPerRowChange = (value: number | null): void => {
+		if (value !== null) {
+			setMaxLinesPerRow(
+				Math.min(Math.max(value, MIN_LINES_PER_ROW), MAX_LINES_PER_ROW),
+			);
 		}
 	};
 
@@ -111,51 +100,36 @@ function OptionsMenu({
 			{isFontSizeOptionsOpen ? (
 				<div className="font-size-dropdown">
 					<Button
+						variant="link"
+						color="secondary"
+						size="sm"
+						width="100%"
+						data-format-menu="back"
+						testId="font-size-back"
+						prefix={<ChevronLeft size={14} />}
 						onClick={(): void => setIsFontSizeOptionsOpen(false)}
-						className="back-btn"
-						type="text"
 					>
-						<ChevronLeft size={14} className="icon" />
-						<Typography.Text className="text">Select font size</Typography.Text>
+						Select font size
 					</Button>
 					<div className="horizontal-line" />
 					<div className="content">
-						<Button
-							onClick={(): void => {
-								setFontSizeValue(FontSize.SMALL);
-							}}
-							className="option-btn"
-							type="text"
-						>
-							<Typography.Text className="text">{FontSize.SMALL}</Typography.Text>
-							{fontSizeValue === FontSize.SMALL && (
-								<Check size={14} className="icon" />
-							)}
-						</Button>
-						<Button
-							onClick={(): void => {
-								setFontSizeValue(FontSize.MEDIUM);
-							}}
-							className="option-btn"
-							type="text"
-						>
-							<Typography.Text className="text">{FontSize.MEDIUM}</Typography.Text>
-							{fontSizeValue === FontSize.MEDIUM && (
-								<Check size={14} className="icon" />
-							)}
-						</Button>
-						<Button
-							onClick={(): void => {
-								setFontSizeValue(FontSize.LARGE);
-							}}
-							className="option-btn"
-							type="text"
-						>
-							<Typography.Text className="text">{FontSize.LARGE}</Typography.Text>
-							{fontSizeValue === FontSize.LARGE && (
-								<Check size={14} className="icon" />
-							)}
-						</Button>
+						{FONT_SIZES.map((size) => (
+							<Button
+								key={size}
+								variant="link"
+								color="secondary"
+								size="sm"
+								width="100%"
+								data-format-menu="font-option"
+								testId={`font-size-option-${size}`}
+								onClick={(): void => setFontSizeValue(size)}
+							>
+								<span className="menu-row">
+									{size}
+									{fontSizeValue === size && <Check size={14} />}
+								</span>
+							</Button>
+						))}
 					</div>
 				</div>
 			) : (
@@ -163,14 +137,20 @@ function OptionsMenu({
 					<div className="font-size-container">
 						<div className="title">Font Size</div>
 						<Button
-							className="value"
-							type="text"
+							variant="link"
+							color="secondary"
+							size="sm"
+							width="100%"
+							data-format-menu="font-size"
+							testId="font-size-select"
 							onClick={(): void => {
 								setIsFontSizeOptionsOpen(true);
 							}}
 						>
-							<Typography.Text className="font-value">{fontSizeValue}</Typography.Text>
-							<ChevronRight size={14} className="icon" />
+							<span className="menu-row">
+								{fontSizeValue}
+								<ChevronRight size={14} />
+							</span>
 						</Button>
 					</div>
 					<div className="horizontal-line" />
@@ -200,30 +180,20 @@ function OptionsMenu({
 							<div className="horizontal-line" />
 							<div className="max-lines-per-row">
 								<div className="title"> max lines per row </div>
-								<div className="raw-format max-lines-per-row-input">
-									<button
-										type="button"
-										className="periscope-btn"
-										onClick={decrementMaxLinesPerRow}
-									>
-										{' '}
-										<Minus size={12} />{' '}
-									</button>
-									<InputNumber
-										min={1}
-										max={10}
-										value={maxLinesPerRow}
-										onChange={handleLinesPerRowChange}
-									/>
-									<button
-										type="button"
-										className="periscope-btn"
-										onClick={incrementMaxLinesPerRow}
-									>
-										{' '}
-										<Plus size={12} />{' '}
-									</button>
-								</div>
+								<InputNumber
+									controls
+									mode="spinner"
+									size="small"
+									min={MIN_LINES_PER_ROW}
+									max={MAX_LINES_PER_ROW}
+									precision={0}
+									value={maxLinesPerRow}
+									onChange={handleLinesPerRowChange}
+									aria-label="Max lines per row"
+									decrementAriaLabel="Fewer lines per row"
+									incrementAriaLabel="More lines per row"
+									testId="max-lines-per-row"
+								/>
 							</div>
 						</>
 					)}
@@ -233,15 +203,18 @@ function OptionsMenu({
 							<div className="horizontal-line" />
 							<div className="edit-columns-container">
 								<Button
-									className="edit-columns-btn"
-									type="text"
+									variant="link"
+									color="secondary"
+									size="sm"
+									width="100%"
+									data-format-menu="edit-columns"
 									onClick={handleEditColumns}
-									data-testid="periscope-btn-edit-columns"
+									testId="periscope-btn-edit-columns"
 								>
-									<Typography.Text className="edit-columns-text">
+									<span className="menu-row">
 										Edit columns
-									</Typography.Text>
-									<ChevronRight size={14} className="icon" />
+										<ChevronRight size={14} />
+									</span>
 								</Button>
 							</div>
 						</>
@@ -280,10 +253,15 @@ function LogsFormatOptionsMenu({
 		>
 			<Tooltip title="Options">
 				<Button
-					className="periscope-btn ghost"
-					icon={<SlidersVertical size="md" />}
-					data-testid="periscope-btn-format-options"
-				/>
+					variant="ghost"
+					color="secondary"
+					size="sm"
+					icon
+					aria-label="Options"
+					testId="periscope-btn-format-options"
+				>
+					<SlidersVertical size={14} />
+				</Button>
 			</Tooltip>
 		</Popover>
 	);

frontend/src/components/LogsFormatOptionsMenu/__tests__/LogsFormatOptionsMenu.test.tsx

@@ -1,5 +1,11 @@
 import { FontSize } from 'container/OptionsMenu/types';
-import { fireEvent, render, waitFor } from 'tests/test-utils';
+import {
+	fireEvent,
+	render,
+	screen,
+	userEvent,
+	waitFor,
+} from 'tests/test-utils';
 
 import LogsFormatOptionsMenu from '../LogsFormatOptionsMenu';
 
@@ -107,18 +113,12 @@ describe('LogsFormatOptionsMenu (unit)', () => {
 	});
 
 	it('increments max-lines and calls onChange', async () => {
-		const { maxLinesOnChange } = setup();
+		const { maxLinesOnChange, getByTestId } = setup();
 
 		// Increment max lines
-		const input = document.querySelector(
-			'.max-lines-per-row-input input',
-		) as HTMLInputElement;
+		const input = getByTestId('max-lines-per-row') as HTMLInputElement;
 		const initial = Number(input.value);
-		const buttons = document.querySelectorAll(
-			'.max-lines-per-row-input .periscope-btn',
-		);
-		const incrementBtn = buttons[1] as HTMLElement;
-		fireEvent.click(incrementBtn);
+		fireEvent.click(screen.getByRole('button', { name: 'More lines per row' }));
 
 		await waitFor(() => {
 			expect(Number(input.value)).toBe(initial + 1);
@@ -128,28 +128,47 @@ describe('LogsFormatOptionsMenu (unit)', () => {
 		});
 	});
 
+	it('clamps a typed max-lines value to 10', async () => {
+		const { maxLinesOnChange, getByTestId } = setup();
+		const input = getByTestId('max-lines-per-row') as HTMLInputElement;
+		const user = userEvent.setup();
+
+		await user.clear(input);
+		await user.type(input, '15');
+		await user.tab();
+
+		await waitFor(() => expect(input.value).toBe('10'));
+		expect(maxLinesOnChange).toHaveBeenLastCalledWith(10);
+	});
+
+	it('stops max-lines at 10', async () => {
+		const { getByTestId } = setup();
+		const input = getByTestId('max-lines-per-row') as HTMLInputElement;
+		const increment = screen.getByRole('button', { name: 'More lines per row' });
+		const user = userEvent.setup();
+
+		for (let i = 0; i < 12; i++) {
+			await user.click(increment);
+		}
+
+		await waitFor(() => expect(input.value).toBe('10'));
+	});
+
 	it('changes font size to MEDIUM and calls onChange', async () => {
-		const { fontSizeOnChange } = setup();
+		const { fontSizeOnChange, getByTestId } = setup();
 		// Open font dropdown
-		const fontButton = document.querySelector(
-			'.font-size-container .value',
-		) as HTMLElement;
-		fireEvent.click(fontButton);
+		fireEvent.click(getByTestId('font-size-select'));
 
 		// Choose MEDIUM
-		const optionButtons = Array.from(
-			document.querySelectorAll('.font-size-dropdown .option-btn'),
-		);
-		const mediumBtn = optionButtons[1] as HTMLElement;
-		fireEvent.click(mediumBtn);
+		fireEvent.click(getByTestId(`font-size-option-${FontSize.MEDIUM}`));
 
 		await waitFor(() => {
 			expect(
-				document.querySelectorAll('.font-size-dropdown .option-btn .icon'),
-			).toHaveLength(1);
-			expect(
-				(optionButtons[1] as Element).querySelector('.icon'),
+				getByTestId(`font-size-option-${FontSize.MEDIUM}`).querySelector('svg'),
 			).toBeInTheDocument();
+			expect(
+				getByTestId(`font-size-option-${FontSize.SMALL}`).querySelector('svg'),
+			).not.toBeInTheDocument();
 		});
 		await waitFor(() => {
 			expect(fontSizeOnChange).toHaveBeenCalledWith(FontSize.MEDIUM);

frontend/src/components/TanStackTableView/useRowNavigation.ts

@@ -0,0 +1,38 @@
+import { useCallback } from 'react';
+
+export type UseRowNavigationParams<TData> = {
+	rows: TData[];
+	activeIndex: number;
+	onNavigate: (row: TData, index: number) => void;
+};
+
+export type UseRowNavigationResult = {
+	goToPrev: () => void;
+	goToNext: () => void;
+	isPrevDisabled: boolean;
+	isNextDisabled: boolean;
+};
+
+/** Steps the active row through the loaded rows; stops at either end. */
+export function useRowNavigation<TData>({
+	rows,
+	activeIndex,
+	onNavigate,
+}: UseRowNavigationParams<TData>): UseRowNavigationResult {
+	const isPrevDisabled = activeIndex <= 0;
+	const isNextDisabled = activeIndex < 0 || activeIndex >= rows.length - 1;
+
+	const goToPrev = useCallback((): void => {
+		if (!isPrevDisabled) {
+			onNavigate(rows[activeIndex - 1], activeIndex - 1);
+		}
+	}, [isPrevDisabled, onNavigate, rows, activeIndex]);
+
+	const goToNext = useCallback((): void => {
+		if (!isNextDisabled) {
+			onNavigate(rows[activeIndex + 1], activeIndex + 1);
+		}
+	}, [isNextDisabled, onNavigate, rows, activeIndex]);
+
+	return { goToPrev, goToNext, isPrevDisabled, isNextDisabled };
+}

frontend/src/constants/events.ts

@@ -8,35 +8,3 @@ export enum Events {
 	TOOLTIP_CONTENT_SCROLLED = 'TOOLTIP_CONTENT_SCROLLED',
 	TOOLTIP_SYNC_MODE_CHANGED = 'TOOLTIP_SYNC_MODE_CHANGED',
 }
-
-export enum InfraMonitoringEvents {
-	PageVisited = 'Infra Monitoring: page visited',
-	PageNumberChanged = 'Infra Monitoring: page number changed',
-	GroupByChanged = 'Infra Monitoring: group by changed',
-	FilterApplied = 'Infra Monitoring: filter applied',
-	ItemClicked = 'Infra Monitoring: item clicked',
-	TabChanged = 'Infra Monitoring: tab changed',
-	TimeUpdated = 'Infra Monitoring: time updated',
-	ExploreClicked = 'Infra Monitoring: explore clicked',
-	HostEntity = 'host',
-	K8sEntity = 'k8s',
-	ListPage = 'list',
-	DetailedPage = 'detailed',
-	LogsView = 'logs',
-	TracesView = 'traces',
-	EventsView = 'events',
-	QuickFiltersView = 'quick filters',
-	MetricsView = 'metrics',
-	Total = 'total',
-	Cluster = 'cluster',
-	Container = 'container',
-	DaemonSet = 'daemonSet',
-	Deployment = 'deployment',
-	Job = 'job',
-	Namespace = 'namespace',
-	Node = 'node',
-	Volume = 'volume',
-	Pod = 'pod',
-	StatefulSet = 'statefulSet',
-	Volumes = 'volumes',
-}

frontend/src/container/AIAssistant/components/ActionsSection/ActionsSection.tsx

@@ -48,18 +48,19 @@ import { AIAssistantEvents, SuggestedPromptCategory } from '../../events';
 import { useAIAssistantAnalyticsContext } from '../../hooks/useAIAssistantAnalyticsContext';
 import { useAIAssistantStore } from '../../store/useAIAssistantStore';
 
+import { getOpenResourceTarget } from './utils/getOpenResourceTarget';
 import {
 	getPanelTypeForRequestType,
 	requestTypeFromActionQuery,
 } from './utils/getPanelTypeForRequestType';
+import { isOnResourcePage } from './utils/isOnResourcePage';
 import { openSavedViewByKey } from './utils/openSavedView';
 import {
 	isSavedViewOpenAction,
-	resolveOpenResourceType,
 	resolveResourceId,
 	resolveSavedViewSourceHint,
 } from './utils/resolveOpenResource';
-import { ResourceType, resourceRoute } from './utils/resourceRoute';
+import { ResourceType } from './utils/resourceRoute';
 
 import styles from './ActionsSection.module.scss';
 
@@ -397,7 +398,7 @@ export default function ActionsSection({
 	actions,
 	messageId,
 }: ActionsSectionProps): JSX.Element | null {
-	const { pathname } = useAppLocation();
+	const { pathname, search } = useAppLocation();
 	const sendMessage = useAIAssistantStore((s) => s.sendMessage);
 	const { threadId, page, mode } = useAIAssistantAnalyticsContext();
 	const { redirectWithQueryBuilderData, handleSetQueryData } = useQueryBuilder();
@@ -493,23 +494,17 @@ export default function ActionsSection({
 			return;
 		}
 
-		const resourceType = resolveOpenResourceType(action);
-		const resourceId = resolveResourceId(action);
-		if (!resourceType || !resourceId) {
-			return;
-		}
-
-		const path = resourceRoute(resourceType, resourceId);
-		if (!path) {
+		const target = getOpenResourceTarget(action);
+		if (!target) {
 			return;
 		}
 		void logEvent(AIAssistantEvents.ResourceOpened, {
 			threadId,
 			messageId,
-			targetModule: targetModuleForResource(resourceType),
-			resourceId,
+			targetModule: targetModuleForResource(target.resourceType),
+			resourceId: target.resourceId,
 		});
-		navigate(path);
+		navigate(target.path);
 	};
 
 	const handleClick = (key: string, action: MessageActionDTO): void => {
@@ -607,6 +602,10 @@ export default function ActionsSection({
 					// is still surfaced visually via the suffix pill below.
 
 					const tooltip = isError ? result.error : (action.tooltip ?? undefined);
+					const openTarget = getOpenResourceTarget(action);
+					const isViewingResource =
+						openTarget !== null &&
+						isOnResourcePage(openTarget.path, { pathname, search });
 
 					let icon: JSX.Element;
 					if (isSuccess) {
@@ -619,12 +618,16 @@ export default function ActionsSection({
 
 					const chip = (
 						<Button
-							disabledTooltip="This action already ran"
+							disabledTooltip={
+								isViewingResource
+									? "You're already viewing this page"
+									: 'This action already ran'
+							}
 							variant="outlined"
 							color="secondary"
 							size="sm"
 							onClick={(): void => handleClick(key, action)}
-							disabled={isSuccess}
+							disabled={isSuccess || isViewingResource}
 							loading={isLoading}
 							aria-label={action.label}
 							testId={`ai-action-chip-${action.kind}`}

frontend/src/container/AIAssistant/components/ActionsSection/__tests__/ActionsSection.openResource.test.tsx

@@ -0,0 +1,99 @@
+import {
+	MessageActionDTO,
+	MessageActionKindDTO,
+} from 'api/ai-assistant/sigNozAIAssistantAPI.schemas';
+import logEvent from 'api/common/logEvent';
+import { getCurrentLocation, navigate } from 'lib/router/navigation';
+import { act, render, screen, userEvent, waitFor } from 'tests/test-utils';
+
+import { AIAssistantEvents } from '../../../events';
+import ActionsSection from '../ActionsSection';
+
+jest.mock('api/common/logEvent');
+
+const mockLogEvent = jest.mocked(logEvent);
+
+const OPEN_ALERT: MessageActionDTO = {
+	kind: MessageActionKindDTO.open_resource,
+	label: 'Open alert',
+	resourceType: 'alert',
+	resourceId: 'rule-1',
+	actionMetadataId: 'meta-1',
+};
+
+const OPEN_ALERT_CHIP = 'ai-action-chip-open_resource';
+
+describe('ActionsSection open_resource', () => {
+	beforeEach(() => {
+		mockLogEvent.mockClear();
+	});
+
+	it.each([
+		'/alerts/edit?ruleId=rule-1&tab=1',
+		'/alerts/overview?ruleId=rule-1&relativeTime=6h',
+	])('disables Open alert while that alert is open at %s', async (route) => {
+		const user = userEvent.setup({ pointerEventsCheck: 0 });
+		render(
+			<ActionsSection actions={[OPEN_ALERT]} messageId="message-1" />,
+			undefined,
+			{ initialRoute: route },
+		);
+
+		const chip = screen.getByTestId(OPEN_ALERT_CHIP);
+		// With a disabled tooltip the button is aria-disabled so the tooltip stays reachable.
+		expect(chip).toHaveAttribute('aria-disabled', 'true');
+
+		await user.click(chip);
+
+		expect(`${getCurrentLocation().pathname}${getCurrentLocation().search}`).toBe(
+			route,
+		);
+		expect(mockLogEvent).not.toHaveBeenCalled();
+	});
+
+	it.each(['/alerts/edit?ruleId=rule-2', '/alerts/history?ruleId=rule-1'])(
+		'opens the alert from %s',
+		async (route) => {
+			const user = userEvent.setup({ pointerEventsCheck: 0 });
+			render(
+				<ActionsSection actions={[OPEN_ALERT]} messageId="message-2" />,
+				undefined,
+				{ initialRoute: route },
+			);
+
+			const chip = screen.getByTestId(OPEN_ALERT_CHIP);
+			expect(chip).not.toHaveAttribute('aria-disabled', 'true');
+
+			await user.click(chip);
+
+			await waitFor(() =>
+				expect(
+					`${getCurrentLocation().pathname}${getCurrentLocation().search}`,
+				).toBe('/alerts/edit?ruleId=rule-1'),
+			);
+			expect(mockLogEvent).toHaveBeenCalledWith(
+				AIAssistantEvents.ResourceOpened,
+				expect.objectContaining({ resourceId: 'rule-1' }),
+			);
+		},
+	);
+
+	it('enables Open alert again after navigating away from that alert', () => {
+		render(
+			<ActionsSection actions={[OPEN_ALERT]} messageId="message-3" />,
+			undefined,
+			{ initialRoute: '/alerts/edit?ruleId=rule-1' },
+		);
+		expect(screen.getByTestId(OPEN_ALERT_CHIP)).toHaveAttribute(
+			'aria-disabled',
+			'true',
+		);
+
+		act(() => navigate('/alerts/edit?ruleId=rule-2'));
+
+		expect(screen.getByTestId(OPEN_ALERT_CHIP)).not.toHaveAttribute(
+			'aria-disabled',
+			'true',
+		);
+	});
+});

frontend/src/container/AIAssistant/components/ActionsSection/utils/getOpenResourceTarget.ts

@@ -0,0 +1,39 @@
+import {
+	type MessageActionDTO,
+	MessageActionKindDTO,
+} from 'api/ai-assistant/sigNozAIAssistantAPI.schemas';
+
+import {
+	isSavedViewOpenAction,
+	resolveOpenResourceType,
+	resolveResourceId,
+} from './resolveOpenResource';
+import { resourceRoute } from './resourceRoute';
+
+export interface OpenResourceTarget {
+	path: string;
+	resourceType: string;
+	resourceId: string;
+}
+
+// Saved views return null so they're never disabled: reopening one resets the explorer to the saved query.
+export function getOpenResourceTarget(
+	action: MessageActionDTO,
+): OpenResourceTarget | null {
+	if (
+		action.kind !== MessageActionKindDTO.open_resource ||
+		isSavedViewOpenAction(action)
+	) {
+		return null;
+	}
+	const resourceType = resolveOpenResourceType(action);
+	const resourceId = resolveResourceId(action);
+	if (!resourceType || !resourceId) {
+		return null;
+	}
+	const path = resourceRoute(resourceType, resourceId);
+	if (!path) {
+		return null;
+	}
+	return { path, resourceType, resourceId };
+}

frontend/src/container/AIAssistant/components/ActionsSection/utils/isOnResourcePage.ts

@@ -0,0 +1,23 @@
+import ROUTES from 'constants/routes';
+import type { AppLocation } from 'lib/router/types';
+
+// The alert details Overview tab renders the same editor as the edit route.
+const EQUIVALENT_PATHNAMES: Record<string, string[]> = {
+	[ROUTES.EDIT_ALERTS]: [ROUTES.ALERT_OVERVIEW],
+};
+
+// Extra params on the current page (time range, view options) don't make it a different resource.
+export function isOnResourcePage(
+	path: string,
+	location: Pick<AppLocation, 'pathname' | 'search'>,
+): boolean {
+	const [pathname, query = ''] = path.split('?');
+	const pathnames = [pathname, ...(EQUIVALENT_PATHNAMES[pathname] ?? [])];
+	if (!pathnames.includes(location.pathname)) {
+		return false;
+	}
+	const current = new URLSearchParams(location.search);
+	return [...new URLSearchParams(query)].every(
+		([key, value]) => current.get(key) === value,
+	);
+}

frontend/src/container/AlertHistory/Statistics/StatsCard/StatsCard.tsx

@@ -3,6 +3,7 @@ import { Tooltip } from 'antd';
 import { QueryParams } from 'constants/query';
 import useUrlQuery from 'hooks/useUrlQuery';
 import { ArrowDownLeft, ArrowUpRight, Calendar } from '@signozhq/icons';
+import { useAlertHistoryQueryParams } from 'pages/AlertDetails/hooks';
 import { AlertRuleStats } from 'types/api/alerts/def';
 import { calculateChange } from 'utils/calculateChange';
 
@@ -86,7 +87,7 @@ function StatsCard({
 }: StatsCardProps): JSX.Element {
 	const urlQuery = useUrlQuery();
 
-	const relativeTime = urlQuery.get('relativeTime');
+	const { relativeTime } = useAlertHistoryQueryParams();
 
 	const { changePercentage, changeDirection } = calculateChange(
 		totalCurrentCount,

frontend/src/container/AlertHistory/Timeline/GraphWrapper/GraphWrapper.tsx

@@ -1,6 +1,8 @@
 import { useMemo } from 'react';
-import useUrlQuery from 'hooks/useUrlQuery';
-import { useGetAlertRuleDetailsTimelineGraphData } from 'pages/AlertDetails/hooks';
+import {
+	useAlertHistoryQueryParams,
+	useGetAlertRuleDetailsTimelineGraphData,
+} from 'pages/AlertDetails/hooks';
 import DataStateRenderer from 'periscope/components/DataStateRenderer/DataStateRenderer';
 import { AlertRuleTimelineGraphResponse } from 'types/api/alerts/def';
 
@@ -13,9 +15,7 @@ function GraphWrapper({
 }: {
 	totalCurrentTriggers: number;
 }): JSX.Element {
-	const urlQuery = useUrlQuery();
-
-	const relativeTime = urlQuery.get('relativeTime');
+	const { relativeTime } = useAlertHistoryQueryParams();
 
 	const { isLoading, isRefetching, isError, data, isValidRuleId, ruleId } =
 		useGetAlertRuleDetailsTimelineGraphData();

frontend/src/container/InfraMonitoringHostsV2/Hosts.tsx

@@ -17,7 +17,6 @@ import {
 	QuickFilterChangeEventData,
 	QuickFiltersSource,
 } from 'components/QuickFilters/types';
-import { InfraMonitoringEvents } from 'constants/events';
 import { initialQueriesMap } from 'constants/queryBuilder';
 import K8sBaseDetails, {
 	K8sDetailsFilters,
@@ -273,7 +272,6 @@ function Hosts(): JSX.Element {
 							fetchListData={fetchListData}
 							getRowKey={getHostRowKey}
 							getItemKey={getHostItemKey}
-							eventCategory={InfraMonitoringEvents.HostEntity}
 							detailsQueryKeyPrefix="hosts"
 						/>
 					</div>
@@ -281,7 +279,6 @@ function Hosts(): JSX.Element {
 			</div>
 			<K8sBaseDetails
 				category={InfraMonitoringEntity.HOSTS}
-				eventCategory={InfraMonitoringEvents.HostEntity}
 				getSelectedItemExpression={hostGetSelectedItemExpression}
 				fetchEntityData={fetchEntityData}
 				getEntityName={hostGetEntityName}

frontend/src/container/InfraMonitoringK8sV2/Base/K8sBaseDetails.tsx

@@ -6,10 +6,8 @@ import { Button } from '@signozhq/ui/button';
 import { DrawerWrapper, DrawerWrapperProps } from '@signozhq/ui/drawer';
 import { toast } from '@signozhq/ui/sonner';
 import { Typography } from '@signozhq/ui/typography';
-import logEvent from 'api/common/logEvent';
 import ErrorContent from 'components/ErrorModal/components/ErrorContent';
 import APIError from 'types/api/error';
-import { InfraMonitoringEvents } from 'constants/events';
 import {
 	GlobalTimeProvider,
 	NANO_SECOND_MULTIPLIER,
@@ -67,7 +65,6 @@ const DRAWER_MOTION_PROPS = {
 
 export default function K8sBaseDetails<T>({
 	category,
-	eventCategory,
 	getSelectedItemExpression,
 	fetchEntityData,
 	getEntityName,
@@ -224,16 +221,6 @@ export default function K8sBaseDetails<T>({
 		};
 	}, [entity, entityName, category]);
 
-	useEffect(() => {
-		if (entity) {
-			void logEvent(InfraMonitoringEvents.PageVisited, {
-				entity: InfraMonitoringEvents.K8sEntity,
-				page: InfraMonitoringEvents.DetailedPage,
-				category: eventCategory,
-			});
-		}
-	}, [entity, eventCategory]);
-
 	// Names the resource it returns to, so a drill several levels deep stays clear
 	const backTarget = previousEntry
 		? `Back to ${K8S_CATEGORY_SINGULAR_LABELS[previousEntry.category]}`
@@ -333,7 +320,6 @@ export default function K8sBaseDetails<T>({
 					<K8sBaseDetailsContent<T>
 						entity={entity}
 						category={category}
-						eventCategory={eventCategory}
 						metadataConfig={metadataConfig}
 						countsConfig={countsConfig}
 						getCountsFilterExpression={getCountsFilterExpression}

frontend/src/container/InfraMonitoringK8sV2/Base/K8sBaseDetailsContent.tsx

@@ -10,9 +10,7 @@ import {
 import { Button } from '@signozhq/ui/button';
 import { ToggleGroup } from '@signozhq/ui/toggle-group';
 import { Tooltip } from '@signozhq/ui/tooltip';
-import logEvent from 'api/common/logEvent';
 import { combineInitialAndUserExpression } from 'components/QueryBuilderV2/QueryV2/QuerySearch/utils';
-import { InfraMonitoringEvents } from 'constants/events';
 import { QueryParams } from 'constants/query';
 import {
 	initialQueryBuilderFormValuesMap,
@@ -55,7 +53,6 @@ import { logInfraExplorerNavigatedEvent } from 'container/InfraMonitoringK8sV2/B
 export default function K8sBaseDetailsContent<T>({
 	entity,
 	category,
-	eventCategory,
 	metadataConfig,
 	countsConfig,
 	getCountsFilterExpression,
@@ -138,14 +135,18 @@ export default function K8sBaseDetailsContent<T>({
 
 	// Wait until the view is a valid tab so we don't log a pending value before
 	// the validation effect above corrects an out-of-scope query param
-	const hasLoggedDefaultTab = useRef(false);
+	const loggedDefaultTabFor = useRef<string | null>(null);
 	useEffect(() => {
-		if (hasLoggedDefaultTab.current || !validTabs.includes(effectiveView)) {
+		const visitKey = `${category}:${selectedItem}`;
+		if (
+			loggedDefaultTabFor.current === visitKey ||
+			!validTabs.includes(effectiveView)
+		) {
 			return;
 		}
-		hasLoggedDefaultTab.current = true;
+		loggedDefaultTabFor.current = visitKey;
 		logInfraDrawerTabViewedEvent(category, effectiveView, true);
-	}, [validTabs, effectiveView, category]);
+	}, [validTabs, effectiveView, category, selectedItem]);
 
 	const [, setLogFiltersParam] = useInfraMonitoringLogFilters();
 	const [, setTracesFiltersParam] = useInfraMonitoringTracesFilters();
@@ -167,12 +168,6 @@ export default function K8sBaseDetailsContent<T>({
 		void setLogFiltersParam(null);
 		void setTracesFiltersParam(null);
 		void setEventsFiltersParam(null);
-		void logEvent(InfraMonitoringEvents.TabChanged, {
-			entity: InfraMonitoringEvents.K8sEntity,
-			page: InfraMonitoringEvents.DetailedPage,
-			category: eventCategory,
-			view: value,
-		});
 		logInfraDrawerTabViewedEvent(category, value, false);
 	};
 
@@ -188,13 +183,6 @@ export default function K8sBaseDetailsContent<T>({
 			urlQuery.set(QueryParams.endTime, (timeRange.endTime * 1000).toString());
 		}
 
-		void logEvent(InfraMonitoringEvents.ExploreClicked, {
-			entity: InfraMonitoringEvents.K8sEntity,
-			page: InfraMonitoringEvents.DetailedPage,
-			category: eventCategory,
-			view: effectiveView,
-		});
-
 		logInfraExplorerNavigatedEvent({
 			entityType: category,
 			destination:
@@ -416,7 +404,6 @@ export default function K8sBaseDetailsContent<T>({
 			{effectiveView === VIEW_TYPES.OVERVIEW && tabVisibility.showOverview && (
 				<EntityOverview
 					category={category}
-					eventEntity={eventCategory}
 					attributes={entityAttributes}
 					entity={entity}
 					entityName={entityName}
@@ -426,7 +413,6 @@ export default function K8sBaseDetailsContent<T>({
 			{effectiveView === VIEW_TYPES.METRICS && (
 				<EntityMetrics<T>
 					entity={entity}
-					eventEntity={eventCategory}
 					entityWidgetInfo={entityWidgetInfo}
 					getEntityQueryPayload={getEntityQueryPayload}
 					category={category}
@@ -436,7 +422,6 @@ export default function K8sBaseDetailsContent<T>({
 			)}
 			{effectiveView === VIEW_TYPES.LOGS && (
 				<EntityLogs
-					eventEntity={eventCategory}
 					queryKey={`${queryKeyPrefix}Logs`}
 					category={category}
 					initialExpression={logsAndTracesInitialExpression}
@@ -444,7 +429,6 @@ export default function K8sBaseDetailsContent<T>({
 			)}
 			{effectiveView === VIEW_TYPES.TRACES && (
 				<EntityTraces
-					eventEntity={eventCategory}
 					queryKey={`${queryKeyPrefix}Traces`}
 					category={category}
 					initialExpression={logsAndTracesInitialExpression}
@@ -452,7 +436,6 @@ export default function K8sBaseDetailsContent<T>({
 			)}
 			{effectiveView === VIEW_TYPES.EVENTS && tabVisibility.showEvents && (
 				<EntityEvents
-					eventEntity={eventCategory}
 					queryKey={`${queryKeyPrefix}Events`}
 					initialExpression={eventsInitialExpression}
 					category={category}

frontend/src/container/InfraMonitoringK8sV2/Base/K8sBaseList.tsx

@@ -1,7 +1,6 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useQuery, useQueryClient } from 'react-query';
 import { Typography } from '@signozhq/ui/typography';
-import logEvent from 'api/common/logEvent';
 import TanStackTable, {
 	SortState,
 	TableColumnDef,
@@ -10,7 +9,6 @@ import TanStackTable, {
 	useRecoverFromEmptyPage,
 	useTableParams,
 } from 'components/TanStackTableView';
-import { InfraMonitoringEvents } from 'constants/events';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useGlobalTimeStore } from 'store/globalTime';
 import { NANO_SECOND_MULTIPLIER } from 'store/globalTime/utils';
@@ -51,6 +49,7 @@ import styles from './K8sBaseList.module.scss';
 import cx from 'classnames';
 import {
 	logInfraColumnSortedEvent,
+	logInfraListRowClickedEvent,
 	logInfraTimeRangeCustomizedEvent,
 } from 'container/InfraMonitoringK8sV2/Base/events';
 
@@ -92,7 +91,6 @@ export type K8sBaseListProps<
 	getRowKey: (record: T) => string;
 	/** Function to get the item key used for selection. Can return string or SelectedItemParams. */
 	getItemKey: (record: T) => TItemKey;
-	eventCategory: InfraMonitoringEvents;
 	renderEmptyState?: (
 		context: K8sBaseListEmptyStateContext,
 	) => React.ReactNode | null;
@@ -115,7 +113,6 @@ export function K8sBaseList<
 	fetchListData,
 	getRowKey,
 	getItemKey,
-	eventCategory,
 	renderEmptyState,
 	extraQueryKeyParts = [],
 	detailsQueryKeyPrefix,
@@ -280,15 +277,6 @@ export function K8sBaseList<
 		[groupBy],
 	);
 
-	useEffect(() => {
-		void logEvent(InfraMonitoringEvents.PageVisited, {
-			entity: InfraMonitoringEvents.K8sEntity,
-			page: InfraMonitoringEvents.ListPage,
-			category: eventCategory,
-			total: totalCount,
-		});
-	}, [eventCategory, totalCount]);
-
 	const prevSelectedTimeRef = useRef(selectedTime);
 	useEffect(() => {
 		if (prevSelectedTimeRef.current !== selectedTime) {
@@ -326,14 +314,10 @@ export function K8sBaseList<
 				setSelectedItemParams(params);
 			}
 
-			void logEvent(InfraMonitoringEvents.ItemClicked, {
-				entity: InfraMonitoringEvents.K8sEntity,
-				page: InfraMonitoringEvents.ListPage,
-				category: eventCategory,
-			});
+			logInfraListRowClickedEvent(entity, false, groupBy.length > 0);
 		},
 		[
-			eventCategory,
+			entity,
 			groupBy.length,
 			setSelectedItemParams,
 			detailsQueryKeyPrefix,
@@ -385,13 +369,9 @@ export function K8sBaseList<
 			}
 			openInNewTab(url.pathname + url.search);
 
-			void logEvent(InfraMonitoringEvents.ItemClicked, {
-				entity: InfraMonitoringEvents.K8sEntity,
-				page: InfraMonitoringEvents.ListPage,
-				category: eventCategory,
-			});
+			logInfraListRowClickedEvent(entity, true, false);
 		},
-		[eventCategory, groupBy.length],
+		[entity, groupBy.length],
 	);
 
 	const isGroupedByAttribute = groupBy.length > 0;
@@ -491,7 +471,6 @@ export function K8sBaseList<
 
 			<K8sTableToolbar
 				entity={entity}
-				eventCategory={eventCategory}
 				leftFilters={leftFilters}
 				onOpenOptionsDrawer={handleOpenOptionsDrawer}
 			/>

frontend/src/container/InfraMonitoringK8sV2/Base/K8sHeader.tsx

@@ -1,8 +1,6 @@
 import React, { useCallback, useMemo, useRef } from 'react';
 import { useAppLocation } from 'lib/router/useAppLocation';
-import logEvent from 'api/common/logEvent';
 import QuerySearch from 'components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch';
-import { InfraMonitoringEvents } from 'constants/events';
 import { QueryParams } from 'constants/query';
 import RunQueryBtn from 'container/QueryBuilder/components/RunQueryBtn/RunQueryBtn';
 import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2';
@@ -92,12 +90,6 @@ function K8sHeader({
 			void invalidateQueries();
 
 			if (finalExpression?.trim()) {
-				void logEvent(InfraMonitoringEvents.FilterApplied, {
-					entity: InfraMonitoringEvents.K8sEntity,
-					page: InfraMonitoringEvents.ListPage,
-					category: entity,
-				});
-
 				logInfraFilterCustomizedEvent(entity, 'search', finalExpression);
 			}
 		},

frontend/src/container/InfraMonitoringK8sV2/Base/K8sTableToolbar.tsx

@@ -3,8 +3,6 @@ import { Button } from '@signozhq/ui/button';
 import { Select } from 'antd';
 import { Download, SlidersVertical } from '@signozhq/icons';
 import { Tooltip } from '@signozhq/ui/tooltip';
-import logEvent from 'api/common/logEvent';
-import { InfraMonitoringEvents } from 'constants/events';
 
 import {
 	INFRA_MONITORING_ATTR_KEYS,
@@ -35,7 +33,6 @@ const NAME_COLUMN_KEYS: Set<string> = new Set([
 
 interface K8sTableToolbarProps {
 	entity: InfraMonitoringEntity;
-	eventCategory: InfraMonitoringEvents;
 	leftFilters?: React.ReactNode;
 	onOpenOptionsDrawer: () => void;
 	onDownload?: () => void;
@@ -43,7 +40,6 @@ interface K8sTableToolbarProps {
 
 function K8sTableToolbar({
 	entity,
-	eventCategory,
 	leftFilters,
 	onOpenOptionsDrawer,
 	onDownload,
@@ -65,15 +61,9 @@ function K8sTableToolbar({
 
 			void setGroupBy(value);
 
-			void logEvent(InfraMonitoringEvents.GroupByChanged, {
-				entity: InfraMonitoringEvents.K8sEntity,
-				page: InfraMonitoringEvents.ListPage,
-				category: eventCategory,
-			});
-
 			logInfraGroupByCustomizedEvent(entity, value);
 		},
-		[entity, eventCategory, orderBy, setCurrentPage, setOrderBy, setGroupBy],
+		[entity, orderBy, setCurrentPage, setOrderBy, setGroupBy],
 	);
 
 	return (

frontend/src/container/InfraMonitoringK8sV2/Base/__tests__/K8sBaseDetails.backNavigation.test.tsx

@@ -1,10 +1,10 @@
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { InfraMonitoringEvents } from 'constants/events';
 import {
 	NuqsTestingAdapter,
 	type OnUrlUpdateFunction,
 } from 'nuqs/adapters/testing';
+import logEvent from 'api/common/logEvent';
 import { act, render, waitFor } from 'tests/test-utils';
 
 import {
@@ -19,6 +19,13 @@ jest.mock('container/TopNav/DateTimeSelectionV2/index.tsx', () => ({
 	default: (): JSX.Element => <div data-testid="mock-datetime" />,
 }));
 
+jest.mock('api/common/logEvent', () => ({
+	__esModule: true,
+	default: jest.fn(() => Promise.resolve()),
+}));
+
+const logEventMock = jest.mocked(logEvent);
+
 type TestEntity = { name: string };
 
 const mockEntity: TestEntity = { name: 'test-container' };
@@ -49,7 +56,6 @@ function renderDrawer(onUrlUpdate?: OnUrlUpdateFunction): void {
 		>
 			<K8sBaseDetails<TestEntity>
 				category={InfraMonitoringEntity.CONTAINERS}
-				eventCategory={InfraMonitoringEvents.Pod}
 				getSelectedItemExpression={(): string => "k8s.pod.uid = 'abc'"}
 				fetchEntityData={jest
 					.fn()
@@ -71,6 +77,7 @@ function renderDrawer(onUrlUpdate?: OnUrlUpdateFunction): void {
 describe('K8sBaseDetails - back navigation', () => {
 	beforeEach(() => {
 		useDrawerHistoryStore.getState().reset();
+		logEventMock.mockClear();
 	});
 
 	it('closes rather than going back when opened from the list', async () => {
@@ -149,4 +156,36 @@ describe('K8sBaseDetails - back navigation', () => {
 			expect(useDrawerHistoryStore.getState().entries).toHaveLength(0);
 		});
 	});
+
+	it('logs a drawer visit for a resource reached from the cache', async () => {
+		const user = userEvent.setup();
+
+		useDrawerHistoryStore.getState().push({
+			params: {
+				selectedItem: 'container-0',
+				category: InfraMonitoringEntity.CONTAINERS,
+				clusterName: null,
+				namespaceName: null,
+			},
+			category: InfraMonitoringEntity.CONTAINERS,
+			label: 'container-0',
+			entity: { name: 'container-0' },
+			queryKeyPrefix: 'testContainer',
+		});
+
+		act(() => {
+			renderDrawer();
+		});
+
+		const drawerVisits = (): number =>
+			logEventMock.mock.calls.filter(
+				([name]) => name === 'Infra Monitoring: Drawer tab viewed',
+			).length;
+
+		await waitFor(() => expect(drawerVisits()).toBe(1));
+
+		await user.click(await screen.findByTestId('drawer-back-button'));
+
+		await waitFor(() => expect(drawerVisits()).toBe(2));
+	});
 });

frontend/src/container/InfraMonitoringK8sV2/Base/__tests__/K8sBaseDetails.tabValidation.test.tsx

@@ -1,6 +1,5 @@
 import { Box } from '@signozhq/icons';
 import { screen } from '@testing-library/react';
-import { InfraMonitoringEvents } from 'constants/events';
 import userEvent from '@testing-library/user-event';
 import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
 import { act, render, waitFor } from 'tests/test-utils';
@@ -43,7 +42,6 @@ const relatedEntity: TestEntity = {
 function createBaseProps(category: InfraMonitoringEntity, entity = mockEntity) {
 	return {
 		category,
-		eventCategory: InfraMonitoringEvents.Pod,
 		getSelectedItemExpression: (): string => 'k8s.pod.name = "test-pod"',
 		fetchEntityData: jest.fn().mockResolvedValue({ data: entity, error: null }),
 		getEntityName: (e: TestEntity): string => e.name,

frontend/src/container/InfraMonitoringK8sV2/Base/__tests__/K8sBaseList.test.tsx

@@ -5,7 +5,6 @@ import { Provider } from 'react-redux';
 import { VirtuosoMockContext } from 'react-virtuoso';
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { InfraMonitoringEvents } from 'constants/events';
 import { server } from 'mocks-server/server';
 import { rest } from 'msw';
 import {
@@ -17,7 +16,9 @@ import { AppProvider } from 'providers/App/App';
 import TimezoneProvider from 'providers/Timezone';
 import store from 'store';
 import { TestRouter } from 'tests/router';
+import { within } from 'tests/test-utils';
 import APIError from 'types/api/error';
+import logEvent from 'api/common/logEvent';
 import { openInNewTab } from 'utils/navigation';
 
 import { TableColumnDef } from 'components/TanStackTableView';
@@ -40,7 +41,13 @@ jest.mock('utils/navigation', () => ({
 	openInNewTab: jest.fn(),
 }));
 
+jest.mock('api/common/logEvent', () => ({
+	__esModule: true,
+	default: jest.fn(() => Promise.resolve()),
+}));
+
 const openInNewTabMock = openInNewTab as jest.Mock;
+const logEventMock = jest.mocked(logEvent);
 
 // Mock Date.now to prevent flaky tests due to time-dependent values
 const MOCK_NOW = 1700000000000; // Fixed timestamp
@@ -227,6 +234,7 @@ describe('K8sBaseList', () => {
 		beforeEach(() => {
 			onUrlUpdateMock.mockClear();
 			fetchListDataMock.mockClear();
+			logEventMock.mockClear();
 			openInNewTabMock.mockClear();
 			fetchListDataMock.mockResolvedValue({
 				data: [
@@ -240,7 +248,6 @@ describe('K8sBaseList', () => {
 			renderComponent<TestItemWithTitle>({
 				onUrlUpdate: onUrlUpdateMock,
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				tableColumns: createTestColumnsWithTitle(),
 				getRowKey: (row): string => row.id,
@@ -299,6 +306,40 @@ describe('K8sBaseList', () => {
 			});
 		});
 
+		it('should log the list row clicked event when a row opens the drawer', async () => {
+			const user = userEvent.setup();
+
+			const row = await screen.findByTestId(`row-PodId:${itemId}`);
+			await user.click(within(row).getByText(`PodId:${itemId}`));
+
+			expect(logEventMock).toHaveBeenCalledWith(
+				'Infra Monitoring: List row clicked',
+				{
+					entityType: InfraMonitoringEntity.PODS,
+					openedInNewTab: false,
+					isGrouped: false,
+				},
+			);
+		});
+
+		it('should log the list row clicked event as a new tab on ctrl+click', async () => {
+			const user = userEvent.setup();
+			const row = await screen.findByTestId(`row-PodId:${itemId}`);
+
+			await user.keyboard('{Control>}');
+			await user.click(within(row).getByText(`PodId:${itemId}`));
+			await user.keyboard('{/Control}');
+
+			expect(logEventMock).toHaveBeenCalledWith(
+				'Infra Monitoring: List row clicked',
+				{
+					entityType: InfraMonitoringEntity.PODS,
+					openedInNewTab: true,
+					isGrouped: false,
+				},
+			);
+		});
+
 		it('should update orderBy in URL when clicking sortable column header', async () => {
 			const user = userEvent.setup();
 
@@ -463,7 +504,6 @@ describe('K8sBaseList', () => {
 			renderComponent<TestItem>({
 				onUrlUpdate: onUrlUpdateMock,
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				queryParams: {
 					orderBy: JSON.stringify({ columnName: 'cpu', order: 'desc' }),
@@ -538,7 +578,6 @@ describe('K8sBaseList', () => {
 			renderComponent<TestItem>({
 				onUrlUpdate: onUrlUpdateMock,
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				queryParams: {
 					orderBy: JSON.stringify({ columnName: 'cpu', order: 'desc' }),
@@ -603,7 +642,6 @@ describe('K8sBaseList', () => {
 			renderComponent<TestItem>({
 				onUrlUpdate: onUrlUpdateMock,
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				tableColumns: createTestColumns(),
 				getRowKey: (row): string => row.id,
@@ -662,7 +700,6 @@ describe('K8sBaseList', () => {
 			renderComponent<TestItem>({
 				onUrlUpdate: onUrlUpdateMock,
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				queryParams: { page: '7', pageSize: '10' },
 				tableColumns: createTestColumns(),
@@ -734,7 +771,6 @@ describe('K8sBaseList', () => {
 			renderComponent<TestItem>({
 				onUrlUpdate: onUrlUpdateMock,
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				queryParams: { page: '0', pageSize: '10' },
 				tableColumns: createTestColumns(),
@@ -819,7 +855,6 @@ describe('K8sBaseList', () => {
 
 			renderComponent<TestItem>({
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				tableColumns: createTestColumns(),
 				getRowKey: (row): string => row.id,
@@ -857,7 +892,6 @@ describe('K8sBaseList', () => {
 
 			renderComponent<TestItem>({
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				tableColumns: createTestColumns(),
 				getRowKey: (row): string => row.id,
@@ -895,7 +929,6 @@ describe('K8sBaseList', () => {
 		it('should show all columns defined in tableColumns', async () => {
 			renderComponent<TestItemWithName>({
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				tableColumns: createTestColumnsWithName(),
 				getRowKey: (row): string => row.id,
@@ -943,7 +976,6 @@ describe('K8sBaseList', () => {
 		it('should show columns when NOT grouped', async () => {
 			renderComponent<TestItemWithGroup>({
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				queryParams: {},
 				tableColumns: createTestColumnsWithGroup(),
@@ -968,7 +1000,6 @@ describe('K8sBaseList', () => {
 
 			renderComponent<TestItemWithGroup>({
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				queryParams: {
 					groupBy: JSON.stringify(groupByValue),
@@ -1010,7 +1041,6 @@ describe('K8sBaseList', () => {
 
 			renderComponent<TestItem>({
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				queryParams: {
 					groupBy: JSON.stringify(groupByValue),
@@ -1055,7 +1085,6 @@ describe('K8sBaseList', () => {
 		it('should render all defined columns', async () => {
 			renderComponent<TestItemWithName>({
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				tableColumns: createTestColumnsWithName(),
 				getRowKey: (row): string => row.id,
@@ -1078,7 +1107,6 @@ describe('K8sBaseList', () => {
 		it('should render data in cells correctly', async () => {
 			renderComponent<TestItemWithName>({
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				tableColumns: createTestColumnsWithName(),
 				getRowKey: (row): string => row.id,
@@ -1115,7 +1143,6 @@ describe('K8sBaseList', () => {
 
 			renderComponent<TestItem>({
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				tableColumns: createTestColumns(),
 				getRowKey: (row): string => row.id,
@@ -1163,7 +1190,6 @@ describe('K8sBaseList', () => {
 			renderComponent<TestItemWithTitle, SelectedItemParams>({
 				onUrlUpdate: onUrlUpdateMock,
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				tableColumns: createTestColumnsWithTitle(),
 				getRowKey: (row): string => row.id,
@@ -1188,7 +1214,6 @@ describe('K8sBaseList', () => {
 			renderComponent<TestItemWithTitle, SelectedItemParams>({
 				onUrlUpdate: onUrlUpdateMock,
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				tableColumns: createTestColumnsWithTitle(),
 				getRowKey: (row): string => row.id,
@@ -1215,7 +1240,6 @@ describe('K8sBaseList', () => {
 			renderComponent<TestItemWithTitle, SelectedItemParams>({
 				onUrlUpdate: onUrlUpdateMock,
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				tableColumns: createTestColumnsWithTitle(),
 				getRowKey: (row): string => row.id,
@@ -1277,7 +1301,6 @@ describe('K8sBaseList', () => {
 
 			renderComponent<TestItem>({
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				tableColumns: createTestColumns(),
 				getRowKey: (row): string => row.id,
@@ -1312,7 +1335,6 @@ describe('K8sBaseList', () => {
 
 			renderComponent<TestItem>({
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				tableColumns: createTestColumns(),
 				getRowKey: (row): string => row.id,
@@ -1352,7 +1374,6 @@ describe('K8sBaseList', () => {
 
 			renderComponent<TestItem>({
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				tableColumns: createTestColumns(),
 				getRowKey: (row): string => row.id,
@@ -1401,7 +1422,6 @@ describe('K8sBaseList', () => {
 
 			renderComponent<TestItem>({
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				tableColumns: createTestColumns(),
 				getRowKey: (row): string => row.id,
@@ -1449,7 +1469,6 @@ describe('K8sBaseList', () => {
 
 			renderComponent<TestItem>({
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				tableColumns: createTestColumns(),
 				getRowKey: (row): string => row.id,
@@ -1506,7 +1525,6 @@ describe('K8sBaseList', () => {
 
 			renderComponent<TestItem>({
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				tableColumns: createTestColumns(),
 				getRowKey: (row): string => row.id,
@@ -1580,7 +1598,6 @@ describe('K8sBaseList', () => {
 			renderComponent<TestItem>({
 				onUrlUpdate: onUrlUpdateMock,
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				queryParams: {
 					// k8s.pod.name is a name column - should be cleared
@@ -1623,7 +1640,6 @@ describe('K8sBaseList', () => {
 			renderComponent<TestItem>({
 				onUrlUpdate: onUrlUpdateMock,
 				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
 				fetchListData: fetchListDataMock,
 				queryParams: {
 					// cpu is NOT a name column - should be kept
@@ -1676,7 +1692,6 @@ describe('K8sBaseList status filters', () => {
 		renderComponent<TestItem>({
 			queryParams,
 			entity: InfraMonitoringEntity.PODS,
-			eventCategory: InfraMonitoringEvents.Pod,
 			fetchListData: fetchListDataMock,
 			tableColumns: createTestColumns(),
 			getRowKey: (row): string => row.id,

frontend/src/container/InfraMonitoringK8sV2/Base/events.ts

@@ -22,10 +22,10 @@ export function logInfraFilterCustomizedEvent(
 		return;
 	}
 
-	void logEvent('infra_filter_customized', {
-		entity_type: entityType,
+	void logEvent('Infra Monitoring: Filter customized', {
+		entityType,
 		source,
-		expression_keys: [...new Set(expressionKeys)],
+		expressionKeys: [...new Set(expressionKeys)],
 	});
 }
 
@@ -34,8 +34,8 @@ export function logInfraMonitoringListViewedEvent(
 ): void {
 	const referrer = getNavigationReferrer();
 
-	void logEvent('infra_list_viewed', {
-		entity,
+	void logEvent('Infra Monitoring: List viewed', {
+		entityType: entity,
 		referrer,
 	});
 }
@@ -44,9 +44,9 @@ export function logInfraTimeRangeCustomizedEvent(
 	entityType: InfraMonitoringEntity,
 	rangeLabel: string,
 ): void {
-	void logEvent('infra_time_range_customized', {
-		entity_type: entityType,
-		range_label: isCustomTimeRange(rangeLabel) ? 'custom' : rangeLabel,
+	void logEvent('Infra Monitoring: Time range customized', {
+		entityType,
+		rangeLabel: isCustomTimeRange(rangeLabel) ? 'custom' : rangeLabel,
 	});
 }
 
@@ -57,11 +57,11 @@ export function logInfraColumnCustomizedEvent(
 	maxLinesPerRow: number,
 	source: 'list' | 'expanded',
 ): void {
-	void logEvent('infra_column_customized', {
-		entity_type: entityType,
-		columns_list: columnsList,
-		font_size: fontSize,
-		max_lines_per_row: maxLinesPerRow,
+	void logEvent('Infra Monitoring: Column customized', {
+		entityType,
+		columnsList,
+		fontSize,
+		maxLinesPerRow,
 		source,
 	});
 }
@@ -72,9 +72,9 @@ export function logInfraColumnSortedEvent(
 	direction: 'asc' | 'desc',
 	source: 'list' | 'expanded',
 ): void {
-	void logEvent('infra_column_sorted', {
-		entity_type: entityType,
-		column_key: columnKey,
+	void logEvent('Infra Monitoring: Column sorted', {
+		entityType,
+		columnKey,
 		direction,
 		source,
 	});
@@ -84,9 +84,9 @@ export function logInfraGroupByCustomizedEvent(
 	entityType: InfraMonitoringEntity,
 	groupByKeysList: string[],
 ): void {
-	void logEvent('infra_group_by_customized', {
-		entity_type: entityType,
-		group_by_keys_list: groupByKeysList,
+	void logEvent('Infra Monitoring: Group by customized', {
+		entityType,
+		groupByKeysList,
 	});
 }
 
@@ -106,12 +106,24 @@ export function logInfraExplorerNavigatedEvent(params: {
 	sourceKey: string | null;
 	drawerDurationMsAtNavigation: number | null;
 }): void {
-	void logEvent('infra_explorer_navigated', {
-		entity_type: params.entityType,
+	void logEvent('Infra Monitoring: Explorer navigated', {
+		entityType: params.entityType,
 		destination: params.destination,
 		source: params.source,
 		tab: params.tab,
-		source_key: params.sourceKey,
-		drawer_duration_ms_at_navigation: params.drawerDurationMsAtNavigation,
+		sourceKey: params.sourceKey,
+		drawerDurationMsAtNavigation: params.drawerDurationMsAtNavigation,
+	});
+}
+
+export function logInfraListRowClickedEvent(
+	entityType: InfraMonitoringEntity,
+	openedInNewTab: boolean,
+	isGrouped: boolean,
+): void {
+	void logEvent('Infra Monitoring: List row clicked', {
+		entityType,
+		openedInNewTab,
+		isGrouped,
 	});
 }

frontend/src/container/InfraMonitoringK8sV2/Base/types.ts

@@ -8,7 +8,6 @@ import {
 	CustomTimeType,
 	Time,
 } from 'container/TopNav/DateTimeSelectionV2/types';
-import { InfraMonitoringEvents } from 'constants/events';
 import { GetQueryResultsProps } from 'lib/dashboard/getQueryResults';
 import APIError from 'types/api/error';
 
@@ -111,7 +110,6 @@ export interface K8sDetailsCustomTab<T> {
 
 export interface K8sBaseDetailsProps<T> {
 	category: InfraMonitoringEntity;
-	eventCategory: InfraMonitoringEvents;
 	// Data fetching configuration
 	getSelectedItemExpression: (params: SelectedItemParams) => string;
 	fetchEntityData: (
@@ -137,7 +135,6 @@ export interface K8sBaseDetailsProps<T> {
 export interface K8sBaseDetailsContentProps<T> {
 	entity: T;
 	category: InfraMonitoringEntity;
-	eventCategory: InfraMonitoringEvents;
 	metadataConfig: K8sDetailsMetadataConfig<T>[];
 	countsConfig?: K8sDetailsCountConfig<T>[];
 	getCountsFilterExpression?: (entity: T) => string;

frontend/src/container/InfraMonitoringK8sV2/Clusters/entity.config.ts

@@ -7,7 +7,6 @@ import {
 	RenderErrorResponseDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { AxiosError } from 'axios';
-import { InfraMonitoringEvents } from 'constants/events';
 
 import { K8sEntityConfig } from '../Base/entity.config.types';
 import { K8sBaseFilters, K8sDetailsFilters } from '../Base/types';
@@ -117,7 +116,6 @@ export const clusterEntityConfig: K8sEntityConfig<InframonitoringtypesClusterRec
 	{
 		list: {
 			entity: InfraMonitoringEntity.CLUSTERS,
-			eventCategory: InfraMonitoringEvents.Cluster,
 			tableColumns: k8sClustersColumnsConfig,
 			fetchListData,
 			getRowKey: getK8sClusterRowKey,
@@ -126,7 +124,6 @@ export const clusterEntityConfig: K8sEntityConfig<InframonitoringtypesClusterRec
 		},
 		details: {
 			category: InfraMonitoringEntity.CLUSTERS,
-			eventCategory: InfraMonitoringEvents.Cluster,
 			tabsConfig: { showOverview: true },
 			queryKeyPrefix: 'cluster',
 			getSelectedItemExpression: k8sClusterGetSelectedItemExpression,

frontend/src/container/InfraMonitoringK8sV2/Containers/entity.config.ts

@@ -7,7 +7,6 @@ import {
 	RenderErrorResponseDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { AxiosError } from 'axios';
-import { InfraMonitoringEvents } from 'constants/events';
 
 import { K8sEntityConfig } from '../Base/entity.config.types';
 import { K8sBaseFilters, K8sDetailsFilters } from '../Base/types';
@@ -120,7 +119,6 @@ export const containerEntityConfig: K8sEntityConfig<
 > = {
 	list: {
 		entity: InfraMonitoringEntity.CONTAINERS,
-		eventCategory: InfraMonitoringEvents.Container,
 		tableColumns: k8sContainerColumnsConfig,
 		fetchListData,
 		getRowKey: getK8sContainerRowKey,
@@ -129,7 +127,6 @@ export const containerEntityConfig: K8sEntityConfig<
 	},
 	details: {
 		category: InfraMonitoringEntity.CONTAINERS,
-		eventCategory: InfraMonitoringEvents.Container,
 		tabsConfig: { showOverview: true },
 		queryKeyPrefix: 'container',
 		getSelectedItemExpression: k8sContainerGetSelectedItemExpression,

frontend/src/container/InfraMonitoringK8sV2/DaemonSets/entity.config.ts

@@ -7,7 +7,6 @@ import {
 	RenderErrorResponseDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { AxiosError } from 'axios';
-import { InfraMonitoringEvents } from 'constants/events';
 
 import { K8sEntityConfig } from '../Base/entity.config.types';
 import { K8sBaseFilters, K8sDetailsFilters } from '../Base/types';
@@ -125,7 +124,6 @@ export const daemonSetEntityConfig: K8sEntityConfig<
 > = {
 	list: {
 		entity: InfraMonitoringEntity.DAEMONSETS,
-		eventCategory: InfraMonitoringEvents.DaemonSet,
 		tableColumns: k8sDaemonSetsColumnsConfig,
 		fetchListData,
 		getRowKey: getK8sDaemonSetRowKey,
@@ -134,7 +132,6 @@ export const daemonSetEntityConfig: K8sEntityConfig<
 	},
 	details: {
 		category: InfraMonitoringEntity.DAEMONSETS,
-		eventCategory: InfraMonitoringEvents.DaemonSet,
 		tabsConfig: { showOverview: true },
 		queryKeyPrefix: 'daemonset',
 		getSelectedItemExpression: k8sDaemonSetGetSelectedItemExpression,

frontend/src/container/InfraMonitoringK8sV2/Deployments/entity.config.ts

@@ -7,7 +7,6 @@ import {
 	RenderErrorResponseDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { AxiosError } from 'axios';
-import { InfraMonitoringEvents } from 'constants/events';
 
 import { K8sEntityConfig } from '../Base/entity.config.types';
 import {
@@ -140,7 +139,6 @@ export const deploymentEntityConfig: K8sEntityConfig<
 > = {
 	list: {
 		entity: InfraMonitoringEntity.DEPLOYMENTS,
-		eventCategory: InfraMonitoringEvents.Deployment,
 		tableColumns: k8sDeploymentsColumnsConfig,
 		fetchListData,
 		getRowKey: getK8sDeploymentRowKey,
@@ -149,7 +147,6 @@ export const deploymentEntityConfig: K8sEntityConfig<
 	},
 	details: {
 		category: InfraMonitoringEntity.DEPLOYMENTS,
-		eventCategory: InfraMonitoringEvents.Deployment,
 		tabsConfig: { showOverview: true },
 		queryKeyPrefix: 'deployment',
 		getSelectedItemExpression: k8sDeploymentGetSelectedItemExpression,

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityDateTimeSelector/EntityDateTimeSelector.tsx

@@ -2,8 +2,6 @@ import { useCallback } from 'react';
 import { Undo } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
 import { Tooltip } from '@signozhq/ui/tooltip';
-import logEvent from 'api/common/logEvent';
-import { InfraMonitoringEvents } from 'constants/events';
 import { InfraMonitoringEntity } from 'container/InfraMonitoringK8sV2/constants';
 import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2';
 import {
@@ -17,15 +15,11 @@ import styles from './EntityDateTimeSelector.module.scss';
 import { logInfraDrawerTimeRangeCustomizedEvent } from 'container/InfraMonitoringK8sV2/EntityDetailsUtils/events';
 
 interface EntityDateTimeSelectorProps {
-	eventEntity: string;
 	category: InfraMonitoringEntity;
-	view: string;
 }
 
 function EntityDateTimeSelector({
-	eventEntity,
 	category,
-	view,
 }: EntityDateTimeSelectorProps): JSX.Element {
 	const {
 		timeRange,
@@ -37,17 +31,10 @@ function EntityDateTimeSelector({
 
 	const onTimeChange = useCallback(
 		(interval: Time | CustomTimeType, dateTimeRange?: [number, number]): void => {
-			void logEvent(InfraMonitoringEvents.TimeUpdated, {
-				entity: eventEntity,
-				page: InfraMonitoringEvents.DetailedPage,
-				category,
-				view,
-				interval,
-			});
 			logInfraDrawerTimeRangeCustomizedEvent(category, interval);
 			handleTimeChange(interval, dateTimeRange);
 		},
-		[category, view, eventEntity, handleTimeChange],
+		[category, handleTimeChange],
 	);
 
 	return (

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityEvents/EntityEvents.tsx

@@ -1,6 +1,5 @@
 import { useCallback, useEffect, useMemo } from 'react';
 import { Table, TableColumnsType } from 'antd';
-import logEvent from 'api/common/logEvent';
 import {
 	QuerySearchV2Provider,
 	useExpression,
@@ -16,12 +15,12 @@ import {
 	combineInitialAndUserExpression,
 	getUserExpressionFromCombined,
 } from 'components/QueryBuilderV2/QueryV2/QuerySearch/utils';
-import { InfraMonitoringEvents } from 'constants/events';
 import Controls from 'container/Controls';
 import { InfraMonitoringEntity } from 'container/InfraMonitoringK8sV2/constants';
 import LoadingContainer from 'container/InfraMonitoringK8sV2/LoadingContainer';
 import RunQueryBtn from 'container/QueryBuilder/components/RunQueryBtn/RunQueryBtn';
 import { ChevronDown, ChevronRight } from '@signozhq/icons';
+import { getBodyDisplay } from 'lib/logs/logBody';
 import { saveRecentQueryByExpression } from 'lib/recentQueries/saveRecentQuery';
 import { useQueryState } from 'nuqs';
 import { DataSource } from 'types/common/queryBuilder';
@@ -52,7 +51,6 @@ interface EventDataType {
 }
 
 interface Props {
-	eventEntity: string;
 	queryKey: string;
 	category: InfraMonitoringEntity;
 	initialExpression: string;
@@ -67,7 +65,6 @@ const handleExpandRow = (record: EventDataType): JSX.Element => (
 );
 
 function EntityEventsContent({
-	eventEntity,
 	queryKey,
 	category,
 }: Omit<Props, 'initialExpression'>): JSX.Element {
@@ -120,13 +117,6 @@ function EntityEventsContent({
 				saveRecentQueryByExpression(DataSource.LOGS, newUserExpression);
 				querySearchOnRun(newUserExpression || '');
 
-				void logEvent(InfraMonitoringEvents.FilterApplied, {
-					entity: eventEntity,
-					page: InfraMonitoringEvents.DetailedPage,
-					category,
-					view: InfraMonitoringEvents.EventsView,
-				});
-
 				logInfraDrawerFilterCustomizedEvent(
 					category,
 					'events',
@@ -137,14 +127,7 @@ function EntityEventsContent({
 				refetch();
 			}
 		},
-		[
-			inputExpression,
-			initialExpression,
-			refetch,
-			querySearchOnRun,
-			category,
-			eventEntity,
-		],
+		[inputExpression, initialExpression, refetch, querySearchOnRun, category],
 	);
 
 	const queryData = useMemo(
@@ -163,7 +146,7 @@ function EntityEventsContent({
 				key: event.data.id,
 				id: event.data.id,
 				timestamp: event.timestamp,
-				body: event.data.body,
+				body: getBodyDisplay(event.data.body),
 				severity: event.data.severity_text,
 				attributes_string: event.data.attributes_string,
 				resources_string: event.data.resources_string,
@@ -232,11 +215,7 @@ function EntityEventsContent({
 		<div className={styles.container}>
 			<div className={styles.filterContainer}>
 				<div className={styles.filterContainerTime}>
-					<EntityDateTimeSelector
-						eventEntity={eventEntity}
-						category={category}
-						view={InfraMonitoringEvents.EventsView}
-					/>
+					<EntityDateTimeSelector category={category} />
 
 					<RunQueryBtn
 						isLoadingQueries={isFetching}

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityEvents/__tests__/EntityEvents.test.tsx

@@ -69,7 +69,6 @@ describe('EntityEvents', () => {
 					searchParams={`${K8S_ENTITY_EVENTS_EXPRESSION_KEY}=k8s.pod.name+%3D+%22x%22`}
 				>
 					<EntityEvents
-						eventEntity="test"
 						queryKey="test"
 						category={InfraMonitoringEntity.PODS}
 						initialExpression='k8s.pod.name = "x"'

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityEvents/__tests__/EntityEvents.timeRange.test.tsx

@@ -61,7 +61,6 @@ describe('EntityEvents time range wiring', () => {
 						)}`}
 					>
 						<EntityEvents
-							eventEntity="test"
 							queryKey="test"
 							category={InfraMonitoringEntity.PODS}
 							initialExpression={expression}

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityEvents/hooks.ts

@@ -3,6 +3,7 @@ import { useQuery, useQueryClient } from 'react-query';
 import { ENTITY_VERSION_V5 } from 'constants/app';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
 import { GetMetricQueryRange } from 'lib/dashboard/getQueryResults';
+import { ILog } from 'types/api/logs/log';
 
 import { getEntityEventsQueryPayload } from './utils';
 
@@ -10,7 +11,7 @@ export const K8S_ENTITY_EVENTS_EXPRESSION_KEY = 'k8sEntityEventsExpression';
 
 export interface EventRowData {
 	id: string;
-	body: string;
+	body: ILog['body'];
 	severity_text: string;
 	attributes_string?: Record<string, string>;
 	resources_string?: Record<string, string>;

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityLogs/EntityLogs.tsx

@@ -1,7 +1,6 @@
 import React, { useCallback, useMemo, useRef } from 'react';
 import { Virtuoso, VirtuosoHandle } from 'react-virtuoso';
 import { Card } from 'antd';
-import logEvent from 'api/common/logEvent';
 import LogDetail from 'components/LogDetail';
 import RawLogView from 'components/Logs/RawLogView';
 import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
@@ -20,7 +19,6 @@ import {
 	combineInitialAndUserExpression,
 	getUserExpressionFromCombined,
 } from 'components/QueryBuilderV2/QueryV2/QuerySearch/utils';
-import { InfraMonitoringEvents } from 'constants/events';
 import { InfraMonitoringEntity } from 'container/InfraMonitoringK8sV2/constants';
 import { LogsLoading } from 'container/LogsLoading/LogsLoading';
 import { FontSize } from 'container/OptionsMenu/types';
@@ -52,14 +50,12 @@ import { Query } from 'types/api/queryBuilder/queryBuilderData';
 import { logInfraDrawerFilterCustomizedEvent } from 'container/InfraMonitoringK8sV2/EntityDetailsUtils/events';
 
 interface Props {
-	eventEntity: string;
 	queryKey: string;
 	category: InfraMonitoringEntity;
 	initialExpression: string;
 }
 
 function EntityLogsContent({
-	eventEntity,
 	queryKey,
 	category,
 }: Omit<Props, 'initialExpression'>): JSX.Element {
@@ -127,13 +123,6 @@ function EntityLogsContent({
 				saveRecentQueryByExpression(DataSource.LOGS, newUserExpression);
 				querySearchOnRun(newUserExpression);
 
-				void logEvent(InfraMonitoringEvents.FilterApplied, {
-					entity: InfraMonitoringEvents.K8sEntity,
-					page: InfraMonitoringEvents.DetailedPage,
-					category,
-					view: InfraMonitoringEvents.LogsView,
-				});
-
 				logInfraDrawerFilterCustomizedEvent(
 					category,
 					'logs',
@@ -277,11 +266,7 @@ function EntityLogsContent({
 		<div className={styles.container}>
 			<div className={styles.filterContainer}>
 				<div className={styles.filterContainerTime}>
-					<EntityDateTimeSelector
-						eventEntity={eventEntity}
-						category={category}
-						view={InfraMonitoringEvents.LogsView}
-					/>
+					<EntityDateTimeSelector category={category} />
 
 					<RunQueryBtn
 						isLoadingQueries={isFetching}

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityLogs/__tests__/EntityLogs.test.tsx

@@ -94,7 +94,6 @@ describe('EntityLogs', () => {
 				>
 					<VirtuosoMockContext.Provider value={{ viewportHeight: 500, itemHeight }}>
 						<EntityLogs
-							eventEntity="test"
 							queryKey="test"
 							category={InfraMonitoringEntity.PODS}
 							initialExpression='k8s.pod.name = "x"'

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityLogs/__tests__/EntityLogs.timeRange.test.tsx

@@ -73,7 +73,6 @@ describe('EntityLogs time range wiring', () => {
 						)}`}
 					>
 						<EntityLogs
-							eventEntity="test"
 							queryKey="test"
 							category={InfraMonitoringEntity.PODS}
 							initialExpression={expression}

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityMetrics/EntityMetrics.tsx

@@ -2,7 +2,6 @@ import { useCallback, useMemo, useRef, useState } from 'react';
 import { UseQueryResult } from 'react-query';
 import { Skeleton } from 'antd';
 import cx from 'classnames';
-import { InfraMonitoringEvents } from 'constants/events';
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import TimeSeries from 'lib/visualization/charts/TimeSeries/TimeSeries';
 import {
@@ -41,7 +40,6 @@ import ChartTooltipFooter from './ChartTooltipFooter';
 
 interface EntityMetricsProps<T> {
 	entity: T;
-	eventEntity: string;
 	entityWidgetInfo: K8sDetailsWidgetInfo[];
 	getEntityQueryPayload: (
 		node: T,
@@ -55,7 +53,6 @@ interface EntityMetricsProps<T> {
 
 function EntityMetrics<T>({
 	entity,
-	eventEntity,
 	entityWidgetInfo,
 	getEntityQueryPayload,
 	queryKey,
@@ -203,11 +200,7 @@ function EntityMetrics<T>({
 			<div ref={setTooltipPortalEl} style={{ display: 'contents' }} />
 
 			<div className={styles.metricsHeader}>
-				<EntityDateTimeSelector
-					eventEntity={eventEntity}
-					category={category}
-					view={InfraMonitoringEvents.MetricsView}
-				/>
+				<EntityDateTimeSelector category={category} />
 			</div>
 			<div className={styles.entityMetricsContainer}>
 				{queries.map((query, idx) => (

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityMetrics/__tests__/EntityMetrics.test.tsx

@@ -293,7 +293,6 @@ const renderEntityMetrics = (overrides = {}): any => {
 		<TestRouter>
 			<EntityMetrics
 				entity={defaultProps.entity}
-				eventEntity="test"
 				entityWidgetInfo={defaultProps.entityWidgetInfo}
 				getEntityQueryPayload={defaultProps.getEntityQueryPayload}
 				queryKey={defaultProps.queryKey}

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityMetrics/__tests__/EntityMetrics.timeRange.test.tsx

@@ -60,7 +60,6 @@ function renderEntityMetrics(store: GlobalTimeStoreApi): jest.Mock {
 		<GlobalTimeContext.Provider value={store}>
 			<EntityMetrics
 				entity={entity}
-				eventEntity="test"
 				entityWidgetInfo={[{ title: 'CPU Usage', yAxisUnit: 'percentage' }]}
 				getEntityQueryPayload={getEntityQueryPayload}
 				queryKey="test-query-key"

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityOverview/EntityOverview.stories.tsx

@@ -58,7 +58,6 @@ type Story = StoryObj<OverviewArgs>;
 export const Default: Story = {
 	args: {
 		category: InfraMonitoringEntity.PODS,
-		eventEntity: 'pod',
 		attributes: POD_ATTRIBUTES,
 		entity: { podUID: POD_UID },
 		entityName: POD_ATTRIBUTES['k8s.pod.name'],

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityOverview/EntityOverview.tsx

@@ -63,7 +63,6 @@ import styles from './EntityOverview.module.scss';
 
 export interface EntityOverviewProps {
 	category: InfraMonitoringEntity;
-	eventEntity: string;
 	/** The drawer entity's own attributes, which scope every related query */
 	attributes: EntityAttributes;
 	/** The drawer's own record and query prefix, so a row click can leave a
@@ -82,7 +81,6 @@ interface ContentProps extends EntityOverviewProps {
 
 function EntityOverviewContent({
 	category,
-	eventEntity,
 	attributes,
 	entity,
 	entityName,
@@ -190,11 +188,7 @@ function EntityOverviewContent({
 	return (
 		<div className={styles.container}>
 			<div className={styles.controls}>
-				<EntityDateTimeSelector
-					eventEntity={eventEntity}
-					category={category}
-					view={VIEW_TYPES.OVERVIEW}
-				/>
+				<EntityDateTimeSelector category={category} />
 
 				<RunQueryBtn
 					isLoadingQueries={isFetching}

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityOverview/__tests__/EntityOverview.test.tsx

@@ -88,7 +88,6 @@ function overviewTree(
 					>
 						<EntityOverview
 							category={InfraMonitoringEntity.NODES}
-							eventEntity="node"
 							attributes={attributes}
 							entity={{ nodeName: attributes['k8s.node.name'] }}
 							entityName={attributes['k8s.node.name']}

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityTraces/EntityTraces.tsx

@@ -1,5 +1,4 @@
 import { useCallback, useEffect, useMemo } from 'react';
-import logEvent from 'api/common/logEvent';
 import {
 	QuerySearchV2Provider,
 	useExpression,
@@ -16,7 +15,6 @@ import {
 	getUserExpressionFromCombined,
 } from 'components/QueryBuilderV2/QueryV2/QuerySearch/utils';
 import { ResizeTable } from 'components/ResizeTable';
-import { InfraMonitoringEvents } from 'constants/events';
 import Controls from 'container/Controls';
 import { InfraMonitoringEntity } from 'container/InfraMonitoringK8sV2/constants';
 import RunQueryBtn from 'container/QueryBuilder/components/RunQueryBtn/RunQueryBtn';
@@ -39,17 +37,18 @@ import { getEntityTracesQueryPayload } from './utils';
 
 import styles from './EntityTraces.module.scss';
 import { useTimezone } from 'providers/Timezone';
-import { logInfraDrawerFilterCustomizedEvent } from 'container/InfraMonitoringK8sV2/EntityDetailsUtils/events';
+import {
+	logInfraDrawerFilterCustomizedEvent,
+	logInfraDrawerTraceClickedEvent,
+} from 'container/InfraMonitoringK8sV2/EntityDetailsUtils/events';
 
 interface Props {
-	eventEntity: string;
 	queryKey: string;
 	category: InfraMonitoringEntity;
 	initialExpression: string;
 }
 
 function EntityTracesContent({
-	eventEntity,
 	queryKey,
 	category,
 }: Omit<Props, 'initialExpression'>): JSX.Element {
@@ -102,13 +101,6 @@ function EntityTracesContent({
 				saveRecentQueryByExpression(DataSource.TRACES, newUserExpression);
 				querySearchOnRun(newUserExpression || '');
 
-				void logEvent(InfraMonitoringEvents.FilterApplied, {
-					entity: eventEntity,
-					page: InfraMonitoringEvents.DetailedPage,
-					category,
-					view: InfraMonitoringEvents.TracesView,
-				});
-
 				logInfraDrawerFilterCustomizedEvent(
 					category,
 					'traces',
@@ -119,14 +111,7 @@ function EntityTracesContent({
 				refetch();
 			}
 		},
-		[
-			inputExpression,
-			initialExpression,
-			refetch,
-			querySearchOnRun,
-			category,
-			eventEntity,
-		],
+		[inputExpression, initialExpression, refetch, querySearchOnRun, category],
 	);
 
 	const queryData = useMemo(
@@ -154,11 +139,7 @@ function EntityTracesContent({
 	const hasAdditionalFilters = !!userExpression?.trim();
 
 	const handleRowClick = useCallback(() => {
-		void logEvent(InfraMonitoringEvents.ItemClicked, {
-			entity: InfraMonitoringEvents.K8sEntity,
-			category,
-			view: InfraMonitoringEvents.TracesView,
-		});
+		logInfraDrawerTraceClickedEvent(category);
 	}, [category]);
 
 	useEffect(() => {
@@ -171,11 +152,7 @@ function EntityTracesContent({
 		<div className={styles.container}>
 			<div className={styles.filterContainer}>
 				<div className={styles.filterContainerTime}>
-					<EntityDateTimeSelector
-						eventEntity={eventEntity}
-						category={category}
-						view={InfraMonitoringEvents.TracesView}
-					/>
+					<EntityDateTimeSelector category={category} />
 
 					<RunQueryBtn
 						isLoadingQueries={isFetching}

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityTraces/__tests__/EntityTraces.table.test.tsx

@@ -1,4 +1,6 @@
-import { act, screen, within } from 'tests/test-utils';
+import logEvent from 'api/common/logEvent';
+import { InfraMonitoringEntity } from 'container/InfraMonitoringK8sV2/constants';
+import { act, screen, userEvent, within } from 'tests/test-utils';
 
 import { renderEntityTraces } from './testUtils';
 import { mockQueryRangeV5WithTracesResponse } from '__tests__/query_range_v5.util';
@@ -20,6 +22,11 @@ jest.spyOn(window, 'matchMedia').mockImplementation(
 		}) as unknown as MediaQueryList,
 );
 
+jest.mock('api/common/logEvent', () => ({
+	__esModule: true,
+	default: jest.fn(() => Promise.resolve()),
+}));
+
 describe('EntityTraces - Table Rendering', () => {
 	it('should render table with all column headers', async () => {
 		mockQueryRangeV5WithTracesResponse({ pageSize: 3 });
@@ -182,4 +189,23 @@ describe('EntityTraces - Table Rendering', () => {
 			'database',
 		]);
 	});
+
+	it('should log the drawer trace clicked event when a trace row is clicked', async () => {
+		mockQueryRangeV5WithTracesResponse({
+			customTraces: [{ serviceName: 'frontend' }],
+		});
+
+		renderEntityTraces();
+
+		const user = userEvent.setup();
+		const cell = await screen.findByTestId('serviceName');
+		await user.click(cell.closest('tr') as HTMLElement);
+
+		expect(logEvent).toHaveBeenCalledWith(
+			'Infra Monitoring: Drawer trace clicked',
+			{
+				entityType: InfraMonitoringEntity.PODS,
+			},
+		);
+	});
 });

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityTraces/__tests__/EntityTraces.timeRange.test.tsx

@@ -61,7 +61,6 @@ describe('EntityTraces time range wiring', () => {
 						)}`}
 					>
 						<EntityTraces
-							eventEntity="test"
 							queryKey="test"
 							category={InfraMonitoringEntity.PODS}
 							initialExpression={expression}

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityTraces/__tests__/testUtils.tsx

@@ -33,7 +33,6 @@ export function renderEntityTraces({
 	return render(
 		<NuqsTestingAdapter searchParams={searchParams}>
 			<EntityTraces
-				eventEntity="test"
 				queryKey="test"
 				category={category}
 				initialExpression={expression}

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/__tests__/events.test.ts

@@ -0,0 +1,30 @@
+import logEvent from 'api/common/logEvent';
+import { InfraMonitoringEntity } from 'container/InfraMonitoringK8sV2/constants';
+
+import { logInfraDrawerFilterCustomizedEvent } from '../events';
+
+jest.mock('api/common/logEvent', () => ({
+	__esModule: true,
+	default: jest.fn(() => Promise.resolve()),
+}));
+
+describe('logInfraDrawerFilterCustomizedEvent', () => {
+	it('logs a cleared filter with no expression keys', () => {
+		logInfraDrawerFilterCustomizedEvent(
+			InfraMonitoringEntity.PODS,
+			'logs',
+			'',
+			'search',
+		);
+
+		expect(jest.mocked(logEvent)).toHaveBeenCalledWith(
+			'Infra Monitoring: Drawer filter customized',
+			{
+				entityType: InfraMonitoringEntity.PODS,
+				tab: 'logs',
+				expressionKeys: [],
+				filterSource: 'search',
+			},
+		);
+	});
+});

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/createPodMetricsTab.tsx

@@ -1,5 +1,4 @@
 import { Container } from '@signozhq/icons';
-import { InfraMonitoringEvents } from 'constants/events';
 import { GetQueryResultsProps } from 'lib/dashboard/getQueryResults';
 
 import { CustomTab } from '../Base/types';
@@ -11,20 +10,6 @@ import {
 
 import EntityMetrics from './EntityMetrics';
 
-const categoryToEventEntity: Record<InfraMonitoringEntity, string> = {
-	[InfraMonitoringEntity.DAEMONSETS]: InfraMonitoringEvents.DaemonSet,
-	[InfraMonitoringEntity.DEPLOYMENTS]: InfraMonitoringEvents.Deployment,
-	[InfraMonitoringEntity.JOBS]: InfraMonitoringEvents.Job,
-	[InfraMonitoringEntity.NAMESPACES]: InfraMonitoringEvents.Namespace,
-	[InfraMonitoringEntity.STATEFULSETS]: InfraMonitoringEvents.StatefulSet,
-	[InfraMonitoringEntity.PODS]: InfraMonitoringEvents.Pod,
-	[InfraMonitoringEntity.NODES]: InfraMonitoringEvents.Node,
-	[InfraMonitoringEntity.CLUSTERS]: InfraMonitoringEvents.Cluster,
-	[InfraMonitoringEntity.VOLUMES]: InfraMonitoringEvents.Volume,
-	[InfraMonitoringEntity.HOSTS]: InfraMonitoringEvents.HostEntity,
-	[InfraMonitoringEntity.CONTAINERS]: 'container',
-};
-
 interface CreatePodMetricsTabParams<T> {
 	getQueryPayload: (
 		entity: T,
@@ -42,8 +27,6 @@ export function createPodMetricsTab<T>({
 	category,
 	docBasePath,
 }: CreatePodMetricsTabParams<T>): CustomTab<T> {
-	const eventEntity = categoryToEventEntity[category];
-
 	const widgetInfo = docBasePath
 		? podUtilizationByPodWidgetInfo.map((widget) => ({
 				...widget,
@@ -58,7 +41,6 @@ export function createPodMetricsTab<T>({
 		render: ({ entity }) => (
 			<EntityMetrics
 				entity={entity}
-				eventEntity={eventEntity}
 				entityWidgetInfo={widgetInfo}
 				getEntityQueryPayload={getQueryPayload}
 				queryKey={queryKey}

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/events.ts

@@ -10,9 +10,9 @@ export function logInfraDrawerTimeRangeCustomizedEvent(
 	entityType: InfraMonitoringEntity,
 	rangeLabel: string,
 ): void {
-	void logEvent('infra_drawer_time_range_customized', {
-		entity_type: entityType,
-		range_label: isCustomTimeRange(rangeLabel) ? 'custom' : rangeLabel,
+	void logEvent('Infra Monitoring: Drawer time range customized', {
+		entityType,
+		rangeLabel: isCustomTimeRange(rangeLabel) ? 'custom' : rangeLabel,
 	});
 }
 
@@ -26,15 +26,11 @@ export function logInfraDrawerFilterCustomizedEvent(
 		(pair) => pair.key,
 	);
 
-	if (expressionKeys.length === 0) {
-		return;
-	}
-
-	void logEvent('infra_drawer_filter_customized', {
-		entity_type: entityType,
+	void logEvent('Infra Monitoring: Drawer filter customized', {
+		entityType,
 		tab,
-		expression_keys: [...new Set(expressionKeys)],
-		filter_source: filterSource,
+		expressionKeys: [...new Set(expressionKeys)],
+		filterSource,
 	});
 }
 
@@ -43,9 +39,17 @@ export function logInfraDrawerTabViewedEvent(
 	tab: string,
 	isDefaultTab: boolean,
 ): void {
-	void logEvent('infra_drawer_tab_viewed', {
-		entity_type: entityType,
+	void logEvent('Infra Monitoring: Drawer tab viewed', {
+		entityType,
 		tab,
-		is_default_tab: isDefaultTab,
+		isDefaultTab,
+	});
+}
+
+export function logInfraDrawerTraceClickedEvent(
+	entityType: InfraMonitoringEntity,
+): void {
+	void logEvent('Infra Monitoring: Drawer trace clicked', {
+		entityType,
 	});
 }

frontend/src/container/InfraMonitoringK8sV2/InfraMonitoringK8s.tsx

@@ -47,8 +47,6 @@ import {
 } from './hooks';
 
 import styles from './InfraMonitoringK8s.module.scss';
-import { InfraMonitoringEvents } from 'constants/events';
-import logEvent from 'api/common/logEvent';
 import { NANO_SECOND_MULTIPLIER, useGlobalTimeStore } from 'store/globalTime';
 import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
 import {
@@ -120,13 +118,6 @@ export default function InfraMonitoringK8s(): JSX.Element {
 	}, [compositeQuery, redirectWithQueryBuilderData]);
 
 	useEffect(() => {
-		void logEvent(InfraMonitoringEvents.FilterApplied, {
-			entity: InfraMonitoringEvents.K8sEntity,
-			page: InfraMonitoringEvents.ListPage,
-			category: selectedCategory,
-			view: InfraMonitoringEvents.QuickFiltersView,
-		});
-
 		// The category query param is a plain string; entities are validated by
 		// getEntityConfig before rendering
 		logInfraMonitoringListViewedEvent(selectedCategory as InfraMonitoringEntity);

frontend/src/container/InfraMonitoringK8sV2/Jobs/entity.config.ts

@@ -7,7 +7,6 @@ import {
 	RenderErrorResponseDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { AxiosError } from 'axios';
-import { InfraMonitoringEvents } from 'constants/events';
 
 import { K8sEntityConfig } from '../Base/entity.config.types';
 import { K8sBaseFilters, K8sDetailsFilters } from '../Base/types';
@@ -125,7 +124,6 @@ export const jobEntityConfig: K8sEntityConfig<
 > = {
 	list: {
 		entity: InfraMonitoringEntity.JOBS,
-		eventCategory: InfraMonitoringEvents.Job,
 		tableColumns: k8sJobsColumnsConfig,
 		fetchListData,
 		getRowKey: getK8sJobRowKey,
@@ -134,7 +132,6 @@ export const jobEntityConfig: K8sEntityConfig<
 	},
 	details: {
 		category: InfraMonitoringEntity.JOBS,
-		eventCategory: InfraMonitoringEvents.Job,
 		tabsConfig: { showOverview: true },
 		queryKeyPrefix: 'job',
 		getSelectedItemExpression: k8sJobGetSelectedItemExpression,

frontend/src/container/InfraMonitoringK8sV2/Namespaces/entity.config.ts

@@ -7,7 +7,6 @@ import {
 	RenderErrorResponseDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { AxiosError } from 'axios';
-import { InfraMonitoringEvents } from 'constants/events';
 import { createPodMetricsTab } from 'container/InfraMonitoringK8sV2/EntityDetailsUtils/createPodMetricsTab';
 
 import { K8sEntityConfig } from '../Base/entity.config.types';
@@ -136,7 +135,6 @@ export const namespaceEntityConfig: K8sEntityConfig<
 > = {
 	list: {
 		entity: InfraMonitoringEntity.NAMESPACES,
-		eventCategory: InfraMonitoringEvents.Namespace,
 		tableColumns: k8sNamespacesColumnsConfig,
 		fetchListData,
 		getRowKey: getK8sNamespaceRowKey,
@@ -145,7 +143,6 @@ export const namespaceEntityConfig: K8sEntityConfig<
 	},
 	details: {
 		category: InfraMonitoringEntity.NAMESPACES,
-		eventCategory: InfraMonitoringEvents.Namespace,
 		tabsConfig: { showOverview: true },
 		queryKeyPrefix: 'namespace',
 		getSelectedItemExpression: k8sNamespaceGetSelectedItemExpression,

frontend/src/container/InfraMonitoringK8sV2/Nodes/entity.config.ts

@@ -7,7 +7,6 @@ import {
 	RenderErrorResponseDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { AxiosError } from 'axios';
-import { InfraMonitoringEvents } from 'constants/events';
 
 import { K8sEntityConfig } from '../Base/entity.config.types';
 import { K8sBaseFilters, K8sDetailsFilters } from '../Base/types';
@@ -123,7 +122,6 @@ export const nodeEntityConfig: K8sEntityConfig<
 > = {
 	list: {
 		entity: InfraMonitoringEntity.NODES,
-		eventCategory: InfraMonitoringEvents.Node,
 		tableColumns: k8sNodesColumnsConfig,
 		fetchListData,
 		getRowKey: getK8sNodeRowKey,
@@ -132,7 +130,6 @@ export const nodeEntityConfig: K8sEntityConfig<
 	},
 	details: {
 		category: InfraMonitoringEntity.NODES,
-		eventCategory: InfraMonitoringEvents.Node,
 		tabsConfig: { showOverview: true },
 		queryKeyPrefix: 'node',
 		getSelectedItemExpression: k8sNodeGetSelectedItemExpression,

frontend/src/container/InfraMonitoringK8sV2/Pods/entity.config.ts

@@ -7,7 +7,6 @@ import {
 	RenderErrorResponseDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { AxiosError } from 'axios';
-import { InfraMonitoringEvents } from 'constants/events';
 
 import { K8sEntityConfig } from '../Base/entity.config.types';
 import { K8sBaseFilters, K8sDetailsFilters } from '../Base/types';
@@ -114,7 +113,6 @@ export const podEntityConfig: K8sEntityConfig<InframonitoringtypesPodRecordDTO>
 	{
 		list: {
 			entity: InfraMonitoringEntity.PODS,
-			eventCategory: InfraMonitoringEvents.Pod,
 			tableColumns: k8sPodColumnsConfig,
 			fetchListData,
 			getRowKey: getK8sPodRowKey,
@@ -123,7 +121,6 @@ export const podEntityConfig: K8sEntityConfig<InframonitoringtypesPodRecordDTO>
 		},
 		details: {
 			category: InfraMonitoringEntity.PODS,
-			eventCategory: InfraMonitoringEvents.Pod,
 			tabsConfig: { showOverview: true },
 			queryKeyPrefix: 'pod',
 			getSelectedItemExpression: k8sPodGetSelectedItemExpression,

frontend/src/container/InfraMonitoringK8sV2/StatefulSets/entity.config.ts

@@ -7,7 +7,6 @@ import {
 	RenderErrorResponseDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { AxiosError } from 'axios';
-import { InfraMonitoringEvents } from 'constants/events';
 import { createPodMetricsTab } from 'container/InfraMonitoringK8sV2/EntityDetailsUtils/createPodMetricsTab';
 
 import { K8sEntityConfig } from '../Base/entity.config.types';
@@ -125,7 +124,6 @@ export const statefulSetEntityConfig: K8sEntityConfig<
 > = {
 	list: {
 		entity: InfraMonitoringEntity.STATEFULSETS,
-		eventCategory: InfraMonitoringEvents.StatefulSet,
 		tableColumns: k8sStatefulSetsColumnsConfig,
 		fetchListData,
 		getRowKey: getK8sStatefulSetRowKey,
@@ -134,7 +132,6 @@ export const statefulSetEntityConfig: K8sEntityConfig<
 	},
 	details: {
 		category: InfraMonitoringEntity.STATEFULSETS,
-		eventCategory: InfraMonitoringEvents.StatefulSet,
 		tabsConfig: { showOverview: true },
 		queryKeyPrefix: 'statefulSet',
 		getSelectedItemExpression: k8sStatefulSetGetSelectedItemExpression,

frontend/src/container/InfraMonitoringK8sV2/Volumes/entity.config.ts

@@ -7,7 +7,6 @@ import {
 	RenderErrorResponseDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { AxiosError } from 'axios';
-import { InfraMonitoringEvents } from 'constants/events';
 
 import { K8sEntityConfig } from '../Base/entity.config.types';
 import { K8sBaseFilters, K8sDetailsFilters } from '../Base/types';
@@ -117,7 +116,6 @@ export const volumeEntityConfig: K8sEntityConfig<
 > = {
 	list: {
 		entity: InfraMonitoringEntity.VOLUMES,
-		eventCategory: InfraMonitoringEvents.Volumes,
 		tableColumns: k8sVolumesColumnsConfig,
 		fetchListData,
 		getRowKey: getK8sVolumeRowKey,
@@ -126,7 +124,6 @@ export const volumeEntityConfig: K8sEntityConfig<
 	},
 	details: {
 		category: InfraMonitoringEntity.VOLUMES,
-		eventCategory: InfraMonitoringEvents.Volume,
 		tabsConfig: { showOverview: true },
 		queryKeyPrefix: 'volume',
 		getSelectedItemExpression: k8sVolumeGetSelectedItemExpression,

frontend/src/container/LogDetailedView/ContextView/__tests__/ContextLogRenderer.test.tsx

@@ -33,6 +33,10 @@ import {
 // Mock the useContextLogData hook
 const mockHandleRunQuery = jest.fn();
 
+jest.mock('hooks/logs/useIsBodyJsonEnabled', () => ({
+	useIsBodyJsonEnabled: (): boolean => false,
+}));
+
 jest.mock('container/OptionsMenu', () => ({
 	useOptionsMenu: (): any => ({
 		options: {

frontend/src/container/LogDetailedView/hooks/useLogAttributeActions.tsx

@@ -1,7 +1,6 @@
 import { useCallback, useMemo } from 'react';
 import { CircleMinus, CirclePlus, Layers, RefreshCw } from '@signozhq/icons';
 import { convertFiltersToExpression } from 'components/QueryBuilderV2/utils';
-import { FeatureKeys } from 'constants/features';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import {
 	ChangeViewFunctionType,
@@ -13,7 +12,7 @@ import {
 	PrettyViewAction,
 	VisibleActionsConfig,
 } from 'periscope/components/PrettyView/PrettyView';
-import { useAppContext } from 'providers/App/App';
+import { useIsBodyJsonEnabled } from 'hooks/logs/useIsBodyJsonEnabled';
 import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 
 import { LogDetailsAction } from '../constants';
@@ -54,11 +53,7 @@ export function useLogAttributeActions({
 	onApplyLogFilter,
 }: UseLogAttributeActionsParams): UseLogAttributeActionsResult {
 	const { stagedQuery, updateQueriesData } = useQueryBuilder();
-	const { featureFlags } = useAppContext();
-
-	const isBodyJsonQueryEnabled =
-		featureFlags?.find((flag) => flag.name === FeatureKeys.USE_JSON_BODY)
-			?.active || false;
+	const isBodyJsonQueryEnabled = useIsBodyJsonEnabled();
 
 	const filterFor = useCallback(
 		(context: FieldContext, isFilterIn: boolean): void => {

frontend/src/container/LogDetailedView/utils.tsx

@@ -2,11 +2,7 @@ import * as Sentry from '@sentry/react';
 import Convert from 'ansi-to-html';
 import { MetricsType } from 'container/MetricsApplication/constant';
 import dompurify from 'dompurify';
-import {
-	ILog,
-	ILogAggregateAttributesResources,
-	ILogBody,
-} from 'types/api/logs/log';
+import { ILog, ILogAggregateAttributesResources } from 'types/api/logs/log';
 import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
 import { FORBID_DOM_PURIFY_ATTR, FORBID_DOM_PURIFY_TAGS } from 'utils/app';
 
@@ -349,8 +345,3 @@ export const getSanitizedLogBody = (
 		return '{}';
 	}
 };
-
-// Returns a plain string for display contexts (Monaco editor, table cells, raw log row).
-export function getBodyDisplayString(body: string | ILogBody): string {
-	return typeof body === 'string' ? body : JSON.stringify(body as ILogBody);
-}

frontend/src/container/LogsExplorerList/LogsExplorerList.module.scss

@@ -0,0 +1,3 @@
+.logsTable {
+	--tanstack-table-row-height: 30px;
+}

frontend/src/container/LogsExplorerList/LogsExplorerList.style.scss

@@ -2,7 +2,6 @@
 	flex: 1;
 	display: flex;
 	flex-direction: column;
-	font-family: 'Space Mono', monospace;
 	font-size: 14px;
 	font-weight: 400;
 	line-height: 18px;
@@ -19,7 +18,6 @@
 			thead {
 				tr {
 					th {
-						font-family: 'Space Mono', monospace;
 						font-size: 12px;
 						color: white !important;
 
@@ -37,7 +35,6 @@
 					}
 
 					td {
-						font-family: 'Space Mono', monospace;
 						font-size: 12px;
 					}
 
@@ -57,7 +54,6 @@
 			tbody {
 				tr {
 					td {
-						font-family: 'Space Mono', monospace;
 						font-size: 12px;
 						padding: 4px !important;
 

frontend/src/container/LogsExplorerList/index.tsx

@@ -48,6 +48,7 @@ import {
 	isTraceToLogsQuery,
 } from './utils';
 
+import styles from './LogsExplorerList.module.scss';
 import './LogsExplorerList.style.scss';
 
 function Footer(): JSX.Element {
@@ -202,6 +203,7 @@ function LogsExplorerList({
 			return (
 				<TanStackTable<ILog>
 					ref={ref as React.Ref<TanStackTableHandle>}
+					className={styles.logsTable}
 					columns={logsColumns}
 					columnStorageKey={LOCALSTORAGE.LOGS_LIST_COLUMNS}
 					respectColumnOrder={false}

frontend/src/container/LogsExplorerViews/LogsExplorerViews.styles.scss

@@ -1,5 +1,4 @@
 .logs-explorer-views-container {
-	margin-bottom: 24px;
 	flex: 1;
 	min-height: 0;
 	display: flex;

frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/ProcessorForm.tsx

@@ -2,9 +2,8 @@ import { useTranslation } from 'react-i18next';
 import { Input } from '@signozhq/ui/input';
 import { Switch } from '@signozhq/ui/switch';
 import { Form, Select, Space } from 'antd';
-import { FeatureKeys } from 'constants/features';
 import { ModalFooterTitle } from 'container/PipelinePage/styles';
-import { useAppContext } from 'providers/App/App';
+import { useIsBodyJsonEnabled } from 'hooks/logs/useIsBodyJsonEnabled';
 import { ProcessorData } from 'types/api/pipeline/def';
 
 import { formValidationRules } from '../config';
@@ -138,10 +137,7 @@ function ProcessorForm({
 	selectedProcessorData,
 	isAdd,
 }: ProcessorFormProps): JSX.Element {
-	const { featureFlags } = useAppContext();
-	const isBodyJsonEnabled =
-		featureFlags?.find((flag) => flag.name === FeatureKeys.USE_JSON_BODY)
-			?.active || false;
+	const isBodyJsonEnabled = useIsBodyJsonEnabled();
 
 	return (
 		<div className="processor-form-container">

frontend/src/container/PipelinePage/PipelineListsView/Preview/components/LogsList/index.tsx

@@ -2,8 +2,8 @@ import { Expand } from '@signozhq/icons';
 import LogDetail from 'components/LogDetail';
 import { VIEW_TYPES } from 'components/LogDetail/constants';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
-import { getBodyDisplayString } from 'container/LogDetailedView/utils';
 import { useActiveLog } from 'hooks/logs/useActiveLog';
+import { getBodyDisplay } from 'lib/logs/logBody';
 import { useTimezone } from 'providers/Timezone';
 import { ILog } from 'types/api/logs/log';
 
@@ -31,7 +31,7 @@ function LogsList({ logs }: LogsListProps): JSX.Element {
 						)}
 					</div>
 					<div className="logs-preview-list-item-body">
-						{getBodyDisplayString(log.body)}
+						{getBodyDisplay(log.body)}
 					</div>
 					<div
 						className="logs-preview-list-item-expand"

frontend/src/container/TracesExplorer/Controls/Controls.module.scss

@@ -1,14 +0,0 @@
-.container {
-	display: flex;
-	align-items: center;
-	justify-content: flex-end;
-	gap: 0.3rem;
-	margin: 8px 0;
-}
-
-.optionsTrigger {
-	display: flex;
-	align-items: center;
-	gap: 4px;
-	cursor: pointer;
-}

frontend/src/container/TracesExplorer/Controls/index.tsx

@@ -1,82 +1,57 @@
 import { memo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Settings } from '@signozhq/icons';
+import { SlidersVertical } from '@signozhq/icons';
+import { Button } from '@signozhq/ui/button';
+import { Tooltip } from '@signozhq/ui/tooltip';
 import FieldsSelector from 'components/FieldsSelector';
-import Controls, { ControlsProps } from 'container/Controls';
 import { OptionsMenuConfig } from 'container/OptionsMenu/types';
-import useQueryPagination from 'hooks/queryPagination/useQueryPagination';
 import { DataSource } from 'types/common/queryBuilder';
 
-import styles from './Controls.module.scss';
-
 function TraceExplorerControls({
-	isLoading,
-	totalCount,
-	perPageOptions,
 	config,
-	showSizeChanger = true,
 }: TraceExplorerControlsProps): JSX.Element | null {
 	const { t } = useTranslation(['trace']);
 	const [isFieldsSelectorOpen, setIsFieldsSelectorOpen] = useState(false);
 
-	const {
-		pagination,
-		handleCountItemsPerPageChange,
-		handleNavigateNext,
-		handleNavigatePrevious,
-	} = useQueryPagination(totalCount, perPageOptions);
+	if (!config?.fieldsSelector) {
+		return null;
+	}
+
+	const label = t('options_menu.options');
 
 	return (
-		<div className={styles.container}>
-			{config?.fieldsSelector && (
-				<>
-					<div
-						className={styles.optionsTrigger}
-						onClick={(): void => setIsFieldsSelectorOpen(true)}
-					>
-						{t('options_menu.options')}
-						<Settings size="md" />
-					</div>
-					<FieldsSelector
-						isOpen={isFieldsSelectorOpen}
-						title="Edit columns"
-						fields={config.fieldsSelector.value}
-						onFieldsChange={config.fieldsSelector.onFieldsChange}
-						onClose={(): void => setIsFieldsSelectorOpen(false)}
-						signal={DataSource.TRACES}
-					/>
-				</>
-			)}
-
-			<Controls
-				isLoading={isLoading}
-				totalCount={totalCount}
-				offset={pagination.offset}
-				countPerPage={pagination.limit}
-				perPageOptions={perPageOptions}
-				handleCountItemsPerPageChange={handleCountItemsPerPageChange}
-				handleNavigateNext={handleNavigateNext}
-				handleNavigatePrevious={handleNavigatePrevious}
-				showSizeChanger={showSizeChanger}
+		<>
+			<Tooltip title={label}>
+				<Button
+					variant="ghost"
+					color="secondary"
+					size="sm"
+					icon
+					aria-label={label}
+					testId="periscope-btn-options-traces"
+					onClick={(): void => setIsFieldsSelectorOpen(true)}
+				>
+					<SlidersVertical size={14} />
+				</Button>
+			</Tooltip>
+			<FieldsSelector
+				isOpen={isFieldsSelectorOpen}
+				title="Edit columns"
+				fields={config.fieldsSelector.value}
+				onFieldsChange={config.fieldsSelector.onFieldsChange}
+				onClose={(): void => setIsFieldsSelectorOpen(false)}
+				signal={DataSource.TRACES}
 			/>
-		</div>
+		</>
 	);
 }
 
+type TraceExplorerControlsProps = {
+	config?: OptionsMenuConfig | null;
+};
+
 TraceExplorerControls.defaultProps = {
 	config: null,
 };
 
-type TraceExplorerControlsProps = Pick<
-	ControlsProps,
-	'isLoading' | 'totalCount' | 'perPageOptions'
-> & {
-	config?: OptionsMenuConfig | null;
-	showSizeChanger?: boolean;
-};
-
-TraceExplorerControls.defaultProps = {
-	showSizeChanger: true,
-};
-
 export default memo(TraceExplorerControls);

frontend/src/container/TracesExplorer/ListView/ListView.module.scss

@@ -6,3 +6,33 @@
 	height: calc(100vh - 240px);
 	min-height: 400px;
 }
+
+.controls {
+	display: flex;
+	justify-content: flex-end;
+	align-items: center;
+	gap: 4px;
+	min-height: 40px;
+	padding: 4px 8px;
+	border-bottom: 1px solid var(--l1-border);
+}
+
+.orderBy {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+}
+
+.orderByLabel {
+	display: flex;
+	align-items: center;
+	gap: 4px;
+	color: var(--l2-foreground);
+	font-size: 12px;
+	font-weight: 400;
+	line-height: 16px;
+}
+
+.drawerScope {
+	display: contents;
+}

frontend/src/container/TracesExplorer/ListView/ListView.styles.scss

@@ -1,34 +0,0 @@
-.trace-explorer-controls {
-	display: flex;
-	justify-content: flex-end;
-	align-items: center;
-	gap: 8px;
-
-	.order-by-container {
-		display: flex;
-		align-items: center;
-		gap: 8px;
-
-		.order-by-label {
-			color: var(--muted-foreground);
-			font-size: 12px;
-			font-style: normal;
-			font-weight: 400;
-			line-height: 16px; /* 133.333% */
-
-			display: flex;
-			align-items: center;
-			gap: 4px;
-		}
-
-		.order-by-select {
-			width: 100px;
-
-			.ant-select-selector {
-				border: none;
-				box-shadow: none;
-				background-color: transparent;
-			}
-		}
-	}
-}