Merge pull request #41 from newrelic/update/error-attribute

fix: Update error name to error Message

Author: sadhana-newrelic

NRExoPlayerTracker/build.gradle

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

NRIMATracker/build.gradle

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

NewRelicVideoCore/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 33
         versionCode 9
-        versionName "3.0.1"
+        versionName "3.0.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
@@ -36,6 +36,8 @@ 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.6.3'
+    implementation 'androidx.media3:media3-exoplayer:1.1.0'
+    implementation 'androidx.media3:media3-exoplayer-ima:1.1.0'
     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/exception/ErrorExceptionHandler.java

@@ -0,0 +1,49 @@
+package com.newrelic.videoagent.core.exception;
+
+import androidx.media3.common.PlaybackException;
+import androidx.media3.datasource.HttpDataSource.InvalidResponseCodeException;
+import com.google.ads.interactivemedia.v3.api.AdError;
+import androidx.media3.exoplayer.source.ads.AdsMediaSource.AdLoadException;
+
+public class ErrorExceptionHandler {
+
+    private final static int DEFAULT_ERROR_CODE = -9999; // default error code for unhandled exceptions
+
+    private int errorCode;
+    private String errorMessage;
+
+
+    public ErrorExceptionHandler(Exception error) {
+        this.errorCode = DEFAULT_ERROR_CODE; 
+        this.errorMessage = error.getMessage();
+
+        if (error instanceof InvalidResponseCodeException) {
+            InvalidResponseCodeException dataSourceError = (InvalidResponseCodeException) error;
+            this.errorCode = dataSourceError.responseCode;
+            this.errorMessage = dataSourceError.responseMessage;
+        } else if (error instanceof PlaybackException) {
+            PlaybackException playbackError = (PlaybackException) error;
+            this.errorCode = playbackError.errorCode;
+            this.errorMessage = playbackError.getMessage();
+        } else if (error instanceof AdError || error instanceof AdLoadException) {
+            AdError adError = (error instanceof AdLoadException)
+                    ? (error.getCause() instanceof AdError ? (AdError) error.getCause() : null)
+                    : (AdError) error;
+
+            if (adError != null) {
+                this.errorCode = adError.getErrorCodeNumber();
+                this.errorMessage = adError.getMessage();
+            }
+        }
+    }
+
+
+    public int getErrorCode() {
+        return this.errorCode;
+    }
+
+    public String getErrorMessage() {
+        return this.errorMessage;
+    }
+}
+

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

@@ -13,6 +13,7 @@
 import java.util.Random;
 
 import static com.newrelic.videoagent.core.NRDef.*;
+import com.newrelic.videoagent.core.exception.ErrorExceptionHandler;
 
 /**
  * `NRVideoTracker` defines the basic behaviour of a video tracker.
@@ -462,34 +463,23 @@ public void sendRenditionChange() {
      * @param error Exception.
      */
     public void sendError(Exception error) {
-        String msg;
-        if (error != null) {
-            if (error.getMessage() != null) {
-                msg = error.getMessage();
-            }
-            else {
-                msg = error.toString();
-            }
-        }
-        else {
-            msg = "<Unknown error>";
-        }
-
-        sendError(msg);
+        ErrorExceptionHandler exceptionHandler = new ErrorExceptionHandler(error);
+        sendError(exceptionHandler.getErrorCode(), exceptionHandler.getErrorMessage());
     }
 
     /**
      * Send request event.
      *
      * @param errorMessage Error message.
      */
-    public void sendError(String errorMessage) {
+    public void sendError(int errorCode, String errorMessage) {
         if (errorMessage == null) {
             errorMessage = "<Unknown error>";
         }
         numberOfErrors++;
         Map<String, Object> errAttr = new HashMap<>();
-        errAttr.put("errorName", errorMessage);
+        errAttr.put("errorMessage", errorMessage);
+        errAttr.put("errorCode", errorCode);
 //        generatePlayElapsedTime();
         String actionName = CONTENT_ERROR;
         if (state.isAd) {

README.md

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