Merge pull request #48 from newrelic/fix/custom-event-attribute-enrinchment

fix: Enrich custom event with attributes

Author: rajeevkumar-nr

NRExoPlayerTracker/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 33
         versionCode 6
-        versionName "4.0.0"
+        versionName "4.0.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }

NRIMATracker/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 33
         versionCode 6
-        versionName "4.0.0"
+        versionName "4.0.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }

NewRelicVideoCore/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 33
         versionCode 9
-        versionName "4.0.0"
+        versionName "4.0.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }

NewRelicVideoCore/src/main/java/com/newrelic/videoagent/core/NRVideo.java

@@ -115,12 +115,59 @@ public static void recordEvent(String eventType, Map<String, Object> attributes)
     }
 
     /**
-     * Static convenience method for recording custom video events
+     * Static convenience method for recording custom video events to all active trackers
      *
-     * @param attributes A map of attributes for the event.
+     * @param attributes A map of attributes for the event. Must contain an "actionName" key.
      */
     public static void recordCustomEvent(Map<String, Object> attributes) {
-        recordEvent("VideoCustomAction", attributes);
+        recordCustomEvent(attributes, null);
+    }
+
+    /**
+     * Static convenience method for recording custom video events with tracker ID support
+     *
+     * @param attributes A map of attributes for the event. Must contain an "action" key.
+     * @param trackerId The tracker ID to send the event to. If null, event is sent to all active trackers.
+     */
+    public static void recordCustomEvent(Map<String, Object> attributes, Integer trackerId) {
+        if (!isInitialized()) {
+            NRLog.w("recordCustomEvent called before NRVideo is fully initialized - event dropped");
+            return;
+        }
+
+        if (attributes == null || attributes.isEmpty()) {
+            NRLog.w("Attributes parameter is mandatory for custom events");
+            return;
+        }
+
+        // Extract and validate action from attributes
+        Object actionObj = attributes.get("actionName");
+        if (actionObj == null || actionObj.toString().isEmpty()) {
+            NRLog.w("Action attribute is mandatory for custom events - must be included in attributes map with key 'actionName'");
+            return;
+        }
+        String action = actionObj.toString();
+
+        if (trackerId != null) {
+            NRTracker contentTracker = NewRelicVideoAgent.getInstance().getContentTracker(trackerId);
+            if (contentTracker != null) {
+                contentTracker.sendEvent(action, attributes);
+            } 
+        } else {
+            // Global event - send to all trackers
+            NRVideo videoInstance = getInstance();
+            if (videoInstance == null || videoInstance.trackerIds.isEmpty()) {
+                return;
+            }
+
+            // Send to all trackers
+            for (Integer currentTrackerId : videoInstance.trackerIds.values()) {
+                NRTracker contentTracker = NewRelicVideoAgent.getInstance().getContentTracker(currentTrackerId);
+                if (contentTracker != null) {
+                    contentTracker.sendEvent(action, attributes);
+                }
+            }
+        }
     }
 
     /**

README.md

@@ -49,13 +49,13 @@ dependencies {
     ...
 
     // Add this to install the NewRelicVideoCore (required)
-    implementation 'com.github.newrelic.video-agent-android:NewRelicVideoCore:v4.0.0'
+    implementation 'com.github.newrelic.video-agent-android:NewRelicVideoCore:v4.0.1'
     
     // Add this to install the ExoPlayer tracker
-    implementation 'com.github.newrelic.video-agent-android:NRExoPlayerTracker:v4.0.0'
+    implementation 'com.github.newrelic.video-agent-android:NRExoPlayerTracker:v4.0.1'
     
     // Add this to install the Google IMA library tracker
-    implementation 'com.github.newrelic.video-agent-android:NRIMATracker:v4.0.0'
+    implementation 'com.github.newrelic.video-agent-android:NRIMATracker:v4.0.1'
 }
 ```
 

app/src/main/java/com/newrelic/nrvideoproject/MainActivity.java

@@ -39,6 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {
             public void onClick(View view) {
                 Map<String, Object> attr = new HashMap<>();
                 attr.put("kind", "counter");
+                attr.put("actionName", "CLICK");
                 attr.put("counter", counter++);
                 NRVideo.recordCustomEvent(attr);
 

app/src/main/java/com/newrelic/nrvideoproject/VideoPlayer.java

@@ -62,9 +62,15 @@ private void playVideo(String videoUrl) {
         customAttr.put("myAttrStr", "Hello");
         customAttr.put("myAttrInt", 101);
         customAttr.put("name", "nr-video-agent-android-01-24JUL-john-starc");
-        NRVideoPlayerConfiguration playerConfiguration = new NRVideoPlayerConfiguration("test-player", player, true, customAttr);
+        NRVideoPlayerConfiguration playerConfiguration = new NRVideoPlayerConfiguration("test-player", player, false, customAttr);
         trackerId = NRVideo.addPlayer(playerConfiguration);
 
+        Map<String, Object> attributes = new HashMap<>();
+        attributes.put("actionName", "VIDEO_STARTED");
+        attributes.put("videoUrl", videoUrl);
+        attributes.put("playerType", "ExoPlayer");
+        NRVideo.recordCustomEvent(attributes, trackerId);
+
         PlayerView playerView = findViewById(R.id.player);
         playerView.setPlayer(player);
         // Set the playlist URIs