Merge pull request #69 from QAInsights/feature/telemetry-lambda

Update: Telemetry to AWS Lambda

.github/workflows/release-workflow.yml

@@ -14,7 +14,7 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     env:
-      RELEASE_TAG: 0.2.0
+      RELEASE_TAG: 0.3.0
       INTEL_DMG: Hamster-x86-64-intel.dmg
       ARM64_DMG: Hamster-arm64-silicon.dmg
       MIXPANEL_TOKEN: ${{ secrets.MIXPANEL_TOKEN }}

README.md

@@ -79,7 +79,7 @@ An app that puts your recent JMeter test plans just a click away from your Mac m
   - No personal information or entities are collected.
   - The data collected is not shared with any third-party.
   - The data collected is not used for any marketing purposes.
-  - The data is being collected using [Mixpanel](https://mixpanel.com).
+  - The data is being collected using [Mixpanel](https://mixpanel.com) via AWS Lambda.
 - You can opt out of telemetry by configuring `false` in `~/.hamster_app.properties` file and restart the app.
   - ```commandline
     [TELEMETRY]

hamster/.hamster_app.properties

@@ -1,5 +1,5 @@
 [JMETER]
-home = /Users/naveenkumar/Tools/apache-jmeter-5.6.1
+home = /Users/naveenkumar/Tools/apache-jmeter-5.6.2
 
 [TELEMETRY]
-enabled = false
+enabled = true

hamster/__version__.py

@@ -1,2 +1,2 @@
-__version_info__ = (0, 2, 0)
+__version_info__ = (0, 3, 0)
 __version__ = '.'.join(map(str, __version_info__))

hamster/config.py

@@ -25,8 +25,10 @@ def __init__(self):
         self.authors = ['NaveenKumar Namachivayam', 'Leela Prasad Vadla']
         self.about_website = 'https://QAInsights.com'
         self.app_uuid = str(uuid.uuid4())
+        self.telemetry_url = 'https://dcx0r39ip3.execute-api.us-east-2.amazonaws.com/hamster-mixpanel'
         self.log_dir = os.path.join(os.path.expanduser("~"), 'hamster_logs')
-
+        self.valid_events = ['Launch JMeter', 'Recent Test Plans', 'Edit JMETER_HOME', 'View Config', 'Restart',
+                             'About', 'Refresh', 'Help']
 
     @property
     def authors_str(self):
@@ -90,6 +92,3 @@ def jmeter_path():
         jmeter_home = jmeter_home.rstrip('/')
     jmeter_bin = jmeter_home + '/bin/jmeter'
     return jmeter_home, jmeter_bin
-
-
-

hamster/menu.py

@@ -1,7 +1,7 @@
 import os
 import webbrowser
 import logging
-
+import requests
 from functools import wraps
 
 import rumps
@@ -11,10 +11,6 @@
 from config import jmeter_path, icon_path, properties_file_path, config_parser, jmeter_plist
 from config import app_config, uuid
 
-from mixpanel import Mixpanel
-
-mp = Mixpanel(os.environ.get('MIXPANEL_TOKEN'))
-
 # Create a logger
 logger = logging.getLogger(__name__)
 
@@ -40,9 +36,20 @@ def decorator(func):
         def wrapper(*args, **kwargs):
             try:
                 if telemetry_enabled:
-                    mp.track(ids, menu_item)
-                    logger.info(f"Clicked {menu_item}")
-                    return func(*args, **kwargs)
+                    # Call AWS Lambda function
+                    try:
+                        if menu_item in app_config.valid_events:
+                            requests.post(app_config.telemetry_url, json={
+                                "uuid": ids,
+                                "menu_item": menu_item
+                            })
+
+                            logger.info(f'Clicked {menu_item}')
+                            return func(*args, **kwargs)
+
+                    except Exception as e:
+                        logger.error(e)
+
                 else:
                     logger.info(f"Telemetry is disabled. Not tracking {menu_item}")
                     return func(*args, **kwargs)

windows/__init__.py

@@ -1 +1 @@
-__VERSION__ = "0.2.0"
+__VERSION__ = "0.3.0"

windows/config.py

@@ -17,7 +17,7 @@ def __init__(self):
         self.menu_items_dict = OrderedDict()
 
         self.jmeter_recent_files_pattern = re.compile("recent_file_.*")
-        self.app_version = "0.1.0"
+        self.app_version = "0.3.0"
         self.buy_me_a_coffee_url = 'https://www.buymeacoffee.com/QAInsights'
         self.authors = ['NaveenKumar Namachivayam', 'Leela Prasad Vadla']
         self.about_website = 'https://QAInsights.com'