Update master with develop (#184)

Author: avinash-newrelic

NRIMATracker/NRIMATracker/Tracker/NRTrackerIMA.m

@@ -11,8 +11,8 @@
 
 @interface NRTrackerIMA ()
 
-@property (nonatomic, weak) IMAAdEvent *lastEvent;
-@property (nonatomic, weak) IMAAdsManager *adsManager;
+@property (nonatomic, strong) IMAAdEvent *lastEvent;
+@property (nonatomic, strong) IMAAdsManager *adsManager;
 @property (nonatomic) NSNumber *quartile;
 @property (nonatomic) NSNumber *skipped;
 
@@ -158,7 +158,8 @@ - (NSString *)getTitle {
 
 - (NSNumber *)getBitrate {
     if (self.lastEvent) {
-        return @(self.lastEvent.ad.VASTMediaBitrate);
+        // VASTMediaBitrate returns kbps, convert to bps for consistency with AVPlayer's averageVideoBitrate
+        return @(self.lastEvent.ad.VASTMediaBitrate * 1000);
     }
     else {
         return (NSNumber *)[NSNull null];

NewRelicVideoCore/NewRelicVideoCore/Tracker/NRVideoTracker.m

@@ -142,8 +142,11 @@ - (NSMutableDictionary *)getAttributes:(NSString *)action attributes:(NSDictiona
 
     if (self.state.isAd) {
         [attr setObject:[self getTitle] forKey:@"adTitle"];
-        [attr setObject:[self getBitrate] forKey:@"adBitrate"];
-        [attr setObject:[self getRenditionBitrate] forKey:@"adRenditionBitrate"];
+        // Only add bitrate attributes after ad has started (first frame shown)
+        if ([self.state isStarted]) {
+            [attr setObject:[self getBitrate] forKey:@"adBitrate"];
+            [attr setObject:[self getRenditionBitrate] forKey:@"adRenditionBitrate"];
+        }
         [attr setObject:[self getRenditionWidth] forKey:@"adRenditionWidth"];
         [attr setObject:[self getRenditionHeight] forKey:@"adRenditionHeight"];
         [attr setObject:[self getDuration] forKey:@"adDuration"];
@@ -178,11 +181,14 @@ - (NSMutableDictionary *)getAttributes:(NSString *)action attributes:(NSDictiona
             [attr setObject:@(self.totalAdPlaytime) forKey:@"totalAdPlaytime"];
         }
         [attr setObject:[self getTitle] forKey:@"contentTitle"];
-        [attr setObject:[self getBitrate] forKey:@"contentBitrate"];
-        if ([self respondsToSelector:@selector(getObservedBitrate)]) {
-            [attr setObject:[self getObservedBitrate] forKey:@"contentObservedBitrate"];
+        // Only add bitrate attributes after content has started (first frame shown)
+        if ([self.state isStarted]) {
+            [attr setObject:[self getBitrate] forKey:@"contentBitrate"];
+            if ([self respondsToSelector:@selector(getObservedBitrate)]) {
+                [attr setObject:[self getObservedBitrate] forKey:@"contentObservedBitrate"];
+            }
+            [attr setObject:[self getRenditionBitrate] forKey:@"contentRenditionBitrate"];
         }
-        [attr setObject:[self getRenditionBitrate] forKey:@"contentRenditionBitrate"];
         [attr setObject:[self getRenditionWidth] forKey:@"contentRenditionWidth"];
         [attr setObject:[self getRenditionHeight] forKey:@"contentRenditionHeight"];
         [attr setObject:[self getDuration] forKey:@"contentDuration"];