Skip to content

Commit 0c28765

Browse files
philipsawyerddphilipsawyerdd
committed
Revert "[Structured Logging] Add SentryLog Models (getsentry#5441)"
This reverts commit 51603df.
1 parent 3961d02 commit 0c28765

File tree

3 files changed

+23
-11
lines changed

3 files changed

+23
-11
lines changed

‎Sentry.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -808,22 +808,28 @@
808808
9286059529A5096600F96038 /* SentryGeo.h in Headers */ = {isa = PBXBuildFile; fileRef = 9286059429A5096600F96038 /* SentryGeo.h */; settings = {ATTRIBUTES = (Public, ); }; };
809809
9286059729A5098900F96038 /* SentryGeo.m in Sources */ = {isa = PBXBuildFile; fileRef = 9286059629A5098900F96038 /* SentryGeo.m */; };
810810
9286059929A50BAB00F96038 /* SentryGeoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9286059829A50BAA00F96038 /* SentryGeoTests.swift */; };
811+
<<<<<<< HEAD
811812
<<<<<<< HEAD
812813
928BED2B2E16977A00B4D398 /* SentryLogBatcherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 928BED2A2E16977A00B4D398 /* SentryLogBatcherTests.swift */; };
813814
92B6BDA92E05B8F600D538B3 /* SentryLogLevelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92B6BDA82E05B8F000D538B3 /* SentryLogLevelTests.swift */; };
814815
92B6BDAD2E05B9FB00D538B3 /* SentryLogTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92B6BDAC2E05B9F700D538B3 /* SentryLogTests.swift */; };
816+
=======
817+
>>>>>>> parent of 51603dfa ([Structured Logging] Add `SentryLog` Models (#5441))
815818
92D957732E05A44600E20E66 /* SentryAsyncLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 92D957722E05A44600E20E66 /* SentryAsyncLog.m */; };
816819
92D957772E05A4F300E20E66 /* SentryAsyncLog.h in Headers */ = {isa = PBXBuildFile; fileRef = 92D957762E05A4F300E20E66 /* SentryAsyncLog.h */; };
817820
92E5F3D62CDBB3BF00B7AD98 /* SentrySampling.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E8C57A525EEFC42001CEEFA /* SentrySampling.h */; };
818821
92EC54CE2E1EB54B00A10AC2 /* SentryClient+Logs.h in Headers */ = {isa = PBXBuildFile; fileRef = 92EC54CD2E1EB54B00A10AC2 /* SentryClient+Logs.h */; };
819822
92ECD7202E05A7DF0063EC10 /* SentryLogC.h in Headers */ = {isa = PBXBuildFile; fileRef = D8AE48B12C5786AA0092A2A6 /* SentryLogC.h */; settings = {ATTRIBUTES = (Private, ); }; };
823+
<<<<<<< HEAD
820824
92ECD73C2E05ACE00063EC10 /* SentryLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92ECD73B2E05ACDE0063EC10 /* SentryLog.swift */; };
821825
92ECD73E2E05AD320063EC10 /* SentryLogLevel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92ECD73D2E05AD2B0063EC10 /* SentryLogLevel.swift */; };
822826
92ECD7402E05AD580063EC10 /* SentryLogAttribute.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92ECD73F2E05AD500063EC10 /* SentryLogAttribute.swift */; };
823827
92ECD7482E05B57C0063EC10 /* SentryLogAttributeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92ECD7472E05B5760063EC10 /* SentryLogAttributeTests.swift */; };
824828
=======
825829
92E5F3D62CDBB3BF00B7AD98 /* SentrySampling.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E8C57A525EEFC42001CEEFA /* SentrySampling.h */; };
826830
>>>>>>> parent of 2609f7a4 ([Structured Logging] Rename SentryLog to SentrySDKLog (#5473))
831+
=======
832+
>>>>>>> parent of 51603dfa ([Structured Logging] Add `SentryLog` Models (#5441))
827833
92F6726B29C8B7B100BFD34D /* SentryUser+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 92F6726A29C8B7B000BFD34D /* SentryUser+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
828834
A811D867248E2770008A41EA /* SentrySystemEventBreadcrumbsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = A811D866248E2770008A41EA /* SentrySystemEventBreadcrumbsTest.swift */; };
829835
A839D89824864B80003B7AFD /* SentrySystemEventBreadcrumbs.h in Headers */ = {isa = PBXBuildFile; fileRef = A839D89724864B80003B7AFD /* SentrySystemEventBreadcrumbs.h */; };
@@ -2156,6 +2162,7 @@
21562162
9286059429A5096600F96038 /* SentryGeo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentryGeo.h; path = Public/SentryGeo.h; sourceTree = "<group>"; };
21572163
9286059629A5098900F96038 /* SentryGeo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SentryGeo.m; sourceTree = "<group>"; };
21582164
9286059829A50BAA00F96038 /* SentryGeoTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SentryGeoTests.swift; sourceTree = "<group>"; };
2165+
<<<<<<< HEAD
21592166
<<<<<<< HEAD
21602167
928BED2A2E16977A00B4D398 /* SentryLogBatcherTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryLogBatcherTests.swift; sourceTree = "<group>"; };
21612168
92B6BDA82E05B8F000D538B3 /* SentryLogLevelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryLogLevelTests.swift; sourceTree = "<group>"; };
@@ -2169,6 +2176,10 @@
21692176
92ECD7472E05B5760063EC10 /* SentryLogAttributeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryLogAttributeTests.swift; sourceTree = "<group>"; };
21702177
=======
21712178
>>>>>>> parent of 2609f7a4 ([Structured Logging] Rename SentryLog to SentrySDKLog (#5473))
2179+
=======
2180+
92D957722E05A44600E20E66 /* SentryAsyncLog.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryAsyncLog.m; sourceTree = "<group>"; };
2181+
92D957762E05A4F300E20E66 /* SentryAsyncLog.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryAsyncLog.h; path = include/SentryAsyncLog.h; sourceTree = "<group>"; };
2182+
>>>>>>> parent of 51603dfa ([Structured Logging] Add `SentryLog` Models (#5441))
21722183
92F6726A29C8B7B000BFD34D /* SentryUser+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SentryUser+Private.h"; path = "include/HybridPublic/SentryUser+Private.h"; sourceTree = "<group>"; };
21732184
A811D866248E2770008A41EA /* SentrySystemEventBreadcrumbsTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySystemEventBreadcrumbsTest.swift; sourceTree = "<group>"; };
21742185
A839D89724864B80003B7AFD /* SentrySystemEventBreadcrumbs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentrySystemEventBreadcrumbs.h; path = include/SentrySystemEventBreadcrumbs.h; sourceTree = "<group>"; };
@@ -3431,10 +3442,13 @@
34313442
7B3D0474249A3D5800E106B6 /* Protocol */ = {
34323443
isa = PBXGroup;
34333444
children = (
3445+
<<<<<<< HEAD
34343446
9264E1EC2E2E397400B077CF /* SentryLogMessageTests.swift */,
34353447
92B6BDAC2E05B9F700D538B3 /* SentryLogTests.swift */,
34363448
92ECD7472E05B5760063EC10 /* SentryLogAttributeTests.swift */,
34373449
92B6BDA82E05B8F000D538B3 /* SentryLogLevelTests.swift */,
3450+
=======
3451+
>>>>>>> parent of 51603dfa ([Structured Logging] Add `SentryLog` Models (#5441))
34383452
D46712612DCD059500D4074A /* SentryRedactDefaultOptionsTests.swift */,
34393453
620078762D3906AD0022CB67 /* Codable */,
34403454
7BC6EBF7255C05060059822A /* TestData.swift */,
@@ -4758,7 +4772,10 @@
47584772
isa = PBXGroup;
47594773
children = (
47604774
620078752D38F1110022CB67 /* Codable */,
4775+
<<<<<<< HEAD
47614776
D8CA12942C203E71005894F4 /* SentrySessionListener.swift */,
4777+
=======
4778+
>>>>>>> parent of 51603dfa ([Structured Logging] Add `SentryLog` Models (#5441))
47624779
);
47634780
path = Protocol;
47644781
sourceTree = "<group>";
@@ -5710,9 +5727,12 @@
57105727
63EED6C02237923600E02400 /* SentryOptions.m in Sources */,
57115728
620078722D38F00D0022CB67 /* SentryGeoCodable.swift in Sources */,
57125729
D8CB741B2947286500A5F964 /* SentryEnvelopeItemHeader.m in Sources */,
5730+
<<<<<<< HEAD
57135731
92ECD73C2E05ACE00063EC10 /* SentryLog.swift in Sources */,
57145732
F458D1152E1869AD0028273E /* SentryScopePersistentStore+String.swift in Sources */,
57155733
F458D1172E186DF20028273E /* SentryScopePersistentStore+Fingerprint.swift in Sources */,
5734+
=======
5735+
>>>>>>> parent of 51603dfa ([Structured Logging] Add `SentryLog` Models (#5441))
57165736
D8CB7417294724CC00A5F964 /* SentryEnvelopeAttachmentHeader.m in Sources */,
57175737
D84793262788737D00BE8E99 /* SentryByteCountFormatter.m in Sources */,
57185738
63AA769E1EB9C57A00D153DE /* SentryError.mm in Sources */,
@@ -5910,8 +5930,6 @@
59105930
6344DDB11EC308E400D9160D /* SentryCrashInstallationReporter.m in Sources */,
59115931
84BA62272CAE2EEF0049F636 /* SentryUserFeedbackWidgetButtonView.swift in Sources */,
59125932
D85596F3280580F10041FF8B /* SentryScreenshotIntegration.m in Sources */,
5913-
92ECD73E2E05AD320063EC10 /* SentryLogLevel.swift in Sources */,
5914-
92ECD7402E05AD580063EC10 /* SentryLogAttribute.swift in Sources */,
59155933
7BAF3DCE243DCBFE008A5414 /* SentryTransportFactory.m in Sources */,
59165934
844EDC70294143B900C86F34 /* SentryNSProcessInfoWrapper.mm in Sources */,
59175935
F4E3DCCB2E1579240093CB80 /* SentryScopePersistentStore.swift in Sources */,
@@ -6042,9 +6060,7 @@
60426060
D82915632C85EF0C00A6CDD4 /* SentryViewPhotographerTests.swift in Sources */,
60436061
D8DBE0CA2C0E093000FAB1FD /* SentryTouchTrackerTests.swift in Sources */,
60446062
D8F67AF42BE10F9600C9197B /* SentryUIRedactBuilderTests.swift in Sources */,
6045-
92ECD7482E05B57C0063EC10 /* SentryLogAttributeTests.swift in Sources */,
60466063
63B819141EC352A7002FDF4C /* SentryInterfacesTests.m in Sources */,
6047-
92B6BDA92E05B8F600D538B3 /* SentryLogLevelTests.swift in Sources */,
60486064
62F05D2B2C0DB1F100916E3F /* SentryLogTestHelper.m in Sources */,
60496065
7B68345128F7EB3D00FB7064 /* SentryMeasurementUnitTests.swift in Sources */,
60506066
7B14089A248791660035403D /* SentryCrashStackEntryMapperTests.swift in Sources */,
@@ -6269,7 +6285,6 @@
62696285
8F73BC312B02B87E00C3CEF4 /* SentryInstallationTests.swift in Sources */,
62706286
7B569E002590EEF600B653FC /* SentryScope+Equality.m in Sources */,
62716287
D8BFE37929A76666002E73F3 /* SentryTimeToDisplayTrackerTest.swift in Sources */,
6272-
92B6BDAD2E05B9FB00D538B3 /* SentryLogTests.swift in Sources */,
62736288
D84541182A2DC2CD00E2B11C /* SentryBinaryImageCacheTests.swift in Sources */,
62746289
7BF536D424BEF255004FA6A2 /* SentryAssertions.swift in Sources */,
62756290
7BC6EC14255C415E0059822A /* SentryExceptionTests.swift in Sources */,

‎Sources/Swift/Protocol/Codable/SentryCodable.swift‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
@_implementationOnly import _SentryPrivate
22
import Foundation
33

4-
func encodeToJSONData<T: Encodable>(data: T) throws -> Data {
5-
let jsonEncoder = JSONEncoder()
6-
jsonEncoder.dateEncodingStrategy = .secondsSince1970
7-
return try jsonEncoder.encode(data)
8-
}
9-
104
func decodeFromJSONData<T: Decodable>(jsonData: Data) -> T? {
115
if jsonData.isEmpty {
126
return nil

‎Tests/SentryTests/Protocol/Codable/SentryCodableTests.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import XCTest
44
class SentryCodableTests: XCTestCase {
55
<<<<<<< HEAD
66

7+
<<<<<<< HEAD
78
func testEncodeToJSONData_EncodesCorrectDateFormat() throws {
89
let date = Date(timeIntervalSince1970: 1_234_567_890.987654)
910
let jsonData = try encodeToJSONData(data: date)
@@ -34,6 +35,8 @@ class SentryCodableTests: XCTestCase {
3435
=======
3536

3637
>>>>>>> parent of 2609f7a4 ([Structured Logging] Rename SentryLog to SentrySDKLog (#5473))
38+
=======
39+
>>>>>>> parent of 51603dfa ([Structured Logging] Add `SentryLog` Models (#5441))
3740
func testDecodeWithEmptyData_ReturnsNil() {
3841
XCTAssertNil(decodeFromJSONData(jsonData: Data()) as Geo?)
3942
}

0 commit comments

Comments
 (0)