Merge pull request #103 from newrelic/QOE-beta-release-android

feat : qoe event with attributes

Author: ametku

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

@@ -30,6 +30,7 @@ private NRDef() {
     public static final String CONTENT_HEARTBEAT = "CONTENT_HEARTBEAT";
     public static final String CONTENT_RENDITION_CHANGE = "CONTENT_RENDITION_CHANGE";
     public static final String CONTENT_ERROR = "CONTENT_ERROR";
+    public static final String QOE_AGGREGATE = "QOE_AGGREGATE";
 
     public static final String AD_REQUEST = "AD_REQUEST";
     public static final String AD_START = "AD_START";
@@ -47,4 +48,4 @@ private NRDef() {
     public static final String AD_BREAK_END = "AD_BREAK_END";
     public static final String AD_QUARTILE = "AD_QUARTILE";
     public static final String AD_CLICK = "AD_CLICK";
-}
+}

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

@@ -42,6 +42,17 @@ public static boolean isInitialized() {
         return instance != null;
     }
 
+    /**
+     * Get configured harvest cycle in seconds
+     * @return harvest cycle seconds, or default 60 if not initialized
+     */
+    public static int getHarvestCycleSeconds() {
+        if (instance != null && instance.harvestManager != null) {
+            return instance.harvestManager.getFactory().getConfiguration().getHarvestCycleSeconds();
+        }
+        return 60; // Default harvest cycle
+    }
+
     public static Integer addPlayer(NRVideoPlayerConfiguration config) {
         if (!isInitialized()) {
             NRLog.w("NRVideo not initialized - cannot add player");
@@ -152,7 +163,7 @@ public static void recordCustomEvent(Map<String, Object> attributes, Integer tra
             NRTracker contentTracker = NewRelicVideoAgent.getInstance().getContentTracker(trackerId);
             if (contentTracker != null) {
                 contentTracker.sendEvent(action, attributes);
-            } 
+            }
         } else {
             // Global event - send to all trackers
             NRVideo videoInstance = getInstance();
@@ -224,7 +235,7 @@ private NRVideo initialize(Context context, NRVideoConfiguration config) {
             if (applicationContext instanceof Application) {
                 Application app = (Application) applicationContext;
                 NRVideoLifecycleObserver lifecycleObserver =
-                    new NRVideoLifecycleObserver(harvestManager.getFactory());
+                        new NRVideoLifecycleObserver(harvestManager.getFactory());
 
                 // Register with application
                 app.registerActivityLifecycleCallbacks(lifecycleObserver);
@@ -342,4 +353,4 @@ public static void setAdAttribute(Integer trackerId, String key, Object value) {
     public static void setGlobalAttribute(String key, Object value) {
         NewRelicVideoAgent.getInstance().setGlobalAttribute(key, value);
     }
-}
+}

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

@@ -73,7 +73,6 @@ public Map<String, Object> getAttributes(String action, Map<String, Object> attr
         attributes = eventAttributes.generateAttributes(action, attributes);
         return attributes;
     }
-
     /**
      * Add an entry to the timeSince table.
      *
@@ -142,6 +141,9 @@ public void sendEvent(String eventType, String action, Map<String, Object> attri
         attributes = getAttributes(action, attributes);
         timeSinceTable.applyAttributes(action, attributes);
 
+        // Process QoE events that require timing attributes
+        processQoeEvents(action, attributes);
+
         attributes.put("agentSession", getAgentSession());
         attributes.put("instrumentation.provider", "newrelic");
         attributes.put("instrumentation.name", getInstrumentationName());
@@ -247,5 +249,28 @@ public String getInstrumentationName() {
     public String getAgentSession() {
         return NewRelicVideoAgent.getInstance().getSessionId();
     }
+    /**
+     * Process QoE events that require timing attributes to be already applied.
+     * This method handles QOE_AGGREGATE and CONTENT_BUFFER_END events for various QoE calculations.
+     *
+     * @param action The event action name
+     * @param attributes The event attributes map (timing attributes already applied)
+     */
+    private void processQoeEvents(String action, Map<String, Object> attributes) {
+        if (this instanceof NRVideoTracker) {
+            NRVideoTracker videoTracker = (NRVideoTracker) this;
 
-}
+            if (QOE_AGGREGATE.equals(action)) {
+                // Process QOE_AGGREGATE events for startup time calculation
+                Long timeSinceRequested = (Long) attributes.get("timeSinceRequested");
+                Long timeSinceStarted = (Long) attributes.get("timeSinceStarted");
+                Long timeSinceLastError = (Long) attributes.get("timeSinceLastError");
+                videoTracker.calculateAndAddStartupTime(attributes, timeSinceRequested, timeSinceStarted, timeSinceLastError);
+            }
+            else if (CONTENT_BUFFER_END.equals(action)) {
+                // Process CONTENT_BUFFER_END events for rebuffering time calculation
+                videoTracker.calculateRebufferingTime(attributes);
+            }
+        }
+    }
+}