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

{ddapm_test_agent-1.33.0 → ddapm_test_agent-1.33.1}/.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.33.1}/PKG-INFO

@@ -1,15 +1,12 @@
 Metadata-Version: 2.4
 Name: ddapm-test-agent
-Version: 1.33.0
+Version: 1.33.1
 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

{ddapm_test_agent-1.33.0 → ddapm_test_agent-1.33.1}/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

{ddapm_test_agent-1.33.0 → ddapm_test_agent-1.33.1}/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.33.1}/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,
@@ -929,10 +929,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:

{ddapm_test_agent-1.33.0 → ddapm_test_agent-1.33.1}/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.33.1}/ddapm_test_agent/vcr_proxy.py

@@ -167,6 +167,7 @@ async def proxy_request(request: Request, vcr_cassettes_directory: str) -> Respo
 
     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"
 
     request_kwargs: Dict[str, Any] = {
         "method": request.method,
@@ -178,7 +179,9 @@ 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 os.path.exists(
+        os.path.join(vcr_cassettes_directory, provider, cassette_file_name)
+    ):
         if not AWS_SECRET_ACCESS_KEY:
             return Response(
                 body="AWS_SECRET_ACCESS_KEY environment variable not set for aws signature recalculation",
@@ -192,7 +195,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.33.1}/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.33.1
 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

{ddapm_test_agent-1.33.0 → ddapm_test_agent-1.33.1}/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,8 @@ 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-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
@@ -158,6 +150,7 @@ 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-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.33.1/releasenotes/notes/remove-nix-ec1c4aca7dc002c4.yaml

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

ddapm_test_agent-1.33.1/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.33.1/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.33.1}/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.33.1}/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.33.1}/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.33.1}/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.33.1}/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.33.1}/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`

ddapm_test_agent-1.33.0/.github/workflows/nix-auto.yml

@@ -1,33 +0,0 @@
-name: CI tasks from Nix config
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - main
-
-jobs:
-  nix-matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
-      - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27.0.0
-      - id: set-matrix
-        name: Generate Nix Matrix
-        run: |
-          set -Eeu
-          matrix="$(nix eval --json '.#githubActions.matrix')"
-          echo "matrix=$matrix" >> "$GITHUB_OUTPUT"
-
-  nix:
-    needs: nix-matrix
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix: ${{fromJSON(needs.nix-matrix.outputs.matrix)}}
-    steps:
-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
-      - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27.0.0
-      - run: nix build -L '.#githubActions.checks.${{ matrix.attr }}'

ddapm_test_agent-1.33.0/build-on-darwin.Dockerfile

@@ -1,28 +0,0 @@
-# simple hack to build the same image on OSX. otherwise the Nix docker build will by default not cross compile to linux
-# in CI or on linux systems - use `nix build .#image | docker load -i result` instead
-
-FROM nixos/nix AS builder
-RUN   set -xe; \
-    echo 'sandbox = true' >> /etc/nix/nix.conf; \
-    echo 'filter-syscalls = false' >> /etc/nix/nix.conf; \
-    echo 'max-jobs = auto' >> /etc/nix/nix.conf; \
-    echo 'experimental-features = nix-command flakes' >> /etc/nix/nix.conf
-
-WORKDIR /build
-COPY flake.lock *.nix .
-
-RUN nix flake show
-
-
-COPY . .
-
-RUN nix build .#image
-RUN mkdir -p /output; mkdir -p /img
-# very simplistic way to unpack image - relies only on there being a single layer
-RUN tar -xf result --strip-components=1 -C /img 
-RUN tar -xf /img/layer.tar -C /output
-
-FROM scratch AS final
-COPY --from=builder /output/ /
-
-ENTRYPOINT ["/bin/ddapm-test-agent"]

ddapm_test_agent-1.33.0/ddsketch.nix

@@ -1,32 +0,0 @@
-{ python, pkgs, ... }:
-python.pkgs.buildPythonPackage rec {
-  name = "ddsketch";
-  version = "3.0.1";
-
-  src = pkgs.fetchFromGitHub {
-    owner = "datadog";
-    repo = "sketches-py";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-SmdKq5aXi5B3FNBxPQDNKNBujGGEPXF132YGadGFPpo=";
-  };
-
-  propagatedBuildInputs = with python.pkgs; [
-    six
-    protobuf
-    setuptools
-  ];
-  nativeBuildInputs = with python.pkgs; [ setuptools_scm ];
-  checkInputs = with python.pkgs; [
-    pytest
-    numpy
-  ];
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
-
-  pythonImportsCheck = [ "ddsketch" ];
-
-  postPatch = ''
-    patchShebangs setup.py
-    ls -lah
-    echo version=\"${version}\" > ddsketch/__version.py
-  '';
-}

ddapm_test_agent-1.33.0/ddtrace.nix

@@ -1,72 +0,0 @@
-{
-  python,
-  pkgs,
-  ddsketch,
-  ...
-}:
-
-let
-  envier = python.pkgs.buildPythonPackage rec {
-    pname = "envier";
-    version = "0.5.2";
-
-    pyproject = true;
-    propagatedBuildInputs = with python.pkgs; [
-      hatchling
-      hatch-vcs
-    ];
-
-    src = pkgs.fetchPypi {
-      inherit pname version;
-      sha256 = "sha256-Tn45jLCajdNgUI734SURoVI1VCbSVEuEh6NNrSfMIK0=";
-    };
-  };
-
-  ddtrace = python.pkgs.buildPythonPackage rec {
-    pname = "ddtrace";
-    version = "2.9.2";
-    pyproject = true;
-
-    nativeBuildInputs =
-      [ pkgs.cmake ]
-      ++ (with python.pkgs; [
-        cmake
-        setuptools
-        setuptools_scm
-        cython
-      ]);
-
-    propagatedBuildInputs = with python.pkgs; [
-      attrs
-      cattrs
-      ddsketch
-      envier
-      opentelemetry-api
-      protobuf
-      six
-      xmltodict
-      bytecode
-    ];
-
-    buildInputs = pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ];
-
-    postPatch = ''
-      substituteInPlace setup.py --replace "cmake>=3.24.2,<3.28" "cmake"
-
-      # downloading artifacts is impossible in sandboxed build
-      substituteInPlace setup.py --replace "cls.download_artifacts()" "pass"
-
-      substituteInPlace pyproject.toml --replace "cmake>=3.24.2,<3.28" "cmake"
-    '';
-
-    dontUseCmakeConfigure = true;
-
-    src = pkgs.fetchFromGitHub {
-      owner = "datadog";
-      repo = "dd-trace-py";
-      rev = "refs/tags/v${version}";
-      hash = "sha256-Ax220/uBNwSZNBFYxbxAe0rmLrqYYf3a8K/PIuSE150=";
-    };
-  };
-in
-(ddtrace)