Merge branch 'develop' into issue_4777

* refactor: removed the error body

* refactor: check for error response body condition

* refactor: empty object check

ee/query-service/app/server.go

@@ -10,6 +10,7 @@ import (
 	"net/http"
 	_ "net/http/pprof" // http profiler
 	"os"
+	"regexp"
 	"time"
 
 	"github.com/gorilla/handlers"
@@ -393,13 +394,14 @@ func (lrw *loggingResponseWriter) Flush() {
 	lrw.ResponseWriter.(http.Flusher).Flush()
 }
 
-func extractQueryRangeV3Data(path string, r *http.Request) (map[string]interface{}, bool) {
-	pathToExtractBodyFrom := "/api/v3/query_range"
+func extractQueryRangeData(path string, r *http.Request) (map[string]interface{}, bool) {
+	pathToExtractBodyFromV3 := "/api/v3/query_range"
+	pathToExtractBodyFromV4 := "/api/v4/query_range"
 
 	data := map[string]interface{}{}
 	var postData *v3.QueryRangeParamsV3
 
-	if path == pathToExtractBodyFrom && (r.Method == "POST") {
+	if (r.Method == "POST") && ((path == pathToExtractBodyFromV3) || (path == pathToExtractBodyFromV4)) {
 		if r.Body != nil {
 			bodyBytes, err := io.ReadAll(r.Body)
 			if err != nil {
@@ -417,6 +419,25 @@ func extractQueryRangeV3Data(path string, r *http.Request) (map[string]interface
 		return nil, false
 	}
 
+	referrer := r.Header.Get("Referer")
+
+	dashboardMatched, err := regexp.MatchString(`/dashboard/[a-zA-Z0-9\-]+/(new|edit)(?:\?.*)?$`, referrer)
+	if err != nil {
+		zap.L().Error("error while matching the referrer", zap.Error(err))
+	}
+	alertMatched, err := regexp.MatchString(`/alerts/(new|edit)(?:\?.*)?$`, referrer)
+	if err != nil {
+		zap.L().Error("error while matching the alert: ", zap.Error(err))
+	}
+	logsExplorerMatched, err := regexp.MatchString(`/logs/logs-explorer(?:\?.*)?$`, referrer)
+	if err != nil {
+		zap.L().Error("error while matching the logs explorer: ", zap.Error(err))
+	}
+	traceExplorerMatched, err := regexp.MatchString(`/traces-explorer(?:\?.*)?$`, referrer)
+	if err != nil {
+		zap.L().Error("error while matching the trace explorer: ", zap.Error(err))
+	}
+
 	signozMetricsUsed := false
 	signozLogsUsed := false
 	signozTracesUsed := false
@@ -445,6 +466,20 @@ func extractQueryRangeV3Data(path string, r *http.Request) (map[string]interface
 		data["tracesUsed"] = signozTracesUsed
 		userEmail, err := baseauth.GetEmailFromJwt(r.Context())
 		if err == nil {
+			// switch case to set data["screen"] based on the referrer
+			switch {
+			case dashboardMatched:
+				data["screen"] = "panel"
+			case alertMatched:
+				data["screen"] = "alert"
+			case logsExplorerMatched:
+				data["screen"] = "logs-explorer"
+			case traceExplorerMatched:
+				data["screen"] = "traces-explorer"
+			default:
+				data["screen"] = "unknown"
+				return data, true
+			}
 			telemetry.GetInstance().SendEvent(telemetry.TELEMETRY_EVENT_QUERY_RANGE_API, data, userEmail, true, false)
 		}
 	}
@@ -472,7 +507,7 @@ func (s *Server) analyticsMiddleware(next http.Handler) http.Handler {
 		route := mux.CurrentRoute(r)
 		path, _ := route.GetPathTemplate()
 
-		queryRangeV3data, metadataExists := extractQueryRangeV3Data(path, r)
+		queryRangeData, metadataExists := extractQueryRangeData(path, r)
 		getActiveLogs(path, r)
 
 		lrw := NewLoggingResponseWriter(w)
@@ -480,7 +515,7 @@ func (s *Server) analyticsMiddleware(next http.Handler) http.Handler {
 
 		data := map[string]interface{}{"path": path, "statusCode": lrw.statusCode}
 		if metadataExists {
-			for key, value := range queryRangeV3data {
+			for key, value := range queryRangeData {
 				data[key] = value
 			}
 		}

frontend/.gitignore

@@ -0,0 +1,3 @@
+
+# Sentry Config File
+.env.sentry-build-plugin

frontend/package.json

@@ -41,7 +41,7 @@
 		"@radix-ui/react-tabs": "1.0.4",
 		"@radix-ui/react-tooltip": "1.0.7",
 		"@sentry/react": "7.102.1",
-		"@sentry/webpack-plugin": "2.14.2",
+		"@sentry/webpack-plugin": "2.16.0",
 		"@signozhq/design-tokens": "0.0.8",
 		"@uiw/react-md-editor": "3.23.5",
 		"@xstate/react": "^3.0.0",

frontend/src/AppRoutes/index.tsx

@@ -147,7 +147,11 @@ function App(): JSX.Element {
 			}
 		}
 
-		if (isOnBasicPlan || (isLoggedInState && role && role !== 'ADMIN')) {
+		if (
+			isOnBasicPlan ||
+			(isLoggedInState && role && role !== 'ADMIN') ||
+			!(isCloudUserVal || isEECloudUser())
+		) {
 			const newRoutes = routes.filter((route) => route?.path !== ROUTES.BILLING);
 			setRoutes(newRoutes);
 		}

frontend/src/components/Loadable/index.tsx

@@ -1,9 +1,10 @@
 import { ComponentType, lazy, LazyExoticComponent } from 'react';
+import { lazyRetry } from 'utils/lazyWithRetries';
 
 function Loadable(importPath: {
 	(): LoadableProps;
 }): LazyExoticComponent<LazyComponent> {
-	return lazy(() => importPath());
+	return lazy(() => lazyRetry(() => importPath()));
 }
 
 type LazyComponent = ComponentType<Record<string, unknown>>;

frontend/src/components/TableRenderer/LabelColumn.tsx

@@ -1,10 +1,10 @@
 import './LabelColumn.styles.scss';
 
 import { Popover, Tag } from 'antd';
-import { popupContainer } from 'utils/selectPopupContainer';
 
 import { LabelColumnProps } from './TableRenderer.types';
 import TagWithToolTip from './TagWithToolTip';
+import { getLabelAndValueContent } from './utils';
 
 function LabelColumn({ labels, value, color }: LabelColumnProps): JSX.Element {
 	const newLabels = labels.length > 3 ? labels.slice(0, 3) : labels;
@@ -19,19 +19,17 @@ function LabelColumn({ labels, value, color }: LabelColumnProps): JSX.Element {
 			)}
 			{remainingLabels.length > 0 && (
 				<Popover
-					getPopupContainer={popupContainer}
 					placement="bottomRight"
 					showArrow={false}
 					content={
 						<div>
 							{labels.map(
 								(label: string): JSX.Element => (
-									<TagWithToolTip
-										key={label}
-										label={label}
-										color={color}
-										value={value}
-									/>
+									<div key={label}>
+										<Tag className="label-column--tag" color={color}>
+											{getLabelAndValueContent(label, value && value[label])}
+										</Tag>
+									</div>
 								),
 							)}
 						</div>

frontend/src/components/TableRenderer/utils.ts

@@ -38,6 +38,16 @@ export const getLabelRenderingValue = (
 	return label;
 };
 
+export const getLabelAndValueContent = (
+	label: string,
+	value?: string,
+): string => {
+	if (value) {
+		return `${label}: ${value}`;
+	}
+	return `${label}`;
+};
+
 interface GeneratorResizeTableColumnsProp<T> {
 	baseColumnOptions: ColumnsType<T>;
 	dynamicColumnOption: { key: string; columnOption: ColumnType<T> }[];

frontend/src/constants/queryFunctionOptions.ts

@@ -2,7 +2,7 @@
 import { QueryFunctionsTypes } from 'types/common/queryBuilder';
 import { SelectOption } from 'types/common/select';
 
-export const queryFunctionOptions: SelectOption<string, string>[] = [
+export const metricQueryFunctionOptions: SelectOption<string, string>[] = [
 	{
 		value: QueryFunctionsTypes.CUTOFF_MIN,
 		label: 'Cut Off Min',
@@ -65,6 +65,12 @@ export const queryFunctionOptions: SelectOption<string, string>[] = [
 	},
 ];
 
+export const logsQueryFunctionOptions: SelectOption<string, string>[] = [
+	{
+		value: QueryFunctionsTypes.TIME_SHIFT,
+		label: 'Time Shift',
+	},
+];
 interface QueryFunctionConfigType {
 	[key: string]: {
 		showInput: boolean;

frontend/src/constants/sessionStorage.ts

@@ -0,0 +1,3 @@
+export enum SESSIONSTORAGE {
+	RETRY_LAZY_REFRESHED = 'retry-lazy-refreshed',
+}

frontend/src/container/AppLayout/AppLayout.styles.scss

@@ -6,6 +6,7 @@
 	.app-content {
 		width: calc(100% - 64px);
 		overflow: auto;
+		z-index: 0;
 
 		.content-container {
 			position: relative;

frontend/src/container/ConfigDropdown/Config/index.tsx

@@ -3,6 +3,7 @@ import Spinner from 'components/Spinner';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import { lazy, Suspense, useMemo } from 'react';
 import { ConfigProps } from 'types/api/dynamicConfigs/getDynamicConfigs';
+import { lazyRetry } from 'utils/lazyWithRetries';
 
 import ErrorLink from './ErrorLink';
 import LinkContainer from './Link';
@@ -17,8 +18,9 @@ function HelpToolTip({ config }: HelpToolTipProps): JSX.Element {
 
 	const items = sortedConfig.map((item) => {
 		const iconName = `${isDarkMode ? item.darkIcon : item.lightIcon}`;
-		const Component = lazy(
-			() => import(`@ant-design/icons/es/icons/${iconName}.js`),
+
+		const Component = lazy(() =>
+			lazyRetry(() => import(`@ant-design/icons/es/icons/${iconName}.js`)),
 		);
 		return {
 			key: item.text + item.href,

frontend/src/container/ExplorerOptions/ExplorerOptions.styles.scss

@@ -1,10 +1,10 @@
 .hide-update {
-	left: calc(50% - 41px) !important;
+	left: calc(50% - 72px) !important;
 }
 .explorer-update {
 	position: fixed;
 	bottom: 24px;
-	left: calc(50% - 250px);
+	left: calc(50% - 352px);
 	display: flex;
 	align-items: center;
 	gap: 12px;
@@ -37,7 +37,6 @@
 	}
 }
 
-	
 .explorer-options {
 	position: fixed;
 	bottom: 24px;
@@ -78,11 +77,9 @@
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			gap: 8px;
+			border: none;
 
 			border: 1px solid #1d2023;
-			color: #c0c1c3;
-			background-color: #161922;
 
 			box-shadow: none !important;
 

frontend/src/container/ExplorerOptions/ExplorerOptions.tsx

@@ -373,34 +373,42 @@ function ExplorerOptions({
 							onClick={handleSaveViewModalToggle}
 							className={isEditDeleteSupported ? '' : 'hidden'}
 							disabled={viewsIsLoading || isRefetching}
+							icon={<Disc3 size={16} />}
 						>
-							<Disc3 size={16} /> Save this view
+							Save this view
 						</Button>
 					</div>
 
 					<hr className={isEditDeleteSupported ? '' : 'hidden'} />
 
 					<div className={cx('actions', isEditDeleteSupported ? '' : 'hidden')}>
-						<Tooltip title="Create Alerts">
+						<Button
+							disabled={disabled}
+							shape="round"
+							onClick={onCreateAlertsHandler}
+							icon={<ConciergeBell size={16} />}
+						>
+							Create an Alert
+						</Button>
+
+						<Button
+							type="primary"
+							disabled={disabled}
+							shape="round"
+							onClick={onAddToDashboard}
+							icon={<Plus size={16} />}
+						>
+							Add to Dashboard
+						</Button>
+					</div>
+					<div className="actions">
+						<Tooltip title="Hide">
 							<Button
 								disabled={disabled}
 								shape="circle"
-								onClick={onCreateAlertsHandler}
-							>
-								<ConciergeBell size={16} />
-							</Button>
-						</Tooltip>
-
-						<Tooltip title="Add to Dashboard">
-							<Button disabled={disabled} shape="circle" onClick={onAddToDashboard}>
-								<Plus size={16} />
-							</Button>
-						</Tooltip>
-
-						<Tooltip title="Hide">
-							<Button disabled={disabled} shape="circle" onClick={hideToolbar}>
-								<PanelBottomClose size={16} />
-							</Button>
+								onClick={hideToolbar}
+								icon={<PanelBottomClose size={16} />}
+							/>
 						</Tooltip>
 					</div>
 				</div>
@@ -413,6 +421,7 @@ function ExplorerOptions({
 				isQueryUpdated={isQueryUpdated}
 				handleClearSelect={handleClearSelect}
 				onUpdateQueryHandler={onUpdateQueryHandler}
+				isEditDeleteSupported={isEditDeleteSupported}
 			/>
 
 			<Modal

frontend/src/container/ExplorerOptions/ExplorerOptionsHideArea.tsx

@@ -16,6 +16,7 @@ interface DroppableAreaProps {
 	setIsExplorerOptionHidden?: Dispatch<SetStateAction<boolean>>;
 	handleClearSelect: () => void;
 	onUpdateQueryHandler: () => void;
+	isEditDeleteSupported: boolean;
 }
 
 function ExplorerOptionsHideArea({
@@ -25,6 +26,7 @@ function ExplorerOptionsHideArea({
 	setIsExplorerOptionHidden,
 	handleClearSelect,
 	onUpdateQueryHandler,
+	isEditDeleteSupported,
 }: DroppableAreaProps): JSX.Element {
 	const handleShowExplorerOption = (): void => {
 		if (setIsExplorerOptionHidden) {
@@ -47,14 +49,16 @@ function ExplorerOptionsHideArea({
 									icon={<X size={14} color={Color.BG_INK_500} />}
 								/>
 							</Tooltip>
-							<Tooltip title="Update this View">
-								<Button
-									onClick={onUpdateQueryHandler}
-									className="action-btn"
-									style={{ background: Color.BG_ROBIN_500 }}
-									icon={<Disc3 size={14} color={Color.BG_INK_500} />}
-								/>
-							</Tooltip>
+							{isEditDeleteSupported && (
+								<Tooltip title="Update this View">
+									<Button
+										onClick={onUpdateQueryHandler}
+										className="action-btn"
+										style={{ background: Color.BG_ROBIN_500 }}
+										icon={<Disc3 size={14} color={Color.BG_INK_500} />}
+									/>
+								</Tooltip>
+							)}
 						</div>
 					)}
 					<Button

frontend/src/container/FormAlertRules/QuerySection.tsx

@@ -56,8 +56,9 @@ function QuerySection({
 				initialDataSource: ALERTS_DATA_SOURCE_MAP[alertType],
 			}}
 			showFunctions={
-				alertType === AlertTypes.METRICS_BASED_ALERT &&
-				alertDef.version === ENTITY_VERSION_V4
+				(alertType === AlertTypes.METRICS_BASED_ALERT &&
+					alertDef.version === ENTITY_VERSION_V4) ||
+				alertType === AlertTypes.LOGS_BASED_ALERT
 			}
 			version={alertDef.version || 'v3'}
 		/>

frontend/src/container/GridCardLayout/GridCard/FullView/index.tsx

@@ -86,7 +86,7 @@ function FullView({
 		return {
 			query: updatedQuery,
 			graphType: PANEL_TYPES.LIST,
-			selectedTime: 'GLOBAL_TIME',
+			selectedTime: widget?.timePreferance || 'GLOBAL_TIME',
 			globalSelectedInterval: globalSelectedTime,
 			tableParams: {
 				pagination: {

frontend/src/container/GridCardLayout/GridCard/index.tsx

@@ -106,7 +106,7 @@ function GridCardGraph({
 		return {
 			query: updatedQuery,
 			graphType: PANEL_TYPES.LIST,
-			selectedTime: 'GLOBAL_TIME',
+			selectedTime: widget.timePreferance || 'GLOBAL_TIME',
 			globalSelectedInterval,
 			tableParams: {
 				pagination: {
@@ -121,7 +121,7 @@ function GridCardGraph({
 		{
 			...requestData,
 			variables: getDashboardVariables(variables),
-			selectedTime: 'GLOBAL_TIME',
+			selectedTime: widget.timePreferance || 'GLOBAL_TIME',
 			globalSelectedInterval,
 		},
 		version || DEFAULT_ENTITY_VERSION,

frontend/src/container/GridCardLayout/GridCardLayout.styles.scss

@@ -5,6 +5,12 @@
 	.react-grid-layout {
 		border: none !important;
 		margin-top: 0;
+
+		.widget-graph-container {
+			&.graph {
+				height: 100%;
+			}
+		}
 	}
 }
 
@@ -23,7 +29,7 @@
 		.ant-modal-header {
 			background-color: var(--bg-ink-400);
 		}
-	}	
+	}
 }
 
 .lightMode {

frontend/src/container/NewDashboard/ComponentsSlider/menuItems.tsx

@@ -30,7 +30,7 @@ const Items: ItemsProps[] = [
 	},
 ];
 
-interface ItemsProps {
+export interface ItemsProps {
 	name: PANEL_TYPES;
 	icon: JSX.Element;
 	display: string;

frontend/src/container/NewWidget/LeftContainer/WidgetGraph/WidgetGraphContainer.tsx

@@ -64,6 +64,7 @@ function WidgetGraphContainer({
 			selectedWidget={selectedWidget}
 			queryResponse={queryResponse}
 			setRequestData={setRequestData}
+			selectedGraph={selectedGraph}
 		/>
 	);
 }

frontend/src/container/NewWidget/LeftContainer/WidgetGraph/WidgetGraphs.tsx

@@ -1,4 +1,5 @@
 import { QueryParams } from 'constants/query';
+import { PANEL_TYPES } from 'constants/queryBuilder';
 import PanelWrapper from 'container/PanelWrapper/PanelWrapper';
 import { CustomTimeType } from 'container/TopNav/DateTimeSelectionV2/config';
 import useUrlQuery from 'hooks/useUrlQuery';
@@ -25,6 +26,7 @@ function WidgetGraph({
 	selectedWidget,
 	queryResponse,
 	setRequestData,
+	selectedGraph,
 }: WidgetGraphProps): JSX.Element {
 	const graphRef = useRef<HTMLDivElement>(null);
 	const dispatch = useDispatch();
@@ -89,6 +91,7 @@ function WidgetGraph({
 				queryResponse={queryResponse}
 				setRequestData={setRequestData}
 				onDragSelect={onDragSelect}
+				selectedGraph={selectedGraph}
 			/>
 		</div>
 	);
@@ -101,6 +104,7 @@ interface WidgetGraphProps {
 		Error
 	>;
 	setRequestData: Dispatch<SetStateAction<GetQueryResultsProps>>;
+	selectedGraph: PANEL_TYPES;
 }
 
 export default WidgetGraph;

frontend/src/container/NewWidget/LeftContainer/index.tsx

@@ -25,6 +25,7 @@ function LeftContainer({
 	selectedTracesFields,
 	setSelectedTracesFields,
 	selectedWidget,
+	selectedTime,
 }: WidgetGraphProps): JSX.Element {
 	const { stagedQuery, redirectWithQueryBuilderData } = useQueryBuilder();
 	const { selectedDashboard } = useDashboard();
@@ -35,10 +36,10 @@ function LeftContainer({
 	>((state) => state.globalTime);
 
 	const [requestData, setRequestData] = useState<GetQueryResultsProps>(() => {
-		if (selectedWidget && selectedWidget.panelTypes !== PANEL_TYPES.LIST) {
+		if (selectedWidget && selectedGraph !== PANEL_TYPES.LIST) {
 			return {
 				selectedTime: selectedWidget?.timePreferance,
-				graphType: getGraphType(selectedWidget.panelTypes),
+				graphType: getGraphType(selectedGraph || selectedWidget.panelTypes),
 				query: stagedQuery || initialQueriesMap.metrics,
 				globalSelectedInterval,
 				variables: getDashboardVariables(selectedDashboard?.data.variables),
@@ -50,7 +51,7 @@ function LeftContainer({
 		return {
 			query: updatedQuery,
 			graphType: PANEL_TYPES.LIST,
-			selectedTime: 'GLOBAL_TIME',
+			selectedTime: selectedTime.enum || 'GLOBAL_TIME',
 			globalSelectedInterval,
 			tableParams: {
 				pagination: {
@@ -65,11 +66,13 @@ function LeftContainer({
 		if (stagedQuery) {
 			setRequestData((prev) => ({
 				...prev,
+				selectedTime: selectedTime.enum || prev.selectedTime,
+				graphType: getGraphType(selectedGraph || selectedWidget.panelTypes),
 				query: stagedQuery,
 			}));
 		}
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [stagedQuery]);
+	}, [stagedQuery, selectedTime]);
 
 	const queryResponse = useGetQueryRange(
 		requestData,

frontend/src/container/NewWidget/RightContainer/index.tsx

@@ -12,10 +12,20 @@ import {
 import InputComponent from 'components/Input';
 import TimePreference from 'components/TimePreferenceDropDown';
 import { PANEL_TYPES } from 'constants/queryBuilder';
-import GraphTypes from 'container/NewDashboard/ComponentsSlider/menuItems';
+import GraphTypes, {
+	ItemsProps,
+} from 'container/NewDashboard/ComponentsSlider/menuItems';
 import useCreateAlerts from 'hooks/queryBuilder/useCreateAlerts';
-import { Dispatch, SetStateAction, useCallback } from 'react';
+import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
+import {
+	Dispatch,
+	SetStateAction,
+	useCallback,
+	useEffect,
+	useState,
+} from 'react';
 import { Widgets } from 'types/api/dashboard/getAll';
+import { DataSource } from 'types/common/queryBuilder';
 
 import {
 	panelTypeVsCreateAlert,
@@ -75,6 +85,24 @@ function RightContainer({
 	const allowPanelTimePreference =
 		panelTypeVsPanelTimePreferences[selectedGraph];
 
+	const { currentQuery } = useQueryBuilder();
+
+	const [graphTypes, setGraphTypes] = useState<ItemsProps[]>(GraphTypes);
+
+	useEffect(() => {
+		const queryContainsMetricsDataSource = currentQuery.builder.queryData.some(
+			(query) => query.dataSource === DataSource.METRICS,
+		);
+
+		if (queryContainsMetricsDataSource) {
+			setGraphTypes((prev) =>
+				prev.filter((graph) => graph.name !== PANEL_TYPES.LIST),
+			);
+		} else {
+			setGraphTypes(GraphTypes);
+		}
+	}, [currentQuery]);
+
 	const softMinHandler = useCallback(
 		(value: number | null) => {
 			setSoftMin(value);
@@ -95,10 +123,9 @@ function RightContainer({
 			<Select
 				onChange={setGraphHandler}
 				value={selectedGraph}
-				disabled
 				style={{ width: '100%', marginBottom: 24 }}
 			>
-				{GraphTypes.map((item) => (
+				{graphTypes.map((item) => (
 					<Option key={item.name} value={item.name}>
 						{item.display}
 					</Option>

frontend/src/container/NewWidget/index.tsx

@@ -3,6 +3,7 @@ import { LockFilled, WarningOutlined } from '@ant-design/icons';
 import { Button, Modal, Space, Tooltip, Typography } from 'antd';
 import { SOMETHING_WENT_WRONG } from 'constants/api';
 import { FeatureKeys } from 'constants/features';
+import { QueryParams } from 'constants/query';
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import ROUTES from 'constants/routes';
 import { DashboardShortcuts } from 'constants/shortcuts/DashboardShortcuts';
@@ -23,7 +24,7 @@ import {
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useSelector } from 'react-redux';
-import { generatePath, useLocation, useParams } from 'react-router-dom';
+import { generatePath, useParams } from 'react-router-dom';
 import { AppState } from 'store/reducers';
 import { Dashboard, Widgets } from 'types/api/dashboard/getAll';
 import { IField } from 'types/api/logs/fields';
@@ -44,7 +45,7 @@ import {
 	RightContainerWrapper,
 } from './styles';
 import { NewWidgetProps } from './types';
-import { getIsQueryModified } from './utils';
+import { getIsQueryModified, handleQueryChange } from './utils';
 
 function NewWidget({ selectedGraph }: NewWidgetProps): JSX.Element {
 	const {
@@ -57,7 +58,12 @@ function NewWidget({ selectedGraph }: NewWidgetProps): JSX.Element {
 
 	const { registerShortcut, deregisterShortcut } = useKeyboardHotkeys();
 
-	const { currentQuery, stagedQuery } = useQueryBuilder();
+	const {
+		currentQuery,
+		stagedQuery,
+		redirectWithQueryBuilderData,
+		supersetQuery,
+	} = useQueryBuilder();
 
 	const isQueryModified = useMemo(
 		() => getIsQueryModified(currentQuery, stagedQuery),
@@ -70,8 +76,6 @@ function NewWidget({ selectedGraph }: NewWidgetProps): JSX.Element {
 
 	const { widgets = [] } = selectedDashboard?.data || {};
 
-	const { search } = useLocation();
-
 	const query = useUrlQuery();
 
 	const { dashboardId } = useParams<DashboardWidgetPageParams>();
@@ -297,9 +301,14 @@ function NewWidget({ selectedGraph }: NewWidgetProps): JSX.Element {
 	}, [dashboardId]);
 
 	const setGraphHandler = (type: PANEL_TYPES): void => {
-		const params = new URLSearchParams(search);
-		params.set('graphType', type);
+		const updatedQuery = handleQueryChange(type as any, supersetQuery);
 		setGraphType(type);
+		redirectWithQueryBuilderData(
+			updatedQuery,
+			{ [QueryParams.graphType]: type },
+			undefined,
+			true,
+		);
 	};
 
 	const onSaveDashboard = useCallback((): void => {
@@ -392,6 +401,7 @@ function NewWidget({ selectedGraph }: NewWidgetProps): JSX.Element {
 							selectedTracesFields={selectedTracesFields}
 							setSelectedTracesFields={setSelectedTracesFields}
 							selectedWidget={selectedWidget}
+							selectedTime={selectedTime}
 						/>
 					)}
 				</LeftContainerWrapper>

frontend/src/container/NewWidget/types.ts

@@ -6,6 +6,8 @@ import { SuccessResponse } from 'types/api';
 import { Widgets } from 'types/api/dashboard/getAll';
 import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
 
+import { timePreferance } from './RightContainer/timeItems';
+
 export interface NewWidgetProps {
 	selectedGraph: PANEL_TYPES;
 	yAxisUnit: Widgets['yAxisUnit'];
@@ -21,6 +23,7 @@ export interface WidgetGraphProps {
 	>;
 	selectedWidget: Widgets;
 	selectedGraph: PANEL_TYPES;
+	selectedTime: timePreferance;
 }
 
 export type WidgetGraphContainerProps = {

frontend/src/container/NewWidget/utils.ts

@@ -1,6 +1,11 @@
 import { omitIdFromQuery } from 'components/ExplorerCard/utils';
-import { isEqual } from 'lodash-es';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
+import {
+	initialQueryBuilderFormValuesMap,
+	PANEL_TYPES,
+} from 'constants/queryBuilder';
+import { isEqual, set, unset } from 'lodash-es';
+import { IBuilderQuery, Query } from 'types/api/queryBuilder/queryBuilderData';
+import { DataSource } from 'types/common/queryBuilder';
 
 export const getIsQueryModified = (
 	currentQuery: Query,
@@ -13,3 +18,242 @@ export const getIsQueryModified = (
 	const omitIdFromCurrentQuery = omitIdFromQuery(currentQuery);
 	return !isEqual(omitIdFromStageQuery, omitIdFromCurrentQuery);
 };
+
+export type PartialPanelTypes = {
+	[PANEL_TYPES.BAR]: 'bar';
+	[PANEL_TYPES.LIST]: 'list';
+	[PANEL_TYPES.TABLE]: 'table';
+	[PANEL_TYPES.TIME_SERIES]: 'graph';
+	[PANEL_TYPES.VALUE]: 'value';
+};
+
+export const panelTypeDataSourceFormValuesMap: Record<
+	keyof PartialPanelTypes,
+	Record<DataSource, any>
+> = {
+	[PANEL_TYPES.BAR]: {
+		[DataSource.LOGS]: {
+			builder: {
+				queryData: [
+					'filters',
+					'aggregateOperator',
+					'aggregateAttribute',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+					'functions',
+				],
+			},
+		},
+		[DataSource.METRICS]: {
+			builder: {
+				queryData: [
+					'filters',
+					'aggregateOperator',
+					'aggregateAttribute',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+					'functions',
+					'spaceAggregation',
+				],
+			},
+		},
+		[DataSource.TRACES]: {
+			builder: {
+				queryData: [
+					'filters',
+					'aggregateOperator',
+					'aggregateAttribute',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+				],
+			},
+		},
+	},
+	[PANEL_TYPES.TIME_SERIES]: {
+		[DataSource.LOGS]: {
+			builder: {
+				queryData: [
+					'filters',
+					'aggregateOperator',
+					'aggregateAttribute',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+					'functions',
+				],
+			},
+		},
+		[DataSource.METRICS]: {
+			builder: {
+				queryData: [
+					'filters',
+					'aggregateOperator',
+					'aggregateAttribute',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+					'functions',
+					'spaceAggregation',
+				],
+			},
+		},
+		[DataSource.TRACES]: {
+			builder: {
+				queryData: [
+					'filters',
+					'aggregateOperator',
+					'aggregateAttribute',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+				],
+			},
+		},
+	},
+	[PANEL_TYPES.TABLE]: {
+		[DataSource.LOGS]: {
+			builder: {
+				queryData: [
+					'filters',
+					'aggregateOperator',
+					'aggregateAttribute',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+					'functions',
+				],
+			},
+		},
+		[DataSource.METRICS]: {
+			builder: {
+				queryData: [
+					'filters',
+					'aggregateOperator',
+					'aggregateAttribute',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+					'functions',
+					'spaceAggregation',
+				],
+			},
+		},
+		[DataSource.TRACES]: {
+			builder: {
+				queryData: [
+					'filters',
+					'aggregateOperator',
+					'aggregateAttribute',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+				],
+			},
+		},
+	},
+	[PANEL_TYPES.LIST]: {
+		[DataSource.LOGS]: {
+			builder: {
+				queryData: ['filters', 'limit', 'orderBy'],
+			},
+		},
+		[DataSource.METRICS]: {
+			builder: {
+				queryData: [],
+			},
+		},
+		[DataSource.TRACES]: {
+			builder: {
+				queryData: ['filters', 'limit', 'orderBy'],
+			},
+		},
+	},
+	[PANEL_TYPES.VALUE]: {
+		[DataSource.LOGS]: {
+			builder: {
+				queryData: [
+					'filters',
+					'aggregateOperator',
+					'aggregateAttribute',
+					'reduceTo',
+					'having',
+					'functions',
+				],
+			},
+		},
+		[DataSource.METRICS]: {
+			builder: {
+				queryData: [
+					'filters',
+					'aggregateOperator',
+					'aggregateAttribute',
+					'having',
+					'reduceTo',
+					'functions',
+					'spaceAggregation',
+				],
+			},
+		},
+		[DataSource.TRACES]: {
+			builder: {
+				queryData: [
+					'filters',
+					'aggregateOperator',
+					'aggregateAttribute',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+				],
+			},
+		},
+	},
+};
+
+export function handleQueryChange(
+	newPanelType: keyof PartialPanelTypes,
+	supersetQuery: Query,
+): Query {
+	return {
+		...supersetQuery,
+		builder: {
+			...supersetQuery.builder,
+			queryData: supersetQuery.builder.queryData.map((query, index) => {
+				const { dataSource } = query;
+				const tempQuery = { ...initialQueryBuilderFormValuesMap[dataSource] };
+
+				const fieldsToSelect =
+					panelTypeDataSourceFormValuesMap[newPanelType][dataSource].builder
+						.queryData;
+
+				fieldsToSelect.forEach((field: keyof IBuilderQuery) => {
+					set(tempQuery, field, supersetQuery.builder.queryData[index][field]);
+				});
+
+				if (newPanelType === PANEL_TYPES.LIST) {
+					set(tempQuery, 'aggregateOperator', 'noop');
+					set(tempQuery, 'offset', 0);
+					set(tempQuery, 'pageSize', 10);
+				} else if (tempQuery.aggregateOperator === 'noop') {
+					set(tempQuery, 'aggregateOperator', 'count');
+					unset(tempQuery, 'offset');
+					unset(tempQuery, 'pageSize');
+				}
+
+				return tempQuery;
+			}),
+		},
+	};
+}

frontend/src/container/OnboardingContainer/Modules/APM/Dotnet/md-docs/Docker/QuickStart/dotnet-docker-quickStart-instrumentApplication.md

@@ -0,0 +1,106 @@
+
+### Step 1: Install OpenTelemetry Dependencies
+Dependencies related to OpenTelemetry exporter and SDK have to be installed first.
+
+Run the below commands after navigating to the application source folder:
+```bash
+dotnet add package OpenTelemetry
+dotnet add package OpenTelemetry.Exporter.OpenTelemetryProtocol 
+dotnet add package OpenTelemetry.Extensions.Hosting
+dotnet add package OpenTelemetry.Instrumentation.Runtime
+dotnet add package OpenTelemetry.Instrumentation.AspNetCore 
+dotnet add package OpenTelemetry.AutoInstrumentation
+```
+
+ 
+
+### Step 2:  Adding OpenTelemetry as a service and configuring exporter options
+
+In your `Program.cs` file, add OpenTelemetry as a service. Here, we are configuring these variables:
+
+`serviceName` - It is the name of your service.
+
+`otlpOptions.Endpoint` - It is the endpoint for your OTel Collector agent.
+
+ 
+
+Here’s a sample `Program.cs` file with the configured variables:
+
+```bash
+using System.Diagnostics;
+using OpenTelemetry.Exporter;
+using OpenTelemetry.Resources;
+using OpenTelemetry.Trace;
+
+var builder = WebApplication.CreateBuilder(args);
+
+// Configure OpenTelemetry with tracing and auto-start.
+builder.Services.AddOpenTelemetry()
+    .ConfigureResource(resource => 
+        resource.AddService(serviceName: "{{MYAPP}}"))
+    .WithTracing(tracing => tracing
+        .AddAspNetCoreInstrumentation()
+        .AddOtlpExporter(otlpOptions =>
+        {
+                        //sigNoz Cloud Endpoint 
+            otlpOptions.Endpoint = new Uri("https://ingest.{{REGION}}.signoz.cloud:443");
+
+            otlpOptions.Protocol = OtlpExportProtocol.Grpc;
+                        
+                        //SigNoz Cloud account Ingestion key
+            string headerKey = "signoz-access-token";
+            string headerValue = "{{SIGNOZ_INGESTION_KEY}}";
+
+            string formattedHeader = $"{headerKey}={headerValue}";
+            otlpOptions.Headers = formattedHeader;
+        }));
+
+var app = builder.Build();
+
+//The index route ("/") is set up to write out the OpenTelemetry trace information on the response:
+app.MapGet("/", () => $"Hello World! OpenTelemetry Trace: {Activity.Current?.Id}");
+
+app.Run();
+```
+
+ 
+
+
+The OpenTelemetry.Exporter.Options get or set the target to which the exporter is going to send traces. Here, we’re configuring it to send traces to the OTel Collector agent. The target must be a valid Uri with the scheme (http or https) and host and may contain a port and a path.
+
+This is done by configuring an OpenTelemetry [TracerProvider](https://github.com/open-telemetry/opentelemetry-dotnet/tree/main/docs/trace/customizing-the-sdk#readme) using extension methods and setting it to auto-start when the host is started.
+
+
+### Step 3: Dockerize your application
+
+Since the environment variables like SIGNOZ_INGESTION_KEY, Ingestion Endpoint and Service name are set in the `program.cs` file, you don't need to add any additional steps in your Dockerfile.
+
+An **example** of a Dockerfile could look like this:
+
+```bash
+
+# Use the Microsoft official .NET SDK image to build the application
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
+WORKDIR /app
+
+# Copy the CSPROJ file and restore any dependencies (via NUGET)
+COPY *.csproj ./
+RUN dotnet restore
+
+# Copy the rest of the project files and build the application
+COPY . ./
+RUN dotnet publish -c Release -o out
+
+# Generate the runtime image
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
+WORKDIR /app
+COPY --from=build-env /app/out .
+
+# Expose port 5145 for the application
+EXPOSE 5145
+
+# Set the ASPNETCORE_URLS environment variable to listen on port 5145
+ENV ASPNETCORE_URLS=http://+:5145
+
+ENTRYPOINT ["dotnet", "YOUR-APPLICATION.dll"]
+```

frontend/src/container/OnboardingContainer/Modules/APM/Dotnet/md-docs/Docker/QuickStart/dotnet-docker-quickStart-runApplication.md

@@ -0,0 +1,21 @@
+Once you update your Dockerfile, you can build and run it using the commands below.
+
+ 
+
+### Step 1: Build your dockerfile
+
+Build your docker image
+
+```bash
+docker build -t <your-image-name> .
+```
+
+- `<your-image-name>` is the name of your Docker Image
+
+&nbsp;
+
+### Step 2: Run your docker image
+
+```bash
+docker run <your-image-name>
+```

frontend/src/container/OnboardingContainer/Modules/APM/Dotnet/md-docs/Docker/Recommended/dotnet-docker-recommended-installOtelCollector.md

@@ -0,0 +1,12 @@
+## Setup OpenTelemetry Binary as an agent
+
+ 
+
+As a first step, you should install the OTel collector Binary according to the instructions provided on [this link](https://signoz.io/docs/tutorial/opentelemetry-binary-usage-in-virtual-machine/).
+
+ 
+
+Once you are done setting up the OTel collector binary, you can follow the next steps.
+
+ 
+

frontend/src/container/OnboardingContainer/Modules/APM/Dotnet/md-docs/Docker/Recommended/dotnet-docker-recommended-instrumentApplication.md

@@ -0,0 +1,101 @@
+After setting up the Otel collector agent, follow the steps below to instrument your .NET Application
+
+ 
+ 
+
+### Step 1: Install OpenTelemetry Dependencies
+Install the following dependencies in your application.
+
+```bash
+dotnet add package OpenTelemetry
+dotnet add package OpenTelemetry.Exporter.OpenTelemetryProtocol 
+dotnet add package OpenTelemetry.Extensions.Hosting
+dotnet add package OpenTelemetry.Instrumentation.Runtime
+dotnet add package OpenTelemetry.Instrumentation.AspNetCore 
+dotnet add package OpenTelemetry.AutoInstrumentation
+```
+
+ 
+
+### Step 2:  Adding OpenTelemetry as a service and configuring exporter options
+
+In your `Program.cs` file, add OpenTelemetry as a service. Here, we are configuring these variables:
+
+`serviceName` - It is the name of your service.
+
+`otlpOptions.Endpoint` - It is the endpoint for your OTel Collector agent.
+
+ 
+
+Here’s a sample `Program.cs` file with the configured variables:
+
+```bash
+using System.Diagnostics;
+using OpenTelemetry.Exporter;
+using OpenTelemetry.Resources;
+using OpenTelemetry.Trace;
+
+var builder = WebApplication.CreateBuilder(args);
+
+// Configure OpenTelemetry with tracing and auto-start.
+builder.Services.AddOpenTelemetry()
+    .ConfigureResource(resource => 
+        resource.AddService(serviceName: "{{MYAPP}}"))
+    .WithTracing(tracing => tracing
+        .AddAspNetCoreInstrumentation()
+        .AddOtlpExporter(otlpOptions =>
+        {
+            otlpOptions.Endpoint = new Uri("http://localhost:4317");
+
+            otlpOptions.Protocol = OtlpExportProtocol.Grpc;
+        }));
+
+var app = builder.Build();
+
+//The index route ("/") is set up to write out the OpenTelemetry trace information on the response:
+app.MapGet("/", () => $"Hello World! OpenTelemetry Trace: {Activity.Current?.Id}");
+
+app.Run();
+```
+ 
+
+The OpenTelemetry.Exporter.Options get or set the target to which the exporter is going to send traces. Here, we’re configuring it to send traces to the OTel Collector agent. The target must be a valid Uri with the scheme (http or https) and host and may contain a port and a path.
+
+This is done by configuring an OpenTelemetry [TracerProvider](https://github.com/open-telemetry/opentelemetry-dotnet/tree/main/docs/trace/customizing-the-sdk#readme) using extension methods and setting it to auto-start when the host is started.
+
+
+ 
+
+### Step 3: Dockerize your application
+
+Since the crucial environment variables like SIGNOZ_INGESTION_KEY, Ingestion Endpoint and Service name are set in the `program.cs` file, you don't need to add any additional steps in your Dockerfile.
+
+An **example** of a Dockerfile could look like this:
+
+```bash
+
+# Use the Microsoft official .NET SDK image to build the application
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
+WORKDIR /app
+
+# Copy the CSPROJ file and restore any dependencies (via NUGET)
+COPY *.csproj ./
+RUN dotnet restore
+
+# Copy the rest of the project files and build the application
+COPY . ./
+RUN dotnet publish -c Release -o out
+
+# Generate the runtime image
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
+WORKDIR /app
+COPY --from=build-env /app/out .
+
+# Expose port 5145 for the application
+EXPOSE 5145
+
+# Set the ASPNETCORE_URLS environment variable to listen on port 5145
+ENV ASPNETCORE_URLS=http://+:5145
+
+ENTRYPOINT ["dotnet", "YOUR-APPLICATION.dll"]
+```

frontend/src/container/OnboardingContainer/Modules/APM/Dotnet/md-docs/Docker/Recommended/dotnet-docker-recommended-runApplication.md

@@ -0,0 +1,21 @@
+Once you update your Dockerfile, you can build and run it using the commands below.
+
+ 
+
+### Step 1: Build your dockerfile
+
+Build your docker image
+
+```bash
+docker build -t <your-image-name> .
+```
+
+- `<your-image-name>` is the name of your Docker Image
+
+&nbsp;
+
+### Step 2: Run your docker image
+
+```bash
+docker run <your-image-name>
+```

frontend/src/container/OnboardingContainer/Modules/APM/Dotnet/md-docs/LinuxAMD64/Recommended/dotnet-linuxamd64-recommended-installOtelCollector.md

@@ -3,14 +3,14 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_linux_amd64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_linux_amd64.tar.gz
 ```
 
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_linux_amd64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_linux_amd64.tar.gz -C otelcol-contrib
 ```
 
  

frontend/src/container/OnboardingContainer/Modules/APM/Dotnet/md-docs/LinuxARM64/Recommended/dotnet-linuxarm64-recommended-installOtelCollector.md

@@ -4,14 +4,14 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_linux_arm64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_linux_arm64.tar.gz
 ```
 
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_linux_arm64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_linux_arm64.tar.gz -C otelcol-contrib
 ```
 
  

frontend/src/container/OnboardingContainer/Modules/APM/Dotnet/md-docs/MacOsAMD64/Recommended/dotnet-macosamd64-recommended-installOtelCollector.md

@@ -3,13 +3,13 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_darwin_amd64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_darwin_amd64.tar.gz
 ```
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_darwin_amd64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_darwin_amd64.tar.gz -C otelcol-contrib
 ```
 
  

frontend/src/container/OnboardingContainer/Modules/APM/Dotnet/md-docs/MacOsARM64/Recommended/dotnet-macosarm64-recommended-installOtelCollector.md

@@ -3,14 +3,14 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_darwin_arm64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_darwin_arm64.tar.gz
 ```
 
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_darwin_arm64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_darwin_arm64.tar.gz -C otelcol-contrib
 ```
 
  

frontend/src/container/OnboardingContainer/Modules/APM/Elixir/md-docs/Docker/QuickStart/elixir-docker-quickStart-instrumentApplication.md

@@ -0,0 +1,67 @@
+ 
+
+Follow the steps below to instrument your Elixir (Phoenix + Ecto) Application
+
+### Step 1: Add dependencies
+Install dependencies related to OpenTelemetry by adding them to `mix.exs` file 
+
+```bash
+    {:opentelemetry_exporter, "~> 1.6"},
+    {:opentelemetry_api, "~> 1.2"},
+    {:opentelemetry, "~> 1.3"},
+    {:opentelemetry_semantic_conventions, "~> 0.2"},
+    {:opentelemetry_cowboy, "~> 0.2.1"},
+    {:opentelemetry_phoenix, "~> 1.1"},
+    {:opentelemetry_ecto, "~> 1.1"}
+```
+ 
+
+In your application start, usually the `application.ex` file, setup the telemetry handlers 
+
+```bash
+    :opentelemetry_cowboy.setup()
+    OpentelemetryPhoenix.setup(adapter: :cowboy2)
+    OpentelemetryEcto.setup([:{{MYAPP}}, :repo])
+```
+ 
+
+As an example, this is how you can setup the handlers in your application.ex file for an application called demo :
+
+```bash
+# application.ex
+@impl true
+def start(_type, _args) do
+  :opentelemetry_cowboy.setup()
+  OpentelemetryPhoenix.setup(adapter: :cowboy2)
+  OpentelemetryEcto.setup([:demo, :repo])
+
+end
+```
+
+ 
+
+### Step 2: Configure Application
+You need to configure your application to send telemetry data by adding the following config to your `runtime.exs` file:
+
+```bash
+config :opentelemetry, :resource, service: %{name: "{{MYAPP}}"}
+
+config :opentelemetry, :processors,
+  otel_batch_processor: %{
+    exporter: {
+      :opentelemetry_exporter,
+      %{
+        endpoints: ["https://ingest.{{REGION}}.signoz.cloud:443"],
+        headers: [
+          {"signoz-access-token", {{SIGNOZ_ACCESS_TOKEN}} }
+        ]
+      }
+    }
+  }
+```
+
+ 
+
+### Step 3: Dockerize your application
+
+Since the environment variables like SIGNOZ_INGESTION_KEY, Ingestion Endpoint and Service name are set in the above steps, you don't need to add any additional steps in your Dockerfile.

frontend/src/container/OnboardingContainer/Modules/APM/Elixir/md-docs/Docker/QuickStart/elixir-docker-quickStart-runApplication.md

@@ -0,0 +1,25 @@
+Once you update your Dockerfile, you can build and run it using the commands below.
+
+ 
+
+### Step 1: Build your dockerfile
+
+Build your docker image
+
+```bash
+docker build -t <your-image-name> .
+```
+
+- `<your-image-name>` is the name of your Docker Image
+
+&nbsp;
+
+### Step 2: Run your docker image
+
+```bash
+docker run <your-image-name>
+```
+
+&nbsp;
+
+To see some examples for instrumented applications, you can checkout [this link](https://signoz.io/docs/instrumentation/elixir/#sample-examples)

frontend/src/container/OnboardingContainer/Modules/APM/Elixir/md-docs/Docker/Recommended/elixir-docker-recommended-installOtelCollector.md

@@ -0,0 +1,12 @@
+## Setup OpenTelemetry Binary as an agent
+
+ 
+
+As a first step, you should install the OTel collector Binary according to the instructions provided on [this link](https://signoz.io/docs/tutorial/opentelemetry-binary-usage-in-virtual-machine/).
+
+ 
+
+Once you are done setting up the OTel collector binary, you can follow the next steps.
+
+ 
+

frontend/src/container/OnboardingContainer/Modules/APM/Elixir/md-docs/Docker/Recommended/elixir-docker-recommended-instrumentApplication.md

@@ -0,0 +1,61 @@
+ 
+
+After setting up the Otel collector agent, follow the steps below to instrument your Elixir (Phoenix + Ecto) Application
+
+### Step 1: Add dependencies
+Install dependencies related to OpenTelemetry by adding them to `mix.exs` file 
+
+```bash
+    {:opentelemetry_exporter, "~> 1.6"},
+    {:opentelemetry_api, "~> 1.2"},
+    {:opentelemetry, "~> 1.3"},
+    {:opentelemetry_semantic_conventions, "~> 0.2"},
+    {:opentelemetry_cowboy, "~> 0.2.1"},
+    {:opentelemetry_phoenix, "~> 1.1"},
+    {:opentelemetry_ecto, "~> 1.1"}
+```
+ 
+
+In your application start, usually the `application.ex` file, setup the telemetry handlers 
+
+```bash
+    :opentelemetry_cowboy.setup()
+    OpentelemetryPhoenix.setup(adapter: :cowboy2)
+    OpentelemetryEcto.setup([:{{MYAPP}}, :repo])
+```
+ 
+
+As an example, this is how you can setup the handlers in your application.ex file for an application called demo :
+
+```bash
+# application.ex
+@impl true
+def start(_type, _args) do
+  :opentelemetry_cowboy.setup()
+  OpentelemetryPhoenix.setup(adapter: :cowboy2)
+  OpentelemetryEcto.setup([:demo, :repo])
+
+end
+```
+
+ 
+
+### Step 2: Configure Application
+You need to configure your application to send telemetry data by adding the following config to your `runtime.exs` file:
+
+```bash
+config :opentelemetry, :resource, service: %{name: "{{MYAPP}}"}
+
+config :opentelemetry, :processors,
+    otel_batch_processor: %{
+      exporter: 
+      {:opentelemetry_exporter, 
+      %{endpoints: ["http://localhost:4318"]}
+      }
+  }
+```
+ 
+
+### Step 3: Dockerize your application
+
+Since the environment variables like SIGNOZ_INGESTION_KEY, Ingestion Endpoint and Service name are set in the above steps, you don't need to add any additional steps in your Dockerfile.

frontend/src/container/OnboardingContainer/Modules/APM/Elixir/md-docs/Docker/Recommended/elixir-docker-recommended-runApplication.md

@@ -0,0 +1,25 @@
+Once you update your Dockerfile, you can build and run it using the commands below.
+
+ 
+
+### Step 1: Build your dockerfile
+
+Build your docker image
+
+```bash
+docker build -t <your-image-name> .
+```
+
+- `<your-image-name>` is the name of your Docker Image
+
+&nbsp;
+
+### Step 2: Run your docker image
+
+```bash
+docker run <your-image-name>
+```
+
+&nbsp;
+
+To see some examples for instrumented applications, you can checkout [this link](https://signoz.io/docs/instrumentation/elixir/#sample-examples)

frontend/src/container/OnboardingContainer/Modules/APM/Elixir/md-docs/LinuxAMD64/Recommended/elixir-linuxamd64-recommended-installOtelCollector.md

@@ -3,13 +3,13 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_linux_amd64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_linux_amd64.tar.gz
 ```
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_linux_amd64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_linux_amd64.tar.gz -C otelcol-contrib
 ```
  
 

frontend/src/container/OnboardingContainer/Modules/APM/Elixir/md-docs/LinuxARM64/Recommended/elixir-linuxarm64-recommended-installOtelCollector.md

@@ -3,13 +3,13 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_linux_arm64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_linux_arm64.tar.gz
 ```
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_linux_arm64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_linux_arm64.tar.gz -C otelcol-contrib
 ```
  
 

frontend/src/container/OnboardingContainer/Modules/APM/Elixir/md-docs/MacOsAMD64/Recommended/elixir-macosamd64-recommended-installOtelCollector.md

@@ -3,13 +3,13 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_darwin_amd64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_darwin_amd64.tar.gz
 ```
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_darwin_amd64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_darwin_amd64.tar.gz -C otelcol-contrib
 ```
  
 

frontend/src/container/OnboardingContainer/Modules/APM/Elixir/md-docs/MacOsARM64/Recommended/elixir-macosarm64-recommended-installOtelCollector.md

@@ -3,13 +3,13 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_darwin_arm64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_darwin_arm64.tar.gz
 ```
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_darwin_arm64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_darwin_arm64.tar.gz -C otelcol-contrib
 ```
  
 

frontend/src/container/OnboardingContainer/Modules/APM/GoLang/md-docs/Docker/QuickStart/golang-docker-quickStart-instrumentApplication.md

@@ -0,0 +1,135 @@
+### Step 1: Install OpenTelemetry Dependencies
+Dependencies related to OpenTelemetry exporter and SDK have to be installed first.
+
+Run the below commands after navigating to the application source folder:
+```bash
+go get go.opentelemetry.io/otel \
+  go.opentelemetry.io/otel/trace \
+  go.opentelemetry.io/otel/sdk \
+  go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin \
+  go.opentelemetry.io/otel/exporters/otlp/otlptrace \
+  go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc
+```
+
+**Note:** We are assuming you are using gin request router. If you are using other request routers, check out the [corresponding package](https://signoz.io/docs/instrumentation/golang/#request-routers).
+ 
+ 
+
+### Step 2: Declare environment variables for configuring OpenTelemetry
+Declare the following global variables in **`main.go`** which we will use to configure OpenTelemetry:
+```bash
+ var (
+     serviceName  = os.Getenv("SERVICE_NAME")
+     collectorURL = os.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT")
+     insecure     = os.Getenv("INSECURE_MODE")
+ )
+```
+ 
+
+### Step 3: Instrument your Go application 
+To configure your application to send data we will need a function to initialize OpenTelemetry. Add the following snippet of code in your **`main.go`** file.
+
+```bash
+     
+ import (
+     .....
+
+     "google.golang.org/grpc/credentials"
+     "github.com/gin-gonic/gin"
+     "go.opentelemetry.io/otel"
+     "go.opentelemetry.io/otel/attribute"
+     "go.opentelemetry.io/otel/exporters/otlp/otlptrace"
+     "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
+
+     "go.opentelemetry.io/otel/sdk/resource"
+     sdktrace "go.opentelemetry.io/otel/sdk/trace"
+ )
+
+ func initTracer() func(context.Context) error {
+
+     var secureOption otlptracegrpc.Option
+
+     if strings.ToLower(insecure) == "false" || insecure == "0" || strings.ToLower(insecure) == "f" {
+         secureOption = otlptracegrpc.WithTLSCredentials(credentials.NewClientTLSFromCert(nil, ""))
+     } else {
+         secureOption = otlptracegrpc.WithInsecure()
+     }
+
+     exporter, err := otlptrace.New(
+         context.Background(),
+         otlptracegrpc.NewClient(
+             secureOption,
+             otlptracegrpc.WithEndpoint(collectorURL),
+         ),
+     )
+
+     if err != nil {
+         log.Fatalf("Failed to create exporter: %v", err)
+     }
+     resources, err := resource.New(
+         context.Background(),
+         resource.WithAttributes(
+             attribute.String("service.name", serviceName),
+             attribute.String("library.language", "go"),
+         ),
+     )
+     if err != nil {
+         log.Fatalf("Could not set resources: %v", err)
+     }
+
+     otel.SetTracerProvider(
+         sdktrace.NewTracerProvider(
+             sdktrace.WithSampler(sdktrace.AlwaysSample()),
+             sdktrace.WithBatcher(exporter),
+             sdktrace.WithResource(resources),
+         ),
+     )
+     return exporter.Shutdown
+ }
+```
+ 
+
+### Step 4: Initialise the tracer in **`main.go`**
+Modify the main function to initialise the tracer in **`main.go`**. Initiate the tracer at the very beginning of our main function.
+```bash
+func main() {
+    cleanup := initTracer()
+    defer cleanup(context.Background())
+
+    ......
+}
+```
+ 
+
+### Step 5: Add the OpenTelemetry Gin middleware
+Configure Gin to use the middleware by adding the following lines in **`main.go`**
+```bash
+import (
+    ....
+  "go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin"
+)
+
+func main() {
+    ......
+    r := gin.Default()
+    r.Use(otelgin.Middleware(serviceName))
+    ......
+}
+```
+
+ 
+
+### Step 6: Dockerize your application
+
+Set the environment variables in your Dockerfile.
+
+```bash
+...
+# Set environment variables
+ENV SERVICE_NAME={{MYAPP}} \
+    INSECURE_MODE=false \
+    OTEL_EXPORTER_OTLP_HEADERS="signoz-access-token=b{{SIGNOZ_INGESTION_KEY}}" \
+    OTEL_EXPORTER_OTLP_ENDPOINT=ingest.{{REGION}}.signoz.cloud:443
+...
+```
+

frontend/src/container/OnboardingContainer/Modules/APM/GoLang/md-docs/Docker/QuickStart/golang-docker-quickStart-runApplication.md

@@ -0,0 +1,21 @@
+Once you update your Dockerfile, you can build and run it using the commands below.
+
+ 
+
+### Step 1: Build your dockerfile
+
+Build your docker image
+
+```bash
+docker build -t <your-image-name> .
+```
+
+- `<your-image-name>` is the name of your Docker Image
+
+&nbsp;
+
+### Step 2: Run your docker image
+
+```bash
+docker run <your-image-name>
+```

frontend/src/container/OnboardingContainer/Modules/APM/GoLang/md-docs/Docker/Recommended/golang-docker-recommended-installOtelCollector.md

@@ -0,0 +1,12 @@
+## Setup OpenTelemetry Binary as an agent
+
+ 
+
+As a first step, you should install the OTel collector Binary according to the instructions provided on [this link](https://signoz.io/docs/tutorial/opentelemetry-binary-usage-in-virtual-machine/).
+
+ 
+
+Once you are done setting up the OTel collector binary, you can follow the next steps.
+
+ 
+

frontend/src/container/OnboardingContainer/Modules/APM/GoLang/md-docs/Docker/Recommended/golang-docker-recommended-instrumentApplication.md

@@ -0,0 +1,137 @@
+After setting up the Otel collector agent, follow the steps below to instrument your Go Application
+ 
+ 
+
+### Step 1: Install OpenTelemetry Dependencies
+Dependencies related to OpenTelemetry exporter and SDK have to be installed first.
+
+Run the below commands after navigating to the application source folder:
+```bash
+go get go.opentelemetry.io/otel \
+  go.opentelemetry.io/otel/trace \
+  go.opentelemetry.io/otel/sdk \
+  go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin \
+  go.opentelemetry.io/otel/exporters/otlp/otlptrace \
+  go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc
+```
+
+**Note:** We are assuming you are using gin request router. If you are using other request routers, check out the [corresponding package](https://signoz.io/docs/instrumentation/golang/#request-routers).
+ 
+ 
+
+### Step 2: Declare environment variables for configuring OpenTelemetry
+Declare the following global variables in **`main.go`** which we will use to configure OpenTelemetry:
+```bash
+ var (
+     serviceName  = os.Getenv("SERVICE_NAME")
+     collectorURL = os.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT")
+     insecure     = os.Getenv("INSECURE_MODE")
+ )
+```
+ 
+
+### Step 3: Instrument your Go application 
+To configure your application to send data we will need a function to initialize OpenTelemetry. Add the following snippet of code in your **`main.go`** file.
+
+```bash
+     
+ import (
+     .....
+
+     "google.golang.org/grpc/credentials"
+     "github.com/gin-gonic/gin"
+     "go.opentelemetry.io/otel"
+     "go.opentelemetry.io/otel/attribute"
+     "go.opentelemetry.io/otel/exporters/otlp/otlptrace"
+     "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
+
+     "go.opentelemetry.io/otel/sdk/resource"
+     sdktrace "go.opentelemetry.io/otel/sdk/trace"
+ )
+
+ func initTracer() func(context.Context) error {
+
+     var secureOption otlptracegrpc.Option
+
+     if strings.ToLower(insecure) == "false" || insecure == "0" || strings.ToLower(insecure) == "f" {
+         secureOption = otlptracegrpc.WithTLSCredentials(credentials.NewClientTLSFromCert(nil, ""))
+     } else {
+         secureOption = otlptracegrpc.WithInsecure()
+     }
+
+     exporter, err := otlptrace.New(
+         context.Background(),
+         otlptracegrpc.NewClient(
+             secureOption,
+             otlptracegrpc.WithEndpoint(collectorURL),
+         ),
+     )
+
+     if err != nil {
+         log.Fatalf("Failed to create exporter: %v", err)
+     }
+     resources, err := resource.New(
+         context.Background(),
+         resource.WithAttributes(
+             attribute.String("service.name", serviceName),
+             attribute.String("library.language", "go"),
+         ),
+     )
+     if err != nil {
+         log.Fatalf("Could not set resources: %v", err)
+     }
+
+     otel.SetTracerProvider(
+         sdktrace.NewTracerProvider(
+             sdktrace.WithSampler(sdktrace.AlwaysSample()),
+             sdktrace.WithBatcher(exporter),
+             sdktrace.WithResource(resources),
+         ),
+     )
+     return exporter.Shutdown
+ }
+```
+ 
+
+### Step 4: Initialise the tracer in **`main.go`**
+Modify the main function to initialise the tracer in **`main.go`**. Initiate the tracer at the very beginning of our main function.
+```bash
+func main() {
+    cleanup := initTracer()
+    defer cleanup(context.Background())
+
+    ......
+}
+```
+ 
+
+### Step 5: Add the OpenTelemetry Gin middleware
+Configure Gin to use the middleware by adding the following lines in **`main.go`**
+```bash
+import (
+    ....
+  "go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin"
+)
+
+func main() {
+    ......
+    r := gin.Default()
+    r.Use(otelgin.Middleware(serviceName))
+    ......
+}
+```
+
+ 
+
+### Step 6: Dockerize your application
+
+Set the environment variables in your Dockerfile.
+
+```bash
+...
+# Set environment variables
+ENV SERVICE_NAME={{MYAPP}} \
+    INSECURE_MODE=true \
+    OTEL_EXPORTER_OTLP_ENDPOINT=localhost:4317
+...
+```

frontend/src/container/OnboardingContainer/Modules/APM/GoLang/md-docs/Docker/Recommended/golang-docker-recommended-runApplication.md

@@ -0,0 +1,21 @@
+Once you update your Dockerfile, you can build and run it using the commands below.
+
+ 
+
+### Step 1: Build your dockerfile
+
+Build your docker image
+
+```bash
+docker build -t <your-image-name> .
+```
+
+- `<your-image-name>` is the name of your Docker Image
+
+&nbsp;
+
+### Step 2: Run your docker image
+
+```bash
+docker run <your-image-name>
+```

frontend/src/container/OnboardingContainer/Modules/APM/GoLang/md-docs/LinuxAMD64/QuickStart/golang-linuxamd64-quickStart-instrumentApplication.md

@@ -1,7 +1,3 @@
-After setting up the Otel collector agent, follow the steps below to instrument your Go Application
- 
- 
-
 ### Step 1: Install OpenTelemetry Dependencies
 Dependencies related to OpenTelemetry exporter and SDK have to be installed first.
 

frontend/src/container/OnboardingContainer/Modules/APM/GoLang/md-docs/LinuxAMD64/Recommended/golang-linuxamd64-recommended-installOtelCollector.md

@@ -3,13 +3,13 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_linux_amd64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_linux_amd64.tar.gz
 ```
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_linux_amd64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_linux_amd64.tar.gz -C otelcol-contrib
 ```
  
 

frontend/src/container/OnboardingContainer/Modules/APM/GoLang/md-docs/LinuxARM64/QuickStart/golang-linuxarm64-quickStart-instrumentApplication.md

@@ -1,7 +1,3 @@
-After setting up the Otel collector agent, follow the steps below to instrument your Go Application
- 
- 
-
 ### Step 1: Install OpenTelemetry Dependencies
 Dependencies related to OpenTelemetry exporter and SDK have to be installed first.
 

frontend/src/container/OnboardingContainer/Modules/APM/GoLang/md-docs/LinuxARM64/Recommended/golang-linuxarm64-recommended-installOtelCollector.md

@@ -5,13 +5,13 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_linux_arm64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_linux_arm64.tar.gz
 ```
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_linux_arm64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_linux_arm64.tar.gz -C otelcol-contrib
 ```
  
  

frontend/src/container/OnboardingContainer/Modules/APM/GoLang/md-docs/MacOsAMD64/QuickStart/golang-macosamd64-quickStart-instrumentApplication.md

@@ -1,7 +1,3 @@
-After setting up the Otel collector agent, follow the steps below to instrument your Go Application
- 
- 
-
 ### Step 1: Install OpenTelemetry Dependencies
 Dependencies related to OpenTelemetry exporter and SDK have to be installed first.
 

frontend/src/container/OnboardingContainer/Modules/APM/GoLang/md-docs/MacOsAMD64/Recommended/golang-macosamd64-recommended-installOtelCollector.md

@@ -3,13 +3,13 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_darwin_amd64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_darwin_amd64.tar.gz
 ```
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_darwin_amd64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_darwin_amd64.tar.gz -C otelcol-contrib
 ```
  
 

frontend/src/container/OnboardingContainer/Modules/APM/GoLang/md-docs/MacOsARM64/QuickStart/golang-macosarm64-quickStart-instrumentApplication.md

@@ -1,7 +1,3 @@
-After setting up the Otel collector agent, follow the steps below to instrument your Go Application
- 
- 
-
 ### Step 1: Install OpenTelemetry Dependencies
 Dependencies related to OpenTelemetry exporter and SDK have to be installed first.
 

frontend/src/container/OnboardingContainer/Modules/APM/GoLang/md-docs/MacOsARM64/Recommended/golang-macosarm64-recommended-installOtelCollector.md

@@ -3,11 +3,11 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_darwin_arm64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_darwin_arm64.tar.gz
 ```
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_darwin_arm64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_darwin_arm64.tar.gz -C otelcol-contrib
 ```
  
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Jboss/Docker/QuickStart/jboss-docker-quickStart-instrumentApplication.md

@@ -0,0 +1,25 @@
+#### Requirements
+- Java 8 or higher
+
+ 
+
+### Dockerize your application
+
+Update your Dockerfile to include
+
+```bash
+...
+# Set working directory. Assuming `/opt/jboss-eap-7.1` to be your working directory.
+WORKDIR /opt/jboss-eap-7.1
+
+# Download otel java binary agent
+RUN wget https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar -O opentelemetry-javaagent.jar
+
+# Open and update the configuration file
+RUN sed -i 's/\(JAVA_OPTS=".*\)/\1 -javaagent:\/opt\/jboss-eap-7.1\/opentelemetry-javaagent.jar \
+-Dotel.exporter.otlp.endpoint=https:\/\/ingest.{{REGION}}.signoz.cloud:443 \
+-Dotel.exporter.otlp.headers="signoz-access-token={{SIGNOZ_INGESTION_KEY}}" \
+-Dotel.resource.attributes="service.name={{MYAPP}}"/' /opt/jboss-eap-7.1/bin/standalone.conf
+...
+```
+

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Jboss/Docker/QuickStart/jboss-docker-quickStart-runApplication.md

@@ -0,0 +1,25 @@
+Once you update your Dockerfile, you can build and run it using the commands below.
+
+ 
+
+### Step 1: Build your dockerfile
+
+Build your docker image
+
+```bash
+docker build -t <your-image-name> .
+```
+
+- `<your-image-name>` is the name of your Docker Image
+
+&nbsp;
+
+### Step 2: Run your docker image
+
+```bash
+docker run <your-image-name>
+```
+
+&nbsp;
+
+If you encounter any difficulties, please consult the [troubleshooting section](https://signoz.io/docs/instrumentation/jboss/#troubleshooting-your-installation) for assistance.

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Jboss/Docker/Recommended/jboss-docker-recommended-installOtelCollector.md

@@ -0,0 +1,12 @@
+## Setup OpenTelemetry Binary as an agent
+
+ 
+
+As a first step, you should install the OTel collector Binary according to the instructions provided on [this link](https://signoz.io/docs/tutorial/opentelemetry-binary-usage-in-virtual-machine/).
+
+ 
+
+Once you are done setting up the OTel collector binary, you can follow the next steps.
+
+ 
+

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Jboss/Docker/Recommended/jboss-docker-recommended-instrumentApplication.md

@@ -0,0 +1,24 @@
+After setting up the Otel collector agent, follow the steps below to instrument your JavaScript Application
+
+#### Requirements
+- Java 8 or higher
+
+ 
+
+### Dockerize your application
+
+Update your Dockerfile to include
+
+```bash
+...
+# Set working directory. Assuming `/opt/jboss-eap-7.1` to be your working directory.
+WORKDIR /opt/jboss-eap-7.1
+
+# Download otel java binary agent
+RUN wget https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar -O opentelemetry-javaagent.jar
+
+# Open and update the configuration file
+RUN sed -i 's/\(JAVA_OPTS=".*\)/\1 -javaagent:\/opt\/jboss-eap-7.1\/opentelemetry-javaagent.jar/' bin/standalone.conf
+...
+```
+

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Jboss/Docker/Recommended/jboss-docker-recommended-runApplication.md

@@ -0,0 +1,25 @@
+Once you update your Dockerfile, you can build and run it using the commands below.
+
+ 
+
+### Step 1: Build your dockerfile
+
+Build your docker image
+
+```bash
+docker build -t <your-image-name> .
+```
+
+- `<your-image-name>` is the name of your Docker Image
+
+&nbsp;
+
+### Step 2: Run your docker image
+
+```bash
+docker run <your-image-name>
+```
+
+&nbsp;
+
+If you encounter any difficulties, please consult the [troubleshooting section](https://signoz.io/docs/instrumentation/jboss/#troubleshooting-your-installation) for assistance.

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Jboss/LinuxAMD64/Recommended/jboss-linuxamd64-recommended-installOtelCollector.md

@@ -3,13 +3,13 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_linux_amd64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_linux_amd64.tar.gz
 ```
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_linux_amd64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_linux_amd64.tar.gz -C otelcol-contrib
 ```
  
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Jboss/LinuxARM64/Recommended/jboss-linuxarm64-recommended-installOtelCollector.md

@@ -3,13 +3,13 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_linux_arm64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_linux_arm64.tar.gz
 ```
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_linux_arm64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_linux_arm64.tar.gz -C otelcol-contrib
 ```
  
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Jboss/MacOsAMD64/Recommended/jboss-macosamd64-recommended-installOtelCollector.md

@@ -3,13 +3,13 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_darwin_amd64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_darwin_amd64.tar.gz
 ```
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_darwin_amd64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_darwin_amd64.tar.gz -C otelcol-contrib
 ```
  
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Jboss/MacOsARM64/Recommended/jboss-macosarm64-recommended-installOtelCollector.md

@@ -3,13 +3,13 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_darwin_arm64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_darwin_arm64.tar.gz
 ```
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_darwin_arm64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_darwin_arm64.tar.gz -C otelcol-contrib
 ```
  
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Others/Docker/QuickStart/others-docker-quickStart-instrumentApplication.md

@@ -0,0 +1,27 @@
+#### Requirements
+- Java 8 or higher
+ 
+
+### Dockerize your application
+
+Add the following to your Dockerfile
+
+```bash
+...
+# Download otel java binary agent using 
+RUN wget https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar -O opentelemetry-javaagent.jar
+
+# Set environment variables and run your Spring Boot application
+ENV OTEL_RESOURCE_ATTRIBUTES="service.name={{MYAPP}}" \
+    OTEL_EXPORTER_OTLP_HEADERS="signoz-access-token={{SIGNOZ_INGESTION_KEY}}" \
+    OTEL_EXPORTER_OTLP_ENDPOINT="https://ingest.{{REGION}}.signoz.cloud:443"
+
+# Copy the Spring Boot application JAR file into the container
+COPY <my-app>.jar /app
+
+# Command to run the Spring Boot application
+CMD ["java", "-javaagent:/app/opentelemetry-javaagent.jar", "-jar", "/app/<my-app>.jar"]
+...
+```
+
+

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Others/Docker/QuickStart/others-docker-quickStart-runApplication.md

@@ -0,0 +1,27 @@
+
+Once you update your Dockerfile, you can build and run it using the commands below.
+
+ 
+
+### Step 1: Build your dockerfile
+
+Build your docker image
+
+```bash
+docker build -t <your-image-name> .
+```
+
+- `<your-image-name>` is the name of your Docker Image
+
+&nbsp;
+
+### Step 2: Run your docker image
+
+```bash
+docker run <your-image-name>
+```
+
+&nbsp;
+
+If you encounter any difficulties, please consult the [troubleshooting section](https://signoz.io/docs/instrumentation/java/#troubleshooting-your-installation) for assistance.
+

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Others/Docker/Recommended/others-docker-recommended-installOtelCollector.md

@@ -0,0 +1,12 @@
+## Setup OpenTelemetry Binary as an agent
+
+ 
+
+As a first step, you should install the OTel collector Binary according to the instructions provided on [this link](https://signoz.io/docs/tutorial/opentelemetry-binary-usage-in-virtual-machine/).
+
+ 
+
+Once you are done setting up the OTel collector binary, you can follow the next steps.
+
+ 
+

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Others/Docker/Recommended/others-docker-recommended-instrumentApplication.md

@@ -0,0 +1,22 @@
+After setting up the Otel collector agent, follow the steps below to instrument your Java Application
+
+#### Requirements
+- Java 8 or higher
+ 
+
+### Dockerize your application
+
+Add the following to your Dockerfile
+
+```bash
+...
+# Download otel java binary agent using 
+RUN wget https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar -O opentelemetry-javaagent.jar
+
+# Copy the Spring Boot application JAR file into the container
+COPY <my-app>.jar /app
+
+# Command to run the Spring Boot application
+CMD ["java", "-javaagent:/app/opentelemetry-javaagent.jar", "-jar", "/app/<my-app>.jar"]
+...
+```

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Others/Docker/Recommended/others-docker-recommended-runApplication.md

@@ -0,0 +1,26 @@
+Once you update your Dockerfile, you can build and run it using the commands below.
+
+ 
+
+### Step 1: Build your dockerfile
+
+Build your docker image
+
+```bash
+docker build -t <your-image-name> .
+```
+
+- `<your-image-name>` is the name of your Docker Image
+
+&nbsp;
+
+### Step 2: Run your docker image
+
+```bash
+docker run <your-image-name>
+```
+
+
+&nbsp;
+
+If you encounter any difficulties, please consult the [troubleshooting section](https://signoz.io/docs/instrumentation/java/#troubleshooting-your-installation) for assistance.

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Others/Kubernetes/others-kubernetes-runApplication.md

@@ -3,10 +3,12 @@
 Once you are done intrumenting your Java application, you can run it using the below command
 
 ```bash
-java -javaagent:<path>/opentelemetry-javaagent.jar -jar {{MYAPP}}.jar
+java -javaagent:<path>/opentelemetry-javaagent.jar -jar <my-app>.jar
 ```
 
 <path> - update it to the path where you downloaded the Java JAR agent in previous step
+<my-app> - Jar file of your application
+
 &nbsp;
 
 **Note:**

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Others/LinuxAMD64/QuickStart/others-linuxamd64-quickStart-runApplication.md

@@ -5,10 +5,11 @@ Once you are done intrumenting your Java application, you can run it using the b
 OTEL_RESOURCE_ATTRIBUTES=service.name={{MYAPP}} \
 OTEL_EXPORTER_OTLP_HEADERS="signoz-access-token={{SIGNOZ_INGESTION_KEY}}" \
 OTEL_EXPORTER_OTLP_ENDPOINT=https://ingest.{{REGION}}.signoz.cloud:443 \
-java -javaagent:<path>/opentelemetry-javaagent.jar -jar {{MYAPP}}.jar
+java -javaagent:<path>/opentelemetry-javaagent.jar -jar <my-app>.jar
 ```
 
 <path> - update it to the path where you downloaded the Java JAR agent in previous step
+<my-app> - Jar file of your application
 
 &nbsp;
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Others/LinuxAMD64/Recommended/others-linuxamd64-recommended-installOtelCollector.md

@@ -3,13 +3,13 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_linux_amd64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_linux_amd64.tar.gz
 ```
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_linux_amd64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_linux_amd64.tar.gz -C otelcol-contrib
 ```
  
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Others/LinuxAMD64/Recommended/others-linuxamd64-recommended-runApplication.md

@@ -24,8 +24,9 @@ kill "$(< otel-pid)"
 
 ### Step 2: Run your application
 ```bash
-java -javaagent:<path>/opentelemetry-javaagent.jar -jar {{MYAPP}}.jar
+java -javaagent:<path>/opentelemetry-javaagent.jar -jar <my-app>.jar
 ```
 
 <path> - update it to the path where you downloaded the Java JAR agent in previous step
+<my-app> - Jar file of your application
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Others/LinuxARM64/QuickStart/others-linuxarm64-quickStart-runApplication.md

@@ -5,10 +5,11 @@ Once you are done intrumenting your Java application, you can run it using the b
 OTEL_RESOURCE_ATTRIBUTES=service.name={{MYAPP}} \
 OTEL_EXPORTER_OTLP_HEADERS="signoz-access-token={{SIGNOZ_INGESTION_KEY}}" \
 OTEL_EXPORTER_OTLP_ENDPOINT=https://ingest.{{REGION}}.signoz.cloud:443 \
-java -javaagent:<path>/opentelemetry-javaagent.jar -jar {{MYAPP}}.jar
+java -javaagent:<path>/opentelemetry-javaagent.jar -jar <my-app>.jar
 ```
 
 <path> - update it to the path where you downloaded the Java JAR agent in previous step
+<my-app> - Jar file of your application
 
 &nbsp;
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Others/LinuxARM64/Recommended/others-linuxarm64-recommended-installOtelCollector.md

@@ -3,13 +3,13 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_linux_arm64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_linux_arm64.tar.gz
 ```
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_linux_arm64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_linux_arm64.tar.gz -C otelcol-contrib
 ```
  
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Others/LinuxARM64/Recommended/others-linuxarm64-recommended-runApplication.md

@@ -24,8 +24,9 @@ kill "$(< otel-pid)"
 
 ### Step 2: Run your application
 ```bash
-java -javaagent:<path>/opentelemetry-javaagent.jar -jar {{MYAPP}}.jar
+java -javaagent:<path>/opentelemetry-javaagent.jar -jar <my-app>.jar
 ```
 
 <path> - update it to the path where you downloaded the Java JAR agent in previous step
+<my-app> - Jar file of your application
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Others/MacOsAMD64/QuickStart/others-macosamd64-quickStart-runApplication.md

@@ -5,10 +5,11 @@ Once you are done intrumenting your Java application, you can run it using the b
 OTEL_RESOURCE_ATTRIBUTES=service.name={{MYAPP}} \
 OTEL_EXPORTER_OTLP_HEADERS="signoz-access-token={{SIGNOZ_INGESTION_KEY}}" \
 OTEL_EXPORTER_OTLP_ENDPOINT=https://ingest.{{REGION}}.signoz.cloud:443 \
-java -javaagent:<path>/opentelemetry-javaagent.jar -jar {{MYAPP}}.jar
+java -javaagent:<path>/opentelemetry-javaagent.jar -jar <my-app>.jar
 ```
 
 <path> - update it to the path where you downloaded the Java JAR agent in previous step
+<my-app> - Jar file of your application
 
 &nbsp;
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Others/MacOsAMD64/Recommended/others-macosamd64-recommended-installOtelCollector.md

@@ -3,13 +3,13 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_darwin_amd64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_darwin_amd64.tar.gz
 ```
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_darwin_amd64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_darwin_amd64.tar.gz -C otelcol-contrib
 ```
  
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Others/MacOsAMD64/Recommended/others-macosamd64-recommended-runApplication.md

@@ -24,8 +24,9 @@ kill "$(< otel-pid)"
 
 ### Step 2: Run your application
 ```bash
-java -javaagent:<path>/opentelemetry-javaagent.jar -jar {{MYAPP}}.jar
+java -javaagent:<path>/opentelemetry-javaagent.jar -jar <my-app>.jar
 ```
 
 <path> - update it to the path where you downloaded the Java JAR agent in previous step
+<my-app> - Jar file of your application
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Others/MacOsARM64/QuickStart/others-macosarm64-quickStart-runApplication.md

@@ -5,10 +5,11 @@ Once you are done intrumenting your Java application, you can run it using the b
 OTEL_RESOURCE_ATTRIBUTES=service.name={{MYAPP}} \
 OTEL_EXPORTER_OTLP_HEADERS="signoz-access-token={{SIGNOZ_INGESTION_KEY}}" \
 OTEL_EXPORTER_OTLP_ENDPOINT=https://ingest.{{REGION}}.signoz.cloud:443 \
-java -javaagent:<path>/opentelemetry-javaagent.jar -jar {{MYAPP}}.jar
+java -javaagent:<path>/opentelemetry-javaagent.jar -jar <my-app>.jar
 ```
 
 <path> - update it to the path where you downloaded the Java JAR agent in previous step
+<my-app> - Jar file of your application
 
 &nbsp;
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Others/MacOsARM64/Recommended/others-macosarm64-recommended-installOtelCollector.md

@@ -3,13 +3,13 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_darwin_arm64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_darwin_arm64.tar.gz
 ```
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_darwin_arm64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_darwin_arm64.tar.gz -C otelcol-contrib
 ```
  
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/Others/MacOsARM64/Recommended/others-macosarm64-recommended-runApplication.md

@@ -22,8 +22,9 @@ kill "$(< otel-pid)"
 ```
 ### Step 2: Run your application
 ```bash
-java -javaagent:<path>/opentelemetry-javaagent.jar -jar {{MYAPP}}.jar
+java -javaagent:<path>/opentelemetry-javaagent.jar -jar <my-app>.jar
 ```
 
 <path> - update it to the path where you downloaded the Java JAR agent in previous step
+<my-app> - Jar file of your application
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/SpringBoot/Docker/QuickStart/springBoot-docker-quickStart-instrumentApplication.md

@@ -0,0 +1,27 @@
+
+#### Requirements
+- Java 8 or higher
+
+ 
+
+### Dockerize your application
+
+Add the following to your Dockerfile
+
+```bash
+...
+# Download otel java binary agent using 
+RUN wget https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar -O opentelemetry-javaagent.jar
+
+# Set environment variables and run your Spring Boot application
+ENV OTEL_RESOURCE_ATTRIBUTES="service.name={{MYAPP}}" \
+    OTEL_EXPORTER_OTLP_HEADERS="signoz-access-token={{SIGNOZ_INGESTION_KEY}}" \
+    OTEL_EXPORTER_OTLP_ENDPOINT="https://ingest.{{REGION}}.signoz.cloud:443"
+
+# Copy the Spring Boot application JAR file into the container
+COPY <my-app>.jar /app
+
+# Command to run the Spring Boot application
+CMD ["java", "-javaagent:/app/opentelemetry-javaagent.jar", "-jar", "/app/<my-app>.jar"]
+...
+```

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/SpringBoot/Docker/QuickStart/springBoot-docker-quickStart-runApplication.md

@@ -0,0 +1,28 @@
+
+Once you update your Dockerfile, you can build and run it using the commands below.
+
+ 
+
+### Step 1: Build your dockerfile
+
+Build your docker image
+
+```bash
+docker build -t <your-image-name> .
+```
+
+- `<your-image-name>` is the name of your Docker Image
+
+&nbsp;
+
+### Step 2: Run your docker image
+
+```bash
+docker run <your-image-name>
+```
+
+
+&nbsp;
+
+If you encounter any difficulties, please consult the [troubleshooting section](https://signoz.io/docs/instrumentation/springboot/#troubleshooting-your-installation) for assistance.
+

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/SpringBoot/Docker/Recommended/springBoot-docker-recommended-installOtelCollector.md

@@ -0,0 +1,12 @@
+## Setup OpenTelemetry Binary as an agent
+
+ 
+
+As a first step, you should install the OTel collector Binary according to the instructions provided on [this link](https://signoz.io/docs/tutorial/opentelemetry-binary-usage-in-virtual-machine/).
+
+ 
+
+Once you are done setting up the OTel collector binary, you can follow the next steps.
+
+ 
+

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/SpringBoot/Docker/Recommended/springBoot-docker-recommended-instrumentApplication.md

@@ -0,0 +1,22 @@
+After setting up the Otel collector agent, follow the steps below to instrument your Java Application
+
+#### Requirements
+- Java 8 or higher
+ 
+
+### Dockerize your application
+
+Add the following to your Dockerfile
+
+```bash
+...
+# Download otel java binary agent using 
+RUN wget https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar -O opentelemetry-javaagent.jar
+
+# Copy the Spring Boot application JAR file into the container
+COPY <my-app>.jar /app
+
+# Command to run the Spring Boot application
+CMD ["java", "-javaagent:/app/opentelemetry-javaagent.jar", "-jar", "/app/<my-app>.jar"]
+...
+```

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/SpringBoot/Docker/Recommended/springBoot-docker-recommended-runApplication.md

@@ -0,0 +1,26 @@
+Once you update your Dockerfile, you can build and run it using the commands below.
+
+ 
+
+### Step 1: Build your dockerfile
+
+Build your docker image
+
+```bash
+docker build -t <your-image-name> .
+```
+
+- `<your-image-name>` is the name of your Docker Image
+
+&nbsp;
+
+### Step 2: Run your docker image
+
+```bash
+docker run <your-image-name>
+```
+
+
+&nbsp;
+
+If you encounter any difficulties, please consult the [troubleshooting section](https://signoz.io/docs/instrumentation/springboot/#troubleshooting-your-installation) for assistance.

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/SpringBoot/Kubernetes/springBoot-kubernetes-runApplication.md

@@ -4,10 +4,11 @@ Once you are done intrumenting your Java application, you can run it using the b
 
 
 ```bash
-java -javaagent:<path>/opentelemetry-javaagent.jar -jar {{MYAPP}}.jar
+java -javaagent:<path>/opentelemetry-javaagent.jar -jar <my-app>.jar
 ```
 
 <path> - update it to the path where you downloaded the Java JAR agent in previous step
+<my-app> - Jar file of your application
 
 &nbsp;
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/SpringBoot/LinuxAMD64/QuickStart/springBoot-linuxamd64-quickStart-runApplication.md

@@ -5,10 +5,11 @@ Once you are done intrumenting your Java application, you can run it using the b
 OTEL_RESOURCE_ATTRIBUTES=service.name={{MYAPP}} \
 OTEL_EXPORTER_OTLP_HEADERS="signoz-access-token={{SIGNOZ_INGESTION_KEY}}" \
 OTEL_EXPORTER_OTLP_ENDPOINT=https://ingest.{{REGION}}.signoz.cloud:443 \
-java -javaagent:<path>/opentelemetry-javaagent.jar -jar {{MYAPP}}.jar
+java -javaagent:<path>/opentelemetry-javaagent.jar -jar <my-app>.jar
 ```
 
 <path> - update it to the path where you downloaded the Java JAR agent in previous step
+<my-app> - Jar file of your application
 
 &nbsp;
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/SpringBoot/LinuxAMD64/Recommended/springBoot-linuxamd64-recommended-installOtelCollector.md

@@ -3,13 +3,13 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_linux_amd64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_linux_amd64.tar.gz
 ```
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_linux_amd64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_linux_amd64.tar.gz -C otelcol-contrib
 ```
  
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/SpringBoot/LinuxAMD64/Recommended/springBoot-linuxamd64-recommended-runApplication.md

@@ -25,11 +25,12 @@ kill "$(< otel-pid)"
 ### Step 2: Run your application
 
 ```bash
-java -javaagent:<path>/opentelemetry-javaagent.jar -jar {{MYAPP}}.jar
+java -javaagent:<path>/opentelemetry-javaagent.jar -jar <my-app>.jar
 ```
 &nbsp;
 
 <path> - update it to the path where you downloaded the Java JAR agent in previous step
+<my-app> - Jar file of your application
 
 &nbsp;
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/SpringBoot/LinuxARM64/QuickStart/springBoot-linuxarm64-quickStart-runApplication.md

@@ -5,10 +5,11 @@ Once you are done intrumenting your Java application, you can run it using the b
 OTEL_RESOURCE_ATTRIBUTES=service.name={{MYAPP}} \
 OTEL_EXPORTER_OTLP_HEADERS="signoz-access-token={{SIGNOZ_INGESTION_KEY}}" \
 OTEL_EXPORTER_OTLP_ENDPOINT=https://ingest.{{REGION}}.signoz.cloud:443 \
-java -javaagent:<path>/opentelemetry-javaagent.jar -jar {{MYAPP}}.jar
+java -javaagent:<path>/opentelemetry-javaagent.jar -jar <my-app>.jar
 ```
 
 <path> - update it to the path where you downloaded the Java JAR agent in previous step
+<my-app> - Jar file of your application
 
 &nbsp;
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/SpringBoot/LinuxARM64/Recommended/springBoot-linuxarm64-recommended-installOtelCollector.md

@@ -3,13 +3,13 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_linux_arm64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_linux_arm64.tar.gz
 ```
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_linux_arm64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_linux_arm64.tar.gz -C otelcol-contrib
 ```
  
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/SpringBoot/LinuxARM64/Recommended/springBoot-linuxarm64-recommended-runApplication.md

@@ -25,11 +25,12 @@ kill "$(< otel-pid)"
 ### Step 2: Run your application
 
 ```bash
-java -javaagent:<path>/opentelemetry-javaagent.jar -jar {{MYAPP}}.jar
+java -javaagent:<path>/opentelemetry-javaagent.jar -jar <my-app>.jar
 ```
 &nbsp;
 
 <path> - update it to the path where you downloaded the Java JAR agent in previous step
+<my-app> - Jar file of your application
 
 &nbsp;
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/SpringBoot/MacOsAMD64/QuickStart/springBoot-macosamd64-quickStart-runApplication.md

@@ -5,10 +5,11 @@ Once you are done intrumenting your Java application, you can run it using the b
 OTEL_RESOURCE_ATTRIBUTES=service.name={{MYAPP}} \
 OTEL_EXPORTER_OTLP_HEADERS="signoz-access-token={{SIGNOZ_INGESTION_KEY}}" \
 OTEL_EXPORTER_OTLP_ENDPOINT=https://ingest.{{REGION}}.signoz.cloud:443 \
-java -javaagent:<path>/opentelemetry-javaagent.jar -jar {{MYAPP}}.jar
+java -javaagent:<path>/opentelemetry-javaagent.jar -jar <my-app>.jar
 ```
 
 <path> - update it to the path where you downloaded the Java JAR agent in previous step
+<my-app> - Jar file of your application
 
 &nbsp;
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/SpringBoot/MacOsAMD64/Recommended/springBoot-macosamd64-recommended-installOtelCollector.md

@@ -3,13 +3,13 @@
 
 ### Step 1: Download otel-collector tar.gz
 ```bash
-wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.79.0/otelcol-contrib_0.79.0_darwin_amd64.tar.gz
+wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{OTEL_VERSION}}/otelcol-contrib_{{OTEL_VERSION}}_darwin_amd64.tar.gz
 ```
  
 
 ### Step 2: Extract otel-collector tar.gz to the `otelcol-contrib` folder
 ```bash
-mkdir otelcol-contrib && tar xvzf otelcol-contrib_0.79.0_darwin_amd64.tar.gz -C otelcol-contrib
+mkdir otelcol-contrib && tar xvzf otelcol-contrib_{{OTEL_VERSION}}_darwin_amd64.tar.gz -C otelcol-contrib
 ```
  
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/SpringBoot/MacOsAMD64/Recommended/springBoot-macosamd64-recommended-runApplication.md

@@ -25,11 +25,12 @@ kill "$(< otel-pid)"
 ### Step 2: Run your application
 
 ```bash
-java -javaagent:<path>/opentelemetry-javaagent.jar -jar {{MYAPP}}.jar
+java -javaagent:<path>/opentelemetry-javaagent.jar -jar <my-app>.jar
 ```
 &nbsp;
 
 <path> - update it to the path where you downloaded the Java JAR agent in previous step
+<my-app> - Jar file of your application
 
 &nbsp;
 

frontend/src/container/OnboardingContainer/Modules/APM/Java/md-docs/SpringBoot/MacOsARM64/QuickStart/springBoot-macosarm64-quickStart-runApplication.md

@@ -5,10 +5,11 @@ Once you are done intrumenting your Java application, you can run it using the b
 OTEL_RESOURCE_ATTRIBUTES=service.name={{MYAPP}} \
 OTEL_EXPORTER_OTLP_HEADERS="signoz-access-token={{SIGNOZ_INGESTION_KEY}}" \
 OTEL_EXPORTER_OTLP_ENDPOINT=https://ingest.{{REGION}}.signoz.cloud:443 \
-java -javaagent:<path>/opentelemetry-javaagent.jar -jar {{MYAPP}}.jar
+java -javaagent:<path>/opentelemetry-javaagent.jar -jar <my-app>.jar
 ```
 
 <path> - update it to the path where you downloaded the Java JAR agent in previous step
+<my-app> - Jar file of your application
 
 &nbsp;