From 7e26c7260276aa3d5388b6c2f5bf638123f71394 Mon Sep 17 00:00:00 2001 From: Teague Bick Date: Mon, 12 Feb 2024 15:56:33 -0500 Subject: [PATCH 1/3] (fix) tests: Ignore new metric A new metric, metrics._dd.tracer_kr, was added to `dd-trace-py` causing snapshot tests tofail. This metric is now added to the list of ignored snapshot fields. --- ddapm_test_agent/trace_snapshot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ddapm_test_agent/trace_snapshot.py b/ddapm_test_agent/trace_snapshot.py index a36b9d10..b44a4f9b 100644 --- a/ddapm_test_agent/trace_snapshot.py +++ b/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,span_links.trace_id_high,meta.pathway.hash" +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,span_links.trace_id_high,meta.pathway.hash" def _key_match(d1: Dict[str, Any], d2: Dict[str, Any], key: str) -> bool: From 278d3a9b7b0b8e986e7243f0c5ff0b34965a2316 Mon Sep 17 00:00:00 2001 From: Teague Bick Date: Mon, 12 Feb 2024 16:35:53 -0500 Subject: [PATCH 2/3] Add releasenote --- .../ignore-new-metric-in-snapshots-fca905ba6d687929.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 releasenotes/notes/ignore-new-metric-in-snapshots-fca905ba6d687929.yaml diff --git a/releasenotes/notes/ignore-new-metric-in-snapshots-fca905ba6d687929.yaml b/releasenotes/notes/ignore-new-metric-in-snapshots-fca905ba6d687929.yaml new file mode 100644 index 00000000..eff572a3 --- /dev/null +++ b/releasenotes/notes/ignore-new-metric-in-snapshots-fca905ba6d687929.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Prior to this change, snapshot tests were with newer versions of the tracers + because of a new metric, metrics._dd.tracer_kr. After this change, tests pass + because the new metric is ignored. \ No newline at end of file From 8cbb95ec328367c6cd6eeba200ac57bf805c8315 Mon Sep 17 00:00:00 2001 From: Kyle Verhoog Date: Mon, 12 Feb 2024 16:39:56 -0500 Subject: [PATCH 3/3] revert release note cause i can't read --- .../ignore-new-metric-in-snapshots-fca905ba6d687929.yaml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 releasenotes/notes/ignore-new-metric-in-snapshots-fca905ba6d687929.yaml diff --git a/releasenotes/notes/ignore-new-metric-in-snapshots-fca905ba6d687929.yaml b/releasenotes/notes/ignore-new-metric-in-snapshots-fca905ba6d687929.yaml deleted file mode 100644 index eff572a3..00000000 --- a/releasenotes/notes/ignore-new-metric-in-snapshots-fca905ba6d687929.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -fixes: - - | - Prior to this change, snapshot tests were with newer versions of the tracers - because of a new metric, metrics._dd.tracer_kr. After this change, tests pass - because the new metric is ignored. \ No newline at end of file