ddapm-test-agent 1.33.0__tar.gz → 1.34.0__tar.gz

{ddapm_test_agent-1.33.0 → ddapm_test_agent-1.34.0}/.github/workflows/main.yml

@@ -10,7 +10,8 @@ jobs:
     steps:
       - uses: actions/setup-python@7f4fc3e22c37d6ff65e88745f38bd3157c663f7c # v4.9.1
         with:
-          python-version: '3.13'
+          # Run typing/formatting/etc checks on the oldest version we support
+          python-version: '3.11'
       - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           fetch-depth: 0
@@ -22,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: ["3.8", "3.13"]
+        python-version: ["3.11", "3.12", "3.13"]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
@@ -32,7 +33,7 @@ jobs:
       - name: install deps
         run: pip install .[testing]
       - run: |
-          riot run -p --pass-env ${{ matrix.python-version}} test
+          riot run --pass-env -p ${{ matrix.python-version}} test
   cassettes-size:
     runs-on: ubuntu-latest
     steps:

{ddapm_test_agent-1.33.0 → ddapm_test_agent-1.34.0}/PKG-INFO

@@ -1,15 +1,12 @@
 Metadata-Version: 2.4
 Name: ddapm-test-agent
-Version: 1.33.0
+Version: 1.34.0
 Summary: Test agent for Datadog APM client libraries
 Home-page: https://github.com/Datadog/dd-apm-test-agent
 Author: Kyle Verhoog
 Author-email: kyle@verhoog.ca
 License: BSD 3
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
@@ -64,11 +61,6 @@ See the [Development](#development) section for how to get the test agent runnin
 
 ## Installation
 
-The test agent can be installed using [nix](https://docs.determinate.systems/getting-started/):
-
-    nix profile install github:datadog/dd-apm-test-agent#ddapm-test-agent
-    # nix profile upgrade ddapm-test-agent # to upgrade
-
 The test agent can be installed from PyPI:
 
     pip install ddapm-test-agent
@@ -248,6 +240,10 @@ And pass in a valid API key (if needed) in the way that provider expects.
 
 To redact api keys, modify the `filter_headers` list in the `get_vcr` function in `ddapm_test_agent/vcr_proxy.py`. This can be confirmed by viewing cassettes in the `vcr-cassettes` directory (or the otherwise specified directory), and verifying that any new cassettes do not contain the api key.
 
+#### Running in CI
+
+To have the vcr proxy throw a 404 error if a cassette is not found in CI mode to ensure that all cassettes are generated locally and committed, set the `VCR_CI_MODE` environment variable or the `--vcr-ci-mode` flag in the cli tool to `true` (this value defaults to `false`).
+
 ## Configuration
 
 The test agent can be configured via command-line options or via environment variables.

{ddapm_test_agent-1.33.0 → ddapm_test_agent-1.34.0}/README.md

@@ -17,11 +17,6 @@ See the [Development](#development) section for how to get the test agent runnin
 
 ## Installation
 
-The test agent can be installed using [nix](https://docs.determinate.systems/getting-started/):
-
-    nix profile install github:datadog/dd-apm-test-agent#ddapm-test-agent
-    # nix profile upgrade ddapm-test-agent # to upgrade
-
 The test agent can be installed from PyPI:
 
     pip install ddapm-test-agent
@@ -201,6 +196,10 @@ And pass in a valid API key (if needed) in the way that provider expects.
 
 To redact api keys, modify the `filter_headers` list in the `get_vcr` function in `ddapm_test_agent/vcr_proxy.py`. This can be confirmed by viewing cassettes in the `vcr-cassettes` directory (or the otherwise specified directory), and verifying that any new cassettes do not contain the api key.
 
+#### Running in CI
+
+To have the vcr proxy throw a 404 error if a cassette is not found in CI mode to ensure that all cassettes are generated locally and committed, set the `VCR_CI_MODE` environment variable or the `--vcr-ci-mode` flag in the cli tool to `true` (this value defaults to `false`).
+
 ## Configuration
 
 The test agent can be configured via command-line options or via environment variables.

{ddapm_test_agent-1.33.0 → ddapm_test_agent-1.34.0}/ddapm_test_agent/__init__.py

@@ -1,4 +1,4 @@
 def _get_version():
-    import pkg_resources  # type: ignore[import-untyped]
+    import pkg_resources
 
     return pkg_resources.get_distribution(__name__).version

{ddapm_test_agent-1.33.0 → ddapm_test_agent-1.34.0}/ddapm_test_agent/agent.py

@@ -133,7 +133,7 @@ def _session_token(request: Request) -> Optional[str]:
 
 async def _vcr_proxy_cassette_prefix(request: Request) -> Optional[str]:
     try:
-        request_body: dict[str, str] = await request.json()
+        request_body: Dict[str, str] = await request.json()
         requested_test_name = request_body.get("test_name")
         return requested_test_name
     except (json.JSONDecodeError, UnicodeDecodeError):
@@ -165,7 +165,7 @@ async def handle_exception_middleware(request: Request, handler: _Handler) -> we
 
 async def _forward_request(
     request_data: bytes, headers: Mapping[str, str], full_agent_url: str
-) -> tuple[ClientResponse, str]:
+) -> Tuple[ClientResponse, str]:
     async with ClientSession() as session:
         async with session.post(
             full_agent_url,
@@ -831,7 +831,6 @@ class Agent:
                 "peer_tags": ["db.name", "mongodb.db", "messaging.system"],
                 "span_events": True,  # Advertise support for the top-level Span field for Span Events
             },
-            headers={"Datadog-Agent-State": "03e868b3ecdd62a91423cc4c3917d0d151fb9fa486736911ab7f5a0750c63824"},
         )
 
     async def _handle_traces(self, request: Request, version: Literal["v0.4", "v0.5", "v0.7", "v1"]) -> web.Response:
@@ -929,10 +928,9 @@ class Agent:
         # Get the span attributes that are to be removed for this snapshot.
         default_attribute_regex_replaces: Dict[str, str] = request.app["snapshot_regex_placeholders"]
         regex_overrides = _parse_map(request.url.query.get("regex_placeholders", ""))
-        attribute_regex_replaces = dict(
-            (f"{{{key}}}", re.compile(regex))
-            for (key, regex) in (default_attribute_regex_replaces | regex_overrides).items()
-        )
+        regex_replaces = default_attribute_regex_replaces.copy()
+        regex_replaces.update(regex_overrides)
+        attribute_regex_replaces = dict((f"{{{key}}}", re.compile(regex)) for (key, regex) in regex_replaces.items())
         log.info("using regex placeholders %r", attribute_regex_replaces)
 
         if "span_id" in span_removes:
@@ -1357,6 +1355,7 @@ def make_app(
     snapshot_removed_attrs: List[str],
     snapshot_regex_placeholders: Dict[str, str],
     vcr_cassettes_directory: str,
+    vcr_ci_mode: bool,
 ) -> web.Application:
     agent = Agent()
     app = web.Application(
@@ -1418,7 +1417,7 @@ def make_app(
             web.route(
                 "*",
                 "/vcr/{path:.*}",
-                lambda request: proxy_request(request, vcr_cassettes_directory),
+                lambda request: proxy_request(request, vcr_cassettes_directory, vcr_ci_mode),
             ),
         ]
     )
@@ -1583,6 +1582,12 @@ def main(args: Optional[List[str]] = None) -> None:
         default=os.environ.get("VCR_CASSETTES_DIRECTORY", os.path.join(os.getcwd(), "vcr-cassettes")),
         help="Directory to read and store third party API cassettes.",
     )
+    parser.add_argument(
+        "--vcr-ci-mode",
+        type=bool,
+        default=os.environ.get("VCR_CI_MODE", False),
+        help="Will change the test agent to record VCR cassettes in CI mode, throwing an error if a cassette is not found on /vcr/{provider}",
+    )
     parsed_args = parser.parse_args(args=args)
     logging.basicConfig(level=parsed_args.log_level)
 
@@ -1626,6 +1631,7 @@ def main(args: Optional[List[str]] = None) -> None:
         snapshot_removed_attrs=parsed_args.snapshot_removed_attrs,
         snapshot_regex_placeholders=parsed_args.snapshot_regex_placeholders,
         vcr_cassettes_directory=parsed_args.vcr_cassettes_directory,
+        vcr_ci_mode=parsed_args.vcr_ci_mode,
     )
 
     # Validate port configuration

