Allow people to disable sending anything to Sentry (#17)

* allow for disabling Sentry reporting * make sure all can disable sentry * clean up demo app * clean gradle in CI build before building
muxinc · Sep 19, 2019 · 72d3fd2 · 72d3fd2
1 parent bd28681
commit 72d3fd2
Show file tree

Hide file tree

Showing 16 changed files with 52 additions and 23 deletions.
diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
@@ -1,7 +1,7 @@
 steps:
 - agents:
     dind: true
-  command: docker run -it --rm -v "$PWD":/data -w /data muxinc/mux-exoplayer:20190830
+  command: docker run -it --rm -v "$PWD":/data -w /data muxinc/mux-exoplayer:20190919
   label: Build AARs
   artifact_paths:
     - "MuxExoPlayer/buildout/outputs/artifacts/*.aar"

diff --git a/Dockerfile b/Dockerfile
@@ -35,4 +35,4 @@ RUN echo "sdk.dir=$ANDROID_HOME" > local.properties
 RUN ./gradlew --info androidDependencies
 
 # Run build task by default
-CMD ./gradlew --info build
+CMD ./gradlew --info clean build
diff --git a/MuxExoPlayer/build.gradle b/MuxExoPlayer/build.gradle
@@ -5,8 +5,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 2
-        versionName "0.5.0"
+        versionCode 3
+        versionName "0.5.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

diff --git a/MuxExoPlayer/libs/MuxCore.jar b/MuxExoPlayer/libs/MuxCore.jar
diff --git a/MuxExoPlayer/src/main/java/com/mux/stats/sdk/muxstats/MuxBaseExoPlayer.java b/MuxExoPlayer/src/main/java/com/mux/stats/sdk/muxstats/MuxBaseExoPlayer.java
@@ -61,13 +61,13 @@ public enum PlayerState {
     protected PlayerState state;
     protected MuxStats muxStats;
 
-    MuxBaseExoPlayer(Context ctx, ExoPlayer player, String playerName, CustomerPlayerData customerPlayerData, CustomerVideoData customerVideoData) {
+    MuxBaseExoPlayer(Context ctx, ExoPlayer player, String playerName, CustomerPlayerData customerPlayerData, CustomerVideoData customerVideoData, boolean sentryEnabled) {
         super();
         this.player = new WeakReference<>(player);
         state = PlayerState.INIT;
         MuxStats.setHostDevice(new MuxDevice(ctx));
         MuxStats.setHostNetworkApi(new MuxNetworkRequests());
-        muxStats = new MuxStats(this, playerName, customerPlayerData, customerVideoData);
+        muxStats = new MuxStats(this, playerName, customerPlayerData, customerVideoData, sentryEnabled);
         addListener(muxStats);
     }
 

diff --git a/MuxExoPlayer/src/r2_0_4/java/com/mux/stats/sdk/muxstats/MuxStatsExoPlayer.java b/MuxExoPlayer/src/r2_0_4/java/com/mux/stats/sdk/muxstats/MuxStatsExoPlayer.java
@@ -36,7 +36,11 @@ public class MuxStatsExoPlayer extends MuxBaseExoPlayer implements ExoPlayer.Eve
     private WeakReference<MetadataRenderer.Output> metaDataListener;
 
     public MuxStatsExoPlayer(Context ctx, ExoPlayer player, String playerName, CustomerPlayerData customerPlayerData, CustomerVideoData customerVideoData) {
-        super(ctx, player, playerName, customerPlayerData, customerVideoData);
+        this(ctx, player, playerName, customerPlayerData, customerVideoData, true);
+    }
+
+    public MuxStatsExoPlayer(Context ctx, ExoPlayer player, String playerName, CustomerPlayerData customerPlayerData, CustomerVideoData customerVideoData, boolean sentryEnabled) {
+        super(ctx, player, playerName, customerPlayerData, customerVideoData, sentryEnabled);
         player.addListener(this);
     }
 

diff --git a/MuxExoPlayer/src/r2_1_1/java/com/mux/stats/sdk/muxstats/MuxStatsExoPlayer.java b/MuxExoPlayer/src/r2_1_1/java/com/mux/stats/sdk/muxstats/MuxStatsExoPlayer.java
@@ -39,7 +39,11 @@ public class MuxStatsExoPlayer extends MuxBaseExoPlayer implements ExoPlayer.Eve
     private WeakReference<MetadataRenderer.Output> metaDataListener;
 
     public MuxStatsExoPlayer(Context ctx, ExoPlayer player, String playerName, CustomerPlayerData customerPlayerData, CustomerVideoData customerVideoData) {
-        super(ctx, player, playerName, customerPlayerData, customerVideoData);
+        this(ctx, player, playerName, customerPlayerData, customerVideoData, true);
+    }
+
+    public MuxStatsExoPlayer(Context ctx, ExoPlayer player, String playerName, CustomerPlayerData customerPlayerData, CustomerVideoData customerVideoData, boolean sentryEnabled) {
+        super(ctx, player, playerName, customerPlayerData, customerVideoData, sentryEnabled);
         player.addListener(this);
     }
 

diff --git a/MuxExoPlayer/src/r2_2_0/java/com/mux/stats/sdk/muxstats/MuxStatsExoPlayer.java b/MuxExoPlayer/src/r2_2_0/java/com/mux/stats/sdk/muxstats/MuxStatsExoPlayer.java
@@ -39,7 +39,11 @@ public class MuxStatsExoPlayer extends MuxBaseExoPlayer implements ExoPlayer.Eve
     private WeakReference<MetadataRenderer.Output> metaDataListener;
 
     public MuxStatsExoPlayer(Context ctx, ExoPlayer player, String playerName, CustomerPlayerData customerPlayerData, CustomerVideoData customerVideoData) {
-        super(ctx, player, playerName, customerPlayerData, customerVideoData);
+        this(ctx, player, playerName, customerPlayerData, customerVideoData, true);
+    }
+
+    public MuxStatsExoPlayer(Context ctx, ExoPlayer player, String playerName, CustomerPlayerData customerPlayerData, CustomerVideoData customerVideoData, boolean sentryEnabled) {
+        super(ctx, player, playerName, customerPlayerData, customerVideoData, sentryEnabled);
         player.addListener(this);
     }
 

diff --git a/MuxExoPlayer/src/r2_3_1/java/com/mux/stats/sdk/muxstats/MuxStatsExoPlayer.java b/MuxExoPlayer/src/r2_3_1/java/com/mux/stats/sdk/muxstats/MuxStatsExoPlayer.java
@@ -39,7 +39,11 @@ public class MuxStatsExoPlayer extends MuxBaseExoPlayer implements ExoPlayer.Eve
     private WeakReference<MetadataRenderer.Output> metaDataListener;
 
     public MuxStatsExoPlayer(Context ctx, ExoPlayer player, String playerName, CustomerPlayerData customerPlayerData, CustomerVideoData customerVideoData) {
-        super(ctx, player, playerName, customerPlayerData, customerVideoData);
+        this(ctx, player, playerName, customerPlayerData, customerVideoData, true);
+    }
+
+    public MuxStatsExoPlayer(Context ctx, ExoPlayer player, String playerName, CustomerPlayerData customerPlayerData, CustomerVideoData customerVideoData, boolean sentryEnabled) {
+        super(ctx, player, playerName, customerPlayerData, customerVideoData, sentryEnabled);
         player.addListener(this);
     }
 

diff --git a/MuxExoPlayer/src/r2_4_1/java/com/mux/stats/sdk/muxstats/MuxStatsExoPlayer.java b/MuxExoPlayer/src/r2_4_1/java/com/mux/stats/sdk/muxstats/MuxStatsExoPlayer.java
@@ -40,7 +40,11 @@ public class MuxStatsExoPlayer extends MuxBaseExoPlayer implements ExoPlayer.Eve
     private WeakReference<MetadataRenderer.Output> metaDataListener;
 
     public MuxStatsExoPlayer(Context ctx, ExoPlayer player, String playerName, CustomerPlayerData customerPlayerData, CustomerVideoData customerVideoData) {
-        super(ctx, player, playerName, customerPlayerData, customerVideoData);
+        this(ctx, player, playerName, customerPlayerData, customerVideoData, true);
+    }
+
+    public MuxStatsExoPlayer(Context ctx, ExoPlayer player, String playerName, CustomerPlayerData customerPlayerData, CustomerVideoData customerVideoData, boolean sentryEnabled) {
+        super(ctx, player, playerName, customerPlayerData, customerVideoData, sentryEnabled);
         player.addListener(this);
     }
 

diff --git a/MuxExoPlayer/src/r2_5_1/java/com/mux/stats/sdk/muxstats/MuxStatsExoPlayer.java b/MuxExoPlayer/src/r2_5_1/java/com/mux/stats/sdk/muxstats/MuxStatsExoPlayer.java
@@ -40,7 +40,11 @@ public class MuxStatsExoPlayer extends MuxBaseExoPlayer implements ExoPlayer.Eve
     private WeakReference<MetadataRenderer.Output> metaDataListener;
 
     public MuxStatsExoPlayer(Context ctx, ExoPlayer player, String playerName, CustomerPlayerData customerPlayerData, CustomerVideoData customerVideoData) {
-        super(ctx, player, playerName, customerPlayerData, customerVideoData);
+        this(ctx, player, playerName, customerPlayerData, customerVideoData, true);
+    }
+
+    public MuxStatsExoPlayer(Context ctx, ExoPlayer player, String playerName, CustomerPlayerData customerPlayerData, CustomerVideoData customerVideoData, boolean sentryEnabled) {
+        super(ctx, player, playerName, customerPlayerData, customerVideoData, sentryEnabled);
         player.addListener(this);
     }
 

diff --git a/MuxExoPlayer/src/r2_6_0/java/com/mux/stats/sdk/muxstats/MuxStatsExoPlayer.java b/MuxExoPlayer/src/r2_6_0/java/com/mux/stats/sdk/muxstats/MuxStatsExoPlayer.java
@@ -41,7 +41,11 @@ public class MuxStatsExoPlayer extends MuxBaseExoPlayer implements Player.EventL
     private WeakReference<MetadataOutput> metaDataListener;
 
     public MuxStatsExoPlayer(Context ctx, ExoPlayer player, String playerName, CustomerPlayerData customerPlayerData, CustomerVideoData customerVideoData) {
-        super(ctx, player, playerName, customerPlayerData, customerVideoData);
+        this(ctx, player, playerName, customerPlayerData, customerVideoData, true);
+    }
+
+    public MuxStatsExoPlayer(Context ctx, ExoPlayer player, String playerName, CustomerPlayerData customerPlayerData, CustomerVideoData customerVideoData, boolean sentryEnabled) {
+        super(ctx, player, playerName, customerPlayerData, customerVideoData, sentryEnabled);
         player.addListener(this);
     }
 

diff --git a/MuxExoPlayer/src/r2_7_3/java/com/mux/stats/sdk/muxstats/MuxStatsExoPlayer.java b/MuxExoPlayer/src/r2_7_3/java/com/mux/stats/sdk/muxstats/MuxStatsExoPlayer.java
@@ -38,7 +38,11 @@ public class MuxStatsExoPlayer extends MuxBaseExoPlayer implements Player.EventL
     private WeakReference<MetadataOutput> metaDataListener;
 
     public MuxStatsExoPlayer(Context ctx, ExoPlayer player, String playerName, CustomerPlayerData customerPlayerData, CustomerVideoData customerVideoData) {
-        super(ctx, player, playerName, customerPlayerData, customerVideoData);
+        this(ctx, player, playerName, customerPlayerData, customerVideoData, true);
+    }
+
+    public MuxStatsExoPlayer(Context ctx, ExoPlayer player, String playerName, CustomerPlayerData customerPlayerData, CustomerVideoData customerVideoData, boolean sentryEnabled) {
+        super(ctx, player, playerName, customerPlayerData, customerVideoData, sentryEnabled);
         player.addListener(this);
     }
 

diff --git a/MuxExoPlayer/src/r2_8_0/java/com/mux/stats/sdk/muxstats/MuxStatsExoPlayer.java b/MuxExoPlayer/src/r2_8_0/java/com/mux/stats/sdk/muxstats/MuxStatsExoPlayer.java
@@ -28,7 +28,11 @@
 public class MuxStatsExoPlayer extends MuxBaseExoPlayer implements AnalyticsListener, Player.EventListener{
 
     public MuxStatsExoPlayer(Context ctx, ExoPlayer player, String playerName, CustomerPlayerData customerPlayerData, CustomerVideoData customerVideoData) {
-        super(ctx, player, playerName, customerPlayerData, customerVideoData);
+        this(ctx, player, playerName, customerPlayerData, customerVideoData, true);
+    }
+
+    public MuxStatsExoPlayer(Context ctx, ExoPlayer player, String playerName, CustomerPlayerData customerPlayerData, CustomerVideoData customerVideoData, boolean sentryEnabled) {
+        super(ctx, player, playerName, customerPlayerData, customerVideoData, sentryEnabled);
 
         if (player instanceof SimpleExoPlayer) {
             ((SimpleExoPlayer) player).addAnalyticsListener(this);

diff --git a/demo/src/r2_8_0/java/com/google/android/exoplayer2/demo/PlayerActivity.java b/demo/src/r2_8_0/java/com/google/android/exoplayer2/demo/PlayerActivity.java
@@ -401,7 +401,7 @@ private void initializePlayer() {
       customerPlayerData.setEnvironmentKey("YOUR_ENVIRONMENT_KEY");
       CustomerVideoData customerVideoData = new CustomerVideoData();
       customerVideoData.setVideoTitle(intent.getStringExtra(VIDEO_TITLE_EXTRA));
-      muxStats = new MuxStatsExoPlayer(this, player, "demo-player", customerPlayerData, customerVideoData);
+      muxStats = new MuxStatsExoPlayer(this, player, "demo-player", customerPlayerData, customerVideoData, false);
       Point size = new Point();
       getWindowManager().getDefaultDisplay().getSize(size);
       muxStats.setScreenSize(size.x, size.y);

diff --git a/demo/src/r2_8_0_ads/java/com/google/android/exoplayer2/demo/PlayerActivity.java b/demo/src/r2_8_0_ads/java/com/google/android/exoplayer2/demo/PlayerActivity.java
@@ -99,10 +99,8 @@
 import com.google.android.exoplayer2.util.Util;
 import com.mux.stats.sdk.core.model.CustomerPlayerData;
 import com.mux.stats.sdk.core.model.CustomerVideoData;
-import com.mux.stats.sdk.muxstats.AdsImaSDKListener;
 import com.mux.stats.sdk.muxstats.MuxStatsExoPlayer;
 
-import java.lang.reflect.Constructor;
 import java.net.CookieHandler;
 import java.net.CookieManager;
 import java.net.CookiePolicy;
@@ -174,7 +172,6 @@ public class PlayerActivity extends Activity
   private AdsLoader adsLoader;
   private AdsManager adsManager;
   private ImaSdkFactory sdkFactory;
-  private AdsImaSDKListener imaListener;
   // Activity lifecycle
 
   @Override
@@ -619,17 +616,13 @@ private void setupAdsMediaSource(final String adTagUri) {
     adsLoader = sdkFactory.createAdsLoader(this);
     ImaSdkSettings settings = adsLoader.getSettings();
     //settings.setAutoPlayAdBreaks(false);
-    //imaListener = muxStats.getIMASdkListener();
     muxStats.monitorImaAdsLoader(adsLoader);
     adsLoader.addAdsLoadedListener(new AdsLoader.AdsLoadedListener() {
       @Override
       public void onAdsManagerLoaded(AdsManagerLoadedEvent adsManagerLoadedEvent) {
         // Ads were successfully loaded, so get the AdsManager instance. AdsManager has
         // events for ad playback and errors.
         adsManager = adsManagerLoadedEvent.getAdsManager();
-        // Attach mux event and error event listeners.
-        //adsManager.addAdErrorListener(imaListener);
-        //adsManager.addAdEventListener(imaListener);
 
         // Attach local event and error event listeners for player/ima control.
         AdsListener listener = new AdsListener();