@@ -2,16 +2,26 @@
 
 import { initializeFaro, getWebInstrumentations, faro } from '@grafana/faro-web-sdk';
 import { TracingInstrumentation } from '@grafana/faro-web-tracing';
+import { useSession } from 'next-auth/react';
 
 export default function FrontendObservability(): null {
     if (faro.api) {
         return null;
     }
 
+    const session = useSession()
+
     try {
         initializeFaro({
             url: process.env.NEXT_PUBLIC_FARO_API_URL,
             apiKey: process.env.NEXT_PUBLIC_FARO_API_KEY,
+            sessionTracking: {
+                enabled: true,
+                persistent: true,
+                generateSessionId: () => {
+                    return session.status === 'authenticated' && session.data.user && session.data.user.email ? session.data.user.email : crypto.randomUUID()
+                }
+            },
             app: {
                 name: process.env.NEXT_PUBLIC_FARO_APP_NAME,
                 version: process.env.NEXT_PUBLIC_RELEASE,
@@ -17,7 +17,7 @@ import { API_URL } from '#/shared/lib/constants'
 import { declineToken } from '#/shared/lib/helpers/get-token'
 import { IProps } from '#/shared/lib/types/entities'
 import { NavigationSearch } from '#/widgets/navigation-search'
-import { faro } from '@grafana/faro-web-sdk'
+import { PersistentSessionsManager } from '@grafana/faro-web-sdk'
 
 interface InfoBarProps extends IProps {}
 
@@ -312,6 +312,7 @@ const InfoBar: React.FC<InfoBarProps> = ({ device }) => {
 									<Box
 										display='flex'
 										onClick={() => {
+											PersistentSessionsManager.removeUserSession();
 											signOut()
 										}}
 										sx={{ marginTop: '15px', cursor: 'pointer' }}
@@ -3,6 +3,7 @@ import styles from './slow-loading.module.scss'
 import { Loader } from '#/shared'
 import { CommonButton } from '#/shared/ui/button'
 import { signOut, useSession } from 'next-auth/react'
+import { PersistentSessionsManager } from '@grafana/faro-web-sdk'
 
 interface SlowLoadingProps { }
 
@@ -12,7 +13,7 @@ export const SlowLoading = ({ }: SlowLoadingProps) => {
 			<Loader className={styles.loading__loader} size={50} />
 			<p>Долгая загрузка</p>
 			<span>Предлагаем перезайти</span>
-			<CommonButton onClick={() => signOut()} variant='primary'>
+			<CommonButton onClick={() => { PersistentSessionsManager.removeUserSession(); signOut() }} variant='primary'>
 				Выйти
 			</CommonButton>
 		</div>
@@ -65,7 +65,6 @@ function App({ Component, pageProps: { session, ...pageProps } }: AppPropsWithLa
 
 	return (
 		<>
-		<FrontendObservability/>
 			<style jsx global>{`
 				html {
 					font-family: ${inter.style.fontFamily};
@@ -2,9 +2,10 @@ import { Attributes, FC, ReactElement } from 'react'
 import { Layout } from '../ui'
 import { LayoutProps } from '../types'
 import React from 'react'
+import FrontendObservability from '#/app/components/FrontendObservability'
 
 export const getDefaultLayout = function (layoutProps: Omit<LayoutProps, 'children'> = {}) {
-	return (page: ReactElement) => <Layout {...layoutProps}>{page}</Layout>
+	return (page: ReactElement) => <Layout {...layoutProps}><FrontendObservability />{page}</Layout>
 }
 
 export const getLayout = function (
@@ -20,6 +20,7 @@ import { ErrorReportPlate } from '#/features/error-report'
 import { CSSTransition, SwitchTransition } from 'react-transition-group'
 import styles from './default.module.scss'
 import { SlowLoading } from '#/features/slow-loading'
+import { PersistentSessionsManager } from '@grafana/faro-web-sdk';
 
 export const Layout: React.FC<LayoutProps> = ({ children, titlePage, isLoader, height, device = getDeviceType() }) => {
 	const dispatch = useAppDispatch()
@@ -37,6 +38,7 @@ export const Layout: React.FC<LayoutProps> = ({ children, titlePage, isLoader, h
 	const { push } = useRouter()
 
 	function logout() {
+		PersistentSessionsManager.removeUserSession();
 		signOut()
 		push('/login')
 	}
@@ -49,8 +51,7 @@ export const Layout: React.FC<LayoutProps> = ({ children, titlePage, isLoader, h
 
 	useEffect(() => {
 		if (meStatus === 'failed') {
-			signOut()
-			push('/login')
+			logout()
 		}
 	}, [meStatus])
 
@@ -15,6 +15,7 @@ import { useAppDispatch, useAppSelector } from '#/app/store/store'
 import { AccountMenu } from '#/shared'
 
 import { menuListMiddle, menuListTop } from '../../side-menu/ui/side-menu'
+import { PersistentSessionsManager } from '@grafana/faro-web-sdk'
 
 export const MainMenuMobile = memo(() => {
 	const { data, status } = useSession()
@@ -166,7 +167,7 @@ export const MainMenuMobile = memo(() => {
 						</Box>
 					</Box>
 					<Box sx={{ marginTop: 1.5 }}>
-						<Box onClick={() => signOut()}>
+						<Box onClick={() => { PersistentSessionsManager.removeUserSession(); signOut() }}>
 							<MenuItem
 								open={open}
 								pathname={pathname}
@@ -12,7 +12,7 @@ build_staging:
   image: docker:cli
   script:
     - export RELEASE=$(echo -n $(date '+%D %X') | md5sum | awk '{print $1}')
-    - echo -e "\nNEXT_PUBLIC_RELEASE=$RELEASE" >> $ENV
+    - echo -e "\nNEXT_PUBLIC_RELEASE=$RELEASE\nNEXT_PUBLIC_ENVIRONMENT=staging\n" >> $ENV
     - cp $ENV .env.production
     - docker compose --env-file $ENV build
     - docker compose push
@@ -55,7 +55,7 @@ build_production:
   stage: Build
   script:
     - export RELEASE=$(echo -n $(date '+%D %X') | md5sum | awk '{print $1}')
-    - echo -e "\nNEXT_PUBLIC_RELEASE=$RELEASE" >> $ENV
+    - echo -e "\nNEXT_PUBLIC_RELEASE=$RELEASE\nNEXT_PUBLIC_ENVIRONMENT=production\n" >> $ENV
     - cp $ENV .env.production
     - docker compose -f stack.yml --env-file $ENV build
     - docker compose -f stack.yml push