diff --git a/docker_stuff/python_stuff/__init__.py b/docker_stuff/python_stuff/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/docker_stuff/python_stuff/event_classes.py b/docker_stuff/python_stuff/event_classes.py index 7a05f4e..11b4ff6 100644 --- a/docker_stuff/python_stuff/event_classes.py +++ b/docker_stuff/python_stuff/event_classes.py @@ -164,19 +164,16 @@ async def _sanitize_event_keys(self, filters, logger) -> Dict: updated_keys = {} limit = "" global_search = {} - # filters_wo_search_limit = filters try: try: limit = filters.get("limit", 100) filters.pop("limit") - # filters.pop("limit") except Exception as exc: logger.error(f"Exception is: {exc}") try: global_search = filters.get("search", {}) filters.pop("search") - # filters.pop("search") except Exception as exc: logger.error(f"Exception is: {exc}") diff --git a/docker_stuff/python_stuff/event_handler.py b/docker_stuff/python_stuff/event_handler.py index 485e29f..8a228b2 100644 --- a/docker_stuff/python_stuff/event_handler.py +++ b/docker_stuff/python_stuff/event_handler.py @@ -22,7 +22,6 @@ from event_classes import Event, Subscription -# Initialize the logger logger = logging.getLogger(__name__) logger.setLevel(logging.DEBUG) formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s") @@ -30,8 +29,6 @@ handler.setFormatter(formatter) logger.addHandler(handler) -# from otel_metrics import PythonOTEL - app = FastAPI() trace.set_tracer_provider( @@ -43,7 +40,6 @@ span_processor = BatchSpanProcessor(otlp_exporter) otlp_tracer = trace.get_tracer_provider().add_span_processor(span_processor) -# py_otel = PythonOTEL() # Set up a separate tracer provider for Redis redis_tracer_provider = TracerProvider( @@ -231,7 +227,6 @@ async def handle_subscription(request: Request) -> JSONResponse: try: request_payload = await request.json() subscription_obj = Subscription(request_payload) - # py_otel.counter_query.add(1, py_otel.labels) if not subscription_obj.filters: return subscription_obj.sub_response_builder( @@ -286,7 +281,6 @@ async def handle_subscription(request: Request) -> JSONResponse: "EOSE", subscription_obj.subscription_id, "", 500 ) - if __name__ == "__main__": logger.info(f"Write conn string is: {get_conn_str('WRITE')}") logger.info(f"Read conn string is: {get_conn_str('READ')}") diff --git a/docker_stuff/python_stuff/websocket_classes.py b/docker_stuff/python_stuff/websocket_classes.py index 64084f4..7437725 100644 --- a/docker_stuff/python_stuff/websocket_classes.py +++ b/docker_stuff/python_stuff/websocket_classes.py @@ -240,7 +240,7 @@ def __init__(self, message: List[Union[str, Dict[str, Any]]], websocket, logger) merged.update(item) logger.debug(f"merged is {merged} and type {type(merged)}") self.event_payload = ( - merged # {json.loads(item) for item in range(2, len(message))} + merged ) else: self.event_payload: Dict[str, Any] = message[1] diff --git a/docker_stuff/python_stuff/websocket_handler.py b/docker_stuff/python_stuff/websocket_handler.py index 145f574..89d55d2 100644 --- a/docker_stuff/python_stuff/websocket_handler.py +++ b/docker_stuff/python_stuff/websocket_handler.py @@ -28,7 +28,6 @@ AioHttpClientInstrumentor().instrument() -# trace.set_tracer_provider(TracerProvider()) trace.set_tracer_provider( TracerProvider(resource=Resource.create({"service.name": "websocket_handler_otel"})) ) @@ -107,7 +106,6 @@ async def handle_websocket_connection( "send_event_to_subscription" ) as span: current_span = trace.get_current_span() - # current_span.set_attribute("service.name", "websocket_handler") current_span.set_attribute( "operation.name", "send.event.subscription" )