Move order of attribute additions to avoid custom attributes being ov…

…erwritten.

Examples/iOS/SimplePlayerWithAds/SimplePlayerWithAds/ViewController.m

@@ -83,6 +83,11 @@ - (void)playVideo:(NSString *)videoURL {
  self.trackerId = [[NewRelicVideoAgent sharedInstance] startWithContentTracker:[[NRTrackerAVPlayer alloc] initWithAVPlayer:self.playerController.player]
  adTracker:[[NRTrackerIMA alloc] init]];
 
+ NRTracker *contentTracker = [[NewRelicVideoAgent sharedInstance] contentTracker:self.trackerId];
+ [contentTracker setAttribute:@"contentTitle"
+ value:@"A title"
+ forAction:@"CONTENT_START"];
+
  [self setupAds:player];
 
  [self presentViewController:self.playerController animated:YES completion:^{

NRAVPlayerTracker.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
  s.name = 'NRAVPlayerTracker'
- s.version = '2.0.1'
+ s.version = '2.0.2'
  s.summary = 'New Relic Video Agent, AVPlayer Tracker.'
 
 # This description is used to generate tags and improve search results.

NRAVPlayerTracker/NRAVPlayerTracker/Tracker/NRTrackerAVPlayer.m

@@ -382,7 +382,7 @@ - (NSString *)getTrackerName {
 }
 
 - (NSString *)getTrackerVersion {
- return @"2.0.0";
+ return @"2.0.2";
 }
 
 - (NSString *)getPlayerVersion {

NRIMATracker.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
  s.name = 'NRIMATracker'
- s.version = '2.0.1'
+ s.version = '2.0.2'
  s.summary = 'New Relic Video Agent, Google IMA Ads Tracker.'
 
 # This description is used to generate tags and improve search results.

NRIMATracker/NRIMATracker/Tracker/NRTrackerIMA.m

@@ -76,7 +76,7 @@ - (NSString *)getTrackerName {
 }
 
 - (NSString *)getTrackerVersion {
- return @"2.0.0";
+ return @"2.0.2";
 }
 
 - (NSNumber *)getPlayhead {

NewRelicVideoCore.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
  s.name = 'NewRelicVideoCore'
- s.version = '2.0.1'
+ s.version = '2.0.2'
  s.summary = 'New Relic Video Agent, Core.'
 
 # This description is used to generate tags and improve search results.

NewRelicVideoCore/NewRelicVideoCore/Model/NREventAttributes.m

@@ -39,6 +39,10 @@ - (void)setAttribute:(NSString *)key value:(id<NSCopying>)value filter:(nullable
 - (NSMutableDictionary *)generateAttributes:(NSString *)action append:(nullable NSDictionary *)attributes {
  NSMutableDictionary *attr = @{}.mutableCopy;
 
+ if (attributes) {
+ [attr addEntriesFromDictionary:attributes];
+ }
+
  for (NSString *filter in self.attributeBuckets) {
  if ([self checkFilter:filter withAction:action]) {
  NSMutableDictionary *bucket = self.attributeBuckets[filter];
@@ -49,10 +53,6 @@ - (NSMutableDictionary *)generateAttributes:(NSString *)action append:(nullable
  }
  }
 
- if (attributes) {
- [attr addEntriesFromDictionary:attributes];
- }
-
  return attr;
 }
 

NewRelicVideoCore/NewRelicVideoCore/NRVideoDefs.h

@@ -8,7 +8,7 @@
 #ifndef NRVideoDefs_h
 #define NRVideoDefs_h
 
-#define NRVIDEO_CORE_VERSION @"2.0.1"
+#define NRVIDEO_CORE_VERSION @"2.0.2"
 
 #define NR_VIDEO_EVENT @"MobileVideo"
 

NewRelicVideoCore/NewRelicVideoCore/Tracker/NRVideoTracker.m

@@ -107,7 +107,13 @@ - (void)setHeartbeatTime:(int)seconds {
 }
 
 - (NSMutableDictionary *)getAttributes:(NSString *)action attributes:(NSDictionary *)attributes {
- NSMutableDictionary *attr = [super getAttributes:action attributes:attributes];
+ NSMutableDictionary *attr;
+
+ if (attributes) {
+ attr = attributes.mutableCopy;
+ } else {
+ attr = @{}.mutableCopy;
+ }
 
  if ([action hasSuffix:@"_BUFFER_START"] || [action hasSuffix:@"_BUFFER_END"]) {
  [attr setObject:[self getBufferType] forKey:@"bufferType"];
@@ -177,6 +183,8 @@ - (NSMutableDictionary *)getAttributes:(NSString *)action attributes:(NSDictiona
  [attr setObject:[self getVideoId] forKey:@"contentId"];
  }
 
+ attr = [super getAttributes:action attributes:attr];
+
  return attr;
 }