From ffc6306d8b189d5bcecd69cf791c92807022bc64 Mon Sep 17 00:00:00 2001
From: Karthik Nadig <kanadig@microsoft.com>
Date: Thu, 3 Oct 2019 20:30:05 -0700
Subject: [PATCH] Updating telemetry and some comments (#1825)

* Change version field name in telemetry
* Add info on where to set justMyCode
* Address comments.
---
 .../pydevd/_pydevd_bundle/pydevd_net_command_factory_json.py   | 3 ++-
 .../pydevd/_pydevd_bundle/pydevd_process_net_command_json.py   | 3 ++-
 src/ptvsd/adapter/ide.py                                       | 2 +-
 tests/debug/session.py                                         | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/ptvsd/_vendored/pydevd/_pydevd_bundle/pydevd_net_command_factory_json.py b/src/ptvsd/_vendored/pydevd/_pydevd_bundle/pydevd_net_command_factory_json.py
index b4612201..a0826259 100644
--- a/src/ptvsd/_vendored/pydevd/_pydevd_bundle/pydevd_net_command_factory_json.py
+++ b/src/ptvsd/_vendored/pydevd/_pydevd_bundle/pydevd_net_command_factory_json.py
@@ -356,7 +356,8 @@ class NetCommandFactoryJson(NetCommandFactory):
     def make_skipped_step_in_because_of_filters(self, py_db, frame):
         msg = 'Frame skipped from debugging during step-in.'
         if py_db.get_use_libraries_filter():
-            msg += '\nNote: may have been skipped because of "justMyCode" option (default == true).'
+            msg += ('\nNote: may have been skipped because of "justMyCode" option (default == true). '
+                    'Try setting \"justMyCode\": false in the debug configuration (e.g., launch.json).')
 
         body = OutputEventBody(msg, category='console')
         event = OutputEvent(body)
diff --git a/src/ptvsd/_vendored/pydevd/_pydevd_bundle/pydevd_process_net_command_json.py b/src/ptvsd/_vendored/pydevd/_pydevd_bundle/pydevd_process_net_command_json.py
index 3da87cbd..f177700e 100644
--- a/src/ptvsd/_vendored/pydevd/_pydevd_bundle/pydevd_process_net_command_json.py
+++ b/src/ptvsd/_vendored/pydevd/_pydevd_bundle/pydevd_process_net_command_json.py
@@ -582,7 +582,8 @@ class PyDevJsonCommandProcessor(object):
                 elif error_code == self.api.ADD_BREAKPOINT_FILE_EXCLUDED_BY_FILTERS:
                     error_msg = 'Breakpoint in file excluded by filters.'
                     if py_db.get_use_libraries_filter():
-                        error_msg += '\nNote: may be excluded because of "justMyCode" option (default == true).'
+                        error_msg += ('\nNote: may be excluded because of "justMyCode" option (default == true).'
+                                      'Try setting \"justMyCode\": false in the debug configuration (e.g., launch.json).')
 
                 else:
                     # Shouldn't get here.
diff --git a/src/ptvsd/adapter/ide.py b/src/ptvsd/adapter/ide.py
index 21f0a705..05e95f35 100644
--- a/src/ptvsd/adapter/ide.py
+++ b/src/ptvsd/adapter/ide.py
@@ -56,7 +56,7 @@ class IDE(components.Component):
             {
                 "category": "telemetry",
                 "output": "ptvsd.adapter",
-                "data": {"version": ptvsd.__version__},
+                "data": {"packageVersion": ptvsd.__version__},
             },
         )
 
diff --git a/tests/debug/session.py b/tests/debug/session.py
index 3592a1d6..54dacd94 100644
--- a/tests/debug/session.py
+++ b/tests/debug/session.py
@@ -483,7 +483,7 @@ class Session(object):
         assert telemetry == {
             "category": "telemetry",
             "output": "ptvsd.adapter",
-            "data": {"version": some.str},
+            "data": {"packageVersion": some.str},
         }
 
         self.request(