Moving VCS info to resource attributes

Author: bhogayatakb

middleware/distro.py

@@ -244,8 +244,6 @@ def custom_record_exception(span: Span, exc: Exception):
             "exception.language": "python",
             "exception.stacktrace": traceback.format_exc(),
             "exception.escaped": exception_escaped,
-            "exception.vcs.commit_sha": mw_vcs_commit_sha or "",
-            "exception.vcs.repository_url": mw_vcs_repository_url or "",
             "exception.stack_details": stack_info_str,  # Attach full stacktrace details
         }
     )

middleware/resource.py

@@ -12,6 +12,7 @@
 from middleware.detectors.detector import process_detector_input, get_detectors
 from middleware.version import __version__
 import typing
+import os
 
 _logger = getLogger(__name__)
 
@@ -54,6 +55,14 @@ def create_resource(options: MWOptions):
                 "Skipped Custom attributes: parsing error expected format `abcd=1234,wxyz=5678`"
             )
 
+    mw_vcs_repository_url = os.getenv("MW_VCS_REPOSITORY_URL")
+    mw_vcs_commit_sha = os.getenv("MW_VCS_COMMIT_SHA")
+
+    if mw_vcs_repository_url:
+        attributes["vcs.repository_url"] = mw_vcs_repository_url
+    if mw_vcs_commit_sha:
+        attributes["vcs.commit_sha"] = mw_vcs_commit_sha
+
     detectors: typing.List["ResourceDetector"] = [
         OTELResourceDetector(),
         ProcessResourceDetector(),

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "middleware-io"
-version = "2.2.1"
+version = "2.2.2rc1"
 requires-python = ">=3.8"
 description = "Middleware's APM tool enables Python developers to effortlessly monitor their applications, gathering distributed tracing, metrics, logs, and profiling data for valuable insights and performance optimization."
 authors = [{ name = "middleware-dev" }]