Merge pull request #38 from newrelic/set-user-id-in-ads

fix: Added set user id for ads and handle skipped Ad

Author: rajeevkumar-nr

NRExoPlayerTracker/build.gradle

@@ -2,19 +2,16 @@ plugins {
     id 'com.android.library'
     id 'maven-publish'
 }
-
 android {
     compileSdkVersion 33
-
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 33
         versionCode 6
-        versionName "3.0.0"
+        versionName "3.0.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
-
     buildTypes {
         debug {
             minifyEnabled false
@@ -35,9 +32,7 @@ android {
     }
     namespace 'com.newrelic.videoagent.exoplayer'
 }
-
 dependencies {
-
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
     implementation project(path: ':NewRelicVideoCore')
@@ -46,7 +41,6 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
-
 afterEvaluate {
     publishing {
         publications {

NRIMATracker/build.gradle

@@ -2,19 +2,16 @@ plugins {
     id 'com.android.library'
     id 'maven-publish'
 }
-
 android {
     compileSdkVersion 33
-
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 33
         versionCode 6
-        versionName "3.0.0"
+        versionName "3.0.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
-
     buildTypes {
         debug {
             minifyEnabled false
@@ -35,9 +32,7 @@ android {
     }
     namespace 'com.newrelic.videoagent.ima'
 }
-
 dependencies {
-
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation project(path: ':NewRelicVideoCore')
@@ -46,7 +41,6 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
-
 afterEvaluate {
     publishing {
         publications {

NRIMATracker/src/main/java/com/newrelic/videoagent/ima/tracker/NRTrackerIMA.java

@@ -50,6 +50,7 @@ public void onAdEvent(AdEvent adEvent) {
                 sendStart();
                 break;
             case COMPLETED:
+            case SKIPPED:
                 sendEnd();
                 quartile = null;
                 break;

NewRelicVideoCore/build.gradle

@@ -8,12 +8,10 @@ android {
         minSdkVersion 16
         targetSdkVersion 33
         versionCode 9
-        versionName "3.0.0"
-
+        versionName "3.0.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
-
     buildTypes {
         debug {
             minifyEnabled false
@@ -34,11 +32,10 @@ android {
     }
     namespace 'com.newrelic.videoagent.core'
 }
-
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'com.google.android.material:material:1.1.0'
-    implementation 'com.newrelic.agent.android:android-agent:7.0.0'
+    implementation 'com.newrelic.agent.android:android-agent:7.6.3'
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

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

@@ -136,4 +136,23 @@ public NRTracker getAdTracker(Integer trackerId) {
             return null;
         }
     }
+
+    /**
+     * Set userId.
+     *
+     * @param userId User Id.
+     */
+    public void setUserId(String userId) {
+        for (Integer trackerId : trackerPairs.keySet()) {
+            NRTrackerPair pair = trackerPairs.get(trackerId);
+            if (pair.getFirst() != null) {
+                pair.getFirst().setAttribute("enduser.id", userId);
+            }
+            if (pair.getSecond() != null) {
+                pair.getSecond().setAttribute("enduser.id", userId);
+            }
+        }
+    }
+
+
 }

NewRelicVideoCore/src/main/java/com/newrelic/videoagent/core/model/NREventAttributes.java

@@ -10,7 +10,6 @@
 public class NREventAttributes {
 
     private Map<String, Map<String, Object>> attributeBuckets;
-    private String userId;
 
     /**
      * Ïnit a new event attributes model.
@@ -40,16 +39,6 @@ public void setAttribute(String key, Object value, String filter) {
         attributeBuckets.get(filter).put(key, value);
     }
 
-    /**
-     * Set userId.
-     *
-     * @param userId User Id.
-     */
-    public void setUserId(String userId) {
-        this.userId = userId;
-        setAttribute("enduser.id", userId, null);
-    }
-
     /**
      * Generate list of attributes for a given action.
      *

NewRelicVideoCore/src/main/java/com/newrelic/videoagent/core/tracker/NRTracker.java

@@ -39,15 +39,6 @@ public void trackerReady() {
         sendVideoEvent(TRACKER_READY);
     }
 
-    /**
-     * Set userId.
-     *
-     * @param userId User Id.
-     */
-    public void setUserId(String userId) {
-        eventAttributes.setUserId(userId);
-    }
-
     /**
      * Set custom attribute for all events.
      *

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

@@ -65,11 +65,12 @@ private void playVideo(String videoUrl) {
         tracker.setAttribute("contentTitle", "This is my test title", "CONTENT_START");
         tracker.setAttribute("contentIsLive", true, "CONTENT_START");
         tracker.setAttribute("myCustomAttr", "any value", "CONTENT_START");
-        // Uncomment below to set userId
-        tracker.setUserId("myUserId");
 
         trackerId = NewRelicVideoAgent.getInstance().start(tracker);
 
+        // Set the user ID
+        NewRelicVideoAgent.getInstance().setUserId("your_user_id");
+
         Map<String, Object> attr = new HashMap<>();
         attr.put("myAttrStr", "Hello");
         attr.put("myAttrInt", 101);

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

@@ -89,6 +89,9 @@ private void playVideo(String videoUrl) {
         playerView.setPlayer(player);
         adsLoader.setPlayer(player);
 
+        // Set the user ID
+        NewRelicVideoAgent.getInstance().setUserId("your_user_id");
+
         // Pass the player to the content tracker
         tracker.setPlayer(player);