Update session logic

Does the following:

* Clearing a session now clears traces only, instead of also deleting
  the session
* Requesting traces for a esssion will return a 404 Session Not found if
  no traces or session match a non-None session token
* Sessions now return session-less requests only up to the latest
  session marker

.gitignore

@@ -24,6 +24,7 @@ var/
 # Common virtual environments
 .venv/
 venv/
+.python-version
 
 # Editors
 .idea/

ddapm_test_agent/checks.py

@@ -42,14 +42,18 @@ def has_fails(self) -> bool:
 
     def get_results(self, results: Dict[str, Dict[str, int]]) -> Dict[str, Dict[str, int]]:
         """
-        results = {
-            check.name: {
-                "Passed_Checks": int
-                "Failed_Checks": int
-                "Skipped_Checks": int
+        Return the following format
+
+        .. code-block:: python
+
+            results = {
+                check.name: {
+                    "Passed_Checks": int,
+                    "Failed_Checks": int,
+                    "Skipped_Checks": int
+                }
+                ...
             }
-            ...
-        }
 
         """
         for c in self._checks:

ddapm_test_agent/trace_snapshot.py

@@ -30,7 +30,7 @@
 log = logging.getLogger(__name__)
 
 
-DEFAULT_SNAPSHOT_IGNORES = "span_id,trace_id,parent_id,duration,start,metrics.system.pid,metrics.system.process_id,metrics.process_id,meta.runtime-id"
+DEFAULT_SNAPSHOT_IGNORES = "span_id,trace_id,parent_id,duration,start,metrics.system.pid,metrics.system.process_id,metrics.process_id,metrics._dd.tracer_kr,meta.runtime-id"
 
 
 def _key_match(d1: Dict[str, Any], d2: Dict[str, Any], key: str) -> bool:

releasenotes/notes/clearing-sessions-now-only-removes-traces,-instead-of-sessions,-requsting-traces-will-now-return-a-404-error-for-TracesNotFound-if-a-session-is-specified-and-traces-are-not-found-6b0311673d8b37aa.yaml

@@ -0,0 +1,65 @@
+---
+prelude: >
+    Replace this text with content to appear at the top of the section for this
+    release. All of the prelude content is merged together and then rendered
+    separately from the items listed in other parts of the file, so the text
+    needs to be worded so that both the prelude and the other items make sense
+    when read independently. This may mean repeating some details. Not every
+    release note requires a prelude. Usually only notes describing major
+    features or adding release theme details should have a prelude.
+features:
+  - |
+    List new features here, or remove this section.  All of the list items in
+    this section are combined when the release notes are rendered, so the text
+    needs to be worded so that it does not depend on any information only
+    available in another section, such as the prelude. This may mean repeating
+    some details.
+issues:
+  - |
+    List known issues here, or remove this section.  All of the list items in
+    this section are combined when the release notes are rendered, so the text
+    needs to be worded so that it does not depend on any information only
+    available in another section, such as the prelude. This may mean repeating
+    some details.
+upgrade:
+  - |
+    List upgrade notes here, or remove this section.  All of the list items in
+    this section are combined when the release notes are rendered, so the text
+    needs to be worded so that it does not depend on any information only
+    available in another section, such as the prelude. This may mean repeating
+    some details.
+deprecations:
+  - |
+    List deprecations notes here, or remove this section.  All of the list
+    items in this section are combined when the release notes are rendered, so
+    the text needs to be worded so that it does not depend on any information
+    only available in another section, such as the prelude. This may mean
+    repeating some details.
+critical:
+  - |
+    Add critical notes here, or remove this section.  All of the list items in
+    this section are combined when the release notes are rendered, so the text
+    needs to be worded so that it does not depend on any information only
+    available in another section, such as the prelude. This may mean repeating
+    some details.
+security:
+  - |
+    Add security notes here, or remove this section.  All of the list items in
+    this section are combined when the release notes are rendered, so the text
+    needs to be worded so that it does not depend on any information only
+    available in another section, such as the prelude. This may mean repeating
+    some details.
+fixes:
+  - |
+    Add normal bug fixes here, or remove this section.  All of the list items
+    in this section are combined when the release notes are rendered, so the
+    text needs to be worded so that it does not depend on any information only
+    available in another section, such as the prelude. This may mean repeating
+    some details.
+other:
+  - |
+    Add other notes here, or remove this section.  All of the list items in
+    this section are combined when the release notes are rendered, so the text
+    needs to be worded so that it does not depend on any information only
+    available in another section, such as the prelude. This may mean repeating
+    some details.

tests/test_agent.py

@@ -102,3 +102,24 @@ async def test_apmtelemetry(
     )
     assert resp.status == 200
     assert await resp.text() == "[]"
+
+
+async def test_trace_new_session(
+    agent,
+    v04_reference_http_trace_payload_headers,
+    v04_reference_http_trace_payload_data,
+):
+    resp = await agent.put(
+        "/v0.4/traces",
+        params={"test_session_token": "1"},
+        headers=v04_reference_http_trace_payload_headers,
+        data=v04_reference_http_trace_payload_data,
+    )
+    assert resp.status == 200, await resp.text()
+
+    resp = await agent.get("/test/session/clear", params={"test_session_token": "1"})
+    assert resp.status == 200
+
+    resp = await agent.get("/test/traces", params={"trace_ids": "123456"})
+    assert resp.status == 200
+    assert await resp.text() == "[[]]"

tests/test_session.py

