appmap 2.1.7__tar.gz → 2.1.9__tar.gz

{appmap-2.1.7 → appmap-2.1.9}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: appmap
-Version: 2.1.7
+Version: 2.1.9
 Summary: Create AppMap files by recording a Python application.
-Home-page: https://github.com/applandinc/appmap-python
 License: MIT
+License-File: LICENSE
 Author: Alan Potter
 Author-email: alan@app.land
 Requires-Python: >=3.8,<4.0
@@ -20,6 +20,8 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Debuggers
 Classifier: Topic :: Software Development :: Documentation
@@ -27,6 +29,7 @@ Requires-Dist: PyYAML (>=5.3.0)
 Requires-Dist: importlib-resources (>=5.4.0,<6.0.0)
 Requires-Dist: inflection (>=0.3.0)
 Requires-Dist: packaging (>=19.0)
+Project-URL: Homepage, https://github.com/applandinc/appmap-python
 Description-Content-Type: text/markdown
 
 - [About](#about)

{appmap-2.1.7 → appmap-2.1.9}/_appmap/event.py

@@ -446,7 +446,7 @@ class HttpServerRequestEvent(MessageEvent):
 
     __slots__ = ["http_server_request"]
 
-    # pylint: disable=too-many-arguments
+    # pylint: disable=too-many-arguments,too-many-positional-arguments
     def __init__(
         self,
         request_method,

{appmap-2.1.7 → appmap-2.1.9}/_appmap/importer.py

@@ -42,7 +42,9 @@ class FilterableFn(
 ):
     __slots__ = ()
 
-    def __new__(cls, scope, fn_name, fn, static_fn, auxtype=None):  # pylint: disable=too-many-arguments
+    def __new__(
+        cls, scope, fn_name, fn, static_fn, auxtype=None
+    ):  # pylint: disable=too-many-arguments,too-many-positional-arguments
         fqname = "%s.%s" % (scope.fqname, fn_name)
         self = super(FilterableFn, cls).__new__(cls, scope.scope, fqname, fn, static_fn, auxtype)
         return self

{appmap-2.1.7 → appmap-2.1.9}/_appmap/recording.py

@@ -115,7 +115,9 @@ def initialize():
             nonlocal r
             r.stop()
             now = datetime.now(timezone.utc)
-            appmap_name = now.isoformat(timespec="seconds").replace("+00:00", "Z")
+            iso_time = now.isoformat(timespec="seconds").replace("+00:00", "Z")
+            process_id = os.getpid()
+            appmap_name = f"{iso_time}-{process_id}".replace(":","-")
             recorder_type = "process"
             metadata = {
                 "name": appmap_name,

{appmap-2.1.7 → appmap-2.1.9}/_appmap/test/test_configuration.py

@@ -269,7 +269,7 @@ class TestEmpty(DefaultHelpers):
             self.check_default_config(Path(tmpdir).name)
 
 class TestSearchConfig:
-    # pylint: disable=too-many-arguments
+    # pylint: disable=too-many-arguments,too-many-positional-arguments
 
     def test_config_in_parent_folder(self, data_dir, tmpdir, monkeypatch):
         copytree(data_dir / "config-up", str(tmpdir), dirs_exist_ok=True)

{appmap-2.1.7 → appmap-2.1.9}/_appmap/test/test_django.py

@@ -98,7 +98,7 @@ def test_template(events):
 class ClientAdaptor(django.test.Client):
     """Adaptor for the client request parameters used in .web_framework tests."""
 
-    # pylint: disable=too-many-arguments
+    # pylint: disable=too-many-arguments,too-many-positional-arguments
     def generic(
         self,
         method,

{appmap-2.1.7 → appmap-2.1.9}/_appmap/test/test_recording.py

@@ -226,3 +226,27 @@ def test_process_recording(data_dir, shell, tmp_path):
     actual = json.loads(appmap_files[0].read_text())
     assert len(actual["events"]) > 0
     assert len(actual["classMap"]) > 0
+
+
+def test_process_recording_filename_is_sanitized(data_dir, shell, tmp_path):
+    fixture = data_dir / "package1"
+    tmp = tmp_path / "process"
+    copytree(fixture, str(tmp / "package1"), dirs_exist_ok=True)
+    copy(data_dir / "appmap.yml", str(tmp))
+    copytree(data_dir / "flask" / "init", str(tmp / "init"), dirs_exist_ok=True)
+
+    ret = shell.run(
+        "python",
+        "-m",
+        "package1.package2",
+        env={"PYTHONPATH": "init", "APPMAP_RECORD_PROCESS": "true"},
+        cwd=tmp,
+    )
+    assert ret.returncode == 0
+
+    appmap_dir = tmp / "tmp" / "appmap" / "process"
+    appmap_files = list(appmap_dir.glob("*.appmap.json"))
+    assert len(appmap_files) == 1, "this only fails when run from VS Code?"
+
+    filename = appmap_files[0].name
+    assert ":" not in filename

{appmap-2.1.7 → appmap-2.1.9}/_appmap/web_framework.py

@@ -102,7 +102,7 @@ def name_hash(namepart):
     return sha256(os.fsencode(namepart)).hexdigest()
 
 
-# pylint: disable=too-many-arguments
+# pylint: disable=too-many-arguments,too-many-positional-arguments
 def create_appmap_file(
     output_dir,
     request_method,
@@ -142,7 +142,7 @@ class AppmapMiddleware(ABC):
         """Specify the main operations to be performed by a request is processed."""
         raise NotImplementedError
 
-    # pylint: disable=too-many-arguments
+    # pylint: disable=too-many-arguments,too-many-positional-arguments
     def after_request_main(
         self, request_path, status, headers, start, call_event_id
     ) -> Optional[HttpServerResponseEvent]:
@@ -193,7 +193,7 @@ class AppmapMiddleware(ABC):
 
         return rec, start, call_event_id
 
-    # pylint: disable=too-many-arguments
+    # pylint: disable=too-many-arguments,too-many-positional-arguments
     def after_request_hook(
         self,
         request_path,

{appmap-2.1.7 → appmap-2.1.9}/appmap/django.py

@@ -59,7 +59,9 @@ class ExecuteWrapper:  # pylint: disable=too-few-public-methods
         self.recorder = Recorder.get_current()
 
     # This signature is correct, the implementation confuses pylint:
-    def __call__(self, execute, sql, params, many, context):  # pylint: disable=too-many-arguments
+    def __call__(
+        self, execute, sql, params, many, context
+    ):  # pylint: disable=too-many-arguments,too-many-positional-arguments
         start = time.monotonic()
         try:
             return execute(sql, params, many, context)

{appmap-2.1.7 → appmap-2.1.9}/appmap/pytest.py

@@ -5,7 +5,7 @@ try:
     from pytest_django.django_compat import is_django_unittest
 except ImportError:
 
-    def is_django_unittest(item):
+    def is_django_unittest(_item):
         return False
 
 

{appmap-2.1.7 → appmap-2.1.9}/appmap/sqlalchemy.py

@@ -13,7 +13,7 @@ from _appmap.recorder import Recorder
 
 
 @event.listens_for(Engine, "before_cursor_execute")
-# pylint: disable=too-many-arguments,unused-argument
+# pylint: disable=too-many-arguments,unused-argument,too-many-positional-arguments
 def capture_sql_call(conn, cursor, statement, parameters, context, executemany):
     """Capture SQL query call into appmap."""
     if is_instrumentation_disabled():
@@ -45,7 +45,7 @@ def capture_sql_call(conn, cursor, statement, parameters, context, executemany):
 
 
 @event.listens_for(Engine, "after_cursor_execute")
-# pylint: disable=too-many-arguments,unused-argument
+# pylint: disable=too-many-arguments,unused-argument,too-many-positional-arguments
 def capture_sql(conn, cursor, statement, parameters, context, executemany):
     """Capture SQL query return into appmap."""
     if is_instrumentation_disabled():

{appmap-2.1.7 → appmap-2.1.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "appmap"
-version = "2.1.7"
+version = "2.1.9"
 description = "Create AppMap files by recording a Python application."
 readme = "README.md"
 authors = [