From ce379e3cb42f4a191e35bd6a82c1b1a08fe4465e Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Tue, 14 Sep 2021 16:26:05 +0200
Subject: [PATCH] add openpype version information about each process

---
 .../ftrack/ftrack_server/event_server_cli.py  | 19 +++++++++++--------
 .../ftrack/scripts/sub_event_processor.py     | 13 ++++++++++---
 .../ftrack/scripts/sub_event_storer.py        | 14 ++++++++++----
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/openpype/modules/default_modules/ftrack/ftrack_server/event_server_cli.py b/openpype/modules/default_modules/ftrack/ftrack_server/event_server_cli.py
index d8e4d05580..1eeda1fefd 100644
--- a/openpype/modules/default_modules/ftrack/ftrack_server/event_server_cli.py
+++ b/openpype/modules/default_modules/ftrack/ftrack_server/event_server_cli.py
@@ -6,7 +6,6 @@ import subprocess
 import socket
 import json
 import platform
-import argparse
 import getpass
 import atexit
 import time
@@ -16,7 +15,9 @@ import ftrack_api
 import pymongo
 from openpype.lib import (
     get_pype_execute_args,
-    OpenPypeMongoConnection
+    OpenPypeMongoConnection,
+    get_openpype_version,
+    get_build_version
 )
 from openpype_modules.ftrack import FTRACK_MODULE_DIR
 from openpype_modules.ftrack.lib import credentials
@@ -238,12 +239,14 @@ def main_loop(ftrack_url):
 
     system_name, pc_name = platform.uname()[:2]
     host_name = socket.gethostname()
-    main_info = {
-        "created_at": datetime.datetime.now().strftime("%Y.%m.%d %H:%M:%S"),
-        "Username": getpass.getuser(),
-        "Host Name": host_name,
-        "Host IP": socket.gethostbyname(host_name)
-    }
+    main_info = [
+        ["created_at", datetime.datetime.now().strftime("%Y.%m.%d %H:%M:%S")],
+        ["Username", getpass.getuser()],
+        ["Host Name", host_name],
+        ["Host IP", socket.gethostbyname(host_name)],
+        ["OpenPype version", get_openpype_version() or "N/A"],
+        ["OpenPype build version", get_build_version() or "N/A"]
+    ]
     main_info_str = json.dumps(main_info)
     # Main loop
     while True:
diff --git a/openpype/modules/default_modules/ftrack/scripts/sub_event_processor.py b/openpype/modules/default_modules/ftrack/scripts/sub_event_processor.py
index 51b45eb93b..d1e2e3aaeb 100644
--- a/openpype/modules/default_modules/ftrack/scripts/sub_event_processor.py
+++ b/openpype/modules/default_modules/ftrack/scripts/sub_event_processor.py
@@ -13,6 +13,11 @@ from openpype_modules.ftrack.ftrack_server.lib import (
 from openpype.modules import ModulesManager
 
 from openpype.api import Logger
+from openpype.lib import (
+    get_openpype_version,
+    get_build_version
+)
+
 
 import ftrack_api
 
@@ -40,9 +45,11 @@ def send_status(event):
     new_event_data = {
         "subprocess_id": subprocess_id,
         "source": "processor",
-        "status_info": {
-            "created_at": subprocess_started.strftime("%Y.%m.%d %H:%M:%S")
-        }
+        "status_info": [
+            ["created_at", subprocess_started.strftime("%Y.%m.%d %H:%M:%S")],
+            ["OpenPype version", get_openpype_version() or "N/A"],
+            ["OpenPype build version", get_build_version() or "N/A"]
+        ]
     }
 
     new_event = ftrack_api.event.base.Event(
diff --git a/openpype/modules/default_modules/ftrack/scripts/sub_event_storer.py b/openpype/modules/default_modules/ftrack/scripts/sub_event_storer.py
index a8649e0ccc..5543ed74e2 100644
--- a/openpype/modules/default_modules/ftrack/scripts/sub_event_storer.py
+++ b/openpype/modules/default_modules/ftrack/scripts/sub_event_storer.py
@@ -14,7 +14,11 @@ from openpype_modules.ftrack.ftrack_server.lib import (
     TOPIC_STATUS_SERVER_RESULT
 )
 from openpype_modules.ftrack.lib import get_ftrack_event_mongo_info
-from openpype.lib import OpenPypeMongoConnection
+from openpype.lib import (
+    OpenPypeMongoConnection,
+    get_openpype_version,
+    get_build_version
+)
 from openpype.api import Logger
 
 log = Logger.get_logger("Event storer")
@@ -153,9 +157,11 @@ def send_status(event):
     new_event_data = {
         "subprocess_id": os.environ["FTRACK_EVENT_SUB_ID"],
         "source": "storer",
-        "status_info": {
-            "created_at": subprocess_started.strftime("%Y.%m.%d %H:%M:%S")
-        }
+        "status_info": [
+            ["created_at", subprocess_started.strftime("%Y.%m.%d %H:%M:%S")],
+            ["OpenPype version", get_openpype_version() or "N/A"],
+            ["OpenPype build version", get_build_version() or "N/A"]
+        ]
     }
 
     new_event = ftrack_api.event.base.Event(