Use python-core (#271)

* python-core: migrate trigger utils

.pre-commit-config.yaml

@@ -34,3 +34,9 @@ repos:
     hooks:
     -   id: detect-secrets
         args: ['--baseline', '.secrets.baseline']
+
+-   repo: https://github.com/pycqa/isort
+    rev: 5.11.5
+    hooks:
+        - id: isort
+          args: ["--profile", "black"]

.secrets.baseline

@@ -131,51 +131,35 @@
         "filename": "src/test/unit/event/test_event_dumper.py",
         "hashed_secret": "885bb9903f72e004ff2974807b70e7c970d3e6d5",
         "is_verified": false,
-        "line_number": 206
+        "line_number": 207
       },
       {
         "type": "Base64 High Entropy String",
         "filename": "src/test/unit/event/test_event_dumper.py",
         "hashed_secret": "0c47032b03ad0916df339b9c21b194ad8b2ed7b1",
         "is_verified": false,
-        "line_number": 208
+        "line_number": 209
       },
       {
         "type": "Hex High Entropy String",
         "filename": "src/test/unit/event/test_event_dumper.py",
         "hashed_secret": "5e55d44082c01c474ac9d6101d9f88c0a66ae558",
         "is_verified": false,
-        "line_number": 372
+        "line_number": 373
       },
       {
         "type": "Hex High Entropy String",
         "filename": "src/test/unit/event/test_event_dumper.py",
         "hashed_secret": "0615ba62fbaec0ee83b8a181ff49afc60cb043f5",
         "is_verified": false,
-        "line_number": 556
+        "line_number": 557
       },
       {
         "type": "Hex High Entropy String",
         "filename": "src/test/unit/event/test_event_dumper.py",
         "hashed_secret": "5bbac409dd4ddefe2ffc72ce9fc42932d8a238c1",
         "is_verified": false,
-        "line_number": 557
-      }
-    ],
-    "src/test/unit/event/test_event_trigger.py": [
-      {
-        "type": "Base64 High Entropy String",
-        "filename": "src/test/unit/event/test_event_trigger.py",
-        "hashed_secret": "885bb9903f72e004ff2974807b70e7c970d3e6d5",
-        "is_verified": false,
-        "line_number": 613
-      },
-      {
-        "type": "Hex High Entropy String",
-        "filename": "src/test/unit/event/test_event_trigger.py",
-        "hashed_secret": "3fae06dc55a618caed1d794dcd512bfe7e76c9f1",
-        "is_verified": false,
-        "line_number": 658
+        "line_number": 558
       }
     ],
     "src/test/unit/test_lumigo_utils.py": [
@@ -220,5 +204,5 @@
       }
     ]
   },
-  "generated_at": "2023-01-29T12:29:33Z"
+  "generated_at": "2023-02-19T16:59:36Z"
 }

requirements.txt

@@ -3,7 +3,6 @@ pytest==5.2.0
 mock
 boto3
 pytest-cov==2.6.1
-capturer==2.4
 attrs==19.1.0
 requests==2.28.1
 pymongo==3.11.0

scripts/prepare_layer_files.sh

@@ -5,3 +5,5 @@ python setup.py bdist_wheel
 rm -rf python && mkdir python
 cp -R src/lumigo_tracer.egg-info python/
 cp -R src/lumigo_tracer python/
+python -m pip install -r src/lumigo_tracer.egg-info/requires.txt
+cp -R "$(python -c "import lumigo_core; print(lumigo_core.__path__[0])")"* python/

setup.py

@@ -14,7 +14,7 @@
     url="https://github.com/lumigo-io/python_tracer.git",
     package_dir={"": "src"},
     packages=setuptools.find_packages("src"),
-    install_requires=[],
+    install_requires=["lumigo_core==0.0.4"],
     license="Apache License 2.0",
     classifiers=["Programming Language :: Python :: 3", "Operating System :: OS Independent"],
     long_description=open("README.md").read(),

src/lumigo_tracer/__init__.py

