From 1476a4369eb988430019e6a1906d1facdb8aa716 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Thu, 28 Nov 2024 15:27:49 +0100 Subject: [PATCH 1/3] [Debugger] Fix diagnostics schema - The root `message` property is not expected. - The probe version should be encoded in a `version` property - not a `probeVersion` property. --- utils/_context/_scenarios/endtoend.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/utils/_context/_scenarios/endtoend.py b/utils/_context/_scenarios/endtoend.py index 72cda50263..226b87050e 100644 --- a/utils/_context/_scenarios/endtoend.py +++ b/utils/_context/_scenarios/endtoend.py @@ -572,12 +572,6 @@ def pytest_sessionfinish(self, session, exitstatus): condition=context.library == "golang", ticket="APMS-12697", ), - _SchemaBug( - endpoint="/debugger/v1/diagnostics", - data_path="$[].content", - condition=context.library > "nodejs@4.48.0", - ticket="DEBUG-2864", - ), _SchemaBug( endpoint="/debugger/v1/diagnostics", data_path="$[].content[].debugger.diagnostics", @@ -617,12 +611,6 @@ def pytest_sessionfinish(self, session, exitstatus): condition=context.library == "golang", ticket="APMS-12697", ), - _SchemaBug( - endpoint="/api/v2/debugger", - data_path="$[].content", - condition=context.library > "nodejs@4.46.0", - ticket="DEBUG-2864", - ), ] self._test_schemas(session, interfaces.agent, agent_bugs) From e99f09c7c41869ac3f66810f992a714fc73b5e2a Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Thu, 9 Jan 2025 10:30:52 +0100 Subject: [PATCH 2/3] Revert "[Debugger] Fix diagnostics schema" This reverts commit 5c1f430aebd0d5a3e29820420898608c3164085a. --- utils/_context/_scenarios/endtoend.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/utils/_context/_scenarios/endtoend.py b/utils/_context/_scenarios/endtoend.py index 226b87050e..72cda50263 100644 --- a/utils/_context/_scenarios/endtoend.py +++ b/utils/_context/_scenarios/endtoend.py @@ -572,6 +572,12 @@ def pytest_sessionfinish(self, session, exitstatus): condition=context.library == "golang", ticket="APMS-12697", ), + _SchemaBug( + endpoint="/debugger/v1/diagnostics", + data_path="$[].content", + condition=context.library > "nodejs@4.48.0", + ticket="DEBUG-2864", + ), _SchemaBug( endpoint="/debugger/v1/diagnostics", data_path="$[].content[].debugger.diagnostics", @@ -611,6 +617,12 @@ def pytest_sessionfinish(self, session, exitstatus): condition=context.library == "golang", ticket="APMS-12697", ), + _SchemaBug( + endpoint="/api/v2/debugger", + data_path="$[].content", + condition=context.library > "nodejs@4.46.0", + ticket="DEBUG-2864", + ), ] self._test_schemas(session, interfaces.agent, agent_bugs) From f5744512fb4594f9b5b29eed04326b5ac749bb97 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Thu, 9 Jan 2025 12:03:50 +0100 Subject: [PATCH 3/3] fix --- utils/_context/_scenarios/endtoend.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/_context/_scenarios/endtoend.py b/utils/_context/_scenarios/endtoend.py index 72cda50263..48762e8940 100644 --- a/utils/_context/_scenarios/endtoend.py +++ b/utils/_context/_scenarios/endtoend.py @@ -575,7 +575,7 @@ def pytest_sessionfinish(self, session, exitstatus): _SchemaBug( endpoint="/debugger/v1/diagnostics", data_path="$[].content", - condition=context.library > "nodejs@4.48.0", + condition=context.library < "nodejs@5.31.0", ticket="DEBUG-2864", ), _SchemaBug( @@ -620,7 +620,7 @@ def pytest_sessionfinish(self, session, exitstatus): _SchemaBug( endpoint="/api/v2/debugger", data_path="$[].content", - condition=context.library > "nodejs@4.46.0", + condition=context.library < "nodejs@5.31.0", ticket="DEBUG-2864", ), ]