Merge pull request #37 from newrelic/stable

Change video event type from MobileVideo -> VideoAction

Author: mlychndnnr

DATAMODEL.md

@@ -10,8 +10,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 33
         versionCode 6
-        versionName "1.0.6"
-
+        versionName "3.0.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
@@ -59,4 +58,5 @@ afterEvaluate {
             }
         }
     }
+
 }

NRExoPlayerTracker/build.gradle

@@ -16,6 +16,7 @@
 import com.newrelic.videoagent.core.tracker.NRVideoTracker;
 import com.newrelic.videoagent.core.utils.NRLog;
 import com.newrelic.videoagent.exoplayer.BuildConfig;
+import static com.newrelic.videoagent.core.NRDef.*;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -126,6 +127,15 @@ public String getTrackerVersion() {
         return BuildConfig.VERSION_NAME;
     }
 
+    /**
+     * Get tracker src.
+     *
+     * @return Attribute.
+     */
+    public String getTrackerSrc() {
+        return SRC;
+    }
+
     /**
      * Get bitrate.
      *
@@ -354,11 +364,12 @@ public void sendDroppedFrame(int count, int elapsed) {
         Map<String, Object> attr = new HashMap<>();
         attr.put("lostFrames", count);
         attr.put("lostFramesDuration", elapsed);
+//        generatePlayElapsedTime();
         if (getState().isAd) {
-            sendEvent("AD_DROPPED_FRAMES", attr);
+            sendVideoAdEvent("AD_DROPPED_FRAMES", attr);
         }
         else {
-            sendEvent("CONTENT_DROPPED_FRAMES", attr);
+            sendVideoEvent("CONTENT_DROPPED_FRAMES", attr);
         }
     }
 

NRExoPlayerTracker/src/main/java/com/newrelic/videoagent/exoplayer/tracker/NRTrackerExoPlayer.java

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

NRIMATracker/build.gradle

@@ -6,6 +6,7 @@
 import com.newrelic.videoagent.core.tracker.NRVideoTracker;
 import com.newrelic.videoagent.core.utils.NRLog;
 import com.newrelic.videoagent.ima.BuildConfig;
+import static com.newrelic.videoagent.core.NRDef.*;
 
 public class NRTrackerIMA extends NRVideoTracker implements AdErrorEvent.AdErrorListener, AdEvent.AdEventListener {
 
@@ -126,6 +127,15 @@ public String getTrackerVersion() {
         return BuildConfig.VERSION_NAME;
     }
 
+    /**
+     * Get tracker src.
+     *
+     * @return Attribute.
+     */
+    public String getTrackerSrc() {
+        return SRC;
+    }
+
     /**
      * Get Ad Position.
      *

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

@@ -2,15 +2,13 @@ plugins {
     id 'com.android.library'
     id 'maven-publish'
 }
-
 android {
     compileSdkVersion 33
-
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 33
         versionCode 9
-        versionName "1.0.6"
+        versionName "3.0.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -38,15 +36,13 @@ android {
 }
 
 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'
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
-
 afterEvaluate {
     publishing {
         publications {

NewRelicVideoCore/build.gradle

@@ -8,7 +8,12 @@ private NRDef() {
 
     public static final String NRVIDEO_CORE_VERSION = VERSION_NAME;
 
-    public static final String NR_VIDEO_EVENT = "MobileVideo";
+    public static final String NR_VIDEO_EVENT = "VideoAction";
+    public static final String NR_VIDEO_AD_EVENT = "VideoAdAction";
+    public static final String NR_VIDEO_ERROR_EVENT = "VideoErrorAction";
+    public static final String NR_VIDEO_CUSTOM_EVENT = "VideoCustomAction";
+
+    public static final String SRC = "ANDROID";
 
     public static final String TRACKER_READY = "TRACKER_READY";
     public static final String PLAYER_READY = "PLAYER_READY";

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

@@ -0,0 +1,25 @@
+package com.newrelic.videoagent.core.model;
+
+public class NRChrono {
+
+    private long startTime;
+
+    // Constructor
+    public NRChrono() {
+        startTime = 0;
+    }
+
+    // Start the timer
+    public void start() {
+        startTime = System.currentTimeMillis();
+    }
+
+    // Get the delta time in milliseconds
+    public long getDeltaTime() {
+        if (startTime > 0) {
+            return System.currentTimeMillis() - startTime;
+        } else {
+            return 0;
+        }
+    }
+}

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

@@ -10,6 +10,7 @@
 public class NREventAttributes {
 
     private Map<String, Map<String, Object>> attributeBuckets;
+    private String userId;
 
     /**
      * Ïnit a new event attributes model.
@@ -39,6 +40,16 @@ 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/model/NREventAttributes.java

@@ -50,6 +50,7 @@ public void applyAttributes(String action, Map<String, Object> attributes) {
                 attributes.put(ts.getAttribute(), ts.timeSince());
             }
             if (ts.isAction(action)) {
+                // attributes.put("elapsedTime", ts.timeSince());
                 ts.now();
             }
         }