diff --git a/arena/utils/__init__.py b/arena/utils/__init__.py index 2b9fb15c..28210d27 100644 --- a/arena/utils/__init__.py +++ b/arena/utils/__init__.py @@ -1,4 +1,4 @@ from .utils import Utils from .cmd_interpreter import ArenaCmdInterpreter from .arena_telemetry import ArenaTelemetry -from .program_stats import ProgramStats \ No newline at end of file +from .program_info import ProgramRunInfo \ No newline at end of file diff --git a/arena/utils/arena_telemetry.py b/arena/utils/arena_telemetry.py index 4b2e862a..fe68db52 100644 --- a/arena/utils/arena_telemetry.py +++ b/arena/utils/arena_telemetry.py @@ -13,12 +13,12 @@ from opentelemetry.trace import NoOpTracerProvider, Status, StatusCode from opentelemetry.sdk.trace.export import BatchSpanProcessor, ConsoleSpanExporter, SpanExporter, SpanExportResult -from ..env_vars import ( +from ..env import ( ARENA_TELEMETRY, - OTLP_ENDPOINT + OTLP_ENDPOINT, + ENV_DEFAULTS ) -OTLP_ENDPOINT_DFT = "http://localhost:4317" TRACE_TOPIC_DFT = "realm/ns/scene/t/traces" class MQTTSpanExporter(SpanExporter): @@ -56,6 +56,7 @@ def force_flush(self, timeout_millis: int = 30000) -> bool: def shutdown(self) -> None: print("shutdown exporter!") pass + class ArenaTelemetry(): parent_span: Span = None @@ -70,7 +71,7 @@ def __init__(self, name=sys.argv[0], id=None): }) env_telemetry = os.environ.get(ARENA_TELEMETRY, 'None') - otlp_endpoint = os.environ.get(OTLP_ENDPOINT, OTLP_ENDPOINT_DFT) + otlp_endpoint = os.environ.get(OTLP_ENDPOINT, ENV_DEFAULTS.get(OTLP_ENDPOINT)) tel_exporters = { 'otlp': lambda: OTLPSpanExporter(otlp_endpoint, insecure=True), 'mqtt': lambda: MQTTSpanExporter(),