Add message statistics

egbertbouman · egbertbouman · commit 5d509d76ff65 · 2025-03-07T16:24:50.000+01:00
diff --git a/src/tribler/core/session.py b/src/tribler/core/session.py
@@ -59,7 +59,7 @@ def rust_enhancements(session: Session) -> Generator[None, None, None]:
     """
     Attempt to import the IPv8 Rust anonymization backend.
     """
-    use_fallback = session.config.get("statistics")
+    use_fallback = False
     if_specs = [ifc for ifc in session.config.get("ipv8/interfaces") if ifc["interface"] == "UDPIPv4"]
 
     if not use_fallback:
@@ -71,8 +71,9 @@ def rust_enhancements(session: Session) -> Generator[None, None, None]:
                 ifc["worker_threads"] = ifc.get("worker_threads", session.config.get("tunnel_community/max_circuits"))
             yield
             if if_specs:
+                ipv4_endpoint = session.ipv8.endpoint.interfaces["UDPIPv4"]
+                session.ipv8.endpoint.get_statistics = ipv4_endpoint.get_statistics
                 for server in session.socks_servers:
-                    ipv4_endpoint = session.ipv8.endpoint.interfaces["UDPIPv4"]
                     server.rust_endpoint = ipv4_endpoint if isinstance(ipv4_endpoint, RustEndpoint) else None
         except ImportError:
             logger.info("Rust endpoint not found (pip install ipv8-rust-tunnels).")
@@ -140,7 +141,7 @@ def __init__(self, config: TriblerConfigManager) -> None:
         # IPv8
         rescue_keys(self.config)
         with rust_enhancements(self):
-            self.ipv8 = IPv8(self.config.get("ipv8"), enable_statistics=self.config.get("statistics"))
+            self.ipv8 = IPv8(self.config.get("ipv8"))
         self.loader = IPv8CommunityLoader()
 
         # REST
@@ -239,9 +240,14 @@ async def start(self) -> None:
         # REST (2/2)
         self.rest_manager.get_endpoint("/api/ipv8").initialize(self.ipv8)
         self.rest_manager.get_endpoint("/api/statistics").ipv8 = self.ipv8
