From cff5e2b5cd224d9245945fc2d3d6abbdc4ee6b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Spie=C3=9F?= Date: Tue, 12 Jan 2016 00:19:25 +0100 Subject: [PATCH] Rename everything to "Metrics" where appropriate We consider for example users and sessions as metrics. These metrics are a subset of telemetry. Telemetry could also include other data such as crashes, exceptions, etc. --- Classes/BITHockeyManager.h | 18 +++---- Classes/BITHockeyManager.m | 16 +++---- ...TelemetryManager.h => BITMetricsManager.h} | 2 +- ...TelemetryManager.m => BITMetricsManager.m} | 16 +++---- ...erPrivate.h => BITMetricsManagerPrivate.h} | 6 +-- Classes/BITSender.h | 2 +- Classes/BITTelemetryContext.m | 2 +- Classes/HockeySDK.h | 2 +- Classes/HockeySDKFeatureConfig.h | 2 +- Support/HockeySDK.xcodeproj/project.pbxproj | 48 +++++++++---------- ...anagerTests.m => BITMetricsManagerTests.m} | 22 ++++----- 11 files changed, 68 insertions(+), 68 deletions(-) rename Classes/{BITTelemetryManager.h => BITMetricsManager.h} (96%) rename Classes/{BITTelemetryManager.m => BITMetricsManager.m} (93%) rename Classes/{BITTelemetryManagerPrivate.h => BITMetricsManagerPrivate.h} (96%) rename Support/HockeySDKTests/{BITTelemetryManagerTests.m => BITMetricsManagerTests.m} (82%) diff --git a/Classes/BITHockeyManager.h b/Classes/BITHockeyManager.h index 97494c4e7e..dc6229eef0 100644 --- a/Classes/BITHockeyManager.h +++ b/Classes/BITHockeyManager.h @@ -52,7 +52,7 @@ @class BITAuthenticator; #endif #if HOCKEYSDK_FEATURE_METRICS -@class BITTelemetryManager; +@class BITMetricsManager; #endif /** @@ -376,26 +376,26 @@ #if HOCKEYSDK_FEATURE_METRICS /** - Reference to the initialized BITTelemetryManager module + Reference to the initialized BITMetricsManager module - Returns the BITTelemetryManager instance initialized by BITHockeyManager + Returns the BITMetricsManager instance initialized by BITHockeyManager */ -@property (nonatomic, strong, readonly) BITTelemetryManager *telemetryManager; +@property (nonatomic, strong, readonly) BITMetricsManager *metricsManager; /** - Flag the determines whether the Telemetry Manager should be disabled + Flag the determines whether the BITMetricsManager should be disabled - If this flag is enabled, then sending telemetry data such as sessions and users + If this flag is enabled, then sending metrics data such as sessions and users will be turned off! - Please note that the Telemetry Manager instance will be initialized anyway! + Please note that the BITMetricsManager instance will be initialized anyway! @warning This property needs to be set before calling `startManager` *Default*: _NO_ - @see telemetryManager + @see metricsManager */ -@property (nonatomic, getter = isTelemetryManagerDisabled) BOOL disableTelemetryManager; +@property (nonatomic, getter = isMetricsManagerDisabled) BOOL disableMetricsManager; #endif diff --git a/Classes/BITHockeyManager.m b/Classes/BITHockeyManager.m index ba1f070a96..742287cb85 100644 --- a/Classes/BITHockeyManager.m +++ b/Classes/BITHockeyManager.m @@ -74,7 +74,7 @@ bitstadium_info_t bitstadium_library_info __attribute__((section("__TEXT,__bit_h #endif /* HOCKEYSDK_FEATURE_AUTHENTICATOR */ #if HOCKEYSDK_FEATURE_METRICS -#import "BITTelemetryManagerPrivate.h" +#import "BITMetricsManagerPrivate.h" #import "BITCategoryContainer.h" #endif /* HOCKEYSDK_FEATURE_METRICS */ @@ -151,7 +151,7 @@ bitstadium_info_t bitstadium_library_info __attribute__((section("__TEXT,__bit_h _disableCrashManager = NO; #endif #if HOCKEYSDK_FEATURE_METRICS - _disableTelemetryManager = NO; + _disableMetricsManager = NO; #endif #if HOCKEYSDK_FEATURE_FEEDBACK _disableFeedbackManager = NO; @@ -321,10 +321,10 @@ bitstadium_info_t bitstadium_library_info __attribute__((section("__TEXT,__bit_h #endif /* HOCKEYSDK_FEATURE_UPDATES */ #if HOCKEYSDK_FEATURE_METRICS - // start TelemetryManager - if (!self.isTelemetryManagerDisabled) { - BITHockeyLog(@"INFO: Start Telemetry Manager"); - [_telemetryManager startManager]; + // start MetricsManager + if (!self.disableMetricsManager) { + BITHockeyLog(@"INFO: Start MetricsManager"); + [_metricsManager startManager]; [BITCategoryContainer activateCategory]; } #endif /* HOCKEYSDK_FEATURE_METRICS */ @@ -699,9 +699,9 @@ bitstadium_info_t bitstadium_library_info __attribute__((section("__TEXT,__bit_h #endif /* HOCKEYSDK_FEATURE_AUTHENTICATOR */ #if HOCKEYSDK_FEATURE_METRICS - BITHockeyLog(@"INFO: Setup TelemetryManager"); + BITHockeyLog(@"INFO: Setup MetricsManager"); NSString *iKey = bit_appIdentifierToGuid(_appIdentifier); - _telemetryManager = [[BITTelemetryManager alloc] initWithAppIdentifier:iKey appEnvironment:_appEnvironment]; + _metricsManager = [[BITMetricsManager alloc] initWithAppIdentifier:iKey appEnvironment:_appEnvironment]; #endif /* HOCKEYSDK_FEATURE_METRICS */ if (self.appEnvironment != BITEnvironmentAppStore) { diff --git a/Classes/BITTelemetryManager.h b/Classes/BITMetricsManager.h similarity index 96% rename from Classes/BITTelemetryManager.h rename to Classes/BITMetricsManager.h index a9b627e1ba..9f6acdb4a3 100644 --- a/Classes/BITTelemetryManager.h +++ b/Classes/BITMetricsManager.h @@ -28,6 +28,6 @@ #import #import "BITHockeyBaseManager.h" -@interface BITTelemetryManager : BITHockeyBaseManager +@interface BITMetricsManager : BITHockeyBaseManager @end diff --git a/Classes/BITTelemetryManager.m b/Classes/BITMetricsManager.m similarity index 93% rename from Classes/BITTelemetryManager.m rename to Classes/BITMetricsManager.m index 3db3836e03..48ae3065dc 100644 --- a/Classes/BITTelemetryManager.m +++ b/Classes/BITMetricsManager.m @@ -2,9 +2,9 @@ #if HOCKEYSDK_FEATURE_METRICS -#import "BITTelemetryManager.h" +#import "BITMetricsManager.h" #import "BITTelemetryContext.h" -#import "BITTelemetryManagerPrivate.h" +#import "BITMetricsManagerPrivate.h" #import "BITHockeyHelper.h" #import "HockeySDKPrivate.h" #import "BITChannel.h" @@ -15,16 +15,16 @@ #import "BITHockeyBaseManagerPrivate.h" #import "BITSender.h" -static char *const kBITTelemetryEventQueue = +static char *const kBITMetricsEventQueue = "net.hockeyapp.telemetryEventQueue"; NSString *const kBITSessionFileType = @"plist"; NSString *const kBITApplicationDidEnterBackgroundTime = @"BITApplicationDidEnterBackgroundTime"; NSString *const kBITApplicationWasLaunched = @"BITApplicationWasLaunched"; -NSString *const BITTelemetryEndpoint = @"https://gate.hockeyapp.net/v2/track"; +NSString *const BITMetricsEndpoint = @"https://gate.hockeyapp.net/v2/track"; -@implementation BITTelemetryManager { +@implementation BITMetricsManager { id _appWillEnterForegroundObserver; id _appDidEnterBackgroundObserver; } @@ -38,7 +38,7 @@ NSString *const BITTelemetryEndpoint = @"https://gate.hockeyapp.net/v2/track"; - (instancetype)init { if((self = [super init])) { - _telemetryEventQueue = dispatch_queue_create(kBITTelemetryEventQueue, DISPATCH_QUEUE_CONCURRENT); + _metricsEventQueue = dispatch_queue_create(kBITMetricsEventQueue, DISPATCH_QUEUE_CONCURRENT); _appBackgroundTimeBeforeSessionExpires = 20; } self.serverURL = nil; @@ -57,7 +57,7 @@ NSString *const BITTelemetryEndpoint = @"https://gate.hockeyapp.net/v2/track"; - (void)startManager { if(!self.serverURL){ - self.serverURL = BITTelemetryEndpoint; + self.serverURL = BITMetricsEndpoint; } _sender = [[BITSender alloc] initWithPersistence:self.persistence serverURL:[NSURL URLWithString:self.serverURL]]; [_sender sendSavedDataAsync]; @@ -106,7 +106,7 @@ NSString *const BITTelemetryEndpoint = @"https://gate.hockeyapp.net/v2/track"; - (void)startNewSessionIfNeeded { if(self.appBackgroundTimeBeforeSessionExpires == 0) { __weak typeof(self) weakSelf = self; - dispatch_async(_telemetryEventQueue, ^{ + dispatch_async(_metricsEventQueue, ^{ typeof(self) strongSelf = weakSelf; [strongSelf startNewSessionWithId:bit_UUID()]; }); diff --git a/Classes/BITTelemetryManagerPrivate.h b/Classes/BITMetricsManagerPrivate.h similarity index 96% rename from Classes/BITTelemetryManagerPrivate.h rename to Classes/BITMetricsManagerPrivate.h index b2bb01cb7c..d2676dfc83 100644 --- a/Classes/BITTelemetryManagerPrivate.h +++ b/Classes/BITMetricsManagerPrivate.h @@ -38,10 +38,10 @@ @class BITPersistence; @class BITSender; -@interface BITTelemetryManager () +@interface BITMetricsManager () /** - * Create a new telemetry manager instance by passing the channel, the telemetry context, and persistence instance to use + * Create a new BITMetricsManager instance by passing the channel, the telemetry context, and persistence instance to use for processing metrics. This method can be used for dependency injection. */ - (instancetype)initWithChannel:(BITChannel *)channel @@ -72,7 +72,7 @@ /** * A concurrent queue which creates and processes telemetry items. */ -@property (nonatomic, strong, readonly)dispatch_queue_t telemetryEventQueue; +@property (nonatomic, strong, readonly)dispatch_queue_t metricsEventQueue; /** * Sender instance to send out telemetry data. diff --git a/Classes/BITSender.h b/Classes/BITSender.h index 35580c2ded..788a50fc50 100644 --- a/Classes/BITSender.h +++ b/Classes/BITSender.h @@ -79,7 +79,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)sendData:(NSData *)data withFilePath:(NSString * )filePath; /** - * Triggers sending the saved data on a background thread. Does nothing if nothing has been persisted, yet. This method should be called by BITTelemetryManager on app start. + * Triggers sending the saved data on a background thread. Does nothing if nothing has been persisted, yet. This method should be called on app start. */ - (void)sendSavedDataAsync; diff --git a/Classes/BITTelemetryContext.m b/Classes/BITTelemetryContext.m index 3213718faf..364a2d3853 100644 --- a/Classes/BITTelemetryContext.m +++ b/Classes/BITTelemetryContext.m @@ -3,7 +3,7 @@ #if HOCKEYSDK_FEATURE_METRICS -#import "BITTelemetryManagerPrivate.h" +#import "BITMetricsManagerPrivate.h" #import "BITHockeyHelper.h" #import "BITOrderedDictionary.h" #import "BITPersistence.h" diff --git a/Classes/HockeySDK.h b/Classes/HockeySDK.h index 4cdb423706..3224b29d27 100644 --- a/Classes/HockeySDK.h +++ b/Classes/HockeySDK.h @@ -79,7 +79,7 @@ #endif /* HOCKEYSDK_FEATURE_AUTHENTICATOR */ #if HOCKEYSDK_FEATURE_METRICS -#import "BITTelemetryManager.h" +#import "BITMetricsManager.h" #endif /* HOCKEYSDK_FEATURE_METRICS */ // Notification message which HockeyManager is listening to, to retry requesting updated from the server. diff --git a/Classes/HockeySDKFeatureConfig.h b/Classes/HockeySDKFeatureConfig.h index a403ca2f5b..3ebc72891e 100644 --- a/Classes/HockeySDKFeatureConfig.h +++ b/Classes/HockeySDKFeatureConfig.h @@ -80,7 +80,7 @@ #endif /* HOCKEYSDK_FEATURE_UPDATES */ /** - * If true, include support for auto collecting telemetry data such as sessions and user + * If true, include support for auto collecting metrics data such as sessions and user * * _Default_: Enabled */ diff --git a/Support/HockeySDK.xcodeproj/project.pbxproj b/Support/HockeySDK.xcodeproj/project.pbxproj index 182fc21066..c89bef1950 100644 --- a/Support/HockeySDK.xcodeproj/project.pbxproj +++ b/Support/HockeySDK.xcodeproj/project.pbxproj @@ -270,12 +270,12 @@ 8034E62C1BA31AD600D83A30 /* BITTelemetryData.h in Headers */ = {isa = PBXBuildFile; fileRef = 8034E6201BA31AD500D83A30 /* BITTelemetryData.h */; }; 8034E62D1BA31AD600D83A30 /* BITTelemetryData.m in Sources */ = {isa = PBXBuildFile; fileRef = 8034E6211BA31AD500D83A30 /* BITTelemetryData.m */; }; 8034E62E1BA31AD600D83A30 /* BITTelemetryData.m in Sources */ = {isa = PBXBuildFile; fileRef = 8034E6211BA31AD500D83A30 /* BITTelemetryData.m */; }; - 8034E62F1BA31AD600D83A30 /* BITTelemetryManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 8034E6221BA31AD500D83A30 /* BITTelemetryManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 8034E6301BA31AD600D83A30 /* BITTelemetryManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 8034E6221BA31AD500D83A30 /* BITTelemetryManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 8034E6311BA31AD600D83A30 /* BITTelemetryManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8034E6231BA31AD500D83A30 /* BITTelemetryManager.m */; }; - 8034E6321BA31AD600D83A30 /* BITTelemetryManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8034E6231BA31AD500D83A30 /* BITTelemetryManager.m */; }; - 8034E6331BA31AD600D83A30 /* BITTelemetryManagerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 8034E6241BA31AD500D83A30 /* BITTelemetryManagerPrivate.h */; }; - 8034E6341BA31AD600D83A30 /* BITTelemetryManagerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 8034E6241BA31AD500D83A30 /* BITTelemetryManagerPrivate.h */; }; + 8034E62F1BA31AD600D83A30 /* BITMetricsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 8034E6221BA31AD500D83A30 /* BITMetricsManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 8034E6301BA31AD600D83A30 /* BITMetricsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 8034E6221BA31AD500D83A30 /* BITMetricsManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 8034E6311BA31AD600D83A30 /* BITMetricsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8034E6231BA31AD500D83A30 /* BITMetricsManager.m */; }; + 8034E6321BA31AD600D83A30 /* BITMetricsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8034E6231BA31AD500D83A30 /* BITMetricsManager.m */; }; + 8034E6331BA31AD600D83A30 /* BITMetricsManagerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 8034E6241BA31AD500D83A30 /* BITMetricsManagerPrivate.h */; }; + 8034E6341BA31AD600D83A30 /* BITMetricsManagerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 8034E6241BA31AD500D83A30 /* BITMetricsManagerPrivate.h */; }; 8034E6351BA31AD600D83A30 /* BITTelemetryObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 8034E6251BA31AD500D83A30 /* BITTelemetryObject.h */; }; 8034E6361BA31AD600D83A30 /* BITTelemetryObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 8034E6251BA31AD500D83A30 /* BITTelemetryObject.h */; }; 8034E6371BA31AD600D83A30 /* BITTelemetryObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 8034E6261BA31AD500D83A30 /* BITTelemetryObject.m */; }; @@ -369,8 +369,8 @@ 8034E6DB1BA3567B00D83A30 /* BITSessionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8034E6BD1BA3567B00D83A30 /* BITSessionTests.m */; }; 8034E6DE1BA3567B00D83A30 /* BITTelemetryContextTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8034E6BF1BA3567B00D83A30 /* BITTelemetryContextTests.m */; }; 8034E6DF1BA3567B00D83A30 /* BITTelemetryContextTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8034E6BF1BA3567B00D83A30 /* BITTelemetryContextTests.m */; }; - 8034E6E01BA3567B00D83A30 /* BITTelemetryManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8034E6C01BA3567B00D83A30 /* BITTelemetryManagerTests.m */; }; - 8034E6E11BA3567B00D83A30 /* BITTelemetryManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8034E6C01BA3567B00D83A30 /* BITTelemetryManagerTests.m */; }; + 8034E6E01BA3567B00D83A30 /* BITMetricsManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8034E6C01BA3567B00D83A30 /* BITMetricsManagerTests.m */; }; + 8034E6E11BA3567B00D83A30 /* BITMetricsManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8034E6C01BA3567B00D83A30 /* BITMetricsManagerTests.m */; }; 8034E6E21BA3567B00D83A30 /* BITTestsDependencyInjection.m in Sources */ = {isa = PBXBuildFile; fileRef = 8034E6C21BA3567B00D83A30 /* BITTestsDependencyInjection.m */; }; 8034E6E31BA3567B00D83A30 /* BITTestsDependencyInjection.m in Sources */ = {isa = PBXBuildFile; fileRef = 8034E6C21BA3567B00D83A30 /* BITTestsDependencyInjection.m */; }; 8034E6E41BA3567B00D83A30 /* BITUserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8034E6C31BA3567B00D83A30 /* BITUserTests.m */; }; @@ -624,9 +624,9 @@ 8034E61F1BA31AD500D83A30 /* BITTelemetryContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITTelemetryContext.m; sourceTree = ""; }; 8034E6201BA31AD500D83A30 /* BITTelemetryData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITTelemetryData.h; sourceTree = ""; }; 8034E6211BA31AD500D83A30 /* BITTelemetryData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITTelemetryData.m; sourceTree = ""; }; - 8034E6221BA31AD500D83A30 /* BITTelemetryManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITTelemetryManager.h; sourceTree = ""; }; - 8034E6231BA31AD500D83A30 /* BITTelemetryManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITTelemetryManager.m; sourceTree = ""; }; - 8034E6241BA31AD500D83A30 /* BITTelemetryManagerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITTelemetryManagerPrivate.h; sourceTree = ""; }; + 8034E6221BA31AD500D83A30 /* BITMetricsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITMetricsManager.h; sourceTree = ""; }; + 8034E6231BA31AD500D83A30 /* BITMetricsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITMetricsManager.m; sourceTree = ""; }; + 8034E6241BA31AD500D83A30 /* BITMetricsManagerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITMetricsManagerPrivate.h; sourceTree = ""; }; 8034E6251BA31AD500D83A30 /* BITTelemetryObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITTelemetryObject.h; sourceTree = ""; }; 8034E6261BA31AD500D83A30 /* BITTelemetryObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITTelemetryObject.m; sourceTree = ""; }; 8034E63F1BA31AEF00D83A30 /* BITSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITSender.h; sourceTree = ""; }; @@ -677,7 +677,7 @@ 8034E6BD1BA3567B00D83A30 /* BITSessionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITSessionTests.m; sourceTree = ""; }; 8034E6BE1BA3567B00D83A30 /* BITStoreUpdateManagerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITStoreUpdateManagerTests.m; sourceTree = ""; }; 8034E6BF1BA3567B00D83A30 /* BITTelemetryContextTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITTelemetryContextTests.m; sourceTree = ""; }; - 8034E6C01BA3567B00D83A30 /* BITTelemetryManagerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITTelemetryManagerTests.m; sourceTree = ""; }; + 8034E6C01BA3567B00D83A30 /* BITMetricsManagerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITMetricsManagerTests.m; sourceTree = ""; }; 8034E6C11BA3567B00D83A30 /* BITTestsDependencyInjection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITTestsDependencyInjection.h; sourceTree = ""; }; 8034E6C21BA3567B00D83A30 /* BITTestsDependencyInjection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITTestsDependencyInjection.m; sourceTree = ""; }; 8034E6C31BA3567B00D83A30 /* BITUserTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITUserTests.m; sourceTree = ""; }; @@ -863,7 +863,7 @@ 8034E6BD1BA3567B00D83A30 /* BITSessionTests.m */, 1E5A459D16F0DFC200B55C04 /* BITStoreUpdateManagerTests.m */, 8034E6BF1BA3567B00D83A30 /* BITTelemetryContextTests.m */, - 8034E6C01BA3567B00D83A30 /* BITTelemetryManagerTests.m */, + 8034E6C01BA3567B00D83A30 /* BITMetricsManagerTests.m */, 8034E6C11BA3567B00D83A30 /* BITTestsDependencyInjection.h */, 8034E6C21BA3567B00D83A30 /* BITTestsDependencyInjection.m */, 8034E6C31BA3567B00D83A30 /* BITUserTests.m */, @@ -1097,9 +1097,9 @@ 8034E61F1BA31AD500D83A30 /* BITTelemetryContext.m */, 8034E6201BA31AD500D83A30 /* BITTelemetryData.h */, 8034E6211BA31AD500D83A30 /* BITTelemetryData.m */, - 8034E6221BA31AD500D83A30 /* BITTelemetryManager.h */, - 8034E6231BA31AD500D83A30 /* BITTelemetryManager.m */, - 8034E6241BA31AD500D83A30 /* BITTelemetryManagerPrivate.h */, + 8034E6221BA31AD500D83A30 /* BITMetricsManager.h */, + 8034E6231BA31AD500D83A30 /* BITMetricsManager.m */, + 8034E6241BA31AD500D83A30 /* BITMetricsManagerPrivate.h */, ); name = Telemetry; sourceTree = ""; @@ -1335,8 +1335,8 @@ 1E49A4D8161222D400463151 /* HockeySDKPrivate.h in Headers */, 8034E6271BA31AD600D83A30 /* BITTelemetryContext.h in Headers */, 1E754E601621FBB70070AB92 /* BITCrashReportTextFormatter.h in Headers */, - 8034E62F1BA31AD600D83A30 /* BITTelemetryManager.h in Headers */, - 8034E6331BA31AD600D83A30 /* BITTelemetryManagerPrivate.h in Headers */, + 8034E62F1BA31AD600D83A30 /* BITMetricsManager.h in Headers */, + 8034E6331BA31AD600D83A30 /* BITMetricsManagerPrivate.h in Headers */, 8034E6691BA31D7C00D83A30 /* BITApplication.h in Headers */, 1E84DB3417E099BA00AC83FD /* HockeySDKFeatureConfig.h in Headers */, 1EACC97B162F041E007578C5 /* BITAttributedLabel.h in Headers */, @@ -1418,8 +1418,8 @@ 1EB6179E1B0A317C0035A986 /* BITFeedbackActivity.h in Headers */, 8034E6281BA31AD600D83A30 /* BITTelemetryContext.h in Headers */, 1EB617981B0A315F0035A986 /* BITFeedbackMessage.h in Headers */, - 8034E6301BA31AD600D83A30 /* BITTelemetryManager.h in Headers */, - 8034E6341BA31AD600D83A30 /* BITTelemetryManagerPrivate.h in Headers */, + 8034E6301BA31AD600D83A30 /* BITMetricsManager.h in Headers */, + 8034E6341BA31AD600D83A30 /* BITMetricsManagerPrivate.h in Headers */, 8034E66A1BA31D7C00D83A30 /* BITApplication.h in Headers */, 1EB617A91B0A31AB0035A986 /* BITStoreUpdateManager.h in Headers */, 1EB617AB1B0A31B40035A986 /* BITStoreUpdateManagerDelegate.h in Headers */, @@ -1739,7 +1739,7 @@ 8034E6A71BA3217400D83A30 /* BITSessionStateData.m in Sources */, 1E49A4B2161222B900463151 /* BITHockeyBaseManager.m in Sources */, 973EC8C018BE2B5B00DBFFBB /* BITBlurImageAnnotation.m in Sources */, - 8034E6311BA31AD600D83A30 /* BITTelemetryManager.m in Sources */, + 8034E6311BA31AD600D83A30 /* BITMetricsManager.m in Sources */, 9760F6D018BB685600959B93 /* BITImageAnnotation.m in Sources */, 1E49A4BB161222B900463151 /* BITHockeyBaseViewController.m in Sources */, 97F0FA0518B2294D00EF50AA /* BITFeedbackMessageAttachment.m in Sources */, @@ -1792,7 +1792,7 @@ 8034E6E41BA3567B00D83A30 /* BITUserTests.m in Sources */, 8034E6D81BA3567B00D83A30 /* BITSenderTests.m in Sources */, 1E70A23617F31B82001BB32D /* BITHockeyHelperTests.m in Sources */, - 8034E6E01BA3567B00D83A30 /* BITTelemetryManagerTests.m in Sources */, + 8034E6E01BA3567B00D83A30 /* BITMetricsManagerTests.m in Sources */, 8034E6E21BA3567B00D83A30 /* BITTestsDependencyInjection.m in Sources */, 8034E6D41BA3567B00D83A30 /* BITPersistenceTests.m in Sources */, E48A3DEF17B3EFF100924C3D /* BITAuthenticatorTests.m in Sources */, @@ -1842,7 +1842,7 @@ 1EB617721B0A30E40035A986 /* BITAuthenticationViewController.m in Sources */, 1EB617851B0A313A0035A986 /* BITRectangleImageAnnotation.m in Sources */, 1EB6177E1B0A31200035A986 /* BITCrashAttachment.m in Sources */, - 8034E6321BA31AD600D83A30 /* BITTelemetryManager.m in Sources */, + 8034E6321BA31AD600D83A30 /* BITMetricsManager.m in Sources */, 1EB6176E1B0A30CF0035A986 /* BITWebTableViewCell.m in Sources */, 1EB6178F1B0A31510035A986 /* BITFeedbackManager.m in Sources */, 1EB6178B1B0A31510035A986 /* BITFeedbackUserDataViewController.m in Sources */, @@ -1888,7 +1888,7 @@ 8034E6E51BA3567B00D83A30 /* BITUserTests.m in Sources */, 8034E6D91BA3567B00D83A30 /* BITSenderTests.m in Sources */, 1EB617B01B0A31D30035A986 /* BITStoreUpdateManagerTests.m in Sources */, - 8034E6E11BA3567B00D83A30 /* BITTelemetryManagerTests.m in Sources */, + 8034E6E11BA3567B00D83A30 /* BITMetricsManagerTests.m in Sources */, 8034E6E31BA3567B00D83A30 /* BITTestsDependencyInjection.m in Sources */, 8034E6D51BA3567B00D83A30 /* BITPersistenceTests.m in Sources */, 1EB617B41B0A31D30035A986 /* BITHockeyAppClientTests.m in Sources */, diff --git a/Support/HockeySDKTests/BITTelemetryManagerTests.m b/Support/HockeySDKTests/BITMetricsManagerTests.m similarity index 82% rename from Support/HockeySDKTests/BITTelemetryManagerTests.m rename to Support/HockeySDKTests/BITMetricsManagerTests.m index bc48a83a41..2a10389336 100644 --- a/Support/HockeySDKTests/BITTelemetryManagerTests.m +++ b/Support/HockeySDKTests/BITMetricsManagerTests.m @@ -1,7 +1,7 @@ #import #import #import "BITTestsDependencyInjection.h" -#import "BITTelemetryManagerPrivate.h" +#import "BITMetricsManagerPrivate.h" #import "BITHockeyBaseManagerPrivate.h" #import "BITSession.h" #import "BITChannel.h" @@ -14,13 +14,13 @@ #define MOCKITO_SHORTHAND #import -@interface BITTelemetryManagerTests : BITTestsDependencyInjection +@interface BITMetricsManagerTests : BITTestsDependencyInjection -@property (strong) BITTelemetryManager *sut; +@property (strong) BITMetricsManager *sut; @end -@implementation BITTelemetryManagerTests +@implementation BITMetricsManagerTests - (void)setUp { [super setUp]; @@ -31,13 +31,13 @@ [super tearDown]; } -- (void)testTelemetryManagerGetsInstantiated { - self.sut = [BITTelemetryManager new]; +- (void)testMetricsManagerGetsInstantiated { + self.sut = [BITMetricsManager new]; XCTAssertNotNil(self.sut, @"Should not be nil."); } - (void)testDependenciesAreCreatedCorrectly { - self.sut = [BITTelemetryManager new]; + self.sut = [BITMetricsManager new]; BITPersistence *persistence = self.sut.persistence; XCTAssertNotNil(persistence); @@ -56,7 +56,7 @@ NSUserDefaults *testUserDefaults = [NSUserDefaults new]; [testUserDefaults setBool:NO forKey:kBITApplicationWasLaunched]; - self.sut = [[BITTelemetryManager alloc]initWithChannel:nil telemetryContext:nil persistence:nil userDefaults:testUserDefaults]; + self.sut = [[BITMetricsManager alloc] initWithChannel:nil telemetryContext:nil persistence:nil userDefaults:testUserDefaults]; NSString *testSessionId1 = @"12345"; NSString *testSessionId2 = @"67890"; @@ -75,7 +75,7 @@ - (void)testRegisterObserversOnStart { self.mockNotificationCenter = mock(NSNotificationCenter.class); - self.sut = [BITTelemetryManager new]; + self.sut = [BITMetricsManager new]; [self.sut startManager]; [verify((id)self.mockNotificationCenter) addObserverForName:UIApplicationDidEnterBackgroundNotification object:nil queue:NSOperationQueue.mainQueue usingBlock:(id)anything()]; @@ -85,7 +85,7 @@ - (void)testTrackSessionEnqueuesObject { BITChannel *channel = [BITChannel new]; id mockChannel = OCMPartialMock(channel); - self.sut = [[BITTelemetryManager alloc] initWithChannel:mockChannel telemetryContext:nil persistence:nil userDefaults:nil]; + self.sut = [[BITMetricsManager alloc] initWithChannel:mockChannel telemetryContext:nil persistence:nil userDefaults:nil]; OCMExpect([mockChannel enqueueTelemetryItem:[OCMArg checkWithBlock:^BOOL(NSObject *value) { @@ -101,7 +101,7 @@ NSUserDefaults *testUserDefaults = [NSUserDefaults new]; [testUserDefaults setBool:NO forKey:kBITApplicationWasLaunched]; - self.sut = [[BITTelemetryManager alloc]initWithChannel:nil telemetryContext:mockContext persistence:nil userDefaults:testUserDefaults]; + self.sut = [[BITMetricsManager alloc] initWithChannel:nil telemetryContext:mockContext persistence:nil userDefaults:testUserDefaults]; NSString *testSessionId = @"sessionId"; OCMExpect([mockContext setSessionId:testSessionId]);