File tree 5 files changed +16
-11
lines changed
5 files changed +16
-11
lines changed Original file line number Diff line number Diff line change @@ -44,6 +44,9 @@ typedef NS_ENUM(NSInteger, GDLLogQoS) {
44
44
/* * The log map identifier, to allow backends to map the extension property to a proto. */
45
45
@property (readonly , nonatomic ) NSString *logMapID;
46
46
47
+ /* * The identifier for the backend this log will eventually be sent to. */
48
+ @property (readonly , nonatomic ) NSInteger logTarget;
49
+
47
50
/* * The log object itself, encapsulated in the transport of your choice, as long as it implements
48
51
* the GDLLogProto protocol. */
49
52
@property (nonatomic ) id <GDLLogProto> extension;
@@ -62,7 +65,8 @@ typedef NS_ENUM(NSInteger, GDLLogQoS) {
62
65
* @param logMapID The log map identifier.
63
66
* @return An instance of this class.
64
67
*/
65
- - (instancetype )initWithLogMapID : (NSString *)logMapID NS_DESIGNATED_INITIALIZER;
68
+ - (instancetype )initWithLogMapID : (NSString *)logMapID logTarget : (NSInteger )logTarget
69
+ NS_DESIGNATED_INITIALIZER;
66
70
67
71
@end
68
72
Original file line number Diff line number Diff line change 18
18
19
19
@implementation GDLLogEvent
20
20
21
- - (instancetype )initWithLogMapID : (NSString *)logMapID {
21
+ - (instancetype )initWithLogMapID : (NSString *)logMapID logTarget : ( NSInteger ) logTarget {
22
22
NSAssert (logMapID.length > 0 , @" Please give a valid log map ID" );
23
+ NSAssert (logTarget > 0 , @" A log target cannot be negative or 0" );
23
24
self = [super init ];
24
25
if (self) {
25
26
_logMapID = logMapID;
27
+ _logTarget = logTarget;
26
28
}
27
29
return self;
28
30
}
Original file line number Diff line number Diff line change 17
17
#import " GDLLogger.h"
18
18
19
19
#import " GDLLogEvent.h"
20
+ #import " GDLLogWriter.h"
20
21
21
22
@interface GDLLogger ()
22
23
@@ -49,18 +50,16 @@ - (instancetype)initWithLogMapID:(NSString *)logMapID
49
50
50
51
- (void )logTelemetryEvent : (GDLLogEvent *)logEvent {
51
52
NSAssert (logEvent, @" You can't log a nil event" );
52
-
53
- // TODO(mikehaney24): Implement.
53
+ [[GDLLogWriter sharedInstance ] writeLog: logEvent afterApplyingTransformers: _logTransformers];
54
54
}
55
55
56
56
- (void )logDataEvent : (GDLLogEvent *)logEvent {
57
57
NSAssert (logEvent, @" You can't log a nil event" );
58
-
59
- // TODO(mikehaney24): Implement.
58
+ [[GDLLogWriter sharedInstance ] writeLog: logEvent afterApplyingTransformers: _logTransformers];
60
59
}
61
60
62
61
- (GDLLogEvent *)newEvent {
63
- return [[GDLLogEvent alloc ] initWithLogMapID: _logMapID];
62
+ return [[GDLLogEvent alloc ] initWithLogMapID: _logMapID logTarget: _logTarget ];
64
63
}
65
64
66
65
@end
Original file line number Diff line number Diff line change @@ -25,8 +25,8 @@ @interface GDLLogEventTest : XCTestCase
25
25
@implementation GDLLogEventTest
26
26
27
27
- (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 ]);
30
30
}
31
31
32
32
@end
Original file line number Diff line number Diff line change @@ -52,7 +52,7 @@ - (void)testSharedInstance {
52
52
53
53
- (void )testWriteLogWithoutTransformers {
54
54
GDLLogWriter *writer = [GDLLogWriter sharedInstance ];
55
- GDLLogEvent *log = [[GDLLogEvent alloc ] initWithLogMapID: @" 1" ];
55
+ GDLLogEvent *log = [[GDLLogEvent alloc ] initWithLogMapID: @" 1" logTarget: 1 ];
56
56
XCTAssertNoThrow ([writer writeLog: log afterApplyingTransformers: nil ]);
57
57
dispatch_sync (writer.logWritingQueue , ^{
58
58
// TODO(mikehaney24): Assert that storage contains the log.
@@ -61,7 +61,7 @@ - (void)testWriteLogWithoutTransformers {
61
61
62
62
- (void )testWriteLogWithTransformersThatNilTheLog {
63
63
GDLLogWriter *writer = [GDLLogWriter sharedInstance ];
64
- GDLLogEvent *log = [[GDLLogEvent alloc ] initWithLogMapID: @" 2" ];
64
+ GDLLogEvent *log = [[GDLLogEvent alloc ] initWithLogMapID: @" 2" logTarget: 1 ];
65
65
NSArray <id <GDLLogTransformer>> *transformers =
66
66
@[ [[GDLLogWriterTestNilingTransformer alloc ] init ] ];
67
67
XCTAssertNoThrow ([writer writeLog: log afterApplyingTransformers: transformers]);
You can’t perform that action at this time.
0 commit comments