diff --git a/stubs/aws-xray-sdk/@tests/stubtest_allowlist.txt b/stubs/aws-xray-sdk/@tests/stubtest_allowlist.txt index c0f8fbaf4..65bf92543 100644 --- a/stubs/aws-xray-sdk/@tests/stubtest_allowlist.txt +++ b/stubs/aws-xray-sdk/@tests/stubtest_allowlist.txt @@ -1,4 +1,3 @@ -aws_xray_sdk.core.async_recorder.subsegment_decorator aws_xray_sdk.core.models.subsegment.subsegment_decorator aws_xray_sdk.core.sampling.connector.ServiceConnector.fetch_sampling_rules aws_xray_sdk.core.sampling.sampler.ServiceConnector.fetch_sampling_rules diff --git a/stubs/aws-xray-sdk/aws_xray_sdk/core/async_recorder.pyi b/stubs/aws-xray-sdk/aws_xray_sdk/core/async_recorder.pyi index 146a71fc7..41138e427 100644 --- a/stubs/aws-xray-sdk/aws_xray_sdk/core/async_recorder.pyi +++ b/stubs/aws-xray-sdk/aws_xray_sdk/core/async_recorder.pyi @@ -1,14 +1,9 @@ from _typeshed import Incomplete from types import TracebackType -from .models.segment import SegmentContextManager as SegmentContextManager -from .models.subsegment import ( - SubsegmentContextManager as SubsegmentContextManager, - is_already_recording as is_already_recording, - subsegment_decorator as subsegment_decorator, -) -from .recorder import AWSXRayRecorder as AWSXRayRecorder -from .utils import stacktrace as stacktrace +from .models.segment import SegmentContextManager +from .models.subsegment import SubsegmentContextManager +from .recorder import AWSXRayRecorder class AsyncSegmentContextManager(SegmentContextManager): async def __aenter__(self): ... diff --git a/stubs/aws-xray-sdk/aws_xray_sdk/core/context.pyi b/stubs/aws-xray-sdk/aws_xray_sdk/core/context.pyi index d5f0806b6..3b389b303 100644 --- a/stubs/aws-xray-sdk/aws_xray_sdk/core/context.pyi +++ b/stubs/aws-xray-sdk/aws_xray_sdk/core/context.pyi @@ -2,9 +2,6 @@ import time from logging import Logger from typing import Any -from .. import global_sdk_config as global_sdk_config -from .exceptions.exceptions import SegmentNotFoundException as SegmentNotFoundException -from .models.dummy_entities import DummySegment as DummySegment from .models.entity import Entity from .models.segment import Segment from .models.subsegment import Subsegment diff --git a/stubs/aws-xray-sdk/aws_xray_sdk/core/daemon_config.pyi b/stubs/aws-xray-sdk/aws_xray_sdk/core/daemon_config.pyi index 3ac5aa77f..e5c4b9609 100644 --- a/stubs/aws-xray-sdk/aws_xray_sdk/core/daemon_config.pyi +++ b/stubs/aws-xray-sdk/aws_xray_sdk/core/daemon_config.pyi @@ -1,5 +1,3 @@ -from .exceptions.exceptions import InvalidDaemonAddressException as InvalidDaemonAddressException - DAEMON_ADDRESS_KEY: str DEFAULT_ADDRESS: str diff --git a/stubs/aws-xray-sdk/aws_xray_sdk/core/lambda_launcher.pyi b/stubs/aws-xray-sdk/aws_xray_sdk/core/lambda_launcher.pyi index 622213441..2ff1a6d6c 100644 --- a/stubs/aws-xray-sdk/aws_xray_sdk/core/lambda_launcher.pyi +++ b/stubs/aws-xray-sdk/aws_xray_sdk/core/lambda_launcher.pyi @@ -1,11 +1,7 @@ from _typeshed import Incomplete from logging import Logger -from aws_xray_sdk import global_sdk_config as global_sdk_config - -from .context import Context as Context -from .models.facade_segment import FacadeSegment as FacadeSegment -from .models.trace_header import TraceHeader as TraceHeader +from .context import Context log: Logger LAMBDA_TRACE_HEADER_KEY: str diff --git a/stubs/aws-xray-sdk/aws_xray_sdk/core/models/entity.pyi b/stubs/aws-xray-sdk/aws_xray_sdk/core/models/entity.pyi index b07998812..91260a83d 100644 --- a/stubs/aws-xray-sdk/aws_xray_sdk/core/models/entity.pyi +++ b/stubs/aws-xray-sdk/aws_xray_sdk/core/models/entity.pyi @@ -3,12 +3,6 @@ from logging import Logger from traceback import StackSummary from typing import Any -from ..exceptions.exceptions import AlreadyEndedException as AlreadyEndedException -from ..utils.compat import annotation_value_types as annotation_value_types, string_types as string_types -from ..utils.conversion import metadata_to_dict as metadata_to_dict -from . import http as http -from .throwable import Throwable as Throwable - log: Logger ORIGIN_TRACE_HEADER_ATTR_KEY: str diff --git a/stubs/aws-xray-sdk/aws_xray_sdk/core/models/facade_segment.pyi b/stubs/aws-xray-sdk/aws_xray_sdk/core/models/facade_segment.pyi index e8b054ac2..44623545f 100644 --- a/stubs/aws-xray-sdk/aws_xray_sdk/core/models/facade_segment.pyi +++ b/stubs/aws-xray-sdk/aws_xray_sdk/core/models/facade_segment.pyi @@ -1,8 +1,7 @@ from _typeshed import Incomplete from typing import Any -from ..exceptions.exceptions import FacadeSegmentMutationException as FacadeSegmentMutationException -from .segment import Segment as Segment +from .segment import Segment MUTATION_UNSUPPORTED_MESSAGE: str diff --git a/stubs/aws-xray-sdk/aws_xray_sdk/core/models/segment.pyi b/stubs/aws-xray-sdk/aws_xray_sdk/core/models/segment.pyi index 7c90e37a6..507832b24 100644 --- a/stubs/aws-xray-sdk/aws_xray_sdk/core/models/segment.pyi +++ b/stubs/aws-xray-sdk/aws_xray_sdk/core/models/segment.pyi @@ -1,12 +1,10 @@ from types import TracebackType from typing import Any -from ..exceptions.exceptions import SegmentNameMissingException as SegmentNameMissingException from ..recorder import AWSXRayRecorder -from ..utils.atomic_counter import AtomicCounter as AtomicCounter -from .entity import Entity as Entity +from ..utils.atomic_counter import AtomicCounter +from .entity import Entity from .subsegment import Subsegment -from .traceid import TraceId as TraceId ORIGIN_TRACE_HEADER_ATTR_KEY: str diff --git a/stubs/aws-xray-sdk/aws_xray_sdk/core/models/subsegment.pyi b/stubs/aws-xray-sdk/aws_xray_sdk/core/models/subsegment.pyi index 45a6ae889..ad398ae98 100644 --- a/stubs/aws-xray-sdk/aws_xray_sdk/core/models/subsegment.pyi +++ b/stubs/aws-xray-sdk/aws_xray_sdk/core/models/subsegment.pyi @@ -4,8 +4,7 @@ from types import TracebackType from typing import Any from ...core import AWSXRayRecorder -from ..exceptions.exceptions import SegmentNotFoundException as SegmentNotFoundException -from .entity import Entity as Entity +from .entity import Entity from .segment import Segment SUBSEGMENT_RECORDING_ATTRIBUTE: str diff --git a/stubs/aws-xray-sdk/aws_xray_sdk/core/models/throwable.pyi b/stubs/aws-xray-sdk/aws_xray_sdk/core/models/throwable.pyi index a7be6d684..a990c488d 100644 --- a/stubs/aws-xray-sdk/aws_xray_sdk/core/models/throwable.pyi +++ b/stubs/aws-xray-sdk/aws_xray_sdk/core/models/throwable.pyi @@ -1,7 +1,5 @@ from typing import Any -from ..utils.compat import string_types as string_types - log: Any class Throwable: diff --git a/stubs/aws-xray-sdk/aws_xray_sdk/core/patcher.pyi b/stubs/aws-xray-sdk/aws_xray_sdk/core/patcher.pyi index b33041f3f..3557c26c3 100644 --- a/stubs/aws-xray-sdk/aws_xray_sdk/core/patcher.pyi +++ b/stubs/aws-xray-sdk/aws_xray_sdk/core/patcher.pyi @@ -2,10 +2,6 @@ from collections.abc import Iterable from logging import Logger from typing import Any -from aws_xray_sdk import global_sdk_config as global_sdk_config - -from .utils.compat import PY2 as PY2, is_classmethod as is_classmethod, is_instance_method as is_instance_method - log: Logger SUPPORTED_MODULES: Any NO_DOUBLE_PATCH: Any diff --git a/stubs/aws-xray-sdk/aws_xray_sdk/core/plugins/utils.pyi b/stubs/aws-xray-sdk/aws_xray_sdk/core/plugins/utils.pyi index 9d521e651..f3ef252e2 100644 --- a/stubs/aws-xray-sdk/aws_xray_sdk/core/plugins/utils.pyi +++ b/stubs/aws-xray-sdk/aws_xray_sdk/core/plugins/utils.pyi @@ -1,7 +1,5 @@ from typing import Any -from ..exceptions.exceptions import MissingPluginNames as MissingPluginNames - module_prefix: str PLUGIN_MAPPING: Any diff --git a/stubs/aws-xray-sdk/aws_xray_sdk/core/recorder.pyi b/stubs/aws-xray-sdk/aws_xray_sdk/core/recorder.pyi index 88f90f4ae..eb91d70c4 100644 --- a/stubs/aws-xray-sdk/aws_xray_sdk/core/recorder.pyi +++ b/stubs/aws-xray-sdk/aws_xray_sdk/core/recorder.pyi @@ -3,27 +3,15 @@ from collections.abc import Callable, Iterable from logging import Logger from typing import Any -from aws_xray_sdk import global_sdk_config as global_sdk_config -from aws_xray_sdk.version import VERSION as VERSION - -from .context import Context as Context -from .daemon_config import DaemonConfig as DaemonConfig -from .emitters.udp_emitter import UDPEmitter as UDPEmitter -from .exceptions.exceptions import ( - SegmentNameMissingException as SegmentNameMissingException, - SegmentNotFoundException as SegmentNotFoundException, -) -from .lambda_launcher import check_in_lambda as check_in_lambda -from .models.default_dynamic_naming import DefaultDynamicNaming as DefaultDynamicNaming -from .models.dummy_entities import DummySegment as DummySegment, DummySubsegment as DummySubsegment -from .models.segment import Segment as Segment, SegmentContextManager as SegmentContextManager -from .models.subsegment import Subsegment as Subsegment, SubsegmentContextManager as SubsegmentContextManager -from .plugins.utils import get_plugin_modules as get_plugin_modules +from .context import Context +from .emitters.udp_emitter import UDPEmitter +from .models.default_dynamic_naming import DefaultDynamicNaming +from .models.dummy_entities import DummySegment, DummySubsegment +from .models.segment import Segment, SegmentContextManager +from .models.subsegment import Subsegment, SubsegmentContextManager from .sampling.local.sampler import LocalSampler from .sampling.sampler import DefaultSampler -from .streaming.default_streaming import DefaultStreaming as DefaultStreaming -from .utils import stacktrace as stacktrace -from .utils.compat import string_types as string_types +from .streaming.default_streaming import DefaultStreaming log: Logger TRACING_NAME_KEY: str diff --git a/stubs/aws-xray-sdk/aws_xray_sdk/core/sampling/connector.pyi b/stubs/aws-xray-sdk/aws_xray_sdk/core/sampling/connector.pyi index 8edea3c58..3ae19b8da 100644 --- a/stubs/aws-xray-sdk/aws_xray_sdk/core/sampling/connector.pyi +++ b/stubs/aws-xray-sdk/aws_xray_sdk/core/sampling/connector.pyi @@ -1,11 +1,3 @@ -from datetime import datetime as datetime - -from aws_xray_sdk.core.context import Context as Context -from aws_xray_sdk.core.models.dummy_entities import DummySegment as DummySegment -from aws_xray_sdk.core.utils.compat import PY2 as PY2 - -from .sampling_rule import SamplingRule as SamplingRule - class ServiceConnector: def __init__(self) -> None: ... def fetch_sampling_rules(self): ... diff --git a/stubs/aws-xray-sdk/aws_xray_sdk/core/sampling/sampling_rule.pyi b/stubs/aws-xray-sdk/aws_xray_sdk/core/sampling/sampling_rule.pyi index 268fc401c..17b6ee99d 100644 --- a/stubs/aws-xray-sdk/aws_xray_sdk/core/sampling/sampling_rule.pyi +++ b/stubs/aws-xray-sdk/aws_xray_sdk/core/sampling/sampling_rule.pyi @@ -1,8 +1,5 @@ from _typeshed import Incomplete -from ..utils.search_pattern import wildcard_match as wildcard_match -from .reservoir import Reservoir as Reservoir - class SamplingRule: def __init__( self, diff --git a/stubs/aws-xray-sdk/aws_xray_sdk/core/utils/compat.pyi b/stubs/aws-xray-sdk/aws_xray_sdk/core/utils/compat.pyi index 32562d540..799c00ba0 100644 --- a/stubs/aws-xray-sdk/aws_xray_sdk/core/utils/compat.pyi +++ b/stubs/aws-xray-sdk/aws_xray_sdk/core/utils/compat.pyi @@ -1,10 +1,6 @@ from typing import Any -from typing_extensions import Literal -PY2: Literal[False] -PY35: Literal[True] annotation_value_types: Any -string_types = str def is_classmethod(func): ... def is_instance_method(parent_class, func_name, func): ...