From aa0cfb54ced59671a0606110a616e2212cb028e6 Mon Sep 17 00:00:00 2001 From: doctorpangloss <@hiddenswitch.com> Date: Tue, 7 May 2024 17:04:31 -0700 Subject: [PATCH] Refine configuration of OpenTelemetry --- comfy/cli_args.py | 14 -------------- comfy/cli_args_types.py | 28 ---------------------------- requirements.txt | 2 -- 3 files changed, 44 deletions(-) diff --git a/comfy/cli_args.py b/comfy/cli_args.py index aad3ee0f3..8014e3349 100644 --- a/comfy/cli_args.py +++ b/comfy/cli_args.py @@ -184,20 +184,6 @@ def create_parser() -> argparse.ArgumentParser: parser.add_argument("--otel-service-name", type=str, default="comfyui", env_var="OTEL_SERVICE_NAME", help="The name of the service or application that is generating telemetry data.") parser.add_argument("--otel-service-version", type=str, default=__version__, env_var="OTEL_SERVICE_VERSION", help="The version of the service or application that is generating telemetry data.") parser.add_argument("--otel-exporter-otlp-endpoint", type=str, default=None, env_var="OTEL_EXPORTER_OTLP_ENDPOINT", help="A base endpoint URL for any signal type, with an optionally-specified port number. Helpful for when you're sending more than one signal to the same endpoint and want one environment variable to control the endpoint.") - parser.add_argument("--otel-exporter-otlp-traces-endpoint", type=str, default=None, env_var="OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", help="Endpoint URL for trace data only, with an optionally-specified port number. Typically ends with v1/traces when using OTLP/HTTP.") - parser.add_argument("--otel-exporter-otlp-metrics-endpoint", type=str, default=None, env_var="OTEL_EXPORTER_OTLP_METRICS_ENDPOINT", help="Endpoint URL for metric data only, with an optionally-specified port number. Typically ends with v1/metrics when using OTLP/HTTP.") - parser.add_argument("--otel-exporter-otlp-logs-endpoint", type=str, default=None, env_var="OTEL_EXPORTER_OTLP_LOGS_ENDPOINT", help="Endpoint URL for log data only, with an optionally-specified port number. Typically ends with v1/logs when using OTLP/HTTP.") - parser.add_argument("--otel-exporter-otlp-headers", type=str, default=None, env_var="OTEL_EXPORTER_OTLP_HEADERS", help="A list of headers to apply to all outgoing data (traces, metrics, and logs). To add a username and password to your headers, set this field to ``") - parser.add_argument("--otel-exporter-otlp-traces-headers", type=str, default=None, env_var="OTEL_EXPORTER_OTLP_TRACES_HEADERS", help="A list of headers to apply to all outgoing traces.") - parser.add_argument("--otel-exporter-otlp-metrics-headers", type=str, default=None, env_var="OTEL_EXPORTER_OTLP_METRICS_HEADERS", help="A list of headers to apply to all outgoing metrics.") - parser.add_argument("--otel-exporter-otlp-logs-headers", type=str, default=None, env_var="OTEL_EXPORTER_OTLP_LOGS_HEADERS", help="A list of headers to apply to all outgoing logs.") - parser.add_argument("--otel-exporter-otlp-timeout", type=str, default=None, env_var="OTEL_EXPORTER_OTLP_TIMEOUT", help="The timeout value for all outgoing data (traces, metrics, and logs) in milliseconds.") - parser.add_argument("--otel-exporter-otlp-traces-timeout", type=str, default=None, env_var="OTEL_EXPORTER_OTLP_TRACES_TIMEOUT", help="The timeout value for all outgoing traces in milliseconds.") - parser.add_argument("--otel-exporter-otlp-metrics-timeout", type=str, default=None, env_var="OTEL_EXPORTER_OTLP_METRICS_TIMEOUT", help="The timeout value for all outgoing metrics in milliseconds.") - parser.add_argument("--otel-exporter-otlp-logs-timeout", type=str, default=None, env_var="OTEL_EXPORTER_OTLP_LOGS_TIMEOUT", help="The timeout value for all outgoing logs in milliseconds.") - parser.add_argument("--otel-exporter-otlp-protocol", type=str, default=None, env_var="OTEL_EXPORTER_OTLP_PROTOCOL", help="Specifies the OTLP transport protocol to be used for all telemetry data.") - parser.add_argument("--otel-exporter-otlp-traces-protocol", type=str, default=None, env_var="OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", help="Specifies the OTLP transport protocol to be used for trace data.") - parser.add_argument("--otel-exporter-otlp-metrics-protocol", type=str, default=None, env_var="OTEL_EXPORTER_OTLP_METRICS_PROTOCOL", help="Specifies the OTLP transport protocol to be used for metrics data.") # now give plugins a chance to add configuration for entry_point in entry_points().select(group='comfyui.custom_config'): diff --git a/comfy/cli_args_types.py b/comfy/cli_args_types.py index 3a24f1031..7187934c2 100644 --- a/comfy/cli_args_types.py +++ b/comfy/cli_args_types.py @@ -87,20 +87,6 @@ class Configuration(dict): otel_service_name (str): The name of the service or application that is generating telemetry data. Default: "comfyui". otel_service_version (str): The version of the service or application that is generating telemetry data. Default: "0.0.1". otel_exporter_otlp_endpoint (Optional[str]): A base endpoint URL for any signal type, with an optionally-specified port number. Helpful for when you're sending more than one signal to the same endpoint and want one environment variable to control the endpoint. - otel_exporter_otlp_traces_endpoint (Optional[str]): Endpoint URL for trace data only, with an optionally-specified port number. Typically ends with v1/traces when using OTLP/HTTP. - otel_exporter_otlp_metrics_endpoint (Optional[str]): Endpoint URL for metric data only, with an optionally-specified port number. Typically ends with v1/metrics when using OTLP/HTTP. - otel_exporter_otlp_logs_endpoint (Optional[str]): Endpoint URL for log data only, with an optionally-specified port number. Typically ends with v1/logs when using OTLP/HTTP. - otel_exporter_otlp_headers (Optional[str]): A list of headers to apply to all outgoing data (traces, metrics, and logs). - otel_exporter_otlp_traces_headers (Optional[str]): A list of headers to apply to all outgoing traces. - otel_exporter_otlp_metrics_headers (Optional[str]): A list of headers to apply to all outgoing metrics. - otel_exporter_otlp_logs_headers (Optional[str]): A list of headers to apply to all outgoing logs. - otel_exporter_otlp_timeout (Optional[str]): The timeout value for all outgoing data (traces, metrics, and logs) in milliseconds. - otel_exporter_otlp_traces_timeout (Optional[str]): The timeout value for all outgoing traces in milliseconds. - otel_exporter_otlp_metrics_timeout (Optional[str]): The timeout value for all outgoing metrics in milliseconds. - otel_exporter_otlp_logs_timeout (Optional[str]): The timeout value for all outgoing logs in milliseconds. - otel_exporter_otlp_protocol (Optional[str]): Specifies the OTLP transport protocol to be used for all telemetry data. - otel_exporter_otlp_traces_protocol (Optional[str]): Specifies the OTLP transport protocol to be used for trace data. - otel_exporter_otlp_metrics_protocol (Optional[str]): Specifies the OTLP transport protocol to be used for metrics data. """ def __init__(self, **kwargs): @@ -171,20 +157,6 @@ class Configuration(dict): self.otel_service_name: str = "comfyui" self.otel_service_version: str = "0.0.1" self.otel_exporter_otlp_endpoint: Optional[str] = None - self.otel_exporter_otlp_traces_endpoint: Optional[str] = None - self.otel_exporter_otlp_metrics_endpoint: Optional[str] = None - self.otel_exporter_otlp_logs_endpoint: Optional[str] = None - self.otel_exporter_otlp_headers: Optional[str] = None - self.otel_exporter_otlp_traces_headers: Optional[str] = None - self.otel_exporter_otlp_metrics_headers: Optional[str] = None - self.otel_exporter_otlp_logs_headers: Optional[str] = None - self.otel_exporter_otlp_timeout: Optional[str] = None - self.otel_exporter_otlp_traces_timeout: Optional[str] = None - self.otel_exporter_otlp_metrics_timeout: Optional[str] = None - self.otel_exporter_otlp_logs_timeout: Optional[str] = None - self.otel_exporter_otlp_protocol: Optional[str] = None - self.otel_exporter_otlp_traces_protocol: Optional[str] = None - self.otel_exporter_otlp_metrics_protocol: Optional[str] = None for key, value in kwargs.items(): self[key] = value diff --git a/requirements.txt b/requirements.txt index 9b1ba4120..8865baa05 100644 --- a/requirements.txt +++ b/requirements.txt @@ -39,8 +39,6 @@ natsort OpenEXR opentelemetry-distro opentelemetry-exporter-otlp -opentelemetry-exporter-otlp-proto-http -opentelemetry-exporter-otlp-proto-grpc opentelemetry-propagator-jaeger opentelemetry-instrumentation opentelemetry-util-http