{ddapm_test_agent-1.33.0 → ddapm_test_agent-1.34.0}/ddapm_test_agent/trace_snapshot.py

@@ -3,13 +3,13 @@ import json
 import logging
 import operator
 import pprint
-from re import Pattern
 import textwrap
 from typing import Any
 from typing import Dict
 from typing import List
 from typing import Optional
 from typing import OrderedDict as OrderedDictType
+from typing import Pattern
 from typing import Set
 from typing import Tuple
 from typing import cast
@@ -188,9 +188,13 @@ def _match_traces(t1s: List[Trace], t2s: List[Trace]) -> List[Tuple[Trace, Trace
     return matches
 
 
-def _diff_spans(
-    s1: Span, s2: Span, ignored: Set[str]
-) -> Tuple[List[str], List[str], List[str], List[Tuple[List[str], List[str]]], List[Tuple[List[str], List[str]]]]:
+def _diff_spans(s1: Span, s2: Span, ignored: Set[str]) -> Tuple[
+    List[str],
+    List[str],
+    List[str],
+    List[Tuple[List[str], List[str]]],
+    List[Tuple[List[str], List[str]]],
+]:
     """Return differing attributes between two spans and their meta/metrics maps.
 
     It is assumed that the spans have passed through preliminary validation
@@ -255,7 +259,11 @@ def _diff_spans(
             )
             link_diff = []
             for d1, d2, ign in [
-                (l1_no_tags, l2_no_tags, set(i[11:] for i in ignored if i.startswith("span_links."))),
+                (
+                    l1_no_tags,
+                    l2_no_tags,
+                    set(i[11:] for i in ignored if i.startswith("span_links.")),
+                ),
                 (
                     l1.get("attributes") or {},
                     l2.get("attributes") or {},
@@ -288,7 +296,11 @@ def _diff_spans(
             )
             event_diff = []
             for d1, d2, ign in [
-                (l1_no_tags, l2_no_tags, set(i[12:] for i in ignored if i.startswith("span_events."))),
+                (
+                    l1_no_tags,
+                    l2_no_tags,
+                    set(i[12:] for i in ignored if i.startswith("span_events.")),
+                ),
                 (
                     e1.get("attributes") or {},
                     e2.get("attributes") or {},
@@ -307,7 +319,13 @@ def _diff_spans(
     results.append(event_diffs)  # type: ignore
 
     return cast(
-        Tuple[List[str], List[str], List[str], List[Tuple[List[str], List[str]]], List[Tuple[List[str], List[str]]]],
+        Tuple[
+            List[str],
+            List[str],
+            List[str],
+            List[Tuple[List[str], List[str]]],
+            List[Tuple[List[str], List[str]]],
+        ],
         tuple(results),
     )
 
@@ -334,9 +352,13 @@ def _compare_traces(expected: Trace, received: Trace, ignored: Set[str]) -> None
         ) as frame:
             frame.add_item(f"Expected span:\n{pprint.pformat(s_exp)}")
             frame.add_item(f"Received span:\n{pprint.pformat(s_rec)}")
-            top_level_diffs, meta_diffs, metrics_diffs, span_link_diffs, span_event_diffs = _diff_spans(
-                s_exp, s_rec, ignored
-            )
+            (
+                top_level_diffs,
+                meta_diffs,
+                metrics_diffs,
+                span_link_diffs,
+                span_event_diffs,
+            ) = _diff_spans(s_exp, s_rec, ignored)
 
             for diffs, diff_type, d_exp, d_rec in [
                 (top_level_diffs, "span", s_exp, s_rec),
@@ -363,7 +385,12 @@ def _compare_traces(expected: Trace, received: Trace, ignored: Set[str]) -> None
 
             for i, (link_level_diffs, attribute_diffs) in enumerate(span_link_diffs):
                 for diffs, diff_type, d_exp, d_rec in [
-                    (link_level_diffs, f"{i}", s_exp["span_links"][i], s_rec["span_links"][i]),
+                    (
+                        link_level_diffs,
+                        f"{i}",
+                        s_exp["span_links"][i],
+                        s_rec["span_links"][i],
+                    ),
                     (
                         attribute_diffs,
                         f"{i} attributes",
@@ -387,7 +414,12 @@ def _compare_traces(expected: Trace, received: Trace, ignored: Set[str]) -> None
 
             for i, (event_level_diffs, attribute_diffs) in enumerate(span_event_diffs):
                 for diffs, diff_type, d_exp, d_rec in [
-                    (event_level_diffs, f"{i}", s_exp["span_events"][i], s_rec["span_events"][i]),
+                    (
+                        event_level_diffs,
+                        f"{i}",
+                        s_exp["span_events"][i],
+                        s_rec["span_events"][i],
+                    ),
                     (
                         attribute_diffs,
                         f"{i} attributes",
@@ -545,4 +577,7 @@ def generate_snapshot(
     removed: Optional[List[str]] = None,
     attribute_regex_replaces: Optional[Dict[str, Pattern[str]]] = None,
 ) -> str:
-    return _snapshot_json(_normalize_traces(received_traces, attribute_regex_replaces or {}), removed or [])
+    return _snapshot_json(
+        _normalize_traces(received_traces, attribute_regex_replaces or {}),
+        removed or [],
+    )

{ddapm_test_agent-1.33.0 → ddapm_test_agent-1.34.0}/ddapm_test_agent/vcr_proxy.py

@@ -146,7 +146,7 @@ def generate_cassette_name(path: str, method: str, body: bytes, vcr_cassette_pre
     )
 
 
-async def proxy_request(request: Request, vcr_cassettes_directory: str) -> Response:
+async def proxy_request(request: Request, vcr_cassettes_directory: str, vcr_ci_mode: bool) -> Response:
     path = request.match_info["path"]
     if request.query_string:
         path = path + "?" + request.query_string
@@ -159,14 +159,22 @@ async def proxy_request(request: Request, vcr_cassettes_directory: str) -> Respo
     if provider not in PROVIDER_BASE_URLS:
         return Response(body=f"Unsupported provider: {provider}", status=400)
 
-    target_url = url_path_join(PROVIDER_BASE_URLS[provider], remaining_path)
-
-    headers = {key: value for key, value in request.headers.items() if key != "Host"}
-
     body_bytes = await request.read()
 
     vcr_cassette_prefix = request.pop("vcr_cassette_prefix", None)
     cassette_name = generate_cassette_name(path, request.method, body_bytes, vcr_cassette_prefix)
+    cassette_file_name = f"{cassette_name}.yaml"
+    cassette_file_path = os.path.join(vcr_cassettes_directory, provider, cassette_file_name)
+    cassette_exists = os.path.exists(cassette_file_path)
+
+    if vcr_ci_mode and not cassette_exists:
+        return Response(
+            body=f"Cassette {cassette_file_name} not found while running in CI mode. Please generate the cassette locally and commit it.",
+            status=500,
+        )
+
+    target_url = url_path_join(PROVIDER_BASE_URLS[provider], remaining_path)
+    headers = {key: value for key, value in request.headers.items() if key != "Host"}
 
     request_kwargs: Dict[str, Any] = {
         "method": request.method,
@@ -178,7 +186,7 @@ async def proxy_request(request: Request, vcr_cassettes_directory: str) -> Respo
         "stream": True,
     }
 
-    if provider in AWS_SERVICES and not os.path.exists(os.path.join(vcr_cassettes_directory, provider, cassette_name)):
+    if provider in AWS_SERVICES and not cassette_exists:
         if not AWS_SECRET_ACCESS_KEY:
             return Response(
                 body="AWS_SECRET_ACCESS_KEY environment variable not set for aws signature recalculation",
@@ -192,7 +200,7 @@ async def proxy_request(request: Request, vcr_cassettes_directory: str) -> Respo
         auth = AWS4Auth(aws_access_key, AWS_SECRET_ACCESS_KEY, AWS_REGION, AWS_SERVICES[provider])
         request_kwargs["auth"] = auth
 
-    with get_vcr(provider, vcr_cassettes_directory).use_cassette(f"{cassette_name}.yaml"):
+    with get_vcr(provider, vcr_cassettes_directory).use_cassette(cassette_file_name):
         provider_response = requests.request(**request_kwargs)
 
     # Extract content type without charset

{ddapm_test_agent-1.33.0 → ddapm_test_agent-1.34.0}/ddapm_test_agent.egg-info/PKG-INFO

@@ -1,15 +1,12 @@
 Metadata-Version: 2.4
 Name: ddapm-test-agent
-Version: 1.33.0
+Version: 1.34.0
 Summary: Test agent for Datadog APM client libraries
 Home-page: https://github.com/Datadog/dd-apm-test-agent
 Author: Kyle Verhoog
 Author-email: kyle@verhoog.ca
 License: BSD 3
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
@@ -64,11 +61,6 @@ See the [Development](#development) section for how to get the test agent runnin
 
 ## Installation
 
-The test agent can be installed using [nix](https://docs.determinate.systems/getting-started/):
-
-    nix profile install github:datadog/dd-apm-test-agent#ddapm-test-agent
-    # nix profile upgrade ddapm-test-agent # to upgrade
-
 The test agent can be installed from PyPI:
 
     pip install ddapm-test-agent
@@ -248,6 +240,10 @@ And pass in a valid API key (if needed) in the way that provider expects.
 
 To redact api keys, modify the `filter_headers` list in the `get_vcr` function in `ddapm_test_agent/vcr_proxy.py`. This can be confirmed by viewing cassettes in the `vcr-cassettes` directory (or the otherwise specified directory), and verifying that any new cassettes do not contain the api key.
 
+#### Running in CI
+
+To have the vcr proxy throw a 404 error if a cassette is not found in CI mode to ensure that all cassettes are generated locally and committed, set the `VCR_CI_MODE` environment variable or the `--vcr-ci-mode` flag in the cli tool to `true` (this value defaults to `false`).
+
 ## Configuration
 
 The test agent can be configured via command-line options or via environment variables.

{ddapm_test_agent-1.33.0 → ddapm_test_agent-1.34.0}/ddapm_test_agent.egg-info/SOURCES.txt

@@ -1,27 +1,17 @@
 .dockerignore
-.envrc.example
 .gitignore
 Dockerfile
 Dockerfile.windows
 LICENSE.BSD3
 LICENSE.apache2
 README.md
-build-on-darwin.Dockerfile
-ddsketch.nix
-ddtrace.nix
-flake.lock
-flake.nix
 pyproject.toml
 riotfile.py
 setup.cfg
 setup.py
-shell.nix
 test_deps.txt
-treefmt.nix
-use-example.Dockerfile
 .github/workflows/docker.yml
 .github/workflows/main.yml
-.github/workflows/nix-auto.yml
 .github/workflows/publish_pypi.yml
 .github/workflows/releasenote.yml
 ddapm_test_agent/__init__.py
@@ -125,6 +115,9 @@ releasenotes/notes/python310-docker-image-d4e329cfecf6510e.yaml
 releasenotes/notes/rc-encoding-length-fix-cc011edea7f8f5b2.yaml
 releasenotes/notes/rc-get-endpoint-e502f55b7df544e2.yaml
 releasenotes/notes/remoteconfig-requests-1af7abb99c61c069.yaml
+releasenotes/notes/remove-agent-state-header-from-info-87f920bf4ce5785c.yaml
+releasenotes/notes/remove-nix-ec1c4aca7dc002c4.yaml
+releasenotes/notes/remove-old-pythons-4667b182aacf0ce6.yaml
 releasenotes/notes/reuse-session-1670aa569907cf68.yaml
 releasenotes/notes/sample-rate-1e06ae4cdc933b14.yaml
 releasenotes/notes/session-requests-b8057811f976220e.yaml
@@ -157,7 +150,9 @@ releasenotes/notes/vcr-aws-bedrock-proxy-3bf018b1712d5105.yaml
 releasenotes/notes/vcr-cassette-name-middleware-fix-9e47c395892a9fe7.yaml
 releasenotes/notes/vcr-cassettes-for-openai-v5-6e9d78091de1f0c2.yaml
 releasenotes/notes/vcr-cassettes-for-vercel-ai-7a8275f9c2b48bc7.yaml
+releasenotes/notes/vcr-ci-mode-99dbd2940fff8d7a.yaml
 releasenotes/notes/vcr-prefix-instead-of-suffix-4c56dcb5038d222e.yaml
+releasenotes/notes/vcr-proxy-aws-recalculation-fix-2184c10270a7bca5.yaml
 releasenotes/notes/vcr-proxy-use-test-name-bugfix-be758294ba30ac78.yaml
 releasenotes/notes/vcr-proxy-use-test-name-e47891994c961c52.yaml
 releasenotes/notes/vcr-support-querystring-b06555fb9a7c90ae.yaml

ddapm_test_agent-1.34.0/releasenotes/notes/remove-agent-state-header-from-info-87f920bf4ce5785c.yaml

@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Remove `Datadog-Agent-State` header from `/info` endpoint response to match actual Datadog agent behavior.

ddapm_test_agent-1.34.0/releasenotes/notes/remove-nix-ec1c4aca7dc002c4.yaml

@@ -0,0 +1,4 @@
+---
+other:
+  - |
+    This change removes nix build support.

ddapm_test_agent-1.34.0/releasenotes/notes/remove-old-pythons-4667b182aacf0ce6.yaml

@@ -0,0 +1,4 @@
+---
+other:
+  - |
+    Removes support for Python 3.8, 3.9, and 3.10.

ddapm_test_agent-1.34.0/releasenotes/notes/vcr-ci-mode-99dbd2940fff8d7a.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    vcr: adds a new ``--vcr-ci-mode`` flag and accompanying ``VCR_CI_MODE`` environment variable that, when set to ``true`` (defaults to ``false``), will throw a 404 error if a cassette is not found in CI mode to ensure that all cassettes are generated locally and committed.

ddapm_test_agent-1.34.0/releasenotes/notes/vcr-proxy-aws-recalculation-fix-2184c10270a7bca5.yaml

@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    vcr: fixes a bug where the aws signature recalculation would always happen, even if the cassette already existed.

{ddapm_test_agent-1.33.0 → ddapm_test_agent-1.34.0}/riotfile.py

@@ -12,7 +12,7 @@ venv = Venv(
         Venv(
             name="test",
             command="pytest {cmdargs}",
-            pys=["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
+            pys=["3.11", "3.12", "3.13"],
             pkgs={pkg: latest for pkg in testing_deps},
         ),
         Venv(
@@ -21,6 +21,7 @@ venv = Venv(
                 "isort": latest,
                 "toml": latest,
             },
+            pys=["3.11"],
             venvs=[
                 Venv(
                     name="black",
@@ -39,6 +40,7 @@ venv = Venv(
         Venv(
             name="flake8",
             command="flake8 {cmdargs}",
+            pys=["3.11"],
             pkgs={
                 "flake8": latest,
                 "flake8-blind-except": latest,
@@ -54,6 +56,7 @@ venv = Venv(
             name="mypy",
             create=True,
             command="mypy {cmdargs}",
+            pys=["3.11"],
             pkgs={
                 "mypy": "==1.7.1",
                 "pytest": latest,

{ddapm_test_agent-1.33.0 → ddapm_test_agent-1.34.0}/setup.cfg

@@ -13,6 +13,7 @@ enable-extensions = G
 import-order-style = google
 
 [mypy]
+python_version = 3.11
 ignore_missing_imports = true
 disallow_incomplete_defs = true
 disallow_untyped_decorators = true

{ddapm_test_agent-1.33.0 → ddapm_test_agent-1.34.0}/setup.py

@@ -16,9 +16,6 @@ setup(
     author_email="kyle@verhoog.ca",
     classifiers=[
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: 3.13",

{ddapm_test_agent-1.33.0 → ddapm_test_agent-1.34.0}/tests/conftest.py

@@ -110,6 +110,11 @@ def snapshot_server_cassettes_directory() -> Generator[str, None, None]:
     yield "/snapshot-server-cassettes"
 
 
+@pytest.fixture
+def vcr_ci_mode() -> Generator[bool, None, None]:
+    yield False
+
+
 @pytest.fixture
 async def agent_app(
     aiohttp_server,
@@ -126,6 +131,7 @@ async def agent_app(
     snapshot_removed_attrs,
     snapshot_regex_placeholders,
     snapshot_server_cassettes_directory,
+    vcr_ci_mode,
 ):
     app = await aiohttp_server(
         make_app(
@@ -142,6 +148,7 @@ async def agent_app(
             snapshot_removed_attrs,
             snapshot_regex_placeholders,
             snapshot_server_cassettes_directory,
+            vcr_ci_mode,
         )
     )
     yield app

{ddapm_test_agent-1.33.0 → ddapm_test_agent-1.34.0}/tests/integration_snapshots/test_trace_distributed_propagated.json

@@ -16,7 +16,7 @@
     "metrics": {
       "_dd.top_level": 1,
       "_dd.tracer_kr": 1.0,
-      "_sampling_priority_v1": 2,
+      "_sampling_priority_v1": 1,
       "process_id": 94638
     },
     "duration": 162000,

{ddapm_test_agent-1.33.0 → ddapm_test_agent-1.34.0}/tests/test_client.py

@@ -1,4 +1,4 @@
-from ddtrace import Tracer
+from ddtrace.trace import Tracer
 import pytest
 
 from ddapm_test_agent.client import TestAgentClient
@@ -11,7 +11,8 @@ async def client(testagent, testagent_url):
 
 @pytest.fixture
 async def tracer(testagent_url):
-    t = Tracer(testagent_url)
+    t = Tracer()
+    t._agent_url = testagent_url
     yield t
     t.shutdown()
 

{ddapm_test_agent-1.33.0 → ddapm_test_agent-1.34.0}/tests/test_snapshot_integration.py

@@ -11,16 +11,18 @@ from typing import Dict
 from typing import Generator
 
 import aiohttp
-from ddtrace import Tracer
+from ddtrace._trace.sampler import DatadogSampler
+from ddtrace._trace.sampling_rule import SamplingRule
 from ddtrace.profiling import Profiler
 from ddtrace.propagation.http import HTTPPropagator
-from ddtrace.sampler import DatadogSampler
+from ddtrace.trace import Tracer
 import pytest
 
 
 @pytest.fixture
 def tracer(testagent_port: str, testagent: aiohttp.ClientSession) -> Tracer:
-    tracer = Tracer(url=f"http://localhost:{testagent_port}")
+    tracer = Tracer()
+    tracer._agent_url = f"http://localhost:{testagent_port}"
     return tracer
 
 
@@ -31,12 +33,11 @@ def trace_sample_rate() -> float:
 
 @pytest.fixture
 def stats_tracer(tracer: Tracer, trace_sample_rate: float) -> Generator[Tracer, None, None]:
-    tracer.configure(
-        compute_stats_enabled=True,
-        sampler=DatadogSampler(
-            default_sample_rate=trace_sample_rate,
-        ),
-    )
+    tracer.configure(compute_stats_enabled=True)
+    tracer._sampler = DatadogSampler(rules=[SamplingRule(sample_rate=trace_sample_rate)])
+    for processor in tracer._span_processors:
+        if processor.__class__.__name__ == "SpanStatsProcessorV06":
+            processor._agent_url = tracer._agent_url
     yield tracer
 
 
@@ -87,7 +88,8 @@ async def test_single_trace(
     response_code,
 ):
     await testagent.get(f"{testagent_url}/test/session/start?test_session_token=test_single_trace")
-    tracer = Tracer(url=testagent_url)
+    tracer = Tracer()
+    tracer._agent_url = testagent_url
     with tracer.trace(operation_name, service=service, resource=resource, span_type=span_type) as span:
         if error is not None:
             span.error = error
@@ -280,8 +282,8 @@ async def test_cmd(testagent_url: str, testagent: aiohttp.ClientSession, tracer:
     assert p.returncode == 1
 
 
-async def test_profiling_endpoint(testagent_url: str, testagent: aiohttp.ClientSession) -> None:
-    p = Profiler(url=testagent_url)
+async def test_profiling_endpoint(testagent_url: str, testagent: aiohttp.ClientSession, tracer: Tracer) -> None:
+    p = Profiler(tracer=tracer)
     p.start()
     p.stop(flush=True)
     resp = await testagent.get(f"{testagent_url}/test/session/requests")

ddapm_test_agent-1.33.0/.envrc.example

@@ -1,6 +0,0 @@
-# use https://github.com/nix-community/nix-direnv  to load all tools needed to develop in the repository 
-# $ cp .envrc.example .envrc
-# $ direnv allow .
-use flake --impure . 
-
-# alternatively just use `nix develop` or `nix-shell`