-        if self.config.get("statistics"):
-            self.rest_manager.get_endpoint("/api/ipv8").endpoints["/overlays"].enable_overlay_statistics(True, None,
-                                                                                                         True)
+
+        overlays_endpoint = self.rest_manager.get_endpoint("/api/ipv8").endpoints["/overlays"]
+        # Enable statistics for IPv8 StatisticsEndpoint
+        if overlays_endpoint.statistics_supported:
+            overlays_endpoint.enable_overlay_statistics(True, None, True)
+        # When using RustEndpoint, statistics are also reported. However, since RustEndpoint
+        # does not inherit from StatisticsEndpoint, we need to manually set statistics_supported.
+        overlays_endpoint.statistics_supported = True
 
     async def find_api_server(self) -> tuple[str | None, bytes | None]:
         """
diff --git a/src/tribler/ui/src/components/layouts/Header.tsx b/src/tribler/ui/src/components/layouts/Header.tsx
@@ -17,7 +17,7 @@ import { DialogDescription } from "@radix-ui/react-dialog";
 import { Ban, Loader } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import { ScrollArea } from "../ui/scroll-area";
-import { EasyTooltip, Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "../ui/tooltip";
+import { EasyTooltip } from "../ui/tooltip";
 
 export function Header() {
     const [online, setOnline] = useState<boolean>(true);
diff --git a/src/tribler/ui/src/components/ui/simple-table.tsx b/src/tribler/ui/src/components/ui/simple-table.tsx
@@ -1,7 +1,7 @@
 import { Dispatch, SetStateAction, useEffect, useRef, useState } from 'react';
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
 import { getCoreRowModel, useReactTable, flexRender, getFilteredRowModel, getPaginationRowModel, getExpandedRowModel, getSortedRowModel } from '@tanstack/react-table';
-import type { ColumnDef, Row, PaginationState, RowSelectionState, ColumnFiltersState, ExpandedState, ColumnDefTemplate, HeaderContext, SortingState, VisibilityState, Header, Column } from '@tanstack/react-table';
+import type { ColumnDef, Row, PaginationState, RowSelectionState, ColumnFiltersState, ExpandedState, ColumnDefTemplate, HeaderContext, SortingState, VisibilityState, Header, Column, InitialTableState } from '@tanstack/react-table';
 import { cn, isMac } from '@/lib/utils';
 import { Select, SelectContent, SelectGroup, SelectItem, SelectLabel } from './select';
 import { Button } from './button';
@@ -137,6 +137,7 @@ interface ReactTableProps<T extends object> {
     storeSortingState?: string;
     rowId?: (originalRow: T, index: number, parent?: Row<T>) => string,
     selectOnRightClick?: boolean,
+    initialState?: InitialTableState
 }
 
 function SimpleTable<T extends object>({
@@ -158,15 +159,15 @@ function SimpleTable<T extends object>({
     expandable,
     storeSortingState,
     rowId,
-    selectOnRightClick
+    selectOnRightClick,
+    initialState
 }: ReactTableProps<T>) {
     const [pagination, setPagination] = useState<PaginationState>({
         pageIndex: pageIndex ?? 0,
         pageSize: pageSize ?? 20,
     });
     const [rowSelection, setRowSelection] = useState<RowSelectionState>(initialRowSelection || {});
     const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>(filters || [])
-    const [expanded, setExpanded] = useState<ExpandedState>({});
     const [sorting, setSorting] = useState<SortingState>([]);
     const [startId, setStartId] = useState<string | undefined>(undefined);
     const [columnVisibility, setColumnVisibility] = useState<VisibilityState>({});
@@ -204,7 +205,6 @@ function SimpleTable<T extends object>({
             rowSelection,
             columnFilters,
             columnVisibility,
-            expanded,
             sorting
         },
         getFilteredRowModel: getFilteredRowModel(),
@@ -214,11 +214,11 @@ function SimpleTable<T extends object>({
         onRowSelectionChange: (arg: SetStateAction<RowSelectionState>) => {
             if (allowSelect || allowSelectCheckbox || allowMultiSelect) setRowSelection(arg);
         },
-        onExpandedChange: setExpanded,
         onSortingChange: setSorting,
         getSubRows: (row: any) => row?.subRows,
         getRowId: rowId,
         autoResetPageIndex: false,
+        initialState: initialState
     });
 
     // If we're on an empty page, reset the pageIndex to 0
diff --git a/src/tribler/ui/src/models/overlay.model.tsx b/src/tribler/ui/src/models/overlay.model.tsx
@@ -41,6 +41,7 @@ export interface Overlay {
 export interface OverlayMsgStats {
     name?: string;
     identifier: number;
+    handler?: string;
     num_up: number;
     num_down: number;
     bytes_up: number;
@@ -49,6 +50,7 @@ export interface OverlayMsgStats {
     first_measured_down: number;
     last_measured_up: number;
     last_measured_down: number;
+    subRows?: OverlayMsgStats[];
 }
 
 export type OverlayStats = Record<string, Record<string, OverlayMsgStats>>;
diff --git a/src/tribler/ui/src/pages/Debug/IPv8/Details.tsx b/src/tribler/ui/src/pages/Debug/IPv8/Details.tsx
@@ -5,42 +5,73 @@ import { isErrorDict } from "@/services/reporting";
 import { OverlayMsgStats } from "@/models/overlay.model";
 import { ColumnDef } from "@tanstack/react-table";
 import { useInterval } from '@/hooks/useInterval';
+import { formatBytes } from "@/lib/utils";
+import { ChevronDown, ChevronRight } from "lucide-react";
 
 
 const statisticColumns: ColumnDef<OverlayMsgStats>[] = [
     {
         accessorKey: "name",
         header: getHeader("Name", false),
+        cell: ({ row }) => {
+            return (
+                <div
+                    className="flex text-start items-center"
+                    style={{
+                        paddingLeft: `${row.depth * 2}rem`
+                    }}
+                >
+                    {row.original.subRows && row.original.subRows.length > 0 && (
+                        <button onClick={row.getToggleExpandedHandler()}>
+                            {row.getIsExpanded()
+                                ? <ChevronDown size="16" color="#777"></ChevronDown>
+                                : <ChevronRight size="16" color="#777"></ChevronRight>}
+                        </button>
+                    )}
+                    {row.original.name}
+                </div>
+            )
+        }
     },
     {
-        accessorKey: "bytes_up",
-        header: getHeader("Upload (MB)", false),
+        accessorKey: "identifier",
+        header: "Message identifier",
         cell: ({ row }) => {
             if (row.original.identifier < 0) { return }
-            return <span>{(row.original.bytes_up / 1024 ** 2).toFixed(3)}</span>
+            return <span>{row.original.identifier}</span>
+        },
+    },
+    {
+        accessorKey: "handler",
+        header: "Handler",
+    },
+    {
+        accessorKey: "bytes_up",
+        header: getHeader("Upload", false),
+        cell: ({ row }) => {
+            return <span>{formatBytes(row.original.bytes_up)}</span>
         },
     },
     {
         accessorKey: "bytes_down",
-        header: getHeader("Download (MB)", false),
+        header: getHeader("Download", false),
         cell: ({ row }) => {
-            if (row.original.identifier < 0) { return }
-            return <span>{(row.original.bytes_down / 1024 ** 2).toFixed(3)}</span>
+            return <span>{formatBytes(row.original.bytes_down)}</span>
         },
     },
     {
         accessorKey: "num_up",
         header: getHeader("# Msgs sent", false),
         cell: ({ row }) => {
-            if (row.original.identifier < 0) { return }
+            // if (row.original.identifier < 0) { return }
             return <span>{row.original.num_up}</span>
         },
     },
     {
         accessorKey: "num_down",
         header: getHeader("# Msgs received", false),
         cell: ({ row }) => {
-            if (row.original.identifier < 0) { return }
+            // if (row.original.identifier < 0) { return }
             return <span>{row.original.num_down}</span>
         },
     },
@@ -57,44 +88,31 @@ export default function Details() {
             for (var overlayStats of response) {
                 for (const [communityName, communityStats] of Object.entries(overlayStats)) {
                     if (Object.entries(communityStats).length === 0) { break }
+                    let messageStats = []
+                    for (const [msgName, msgStats] of Object.entries(communityStats)) {
+                        let [_, handler] = msgName.split(":", 2);
+                        msgStats.handler = handler;
+                        messageStats.push(msgStats);
+                    }
+                    messageStats.sort((stat1, stat2) => stat1.identifier - stat2.identifier);
                     stats.push({
                         name: communityName,
                         identifier: -1,
-                        num_up: 0,
-                        num_down: 0,
-                        bytes_up: 0,
-                        bytes_down: 0,
+                        num_up: messageStats.reduce((n, stat) => n + stat.num_up, 0),
+                        num_down: messageStats.reduce((n, stat) => n + stat.num_down, 0),
+                        bytes_up: messageStats.reduce((n, stat) => n + stat.bytes_up, 0),
+                        bytes_down: messageStats.reduce((n, stat) => n + stat.bytes_down, 0),
                         first_measured_up: 0,
                         first_measured_down: 0,
                         last_measured_up: 0,
                         last_measured_down: 0,
+                        subRows: messageStats
                     });
-                    for (const [msgName, msgStats] of Object.entries(communityStats)) {
-                        msgStats.name = msgName;
-                        stats.push(msgStats);
-                    }
                 }
             }
             setStatistics(stats);
         }
     }, 5000, true);
 
-    if (statistics.length === 0) {
-        return (
-            <div className="w-3/4 px-4">
-                <div className="whitespace-pre-wrap">
-                    <br />
-                    The details are not available because the statistics measurement is not enabled.
-                    To enable the statistics measurement, go to:
-                    <br /><br />
-                    Settings -&gt; Debugging -&gt; Network (IPv8) Statistics
-                    <br /><br />
-                    After enabling the checkbox and saving the settings, restart Tribler.
-                    Then the details will be available here.
-                </div>
-            </div>
-        )
-    }
-
-    return <SimpleTable data={statistics} columns={statisticColumns} />
+    return <SimpleTable data={statistics} columns={statisticColumns} expandable={true} initialState={{expanded: true}} />
 }
diff --git a/src/tribler/ui/src/pages/Debug/IPv8/Overlays.tsx b/src/tribler/ui/src/pages/Debug/IPv8/Overlays.tsx
@@ -40,46 +40,6 @@ const overlayColumns: ColumnDef<Overlay>[] = [
             )
         },
     },
-    {
-        accessorKey: "statistics.bytes_up",
-        header: getHeader("Upload (MB)", false),
-        cell: ({ row }) => {
-            if (Object.keys(row.original.statistics).length === 0) { return 'N/A' }
-            return <span>{(row.original.statistics.bytes_up / 1024 ** 2).toFixed(3)}</span>
-        },
-    },
-    {
-        accessorKey: "statistics.bytes_down",
-        header: getHeader("Download (MB)", false),
-        cell: ({ row }) => {
-            if (Object.keys(row.original.statistics).length === 0) { return 'N/A' }
-            return <span>{(row.original.statistics.bytes_down / 1024 ** 2).toFixed(3)}</span>
-        },
-    },
-    {
-        accessorKey: "statistics.num_up",
-        header: getHeader("# Msg sent", false),
-        cell: ({ row }) => {
-            if (Object.keys(row.original.statistics).length === 0) { return 'N/A' }
-            return <span>{row.original.statistics.num_up}</span>
-        },
-    },
-    {
-        accessorKey: "statistics.num_down",
-        header: getHeader("# Msg received", false),
-        cell: ({ row }) => {
-            if (Object.keys(row.original.statistics).length === 0) { return 'N/A' }
-            return <span>{row.original.statistics.num_down}</span>
-        },
-    },
-    {
-        accessorKey: "statistics.diff_time",
-        header: getHeader("Diff (sec)", false),
-        cell: ({ row }) => {
-            if (Object.keys(row.original.statistics).length === 0) { return 'N/A' }
-            return <span>{row.original.statistics.diff_time.toFixed(3)}</span>
-        },
-    },
 ]
 
 const peerColumns: ColumnDef<Peer>[] = [
@@ -108,7 +68,7 @@ export default function Overlays() {
         const response = await ipv8Service.getOverlays();
         if (!(response === undefined) && !isErrorDict(response)) {
             // We ignore errors and correct with the missing information on the next call
-            setOverlays(response);
+            setOverlays(response.filter((overlay) => overlay.overlay_name.endsWith("Community")));
         }
     }, 5000, true);
 
diff --git a/src/tribler/ui/src/pages/Debug/IPv8/index.tsx b/src/tribler/ui/src/pages/Debug/IPv8/index.tsx
@@ -7,8 +7,8 @@ export default function IPv8() {
     return (
         <Tabs defaultValue="overlays" className="w-full flex flex-col flex-wrap">
             <TabsList className="flex-rows-3 border-b">
-                <TabsTrigger value="overlays">Overlays</TabsTrigger>
-                <TabsTrigger value="details">Details</TabsTrigger>
+                <TabsTrigger value="overlays">Peers</TabsTrigger>
+                <TabsTrigger value="details">Traffic</TabsTrigger>
             </TabsList>
             <TabsContent value="overlays" className="w-full flex-grow flex-col focus-visible:ring-0">
                 <Overlays />
diff --git a/src/tribler/ui/src/pages/Settings/Debugging.tsx b/src/tribler/ui/src/pages/Settings/Debugging.tsx
@@ -51,25 +51,6 @@ export default function Debugging() {
                     {t('EnableDevMode')}
                 </label>
             </div>
-            <div className="flex items-center space-x-2 p-2">
-                <Checkbox
-                    checked={settings?.statistics}
-                    onCheckedChange={(value) => {
-                        if (settings) {
-                            setSettings({
-                                ...settings,
-                                statistics: !!value,
-                            });
-                        }
-                    }}
-                    id="statistics" />
-                <label
-                    htmlFor="statistics"
-                    className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
-                >
-                    {t('EnableStats')}
-                </label>
-            </div>
 
             <SaveButton
                 onClick={async () => {
