Skip to content

Commit cce26d3

Browse files
committed
Add logTarget as a property to GDLLogEvent and connect the logger to the writer.
1 parent caf84ed commit cce26d3

File tree

5 files changed

+16
-11
lines changed

5 files changed

+16
-11
lines changed

GoogleDataLogger/GoogleDataLogger/Classes/GDLLogEvent.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ typedef NS_ENUM(NSInteger, GDLLogQoS) {
4444
/** The log map identifier, to allow backends to map the extension property to a proto. */
4545
@property(readonly, nonatomic) NSString *logMapID;
4646

47+
/** The identifier for the backend this log will eventually be sent to. */
48+
@property(readonly, nonatomic) NSInteger logTarget;
49+
4750
/** The log object itself, encapsulated in the transport of your choice, as long as it implements
4851
* the GDLLogProto protocol. */
4952
@property(nonatomic) id<GDLLogProto> extension;
@@ -62,7 +65,8 @@ typedef NS_ENUM(NSInteger, GDLLogQoS) {
6265
* @param logMapID The log map identifier.
6366
* @return An instance of this class.
6467
*/
65-
- (instancetype)initWithLogMapID:(NSString *)logMapID NS_DESIGNATED_INITIALIZER;
68+
- (instancetype)initWithLogMapID:(NSString *)logMapID logTarget:(NSInteger)logTarget
69+
NS_DESIGNATED_INITIALIZER;
6670

6771
@end
6872

GoogleDataLogger/GoogleDataLogger/Classes/GDLLogEvent.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@
1818

1919
@implementation GDLLogEvent
2020

21-
- (instancetype)initWithLogMapID:(NSString *)logMapID {
21+
- (instancetype)initWithLogMapID:(NSString *)logMapID logTarget:(NSInteger)logTarget {
2222
NSAssert(logMapID.length > 0, @"Please give a valid log map ID");
23+
NSAssert(logTarget > 0, @"A log target cannot be negative or 0");
2324
self = [super init];
2425
if (self) {
2526
_logMapID = logMapID;
27+
_logTarget = logTarget;
2628
}
2729
return self;
2830
}

GoogleDataLogger/GoogleDataLogger/Classes/GDLLogger.m

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#import "GDLLogger.h"
1818

1919
#import "GDLLogEvent.h"
20+
#import "GDLLogWriter.h"
2021

2122
@interface GDLLogger ()
2223

@@ -49,18 +50,16 @@ - (instancetype)initWithLogMapID:(NSString *)logMapID
4950

5051
- (void)logTelemetryEvent:(GDLLogEvent *)logEvent {
5152
NSAssert(logEvent, @"You can't log a nil event");
52-
53-
// TODO(mikehaney24): Implement.
53+
[[GDLLogWriter sharedInstance] writeLog:logEvent afterApplyingTransformers:_logTransformers];
5454
}
5555

5656
- (void)logDataEvent:(GDLLogEvent *)logEvent {
5757
NSAssert(logEvent, @"You can't log a nil event");
58-
59-
// TODO(mikehaney24): Implement.
58+
[[GDLLogWriter sharedInstance] writeLog:logEvent afterApplyingTransformers:_logTransformers];
6059
}
6160

6261
- (GDLLogEvent *)newEvent {
63-
return [[GDLLogEvent alloc] initWithLogMapID:_logMapID];
62+
return [[GDLLogEvent alloc] initWithLogMapID:_logMapID logTarget:_logTarget];
6463
}
6564

6665
@end

GoogleDataLogger/Tests/GDLLogEventTest.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ @interface GDLLogEventTest : XCTestCase
2525
@implementation GDLLogEventTest
2626

2727
- (void)testInit {
28-
XCTAssertNotNil([[GDLLogEvent alloc] initWithLogMapID:@"1"]);
29-
XCTAssertThrows([[GDLLogEvent alloc] initWithLogMapID:@""]);
28+
XCTAssertNotNil([[GDLLogEvent alloc] initWithLogMapID:@"1" logTarget:1]);
29+
XCTAssertThrows([[GDLLogEvent alloc] initWithLogMapID:@"" logTarget:1]);
3030
}
3131

3232
@end

GoogleDataLogger/Tests/GDLLogWriterTest.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ - (void)testSharedInstance {
5252

5353
- (void)testWriteLogWithoutTransformers {
5454
GDLLogWriter *writer = [GDLLogWriter sharedInstance];
55-
GDLLogEvent *log = [[GDLLogEvent alloc] initWithLogMapID:@"1"];
55+
GDLLogEvent *log = [[GDLLogEvent alloc] initWithLogMapID:@"1" logTarget:1];
5656
XCTAssertNoThrow([writer writeLog:log afterApplyingTransformers:nil]);
5757
dispatch_sync(writer.logWritingQueue, ^{
5858
// TODO(mikehaney24): Assert that storage contains the log.
@@ -61,7 +61,7 @@ - (void)testWriteLogWithoutTransformers {
6161

6262
- (void)testWriteLogWithTransformersThatNilTheLog {
6363
GDLLogWriter *writer = [GDLLogWriter sharedInstance];
64-
GDLLogEvent *log = [[GDLLogEvent alloc] initWithLogMapID:@"2"];
64+
GDLLogEvent *log = [[GDLLogEvent alloc] initWithLogMapID:@"2" logTarget:1];
6565
NSArray<id<GDLLogTransformer>> *transformers =
6666
@[ [[GDLLogWriterTestNilingTransformer alloc] init] ];
6767
XCTAssertNoThrow([writer writeLog:log afterApplyingTransformers:transformers]);

0 commit comments

Comments
 (0)