Commit 45d6b3cb authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'pr_telemetry_fix' into 'develop'

fix: telemetry INT collector misplacement issue

See merge request !405
parents 87cb50ce c414bac8
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -19,12 +19,13 @@ from .collector_api.DriverInstanceCache import get_driver
from common.proto.kpi_manager_pb2            import KpiId
from common.tools.context_queries.Device     import get_device
from common.tools.context_queries.EndPoint   import get_endpoint_names
from typing import List, Tuple, Optional

LOGGER = logging.getLogger(__name__)

def get_subscription_parameters(
        kpi_id : str, kpi_manager_client, context_client, duration, interval
        ) -> list[tuple] | None:
        ) -> Optional[List[Tuple]]:
    """
    Method to get subscription parameters based on KPI ID.
    Returns a list of tuples with subscription parameters.
@@ -95,7 +96,7 @@ def get_subscription_parameters(


def get_collector_by_kpi_id(kpi_id: str, kpi_manager_client, context_client, driver_instance_cache
                            ) -> _Collector | None:
                            ) -> Optional[_Collector]:
    """
    Method to get a collector instance based on KPI ID.
    Preconditions:
+1 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ if LOAD_ALL_DEVICE_DRIVERS:
    )

if LOAD_ALL_DEVICE_DRIVERS:
    from ...collectors.intcollector.INTCollector import INTCollector # pylint: disable=wrong-import-position
    from .intcollector.INTCollector import INTCollector # pylint: disable=wrong-import-position
    COLLECTORS.append(
        (INTCollector, [
            {
@@ -58,4 +58,3 @@ if LOAD_ALL_DEVICE_DRIVERS:
            }
        ])
    )
+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ class Subscription:
        metric_queue:          Queue,
        mode:                  str        = "stream",
        sample_interval_ns:    int        = 10_000_000_000,
        heartbeat_interval_ns: int | None = None,  # ← NEW
        heartbeat_interval_ns: Optional[int] = None,  # ← NEW
        encoding:              str        = "json_ietf",
        on_update:             Optional[Callable[[dict], None]] = None,
    ) -> None:
@@ -82,7 +82,7 @@ class Subscription:
        path_list: List[str],
        mode: str,
        sample_interval_ns: int,
        heartbeat_interval_ns: int | None,
        heartbeat_interval_ns: Optional[int],
        encoding: str,
        on_update: Optional[Callable[[dict], None]],
    ) -> None:  # pragma: no cover
+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ from apscheduler.schedulers.background import BackgroundScheduler
from apscheduler.jobstores.memory import MemoryJobStore
from apscheduler.executors.pool import ThreadPoolExecutor
from datetime import datetime
from telemetry.backend.collector_api._Collector import _Collector
from telemetry.backend.service.collector_api._Collector import _Collector

from scapy.all import *
import struct
Loading