From d4f0ef9538eed1989c8bf7a1a66369e5e92d8025 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Fri, 9 Aug 2019 14:44:27 -0700 Subject: [PATCH] Added SeverityEnum --- .../application_insights_telemetry_client.py | 3 ++- libraries/botbuilder-core/botbuilder/core/__init__.py | 3 ++- .../botbuilder/core/bot_telemetry_client.py | 10 +++++++++- .../botbuilder/core/null_telemetry_client.py | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/application_insights_telemetry_client.py b/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/application_insights_telemetry_client.py index ebaf1a500..1abd99dcc 100644 --- a/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/application_insights_telemetry_client.py +++ b/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/application_insights_telemetry_client.py @@ -7,6 +7,7 @@ from applicationinsights import TelemetryClient # pylint: disable=no-name-in-module from botbuilder.core.bot_telemetry_client import ( BotTelemetryClient, + Severity, TelemetryDataPointType, ) from .integration_post_data import IntegrationPostData @@ -168,7 +169,7 @@ def track_metric( ) def track_trace( - self, name: str, properties: Dict[str, object] = None, severity=None + self, name: str, properties: Dict[str, object] = None, severity: Severity = None ): """ Sends a single trace statement. diff --git a/libraries/botbuilder-core/botbuilder/core/__init__.py b/libraries/botbuilder-core/botbuilder/core/__init__.py index f34eec933..74f09e307 100644 --- a/libraries/botbuilder-core/botbuilder/core/__init__.py +++ b/libraries/botbuilder-core/botbuilder/core/__init__.py @@ -14,7 +14,7 @@ from .bot_framework_adapter import BotFrameworkAdapter, BotFrameworkAdapterSettings from .bot_state import BotState from .bot_state_set import BotStateSet -from .bot_telemetry_client import BotTelemetryClient +from .bot_telemetry_client import BotTelemetryClient, Severity from .card_factory import CardFactory from .conversation_state import ConversationState from .intent_score import IntentScore @@ -56,6 +56,7 @@ "NullTelemetryClient", "Recognizer", "RecognizerResult", + "Severity", "StatePropertyAccessor", "StatePropertyInfo", "Storage", diff --git a/libraries/botbuilder-core/botbuilder/core/bot_telemetry_client.py b/libraries/botbuilder-core/botbuilder/core/bot_telemetry_client.py index a56d05a56..c797b000b 100644 --- a/libraries/botbuilder-core/botbuilder/core/bot_telemetry_client.py +++ b/libraries/botbuilder-core/botbuilder/core/bot_telemetry_client.py @@ -7,6 +7,14 @@ from enum import Enum +class Severity(Enum): + verbose = 0 + information = 1 + warning = 2 + error = 3 + critical = 4 + + class TelemetryDataPointType(Enum): measurement = 0 aggregation = 1 @@ -105,7 +113,7 @@ def track_metric( ) @abstractmethod - def track_trace(self, name, properties=None, severity=None): + def track_trace(self, name, properties=None, severity: Severity = None): """ Sends a single trace statement. :param name: the trace statement.\n diff --git a/libraries/botbuilder-core/botbuilder/core/null_telemetry_client.py b/libraries/botbuilder-core/botbuilder/core/null_telemetry_client.py index 17488a689..dc9954385 100644 --- a/libraries/botbuilder-core/botbuilder/core/null_telemetry_client.py +++ b/libraries/botbuilder-core/botbuilder/core/null_telemetry_client.py @@ -3,7 +3,7 @@ import traceback from typing import Dict -from .bot_telemetry_client import BotTelemetryClient, TelemetryDataPointType +from .bot_telemetry_client import BotTelemetryClient, TelemetryDataPointType, Severity class NullTelemetryClient(BotTelemetryClient): @@ -90,7 +90,7 @@ def track_metric( """ return - def track_trace(self, name, properties=None, severity=None): + def track_trace(self, name, properties=None, severity: Severity = None): """ Sends a single trace statement. :param name: the trace statement.\n