From 5efc40a619a2e36b0120bb24d3df5f117f029ade Mon Sep 17 00:00:00 2001
From: Rajesh Varatharaj <rvaratharaj@nvidia.com>
Date: Tue, 25 Jul 2023 16:16:53 -0700
Subject: [PATCH] zebra,tools: cleaning up subdir and fixing missing LTTng
 snapshot issue

After upgrading to FRR 8.3, the FRR LTTng profile is not being properly linked,
causing a failure to collect LTTng traces when executing cl-support.

To fix this issue, the correct profile has been included and
the path where the logs are recorded has been updated.

with this fix:
lttng list:
frr-snapshot-zebra-onboot () [active snapshot]
frr-snapshot-onboot () [active snapshot]

sample output:
root@tor-11:mgmt:/var/support/cl_support_tor-11/var/log/lttng-traces# /usr/lib/frr/frr_babeltrace.py frr-snapshot-zebra-onboot/
2023-07-25T22:31:17.231 frr_zebra:netlink_interface {'header': 93955466105792, 'ns_id': 0, 'startup': 1}
2023-07-25T22:31:17.231 frr_zebra:if_add_update {'ifindex': 1, 'vrfid': 0, 'ifp': 'lo', 'interface': 'Interface Index added'}
2023-07-25T22:31:17.231 frr_zebra:netlink_interface {'header': 93955466107112, 'ns_id': 0, 'startup': 1}

Ticket: #3554224
Signed-off-by: Rajesh Varatharaj <rvaratharaj@nvidia.com>
---
 .../sessions/auto/frr-snapshot-onboot.lttng   | 72 +++++++++++++++++++
 .../auto/frr-snapshot-zebra-onboot.lttng      |  2 +-
 zebra/subdir.am                               |  1 -
 3 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 tools/etc/lttng/sessions/auto/frr-snapshot-onboot.lttng

diff --git a/tools/etc/lttng/sessions/auto/frr-snapshot-onboot.lttng b/tools/etc/lttng/sessions/auto/frr-snapshot-onboot.lttng
new file mode 100644
index 000000000000..c8e4dd203334
--- /dev/null
+++ b/tools/etc/lttng/sessions/auto/frr-snapshot-onboot.lttng
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sessions>
+	<session>
+		<name>frr-snapshot-onboot</name>
+		<domains>
+			<domain>
+				<type>UST</type>
+				<buffer_type>PER_UID</buffer_type>
+				<channels>
+					<channel>
+						<name>channel0</name>
+						<enabled>true</enabled>
+						<overwrite_mode>OVERWRITE</overwrite_mode>
+						<subbuffer_size>524288</subbuffer_size>
+						<subbuffer_count>4</subbuffer_count>
+						<switch_timer_interval>0</switch_timer_interval>
+						<read_timer_interval>0</read_timer_interval>
+						<output_type>MMAP</output_type>
+						<blocking_timeout>0</blocking_timeout>
+						<monitor_timer_interval>1000000</monitor_timer_interval>
+						<tracefile_size>0</tracefile_size>
+						<tracefile_count>0</tracefile_count>
+						<live_timer_interval>0</live_timer_interval>
+						<events>
+							<event>
+								<name>frr_bgp:evpn*</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+								<loglevel_type>ALL</loglevel_type>
+							</event>
+						</events>
+						<contexts/>
+					</channel>
+				</channels>
+				<trackers/>
+			</domain>
+			<domain>
+				<type>JUL</type>
+				<buffer_type>PER_UID</buffer_type>
+				<channels/>
+			</domain>
+			<domain>
+				<type>LOG4J</type>
+				<buffer_type>PER_UID</buffer_type>
+				<channels/>
+			</domain>
+			<domain>
+				<type>PYTHON</type>
+				<buffer_type>PER_UID</buffer_type>
+				<channels/>
+			</domain>
+		</domains>
+		<started>true</started>
+		<attributes>
+			<snapshot_mode>true</snapshot_mode>
+		</attributes>
+		<output>
+			<snapshot_outputs>
+				<output>
+					<name>snapshot-1</name>
+					<max_size>0</max_size>
+					<consumer_output>
+						<enabled>true</enabled>
+						<destination>
+							<path>/var/log/lttng-traces/frr-snapshot-onboot</path>
+						</destination>
+					</consumer_output>
+				</output>
+			</snapshot_outputs>
+		</output>
+	</session>
+</sessions>
diff --git a/tools/etc/lttng/sessions/auto/frr-snapshot-zebra-onboot.lttng b/tools/etc/lttng/sessions/auto/frr-snapshot-zebra-onboot.lttng
index bee0b51fdd84..aed8cb978752 100644
--- a/tools/etc/lttng/sessions/auto/frr-snapshot-zebra-onboot.lttng
+++ b/tools/etc/lttng/sessions/auto/frr-snapshot-zebra-onboot.lttng
@@ -62,7 +62,7 @@
 					<consumer_output>
 						<enabled>true</enabled>
 						<destination>
-							<path>/var/tmp/lttng-traces/frr-snapshot-zebra-onboot</path>
+							<path>/var/log/lttng-traces/frr-snapshot-zebra-onboot</path>
 						</destination>
 					</consumer_output>
 				</output>
diff --git a/zebra/subdir.am b/zebra/subdir.am
index f45deb6ad58d..e9bbcbeeab10 100644
--- a/zebra/subdir.am
+++ b/zebra/subdir.am
@@ -201,7 +201,6 @@ noinst_HEADERS += \
 	zebra/zserv.h \
 	zebra/dpdk/zebra_dplane_dpdk.h \
 	zebra/dpdk/zebra_dplane_dpdk_private.h \
-	zebra/zebra_trace.h \
 	# end
 
 zebra_zebra_irdp_la_SOURCES = \