Rename GDT core libraries to GDTCOR (#3808)

Author: mikehaney24

Example/CoreDiagnostics/Tests/FIRCoreDiagnosticsTest.m

@@ -21,9 +21,9 @@
 
 #import <FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsData.h>
 #import <FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsInterop.h>
-#import <GoogleDataTransport/GDTEvent.h>
-#import <GoogleDataTransport/GDTEventDataObject.h>
-#import <GoogleDataTransport/GDTTransport.h>
+#import <GoogleDataTransport/GDTCOREvent.h>
+#import <GoogleDataTransport/GDTCOREventDataObject.h>
+#import <GoogleDataTransport/GDTCORTransport.h>
 #import <GoogleDataTransportCCTSupport/GDTCCTPrioritizer.h>
 #import <GoogleUtilities/GULAppEnvironmentUtil.h>
 #import <GoogleUtilities/GULUserDefaults.h>
@@ -47,12 +47,12 @@
 @interface FIRCoreDiagnostics : NSObject
 // Initialization.
 + (instancetype)sharedInstance;
-- (instancetype)initWithTransport:(GDTTransport *)transport
+- (instancetype)initWithTransport:(GDTCORTransport *)transport
              heartbeatDateStorage:(FIRCoreDiagnosticsDateFileStorage *)heartbeatDateStorage;
 
 // Properties.
 @property(nonatomic, readonly) dispatch_queue_t diagnosticsQueue;
-@property(nonatomic, readonly) GDTTransport *transport;
+@property(nonatomic, readonly) GDTCORTransport *transport;
 @property(nonatomic, readonly) FIRCoreDiagnosticsDateFileStorage *heartbeatDateStorage;
 
 // Install string helpers.
@@ -111,7 +111,7 @@ - (instancetype)init {
 
 @end
 
-@interface FIRCoreDiagnosticsLog : NSObject <GDTEventDataObject>
+@interface FIRCoreDiagnosticsLog : NSObject <GDTCOREventDataObject>
 
 @property(nonatomic) logs_proto_mobilesdk_ios_ICoreConfiguration config;
 
@@ -136,9 +136,9 @@ @implementation FIRCoreDiagnosticsTest
 - (void)setUp {
   [super setUp];
 
-  self.mockTransport = OCMClassMock([GDTTransport class]);
+  self.mockTransport = OCMClassMock([GDTCORTransport class]);
   OCMStub([self.mockTransport eventForTransport])
-      .andReturn([[GDTEvent alloc] initWithMappingID:@"111" target:2]);
+      .andReturn([[GDTCOREvent alloc] initWithMappingID:@"111" target:2]);
 
   self.mockDateStorage = OCMClassMock([FIRCoreDiagnosticsDateFileStorage class]);
   self.diagnostics = [[FIRCoreDiagnostics alloc] initWithTransport:self.mockTransport
@@ -322,8 +322,8 @@ - (void)assertEventSentWithHeartbeat:(BOOL)isHeartbeat {
 }
 
 - (void)expectEventToBeSentToTransportWithHeartbeat:(BOOL)isHeartbeat {
-  id eventValidation = [OCMArg checkWithBlock:^BOOL(GDTEvent *obj) {
-    XCTAssert([obj isKindOfClass:[GDTEvent class]]);
+  id eventValidation = [OCMArg checkWithBlock:^BOOL(GDTCOREvent *obj) {
+    XCTAssert([obj isKindOfClass:[GDTCOREvent class]]);
     FIRCoreDiagnosticsLog *dataObject = obj.dataObject;
     XCTAssert([dataObject isKindOfClass:[FIRCoreDiagnosticsLog class]]);
 

Firebase/CoreDiagnostics/FIRCDLibrary/FIRCoreDiagnostics.m

@@ -17,10 +17,10 @@
 #import <objc/runtime.h>
 #include <sys/utsname.h>
 
-#import <GoogleDataTransport/GDTConsoleLogger.h>
-#import <GoogleDataTransport/GDTEvent.h>
-#import <GoogleDataTransport/GDTTargets.h>
-#import <GoogleDataTransport/GDTTransport.h>
+#import <GoogleDataTransport/GDTCORConsoleLogger.h>
+#import <GoogleDataTransport/GDTCOREvent.h>
+#import <GoogleDataTransport/GDTCORTargets.h>
+#import <GoogleDataTransport/GDTCORTransport.h>
 
 #import <GoogleUtilities/GULAppEnvironmentUtil.h>
 #import <GoogleUtilities/GULLogger.h>
@@ -92,7 +92,8 @@
 NSString *const kFIRCoreDiagnosticsHeartbeatDateFileName = @"FIREBASE_DIAGNOSTICS_HEARTBEAT_DATE";
 
 /**
- * @note This should implement the GDTEventDataObject protocol, but can't because of weak-linking.
+ * @note This should implement the GDTCOREventDataObject protocol, but can't because of
+ * weak-linking.
  */
 @interface FIRCoreDiagnosticsLog : NSObject
 
@@ -111,23 +112,23 @@ - (instancetype)initWithConfig:(logs_proto_mobilesdk_ios_ICoreConfiguration)conf
   return self;
 }
 
-// Provided and required by the GDTEventDataObject protocol.
+// Provided and required by the GDTCOREventDataObject protocol.
 - (NSData *)transportBytes {
   pb_ostream_t sizestream = PB_OSTREAM_SIZING;
 
   // Encode 1 time to determine the size.
   if (!pb_encode(&sizestream, logs_proto_mobilesdk_ios_ICoreConfiguration_fields, &_config)) {
-    GDTLogError(GDTMCETransportBytesError, @"Error in nanopb encoding for size: %s",
-                PB_GET_ERROR(&sizestream));
+    GDTCORLogError(GDTCORMCETransportBytesError, @"Error in nanopb encoding for size: %s",
+                   PB_GET_ERROR(&sizestream));
   }
 
   // Encode a 2nd time to actually get the bytes from it.
   size_t bufferSize = sizestream.bytes_written;
   CFMutableDataRef dataRef = CFDataCreateMutable(CFAllocatorGetDefault(), bufferSize);
   pb_ostream_t ostream = pb_ostream_from_buffer((void *)CFDataGetBytePtr(dataRef), bufferSize);
   if (!pb_encode(&ostream, logs_proto_mobilesdk_ios_ICoreConfiguration_fields, &_config)) {
-    GDTLogError(GDTMCETransportBytesError, @"Error in nanopb encoding for bytes: %s",
-                PB_GET_ERROR(&ostream));
+    GDTCORLogError(GDTCORMCETransportBytesError, @"Error in nanopb encoding for bytes: %s",
+                   PB_GET_ERROR(&ostream));
   }
   CFDataSetLength(dataRef, ostream.bytes_written);
 
@@ -149,7 +150,7 @@ @interface FIRCoreDiagnostics : NSObject <FIRCoreDiagnosticsInterop>
 @property(nonatomic, readonly) dispatch_queue_t diagnosticsQueue;
 
 /** The transport object used to send data. */
-@property(nonatomic, readonly) GDTTransport *transport;
+@property(nonatomic, readonly) GDTCORTransport *transport;
 
 /** The storage to store the date of the last sent heartbeat. */
 @property(nonatomic, readonly) FIRCoreDiagnosticsDateFileStorage *heartbeatDateStorage;
@@ -170,9 +171,9 @@ + (instancetype)sharedInstance {
 }
 
 - (instancetype)init {
-  GDTTransport *transport = [[GDTTransport alloc] initWithMappingID:@"137"
-                                                       transformers:nil
-                                                             target:kGDTTargetCCT];
+  GDTCORTransport *transport = [[GDTCORTransport alloc] initWithMappingID:@"137"
+                                                             transformers:nil
+                                                                   target:kGDTCORTargetCCT];
 
   FIRCoreDiagnosticsDateFileStorage *dateStorage = [[FIRCoreDiagnosticsDateFileStorage alloc]
       initWithFileURL:[[self class] filePathURLWithName:kFIRCoreDiagnosticsHeartbeatDateFileName]];
@@ -182,11 +183,11 @@ - (instancetype)init {
 
 /** Initializer for unit tests.
  *
- * @param transport A `GDTTransport` instance which that be used to send event.
+ * @param transport A `GDTCORTransport` instance which that be used to send event.
  * @param heartbeatDateStorage An instanse of date storage to track heartbeat sending.
  * @return Returns the initialized `FIRCoreDiagnostics` instance.
  */
-- (instancetype)initWithTransport:(GDTTransport *)transport
+- (instancetype)initWithTransport:(GDTCORTransport *)transport
              heartbeatDateStorage:(FIRCoreDiagnosticsDateFileStorage *)heartbeatDateStorage {
   self = [super init];
   if (self) {
@@ -374,7 +375,8 @@ void FIRPopulateProtoWithCommonInfoFromApp(logs_proto_mobilesdk_ios_ICoreConfigu
   config->has_pod_name = 1;
 
   if (!diagnosticObjects[kFIRCDllAppsCountKey]) {
-    GDTLogError(GDTMCEGeneralError, @"%@", @"App count is a required value in the data dict.");
+    GDTCORLogError(GDTCORMCEGeneralError, @"%@",
+                   @"App count is a required value in the data dict.");
   }
   config->app_count = (int32_t)[diagnosticObjects[kFIRCDllAppsCountKey] integerValue];
   config->has_app_count = 1;
@@ -635,8 +637,8 @@ - (void)sendDiagnosticsData:(nonnull id<FIRCoreDiagnosticsData>)diagnosticsData
     FIRCoreDiagnosticsLog *log = [[FIRCoreDiagnosticsLog alloc] initWithConfig:icore_config];
 
     // Send the log as a telemetry event.
-    GDTEvent *event = [self.transport eventForTransport];
-    event.dataObject = (id<GDTEventDataObject>)log;
+    GDTCOREvent *event = [self.transport eventForTransport];
+    event.dataObject = (id<GDTCOREventDataObject>)log;
     [self.transport sendTelemetryEvent:event];
   });
 }

GoogleDataTransport.podspec

@@ -25,9 +25,9 @@ Shared library for iOS SDK data transport needs.
   s.static_framework = true
   s.prefix_header_file = false
 
-  s.source_files = 'GoogleDataTransport/GDTLibrary/**/*'
-  s.public_header_files = 'GoogleDataTransport/GDTLibrary/Public/*.h'
-  s.private_header_files = 'GoogleDataTransport/GDTLibrary/Private/*.h'
+  s.source_files = 'GoogleDataTransport/GDTCORLibrary/**/*'
+  s.public_header_files = 'GoogleDataTransport/GDTCORLibrary/Public/*.h'
+  s.private_header_files = 'GoogleDataTransport/GDTCORLibrary/Private/*.h'
 
   header_search_paths = {
     'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}/GoogleDataTransport/"'
@@ -39,25 +39,25 @@ Shared library for iOS SDK data transport needs.
     'CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY' => 'YES'
   }.merge(header_search_paths)
 
-  common_test_sources = ['GoogleDataTransport/GDTTests/Common/**/*.{h,m}']
+  common_test_sources = ['GoogleDataTransport/GDTCORTests/Common/**/*.{h,m}']
 
   # Unit test specs
   s.test_spec 'Tests-Unit' do |test_spec|
     test_spec.requires_app_host = false
-    test_spec.source_files = ['GoogleDataTransport/GDTTests/Unit/**/*.{h,m}'] + common_test_sources
+    test_spec.source_files = ['GoogleDataTransport/GDTCORTests/Unit/**/*.{h,m}'] + common_test_sources
     test_spec.pod_target_xcconfig = header_search_paths
   end
 
   s.test_spec 'Tests-Lifecycle' do |test_spec|
     test_spec.requires_app_host = false
-    test_spec.source_files = ['GoogleDataTransport/GDTTests/Lifecycle/**/*.{h,m}'] + common_test_sources
+    test_spec.source_files = ['GoogleDataTransport/GDTCORTests/Lifecycle/**/*.{h,m}'] + common_test_sources
     test_spec.pod_target_xcconfig = header_search_paths
   end
 
   # Integration test specs
   s.test_spec 'Tests-Integration' do |test_spec|
     test_spec.requires_app_host = false
-    test_spec.source_files = ['GoogleDataTransport/GDTTests/Integration/**/*.{h,m}'] + common_test_sources
+    test_spec.source_files = ['GoogleDataTransport/GDTCORTests/Integration/**/*.{h,m}'] + common_test_sources
     test_spec.pod_target_xcconfig = header_search_paths
     test_spec.dependency 'GCDWebServer'
   end

GoogleDataTransport/CHANGELOG.md

@@ -2,15 +2,15 @@
 - Removes all NSAsserts in favor of custom asserts. (#3747)
 
 # v1.1.3
-- Wrap decoding in GDTUploadCoordinator in a try catch. (#3676)
+- Wrap decoding in GDTCORUploadCoordinator in a try catch. (#3676)
 
 # v1.1.2
 - Add initial support for iOS 13.
 - Add initial support for Catalyst.
-- Backgrounding in GDTStorage is fixed. (#3623 and #3625)
+- Backgrounding in GDTCORStorage is fixed. (#3623 and #3625)
 
 # v1.1.1
-- Fixes a crash in GDTUploadPackage and GDTStorage. (#3547)
+- Fixes a crash in GDTCORUploadPackage and GDTCORStorage. (#3547)
 
 # v1.1.0
 - Remove almost all NSAsserts and NSCAsserts for a better development

GoogleDataTransport/GDTLibrary/GDTAssert.m renamed to GoogleDataTransport/GDTCORLibrary/GDTCORAssert.m

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-#import "GDTLibrary/Public/GDTAssert.h"
+#import "GDTCORLibrary/Public/GDTCORAssert.h"
 
-GDTAssertionBlock GDTAssertionBlockToRunInstead(void) {
+GDTCORAssertionBlock GDTCORAssertionBlockToRunInstead(void) {
   // This class is only compiled in by unit tests, and this should fail quickly in optimized builds.
-  Class GDTAssertClass = NSClassFromString(@"GDTAssertHelper");
-  if (__builtin_expect(!!GDTAssertClass, 0)) {
+  Class GDTCORAssertClass = NSClassFromString(@"GDTCORAssertHelper");
+  if (__builtin_expect(!!GDTCORAssertClass, 0)) {
     SEL assertionBlockSEL = NSSelectorFromString(@"assertionBlock");
     if (assertionBlockSEL) {
-      IMP assertionBlockIMP = [GDTAssertClass methodForSelector:assertionBlockSEL];
+      IMP assertionBlockIMP = [GDTCORAssertClass methodForSelector:assertionBlockSEL];
       if (assertionBlockIMP) {
-        GDTAssertionBlock assertionBlock =
-            ((GDTAssertionBlock(*)(id, SEL))assertionBlockIMP)(GDTAssertClass, assertionBlockSEL);
+        GDTCORAssertionBlock assertionBlock = ((GDTCORAssertionBlock(*)(id, SEL))assertionBlockIMP)(
+            GDTCORAssertClass, assertionBlockSEL);
         if (assertionBlock) {
           return assertionBlock;
         }

GoogleDataTransport/GDTLibrary/GDTClock.m renamed to GoogleDataTransport/GDTCORLibrary/GDTCORClock.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "GDTLibrary/Public/GDTClock.h"
+#import "GDTCORLibrary/Public/GDTCORClock.h"
 
 #import <sys/sysctl.h>
 
@@ -74,7 +74,7 @@ static int64_t UptimeInNanoseconds() {
 }
 
 // TODO: Consider adding a 'trustedTime' property that can be populated by the response from a BE.
-@implementation GDTClock
+@implementation GDTCORClock
 
 - (instancetype)init {
   self = [super init];
@@ -90,17 +90,17 @@ - (instancetype)init {
   return self;
 }
 
-+ (GDTClock *)snapshot {
-  return [[GDTClock alloc] init];
++ (GDTCORClock *)snapshot {
+  return [[GDTCORClock alloc] init];
 }
 
 + (instancetype)clockSnapshotInTheFuture:(uint64_t)millisInTheFuture {
-  GDTClock *snapshot = [self snapshot];
+  GDTCORClock *snapshot = [self snapshot];
   snapshot->_timeMillis += millisInTheFuture;
   return snapshot;
 }
 
-- (BOOL)isAfter:(GDTClock *)otherClock {
+- (BOOL)isAfter:(GDTCORClock *)otherClock {
   // These clocks are trivially comparable when they share a kernel boot time.
   if (_kernelBootTime == otherClock->_kernelBootTime) {
     int64_t timeDiff = (_timeMillis + _timezoneOffsetSeconds) -
@@ -126,16 +126,16 @@ - (BOOL)isEqual:(id)object {
 #pragma mark - NSSecureCoding
 
 /** NSKeyedCoder key for timeMillis property. */
-static NSString *const kGDTClockTimeMillisKey = @"GDTClockTimeMillis";
+static NSString *const kGDTCORClockTimeMillisKey = @"GDTCORClockTimeMillis";
 
 /** NSKeyedCoder key for timezoneOffsetMillis property. */
-static NSString *const kGDTClockTimezoneOffsetSeconds = @"GDTClockTimezoneOffsetSeconds";
+static NSString *const kGDTCORClockTimezoneOffsetSeconds = @"GDTCORClockTimezoneOffsetSeconds";
 
 /** NSKeyedCoder key for _kernelBootTime ivar. */
-static NSString *const kGDTClockKernelBootTime = @"GDTClockKernelBootTime";
+static NSString *const kGDTCORClockKernelBootTime = @"GDTCORClockKernelBootTime";
 
 /** NSKeyedCoder key for _uptime ivar. */
-static NSString *const kGDTClockUptime = @"GDTClockUptime";
+static NSString *const kGDTCORClockUptime = @"GDTCORClockUptime";
 
 + (BOOL)supportsSecureCoding {
   return YES;
@@ -146,19 +146,19 @@ - (instancetype)initWithCoder:(NSCoder *)aDecoder {
   if (self) {
     // TODO: If the kernelBootTime is more recent, we need to change the kernel boot time and
     // uptimeMillis ivars
-    _timeMillis = [aDecoder decodeInt64ForKey:kGDTClockTimeMillisKey];
-    _timezoneOffsetSeconds = [aDecoder decodeInt64ForKey:kGDTClockTimezoneOffsetSeconds];
-    _kernelBootTime = [aDecoder decodeInt64ForKey:kGDTClockKernelBootTime];
-    _uptime = [aDecoder decodeInt64ForKey:kGDTClockUptime];
+    _timeMillis = [aDecoder decodeInt64ForKey:kGDTCORClockTimeMillisKey];
+    _timezoneOffsetSeconds = [aDecoder decodeInt64ForKey:kGDTCORClockTimezoneOffsetSeconds];
+    _kernelBootTime = [aDecoder decodeInt64ForKey:kGDTCORClockKernelBootTime];
+    _uptime = [aDecoder decodeInt64ForKey:kGDTCORClockUptime];
   }
   return self;
 }
 
 - (void)encodeWithCoder:(NSCoder *)aCoder {
-  [aCoder encodeInt64:_timeMillis forKey:kGDTClockTimeMillisKey];
-  [aCoder encodeInt64:_timezoneOffsetSeconds forKey:kGDTClockTimezoneOffsetSeconds];
-  [aCoder encodeInt64:_kernelBootTime forKey:kGDTClockKernelBootTime];
-  [aCoder encodeInt64:_uptime forKey:kGDTClockUptime];
+  [aCoder encodeInt64:_timeMillis forKey:kGDTCORClockTimeMillisKey];
+  [aCoder encodeInt64:_timezoneOffsetSeconds forKey:kGDTCORClockTimezoneOffsetSeconds];
+  [aCoder encodeInt64:_kernelBootTime forKey:kGDTCORClockKernelBootTime];
+  [aCoder encodeInt64:_uptime forKey:kGDTCORClockUptime];
 }
 
 @end

GoogleDataTransport/GDTLibrary/GDTConsoleLogger.m renamed to GoogleDataTransport/GDTCORLibrary/GDTCORConsoleLogger.m

@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-#import "GDTLibrary/Public/GDTConsoleLogger.h"
+#import "GDTCORLibrary/Public/GDTCORConsoleLogger.h"
 
 /** The console logger prefix. */
-static NSString *kGDTConsoleLogger = @"[GoogleDataTransport]";
+static NSString *kGDTCORConsoleLogger = @"[GoogleDataTransport]";
 
-NSString *GDTMessageCodeEnumToString(GDTMessageCode code) {
-  return [[NSString alloc] initWithFormat:@"I-GDT%06ld", (long)code];
+NSString *GDTCORMessageCodeEnumToString(GDTCORMessageCode code) {
+  return [[NSString alloc] initWithFormat:@"I-GDTCOR%06ld", (long)code];
 }
 
-void GDTLog(GDTMessageCode code, NSString *format, ...) {
+void GDTCORLog(GDTCORMessageCode code, NSString *format, ...) {
 // Don't log anything in not debug builds.
 #ifndef NDEBUG
-  NSString *logFormat = [NSString
-      stringWithFormat:@"%@[%@] %@", kGDTConsoleLogger, GDTMessageCodeEnumToString(code), format];
+  NSString *logFormat = [NSString stringWithFormat:@"%@[%@] %@", kGDTCORConsoleLogger,
+                                                   GDTCORMessageCodeEnumToString(code), format];
   va_list args;
   va_start(args, format);
   NSLogv(logFormat, args);