Add instrumentation attributes to each data point.

CHANGELOG.md

@@ -1,7 +1,7 @@
 # CHANGELOG
 All notable changes to this project will be documented in this file.
 
-## [1.0.0] - 2024/02/01
+## [1.0.0] - 2024/02/02
 ### Add
 - Accept arbitrary event log queries.
 - Accept queries of any type of event, not only event logs.
@@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file.
 - Configure the SF API version to use.
 - Configure the NR eventType to report.
 - Dynamic SOQL query generation.
+- Instrumentation attributes.
 ### Update
 - Improve NR API interaction.
 - Improve cache (redis) usage.

src/__main__.py

@@ -10,7 +10,7 @@
 from yaml import Loader, load
 from newrelic_logging.env import get_var, var_exists
 from newrelic_logging.integration import Integration
-from newrelic_logging.telemetry import print_info, print_warn, print_err
+from newrelic_logging.telemetry import print_info, print_warn
 
 config_dir = None
 argv = sys.argv[1:]

src/newrelic_logging/__init__.py

@@ -0,0 +1,6 @@
+# Integration definitions
+
+VERSION         = "1.0.0"
+NAME            = "salesforce-eventlogfile"
+PROVIDER        = "newrelic-labs"
+COLLECTOR_NAME  = "newrelic-logs-salesforce-eventlogfile"

src/newrelic_logging/integration.py

@@ -4,7 +4,7 @@
 from .salesforce import SalesForce, SalesforceApiException, DataCache
 from .env import AuthEnv
 from enum import Enum
-from .telemetry import Telemetry, print_info, print_err, print_warn
+from .telemetry import Telemetry, print_info, print_err
 
 class DataFormat(Enum):
     LOGS = 1
@@ -61,9 +61,9 @@ def __init__(self, config, event_type_fields_mapping, initial_delay):
                 account_id = newrelic_config['account_id']
             else:
                 account_id = auth_env.get_account_id()
+            NewRelic.set_api_endpoint(newrelic_config['api_endpoint'], account_id)
 
         NewRelic.set_logs_endpoint(newrelic_config['api_endpoint'])
-        NewRelic.set_api_endpoint(newrelic_config['api_endpoint'], account_id)
 
     def run(self):
         sfdc_session = new_retry_session()

src/newrelic_logging/newrelic.py

@@ -1,7 +1,8 @@
 import gzip
 import json
-from .telemetry import Telemetry, print_info, print_err, print_warn
+from .telemetry import print_info, print_err
 from requests import RequestException
+from newrelic_logging import VERSION, NAME, PROVIDER, COLLECTOR_NAME
 
 class NewRelicApiException(Exception):
     pass
@@ -25,6 +26,15 @@ class NewRelic:
 
     @classmethod
     def post_logs(cls, session, data):
+        # Append integration attributes
+        for log in data[0]['logs']:
+            if not 'attributes' in log:
+                log['attributes'] = {}
+            log['attributes']['instrumentation.name'] = NAME
+            log['attributes']['instrumentation.provider'] = PROVIDER
+            log['attributes']['instrumentation.version'] = VERSION
+            log['attributes']['collector.name'] = COLLECTOR_NAME
+
         json_payload = json.dumps(data).encode()
 
         # print("----- POST DATA (LOGS) -----")
@@ -52,6 +62,13 @@ def post_logs(cls, session, data):
 
     @classmethod
     def post_events(cls, session, data):
+        # Append integration attributes
+        for event in data:
+            event['instrumentation.name'] = NAME
+            event['instrumentation.provider'] = PROVIDER
+            event['instrumentation.version'] = VERSION
+            event['collector.name'] = COLLECTOR_NAME
+
         json_payload = json.dumps(data).encode()
 
         # print("----- POST DATA (EVENTS) -----")

src/newrelic_logging/salesforce.py

@@ -12,7 +12,7 @@
 import hashlib
 from .env import Auth, AuthEnv
 from .query import Query, substitute
-from .telemetry import Telemetry, print_info, print_err, print_warn
+from .telemetry import print_info, print_err
 
 class LoginException(Exception):
     pass