Merge pull request #13 from int19h/tele

Send both "ptvsd" and "debugpy" telemetry events for smooth transition.
microsoft · Jan 29, 2020 · 7a2891b · 7a2891b
2 parents c53bd33 + 367ff72
commit 7a2891b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 9 deletions.
diff --git a/src/debugpy/adapter/ide.py b/src/debugpy/adapter/ide.py
@@ -77,6 +77,16 @@ def __init__(self, sock):
             session.ide = self
             session.register()
 
+        # For the transition period, send the telemetry events with both old and new
+        # name. The old one should be removed once the new one lights up.
+        self.channel.send_event(
+            "output",
+            {
+                "category": "telemetry",
+                "output": "ptvsd",
+                "data": {"packageVersion": debugpy.__version__},
+            },
+        )
         self.channel.send_event(
             "output",
             {

diff --git a/tests/debug/session.py b/tests/debug/session.py
@@ -149,9 +149,7 @@ def __init__(self, debug_config=None):
         """
 
         self.log_dir = (
-            None
-            if log.log_dir is None
-            else py.path.local(log.log_dir) / str(self)
+            None if log.log_dir is None else py.path.local(log.log_dir) / str(self)
         )
         """The log directory for this session. Passed via DEBUGPY_LOG_DIR to all spawned
         child processes.
@@ -530,12 +528,24 @@ def _start_channel(self, stream):
         self.channel = messaging.JsonMessageChannel(stream, handlers)
         self.channel.start()
 
-        telemetry = self.wait_for_next_event("output")
-        assert telemetry == {
-            "category": "telemetry",
-            "output": "debugpy",
-            "data": {"packageVersion": some.str},
-        }
+        self.wait_for_next(
+            timeline.Event(
+                "output",
+                {
+                    "category": "telemetry",
+                    "output": "ptvsd",
+                    "data": {"packageVersion": some.str},
+                },
+            )
+            & timeline.Event(
+                "output",
+                {
+                    "category": "telemetry",
+                    "output": "debugpy",
+                    "data": {"packageVersion": some.str},
+                },
+            )
+        )
 
         self.request(
             "initialize",