@@ -1,14 +1,15 @@
-from lumigo_tracer.lambda_tracer.tracer import lumigo_tracer, LumigoChalice  # noqa
+from lumigo_tracer.lambda_tracer.tracer import LumigoChalice, lumigo_tracer  # noqa
+
+from .auto_instrument_handler import _handler  # noqa
+from .lambda_tracer.global_scope_exec import global_scope_exec
 from .user_utils import (  # noqa
-    report_error,
     add_execution_tag,
+    error,
+    info,
+    report_error,
     start_manual_trace,
     stop_manual_trace,
-    info,
     warn,
-    error,
 )
-from .auto_instrument_handler import _handler  # noqa
-from .lambda_tracer.global_scope_exec import global_scope_exec
 
 global_scope_exec()

src/lumigo_tracer/auto_tag/auto_tag_event.py

@@ -1,10 +1,12 @@
-from abc import ABC, abstractmethod
 import os
+from abc import ABC, abstractmethod
 from typing import Dict, List, Optional
 
+from lumigo_core.logger import get_logger
+from lumigo_core.parsing_utils import safe_get, str_to_list
+
+from lumigo_tracer.lumigo_utils import Configuration, is_api_gw_event, warn_client
 from lumigo_tracer.user_utils import add_execution_tag
-from lumigo_tracer.parsing_utils import str_to_list, safe_get
-from lumigo_tracer.lumigo_utils import get_logger, is_api_gw_event, Configuration, warn_client
 
 AUTO_TAG_API_GW_HEADERS: Optional[List[str]] = (
     str_to_list(os.environ.get("LUMIGO_AUTO_TAG_API_GW_HEADERS", "")) or []

src/lumigo_tracer/event/__init__.py

@@ -0,0 +1 @@
+import lumigo_tracer.event.trigger_parsing  # noqa: F401

src/lumigo_tracer/event/event_dumper.py

@@ -4,14 +4,15 @@
 from collections import OrderedDict
 from typing import Dict, List, Optional
 
-from lumigo_tracer.parsing_utils import str_to_list, safe_get
+from lumigo_core.logger import get_logger
+from lumigo_core.parsing_utils import safe_get, str_to_list
+
 from lumigo_tracer.lumigo_utils import (
-    get_logger,
+    Configuration,
+    aws_dump,
     is_api_gw_event,
     lumigo_dumps,
-    Configuration,
     should_use_tracer_extension,
-    aws_dump,
 )
 
 EVENT_MAX_SIZE = 6 * 1024 * 1024

src/lumigo_tracer/event/trigger_parsing/__init__.py

@@ -1,37 +1,7 @@
-import re
-from typing import List, Type
+from lumigo_core.triggers.trigger_parsing import EVENT_TRIGGER_PARSERS
 
-from .event_trigger_base import EventTriggerParser
-from .step_function_parser import StepFunctionEventTriggerParser
-from .apigw_parser import ApiGatewayEventTriggerParser
-from .load_balancer_parser import LoadBalancerEventTriggerParser
-from .sns_parser import SnsEventTriggerParser
-from .s3_parser import S3EventTriggerParser
-from .sqs_parser import SqsEventTriggerParser
-from .kinesis_parser import KinesisEventTriggerParser
-from .dynamodb_parser import DynamoDBEventTriggerParser
-from .cloudwatch_parser import CloudwatchEventTriggerParser
-from .eventbridge_parser import EventbridgeEventTriggerParser
-from .appsync_parser import AppsyncEventTriggerParser
-
-
-EVENT_TRIGGER_PARSERS: List[Type[EventTriggerParser]] = [
+from lumigo_tracer.event.trigger_parsing.step_function_parser import (
     StepFunctionEventTriggerParser,
-    ApiGatewayEventTriggerParser,
-    LoadBalancerEventTriggerParser,
-    SnsEventTriggerParser,
-    S3EventTriggerParser,
-    SqsEventTriggerParser,
-    KinesisEventTriggerParser,
-    DynamoDBEventTriggerParser,
-    CloudwatchEventTriggerParser,
-    EventbridgeEventTriggerParser,
-    AppsyncEventTriggerParser,
-]
-INNER_MESSAGES_MAGIC_PATTERN = re.compile(
-    r"("
-    + "|".join(
-        parser.MAGIC_IDENTIFIER for parser in EVENT_TRIGGER_PARSERS if parser.MAGIC_IDENTIFIER
-    )
-    + ")"
 )
+
+EVENT_TRIGGER_PARSERS.append(StepFunctionEventTriggerParser)