From 67e43ca944c58d761c48d67272f6321e30d02390 Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Thu, 14 Nov 2024 10:53:04 -0500 Subject: [PATCH 1/2] Add tools --- Makefile | 3 +++ pyproject.toml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Makefile b/Makefile index ffc4417..f140e93 100644 --- a/Makefile +++ b/Makefile @@ -30,6 +30,9 @@ test: install lint: #! Run type analysis and linting checks lint: install @poetry run mypy ldotel + @poetry run isort --check --atomic ldotel + @poetry run pycodestyle ldotel + # # Documentation generation diff --git a/pyproject.toml b/pyproject.toml index 7df23b1..39b6034 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,6 +36,8 @@ pytest = ">=2.8" pytest-cov = ">=2.4.0" pytest-mypy = "==0.10.3" mypy = "==1.13.0" +pycodestyle = "^2.12.1" +isort = "^5.13.2" [tool.poetry.group.docs] From fb55958fefc0382de029174807cb2df08a455d9e Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Thu, 14 Nov 2024 10:53:25 -0500 Subject: [PATCH 2/2] Fix sort order --- ldotel/testing/test_tracing.py | 16 ++++++++-------- ldotel/tracing.py | 10 ++++++---- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/ldotel/testing/test_tracing.py b/ldotel/testing/test_tracing.py index df8187d..ce3fc79 100644 --- a/ldotel/testing/test_tracing.py +++ b/ldotel/testing/test_tracing.py @@ -1,14 +1,14 @@ import pytest - -from ldotel.tracing import Hook, HookOptions - -from ldclient import Config, LDClient, Context +from ldclient import Config, Context, LDClient from ldclient.integrations.test_data import TestData - -from opentelemetry.sdk.trace.export.in_memory_span_exporter import InMemorySpanExporter, SpanExporter -from opentelemetry.sdk.trace.export import SimpleSpanProcessor from opentelemetry.sdk.trace import TracerProvider -from opentelemetry.trace import set_tracer_provider, get_tracer_provider, Tracer +from opentelemetry.sdk.trace.export import SimpleSpanProcessor +from opentelemetry.sdk.trace.export.in_memory_span_exporter import ( + InMemorySpanExporter, SpanExporter) +from opentelemetry.trace import (Tracer, get_tracer_provider, + set_tracer_provider) + +from ldotel.tracing import Hook, HookOptions @pytest.fixture diff --git a/ldotel/tracing.py b/ldotel/tracing.py index 76f45fa..65b125a 100644 --- a/ldotel/tracing.py +++ b/ldotel/tracing.py @@ -1,10 +1,12 @@ -from ldclient.evaluation import EvaluationDetail -from ldclient.hook import Hook as LDHook, EvaluationSeriesContext, Metadata +from dataclasses import dataclass +from ldclient.evaluation import EvaluationDetail +from ldclient.hook import EvaluationSeriesContext +from ldclient.hook import Hook as LDHook +from ldclient.hook import Metadata from opentelemetry import trace -from opentelemetry.trace import Span, set_span_in_context, get_current_span from opentelemetry.context import attach, detach -from dataclasses import dataclass +from opentelemetry.trace import Span, get_current_span, set_span_in_context @dataclass