Make AppMap paths relative to starting directory

Record the current directory on startup, strip it from source file
locations before adding them to an AppMap.

Author: apotterri

appmap/_implementation/event.py

@@ -5,6 +5,7 @@
 import logging
 import threading
 
+from .env import Env
 from .utils import appmap_tls, split_function_name, fqname, FnType
 
 logger = logging.getLogger(__name__)
@@ -124,6 +125,8 @@ def make(fn, fntype):
 
         try:
             path = inspect.getsourcefile(fn)
+            if path.startswith(Env.current.root_dir):
+                path = path[Env.current.root_dir_len:]
         except TypeError:
             path = '<builtin>'
 

appmap/test/appmap_test_base.py

@@ -64,17 +64,11 @@ def normalize(dct):
                 assert isinstance(elapsed, float)
             if 'git' in dct:
                 self.normalize_git(dct.pop('git'))
-            if 'location' in dct:
-                path, line = dct['location'].split(':')
-                path = os.path.basename(path)
-                dct['location'] = ':'.join([path, line])
             if 'metadata' in dct:
                 self.normalize_metadata(dct['metadata'])
             if 'object_id' in dct:
                 object_id = dct.pop('object_id')
                 assert isinstance(object_id, int)
-            if 'path' in dct:
-                dct['path'] = os.path.basename(dct['path'])
             if 'value' in dct:
                 # This maps all object references to the same
                 # location. We don't actually need to verify that the

appmap/test/data/expected.appmap.json

@@ -21,7 +21,7 @@
             {
               "name": "class_method",
               "type": "function",
-              "location": "example_class.py:4",
+              "location": "appmap/test/data/example_class.py:4",
               "static": true
             }
           ]
@@ -33,13 +33,13 @@
             {
               "name": "static_method",
               "type": "function",
-              "location": "example_class.py:18",
+              "location": "appmap/test/data/example_class.py:18",
               "static": true
             },
             {
               "name": "test_exception",
               "type": "function",
-              "location": "example_class.py:25",
+              "location": "appmap/test/data/example_class.py:25",
               "static": false
             }
           ]
@@ -51,7 +51,7 @@
             {
               "name": "instance_method",
               "type": "function",
-              "location": "example_class.py:10",
+              "location": "appmap/test/data/example_class.py:10",
               "static": false
             }
           ]
@@ -63,7 +63,7 @@
     {
       "defined_class": "example_class.ExampleClass",
       "method_id": "static_method",
-      "path": "example_class.py",
+      "path": "appmap/test/data/example_class.py",
       "lineno": 18,
       "static": true,
       "parameters": [],
@@ -80,7 +80,7 @@
     {
       "defined_class": "example_class.ClassMethodMixin",
       "method_id": "class_method",
-      "path": "example_class.py",
+      "path": "appmap/test/data/example_class.py",
       "lineno": 4,
       "static": true,
       "receiver": {
@@ -103,7 +103,7 @@
     {
       "defined_class": "example_class.Super",
       "method_id": "instance_method",
-      "path": "example_class.py",
+      "path": "appmap/test/data/example_class.py",
       "lineno": 10,
       "static": false,
       "receiver": {
@@ -126,7 +126,7 @@
     {
       "defined_class": "example_class.ExampleClass",
       "method_id": "test_exception",
-      "path": "example_class.py",
+      "path": "appmap/test/data/example_class.py",
       "lineno": 25,
       "static": false,
       "receiver": {