From 068b12d2745651bc6d0abb8221f041311dc1f19d Mon Sep 17 00:00:00 2001 From: Sentry Github Bot Date: Thu, 20 Oct 2022 14:42:39 +0000 Subject: [PATCH] Format code --- Sources/Sentry/Public/SentryOptions.h | 1 - Sources/Sentry/SentryEvent.m | 4 +- Sources/Sentry/SentryNetworkTracker.m | 54 ++++++++++--------- .../Sentry/SentryNetworkTrackingIntegration.m | 5 +- Sources/Sentry/SentryOptions.m | 2 +- Sources/Sentry/SentryRequest.h | 4 +- Sources/Sentry/SentryStacktrace.m | 2 +- 7 files changed, 37 insertions(+), 35 deletions(-) diff --git a/Sources/Sentry/Public/SentryOptions.h b/Sources/Sentry/Public/SentryOptions.h index 2e2cdc29a2b..a99ef040610 100644 --- a/Sources/Sentry/Public/SentryOptions.h +++ b/Sources/Sentry/Public/SentryOptions.h @@ -414,7 +414,6 @@ NS_SWIFT_NAME(Options) */ @property (nonatomic, retain) NSArray *tracePropagationTargets; - /** * When enabled, the SDK captures HTTP Client errors. Default value is NO. */ diff --git a/Sources/Sentry/SentryEvent.m b/Sources/Sentry/SentryEvent.m index ffb89e6f05c..9c9416f0ff1 100644 --- a/Sources/Sentry/SentryEvent.m +++ b/Sources/Sentry/SentryEvent.m @@ -2,7 +2,6 @@ #import "NSDate+SentryExtras.h" #import "NSDictionary+SentrySanitize.h" #import "SentryBreadcrumb.h" -#import "SentryRequest.h" #import "SentryClient.h" #import "SentryCurrentDate.h" #import "SentryDebugMeta.h" @@ -11,6 +10,7 @@ #import "SentryLevelMapper.h" #import "SentryMessage.h" #import "SentryMeta.h" +#import "SentryRequest.h" #import "SentryStacktrace.h" #import "SentryThread.h" #import "SentryUser.h" @@ -158,7 +158,7 @@ - (void)addSimpleProperties:(NSMutableDictionary *)serializedData forKey:@"start_timestamp"]; } } - + if (nil != self.request) { [serializedData setValue:[self.request serialize] forKey:@"request"]; } diff --git a/Sources/Sentry/SentryNetworkTracker.m b/Sources/Sentry/SentryNetworkTracker.m index 43cafd6cc88..45bfb3890ba 100644 --- a/Sources/Sentry/SentryNetworkTracker.m +++ b/Sources/Sentry/SentryNetworkTracker.m @@ -1,19 +1,19 @@ #import "SentryNetworkTracker.h" #import "SentryBaggage.h" #import "SentryBreadcrumb.h" +#import "SentryClient+Private.h" #import "SentryEvent.h" #import "SentryException.h" -#import "SentryMechanism.h" -#import "SentryRequest.h" -#import "SentryStacktrace.h" -#import "SentryThread.h" #import "SentryHub+Private.h" -#import "SentryClient+Private.h" -#import "SentryThreadInspector.h" #import "SentryLog.h" +#import "SentryMechanism.h" +#import "SentryRequest.h" #import "SentrySDK+Private.h" #import "SentryScope+Private.h" #import "SentrySerialization.h" +#import "SentryStacktrace.h" +#import "SentryThread.h" +#import "SentryThreadInspector.h" #import "SentryTraceContext.h" #import "SentryTraceHeader.h" #import "SentryTracer.h" @@ -224,7 +224,8 @@ - (void)urlSessionTaskResume:(NSURLSessionTask *)sessionTask - (void)urlSessionTask:(NSURLSessionTask *)sessionTask setState:(NSURLSessionTaskState)newState { - if (!self.isNetworkTrackingEnabled && !self.isNetworkBreadcrumbEnabled && !self.isCaptureFailedRequests) { + if (!self.isNetworkTrackingEnabled && !self.isNetworkBreadcrumbEnabled + && !self.isCaptureFailedRequests) { return; } @@ -258,7 +259,7 @@ - (void)urlSessionTask:(NSURLSessionTask *)sessionTask setState:(NSURLSessionTas if (sessionTask.state == NSURLSessionTaskStateRunning) { [self captureEvent:sessionTask]; - + [self addBreadcrumbForSessionTask:sessionTask]; NSInteger responseStatusCode = [self urlResponseStatusCode:sessionTask.response]; @@ -288,45 +289,45 @@ - (void)urlSessionTask:(NSURLSessionTask *)sessionTask setState:(NSURLSessionTas - (void)captureEvent:(NSURLSessionTask *)sessionTask { NSInteger responseStatusCode = [self urlResponseStatusCode:sessionTask.response]; - + // TODO: check the string contains and regex if (!self.isCaptureFailedRequests) { return; } - + // TODO: check the range if (responseStatusCode == 201) { return; } - - NSString *message = [NSString stringWithFormat:@"HTTP Client Error with status code: %li", - (long)(responseStatusCode)]; + + NSString *message = [NSString + stringWithFormat:@"HTTP Client Error with status code: %li", (long)(responseStatusCode)]; SentryEvent *event = [[SentryEvent alloc] initWithLevel:kSentryLevelError]; - + SentryThreadInspector *threadInspector = SentrySDK.currentHub.getClient.threadInspector; NSArray *threads = [threadInspector getCurrentThreadsWithStackTrace]; - + SentryException *sentryException = [[SentryException alloc] initWithValue:message type:@"HTTP-ClientError"]; - sentryException.mechanism = [[SentryMechanism alloc] initWithType:@"SentryNetworkTrackingIntegration"]; - - + sentryException.mechanism = + [[SentryMechanism alloc] initWithType:@"SentryNetworkTrackingIntegration"]; + SentryStacktrace *sentryStacktrace = [threads[0] stacktrace]; sentryStacktrace.snapshot = @(YES); - + sentryException.stacktrace = sentryStacktrace; // TODO: do I need this? -// [threads enumerateObjectsUsingBlock:^(SentryThread *_Nonnull obj, NSUInteger idx, -// BOOL *_Nonnull stop) { obj.current = [NSNumber numberWithBool:idx == 0]; }]; - + // [threads enumerateObjectsUsingBlock:^(SentryThread *_Nonnull obj, NSUInteger idx, + // BOOL *_Nonnull stop) { obj.current = [NSNumber numberWithBool:idx == 0]; }]; + SentryRequest *request = [[SentryRequest alloc] init]; NSURLRequest *myRequest = (NSURLRequest *)sessionTask.currentRequest; NSURL *url = [[sessionTask currentRequest] URL]; request.url = url.absoluteString; - + request.fragment = url.fragment; request.queryString = url.query; request.method = myRequest.HTTPMethod; @@ -336,7 +337,7 @@ - (void)captureEvent:(NSURLSessionTask *)sessionTask event.exceptions = @[ sentryException ]; event.request = request; - + NSHTTPURLResponse *myResponse = (NSHTTPURLResponse *)sessionTask.response; NSMutableDictionary *newContext; @@ -349,8 +350,9 @@ - (void)captureEvent:(NSURLSessionTask *)sessionTask [response setValue:[NSNumber numberWithLongLong:responseStatusCode] forKey:@"status_code"]; [response setValue:myResponse.allHeaderFields.copy forKey:@"headers"]; [response setValue:myResponse.allHeaderFields[@"Cookie"] forKey:@"cookies"]; - [response setValue:[NSNumber numberWithLongLong:sessionTask.countOfBytesReceived] forKey:@"body_size"]; - + [response setValue:[NSNumber numberWithLongLong:sessionTask.countOfBytesReceived] + forKey:@"body_size"]; + newContext[@"response"] = response; event.context = newContext; diff --git a/Sources/Sentry/SentryNetworkTrackingIntegration.m b/Sources/Sentry/SentryNetworkTrackingIntegration.m index 36488fe33e3..3f0a5ba5a70 100644 --- a/Sources/Sentry/SentryNetworkTrackingIntegration.m +++ b/Sources/Sentry/SentryNetworkTrackingIntegration.m @@ -24,12 +24,13 @@ - (BOOL)installWithOptions:(SentryOptions *)options if (options.enableNetworkBreadcrumbs) { [SentryNetworkTracker.sharedInstance enableNetworkBreadcrumbs]; } - + if (options.enableCaptureFailedRequests) { [SentryNetworkTracker.sharedInstance enableCaptureFailedRequests]; } - if (shouldEnableNetworkTracking || options.enableNetworkBreadcrumbs || options.enableCaptureFailedRequests) { + if (shouldEnableNetworkTracking || options.enableNetworkBreadcrumbs + || options.enableCaptureFailedRequests) { [SentryNetworkTrackingIntegration swizzleURLSessionTask]; return YES; } else { diff --git a/Sources/Sentry/SentryOptions.m b/Sources/Sentry/SentryOptions.m index fe814094de3..8ee387b9ca1 100644 --- a/Sources/Sentry/SentryOptions.m +++ b/Sources/Sentry/SentryOptions.m @@ -270,7 +270,7 @@ - (BOOL)validateOptions:(NSDictionary *)options [self setBool:options[@"enableAutoPerformanceTracking"] block:^(BOOL value) { self->_enableAutoPerformanceTracking = value; }]; - + [self setBool:options[@"enableCaptureFailedRequests"] block:^(BOOL value) { self->_enableCaptureFailedRequests = value; }]; diff --git a/Sources/Sentry/SentryRequest.h b/Sources/Sentry/SentryRequest.h index 23e55e1a242..3e85ebaa110 100644 --- a/Sources/Sentry/SentryRequest.h +++ b/Sources/Sentry/SentryRequest.h @@ -19,8 +19,8 @@ NS_SWIFT_NAME(Request) @property (atomic, copy) NSString *_Nullable cookies; /** -* Optional: A dictionary of submitted headers. -*/ + * Optional: A dictionary of submitted headers. + */ @property (nonatomic, strong) NSDictionary *_Nullable headers; /** diff --git a/Sources/Sentry/SentryStacktrace.m b/Sources/Sentry/SentryStacktrace.m index 59d73d4e02d..ccf6a7d1232 100644 --- a/Sources/Sentry/SentryStacktrace.m +++ b/Sources/Sentry/SentryStacktrace.m @@ -56,7 +56,7 @@ - (void)fixDuplicateFrames [serializedData setValue:self.registers forKey:@"registers"]; } [serializedData setValue:self.snapshot forKey:@"snapshot"]; - + return serializedData; }