@@ -59,7 +59,8 @@ async def test_concurrent_session(
     for token in ["test_case", "test_case2"]:
         resp = await agent.get("/test/session/traces", params={"test_session_token": token})
         assert resp.status == 200
-        assert await resp.json() == v04_reference_http_trace_payload_data_raw
+        result = await resp.json()
+        assert result == v04_reference_http_trace_payload_data_raw, result
 
     resp = await agent.get("/test/session/traces")
     assert resp.status == 200
@@ -69,8 +70,7 @@ async def test_concurrent_session(
     assert resp.status == 200
     for token in ["test_case", "test_case2"]:
         resp = await agent.get("/test/session/traces", params={"test_session_token": token})
-        assert resp.status == 200
-        assert await resp.json() == []
+        assert resp.status == 404
 
 
 async def test_two_sessions(

tests/test_snapshot.py

@@ -32,6 +32,9 @@ async def test_snapshot_single_trace(
             When the same trace is sent again
                 The snapshot should pass
     """  # noqa: RST301
+    # Start a session
+    resp = await agent.get("/test/session/start", params={"test_session_token": "test_case"})
+    assert resp.status == 200
     # Send a trace
     resp = await do_reference_v04_http_trace(token="test_case")
     assert resp.status == 200
@@ -176,6 +179,8 @@ async def test_snapshot_single_trace(
     ],
 )
 async def test_snapshot_trace_differences(agent, expected_traces, actual_traces, error):
+    resp = await agent.get("/test/session/start", params={"test_session_token": "test"})
+    assert resp.status == 200
     resp = await v04_trace(agent, expected_traces, token="test")
     assert resp.status == 200, await resp.text()
 
@@ -363,6 +368,8 @@ def test_generate_tracestats_snapshot(buckets, expected):
 
 
 async def test_snapshot_custom_dir(agent, tmp_path, do_reference_v04_http_trace):
+    resp = await agent.get("/test/session/start", params={"test_session_token": "test_case"})
+    assert resp.status == 200
     resp = await do_reference_v04_http_trace(token="test_case")
     assert resp.status == 200
 
@@ -381,6 +388,8 @@ async def test_snapshot_custom_dir(agent, tmp_path, do_reference_v04_http_trace)
 
 
 async def test_snapshot_custom_file(agent, tmp_path, do_reference_v04_http_trace):
+    resp = await agent.get("/test/session/start", params={"test_session_token": "test_case"})
+    assert resp.status == 200
     resp = await do_reference_v04_http_trace(token="test_case")
     assert resp.status == 200
 
@@ -401,6 +410,8 @@ async def test_snapshot_custom_file(agent, tmp_path, do_reference_v04_http_trace
 
 @pytest.mark.parametrize("snapshot_ci_mode", [False, True])
 async def test_snapshot_tracestats(agent, tmp_path, snapshot_ci_mode, do_reference_v06_http_stats, snapshot_dir):
+    resp = await agent.get("/test/session/start", params={"test_session_token": "test_case"})
+    assert resp.status == 200
     resp = await do_reference_v06_http_stats(token="test_case")
     assert resp.status == 200
 
@@ -430,6 +441,8 @@ async def test_snapshot_tracestats(agent, tmp_path, snapshot_ci_mode, do_referen
 
 @pytest.mark.parametrize("snapshot_removed_attrs", [{"start", "duration"}])
 async def test_removed_attributes(agent, tmp_path, snapshot_removed_attrs, do_reference_v04_http_trace):
+    resp = await agent.get("/test/session/start", params={"test_session_token": "test_case"})
+    assert resp.status == 200
     resp = await do_reference_v04_http_trace(token="test_case")
     assert resp.status == 200
 
@@ -454,6 +467,8 @@ async def test_removed_attributes(agent, tmp_path, snapshot_removed_attrs, do_re
 
 @pytest.mark.parametrize("snapshot_removed_attrs", [{"metrics.process_id"}])
 async def test_removed_attributes_metrics(agent, tmp_path, snapshot_removed_attrs, do_reference_v04_http_trace):
+    resp = await agent.get("/test/session/start", params={"test_session_token": "test_case"})
+    assert resp.status == 200
     resp = await do_reference_v04_http_trace(token="test_case")
     assert resp.status == 200
 
@@ -599,6 +614,8 @@ async def test_removed_attributes_metrics(agent, tmp_path, snapshot_removed_attr
     ],
 )
 async def test_snapshot_trace_differences_removed_start(agent, expected_traces, actual_traces, error):
+    resp = await agent.get("/test/session/start", params={"test_session_token": "test"})
+    assert resp.status == 200
     resp = await v04_trace(agent, expected_traces, token="test")
     assert resp.status == 200, await resp.text()
 

tests/test_snapshot_integration.py

@@ -2,6 +2,7 @@
 If snapshots need to be (re)generated, set GENERATE_SNAPSHOTS=1
 and run the tests as usual.
 """
+
 import asyncio
 import os
 import subprocess
@@ -149,6 +150,7 @@ async def test_single_trace(
             span.set_metric(k, v)
     tracer.shutdown()
     resp = await testagent.get("http://localhost:8126/test/session/snapshot?test_session_token=test_single_trace")
+
     assert resp.status == response_code
 
 
@@ -298,6 +300,7 @@ async def test_tracestats(
     do_traces: Callable[[Tracer], None],
     fail: bool,
 ) -> None:
+    await testagent.get("http://localhost:8126/test/session/start?test_session_token=test_trace_stats")
     do_traces(stats_tracer)
     stats_tracer.shutdown()  # force out the stats
     resp = await testagent.get("http://localhost:8126/test/session/snapshot?test_session_token=test_trace_stats")