### Overview Major restructuring from monolithic `arcade-ai` package to modular library architecture with standardized uv-based dependency management.  ### New Package Structure - **`arcade-tdk`** - Lightweight toolkit development kit (core decorators, auth) - **`arcade-core`** - Core execution engine and catalog functionality - **`arcade-serve`** - FastAPI/MCP server components - **`arcade-ai`** - Meta package that includes CLI functionality. Optionally include evals via the `evals` extra. Optionally include all packages via the `all` extra. ### Key Benefits - **Lighter Dependencies**: Toolkits now depend only on `arcade-tdk` (~2 deps) vs full `arcade-ai` (~30+ deps) - **Faster Builds**: uv provides 10-100x faster dependency resolution and installation - **Better Modularity**: Clear separation of concerns, consumers import only what they need - **Standard Tooling**: Eliminates custom poetry scripts, uses standard Python packaging ### Migration Impact - All 20 toolkits converted from poetry → uv with `arcade-tdk` dependencies plus `arcade-ai[evals]` and `arcade-serve` dev dependencies. When developing locally, devs should install toolkits via `make install-local`. - Modern Python 3.10+ type hints throughout - Standardized build system with hatchling backend - Enhanced Makefile with robust toolkit management commands - Removed `arcade dev` CLI command - Reduce the number of files created by `arcade new` and add an option to not generate a tests and evals folder. This foundation enables faster development cycles and cleaner dependency chains for the growing toolkit ecosystem. ### Todo After this PR is merged - [ ] Post-merge workflow(s) (release & publish containers, etc) - [ ] Release order plan. @EricGustin suggests releasing in the following order: 1. `arcade-core` version 0.1.0 2. `arcade-serve` version 0.1.0 and `arcade-tdk` version 0.1.0 3. `arcade-ai` version 2.0.0 4. Patch release for all toolkits (all changes in toolkits are internal refactors) - [ ] [Update docs](https://github.com/ArcadeAI/docs/pull/318) --------- Co-authored-by: Eric Gustin <eric@arcade.dev> Co-authored-by: Eric Gustin <34000337+EricGustin@users.noreply.github.com>
130 lines
5.4 KiB
Python
130 lines
5.4 KiB
Python
import logging
|
|
import os
|
|
import urllib.parse
|
|
from typing import Optional
|
|
|
|
from fastapi import FastAPI
|
|
from opentelemetry import _logs, trace
|
|
from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter
|
|
from opentelemetry.exporter.otlp.proto.http.metric_exporter import OTLPMetricExporter
|
|
from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
|
|
from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor
|
|
from opentelemetry.metrics import Meter, get_meter_provider, set_meter_provider
|
|
from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler
|
|
from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
|
|
from opentelemetry.sdk.metrics import MeterProvider
|
|
from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader
|
|
from opentelemetry.sdk.resources import SERVICE_NAME, Resource
|
|
from opentelemetry.sdk.trace import TracerProvider
|
|
from opentelemetry.sdk.trace.export import BatchSpanProcessor
|
|
|
|
|
|
class ShutdownError(Exception):
|
|
pass
|
|
|
|
|
|
class OTELHandler:
|
|
def __init__(self, enable: bool = True, log_level: int = logging.INFO):
|
|
self.enable = enable
|
|
self.log_level = log_level
|
|
self._tracer_provider: Optional[TracerProvider] = None
|
|
self._tracer_span_exporter: Optional[OTLPSpanExporter] = None
|
|
self._meter_provider: Optional[MeterProvider] = None
|
|
self._meter_reader: Optional[PeriodicExportingMetricReader] = None
|
|
self._otlp_metric_exporter: Optional[OTLPMetricExporter] = None
|
|
self._logger_provider: Optional[LoggerProvider] = None
|
|
self._log_processor: Optional[BatchLogRecordProcessor] = None
|
|
self.environment = os.environ.get("ARCADE_ENVIRONMENT", "local")
|
|
|
|
def instrument_app(self, app: FastAPI) -> None:
|
|
if self.enable:
|
|
logging.info(
|
|
"🔎 Initializing OpenTelemetry. Use environment variables to configure the connection"
|
|
)
|
|
self.resource = Resource(
|
|
attributes={SERVICE_NAME: "arcade-worker", "environment": self.environment}
|
|
)
|
|
|
|
self._init_tracer()
|
|
self._init_metrics()
|
|
self._init_logging(self.log_level)
|
|
FastAPIInstrumentor().instrument_app(app)
|
|
|
|
def _init_tracer(self) -> None:
|
|
self._tracer_provider = TracerProvider(resource=self.resource)
|
|
trace.set_tracer_provider(self._tracer_provider)
|
|
|
|
# Create an OTLP exporter
|
|
self._tracer_span_exporter = OTLPSpanExporter()
|
|
|
|
try:
|
|
self._tracer_span_exporter.export([trace.get_tracer(__name__).start_span("ping")])
|
|
except Exception as e:
|
|
raise ConnectionError(
|
|
f"Could not connect to OpenTelemetry Tracer endpoint. Check OpenTelemetry configuration or disable: {e}"
|
|
)
|
|
|
|
# Create a batch span processor and add the exporter
|
|
span_processor = BatchSpanProcessor(self._tracer_span_exporter)
|
|
self._tracer_provider.add_span_processor(span_processor)
|
|
|
|
def _init_metrics(self) -> None:
|
|
self._otlp_metric_exporter = OTLPMetricExporter()
|
|
|
|
self._meter_reader = PeriodicExportingMetricReader(self._otlp_metric_exporter)
|
|
|
|
self._meter_provider = MeterProvider(
|
|
metric_readers=[self._meter_reader], resource=self.resource
|
|
)
|
|
|
|
set_meter_provider(self._meter_provider)
|
|
|
|
def get_meter(self) -> Meter:
|
|
return get_meter_provider().get_meter(__name__)
|
|
|
|
def _init_logging(self, log_level: int) -> None:
|
|
otlp_log_exporter = OTLPLogExporter()
|
|
|
|
self._logger_provider = LoggerProvider(resource=self.resource)
|
|
_logs.set_logger_provider(self._logger_provider)
|
|
|
|
# Create a batch span processor and add the exporter
|
|
self._log_processor = BatchLogRecordProcessor(otlp_log_exporter)
|
|
self._logger_provider.add_log_record_processor(self._log_processor)
|
|
|
|
handler = LoggingHandler(level=log_level, logger_provider=self._logger_provider)
|
|
logging.getLogger().addHandler(handler)
|
|
|
|
# Create a filter for urllib3 connection logs related to OpenTelemetry
|
|
class OTELConnectionFilter(logging.Filter):
|
|
def filter(self, record: logging.LogRecord) -> bool:
|
|
# Filter out connection logs to OpenTelemetry endpoints
|
|
parsed_url = urllib.parse.urlparse(
|
|
os.environ.get("OTEL_EXPORTER_OTLP_ENDPOINT", "")
|
|
)
|
|
domain = parsed_url.netloc.split(":")[0]
|
|
return not (domain and domain in str(getattr(record, "args", ())))
|
|
|
|
# Apply the filter to the urllib3 logger
|
|
urllib3_logger = logging.getLogger("urllib3.connectionpool")
|
|
urllib3_logger.addFilter(OTELConnectionFilter())
|
|
|
|
def _shutdown_tracer(self) -> None:
|
|
if self._tracer_span_exporter is None:
|
|
raise ShutdownError("Tracer provider not initialized. Failed to shutdown")
|
|
self._tracer_span_exporter.shutdown()
|
|
|
|
def _shutdown_metrics(self) -> None:
|
|
if self._otlp_metric_exporter is None:
|
|
raise ShutdownError("Meter provider not initialized. Failed to shutdown")
|
|
self._otlp_metric_exporter.shutdown()
|
|
|
|
def _shutdown_logging(self) -> None:
|
|
if self._logger_provider is None:
|
|
raise ShutdownError("Log provider not initialized. Failed to shutdown")
|
|
self._logger_provider.shutdown()
|
|
|
|
def shutdown(self) -> None:
|
|
self._shutdown_tracer()
|
|
self._shutdown_metrics()
|
|
self._shutdown_logging()
|