Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class SpanObserver: NSObject {
}

convenience init?(callback: @escaping (Span) -> Void) {
guard let span = SentrySDK.span else { return nil }
guard let span = SentrySDKSwift.span else { return nil }
self.init(span: span)
self.performOnFinish(callback: callback)
}
Expand Down
8 changes: 8 additions & 0 deletions Sentry.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1119,6 +1119,8 @@
FAE2DAB82E1F317900262307 /* SentryProfilingSwiftHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = FAE2DAB72E1F317900262307 /* SentryProfilingSwiftHelpers.m */; };
FAE2DABA2E1F318900262307 /* SentryProfilingSwiftHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE2DAB92E1F318900262307 /* SentryProfilingSwiftHelpers.h */; };
FAE5798D2E7D9D4C00B710F9 /* SentrySysctl.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAE579872E7D9D4900B710F9 /* SentrySysctl.swift */; };
FAE57A252E819A8300B710F9 /* SentrySDK.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE57A1F2E819A8000B710F9 /* SentrySDK.h */; settings = {ATTRIBUTES = (Public, ); }; };
FAE57A272E819ADC00B710F9 /* SentrySDK.m in Sources */ = {isa = PBXBuildFile; fileRef = FAE57A262E819ADA00B710F9 /* SentrySDK.m */; };
FAE80C242E4695B40010A595 /* SentryEvent+Serialize.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE80C232E4695AE0010A595 /* SentryEvent+Serialize.h */; };
FAEC270E2DF3526000878871 /* SentryUserFeedback.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAEC270D2DF3526000878871 /* SentryUserFeedback.swift */; };
FAEC273D2DF3933A00878871 /* NSData+Unzip.m in Sources */ = {isa = PBXBuildFile; fileRef = FAEC273C2DF3933200878871 /* NSData+Unzip.m */; };
Expand Down Expand Up @@ -2466,6 +2468,8 @@
FAE2DAB72E1F317900262307 /* SentryProfilingSwiftHelpers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryProfilingSwiftHelpers.m; sourceTree = "<group>"; };
FAE2DAB92E1F318900262307 /* SentryProfilingSwiftHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryProfilingSwiftHelpers.h; path = Sources/Sentry/include/SentryProfilingSwiftHelpers.h; sourceTree = SOURCE_ROOT; };
FAE579872E7D9D4900B710F9 /* SentrySysctl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySysctl.swift; sourceTree = "<group>"; };
FAE57A1F2E819A8000B710F9 /* SentrySDK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentrySDK.h; path = Public/SentrySDK.h; sourceTree = "<group>"; };
FAE57A262E819ADA00B710F9 /* SentrySDK.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentrySDK.m; sourceTree = "<group>"; };
FAE80C232E4695AE0010A595 /* SentryEvent+Serialize.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryEvent+Serialize.h"; path = "include/SentryEvent+Serialize.h"; sourceTree = "<group>"; };
FAEC270D2DF3526000878871 /* SentryUserFeedback.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryUserFeedback.swift; sourceTree = "<group>"; };
FAEC273C2DF3933200878871 /* NSData+Unzip.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSData+Unzip.m"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2900,6 +2904,8 @@
639889D51EDF10BE00EA7442 /* Helper */ = {
isa = PBXGroup;
children = (
FAE57A1F2E819A8000B710F9 /* SentrySDK.h */,
FAE57A262E819ADA00B710F9 /* SentrySDK.m */,
63AA76951EB9C1C200D153DE /* SentryDefines.h */,
627E7588299F6FE40085504D /* SentryInternalDefines.h */,
0A9E917028DC7E7000FB4182 /* SentryInternalCDefines.h */,
Expand Down Expand Up @@ -4919,6 +4925,7 @@
8E133FA625E72EB400ABD0BF /* SentrySamplingContext.h in Headers */,
0A9BF4E428A114B50068D266 /* SentryViewHierarchyIntegration.h in Headers */,
D8BBD32728FD9FC00011F850 /* SentrySwift.h in Headers */,
FAE57A252E819A8300B710F9 /* SentrySDK.h in Headers */,
84CFA4CE2C9E0CA3008DA5F4 /* SentryUserFeedbackIntegration.h in Headers */,
8482FA9B2DD7C397000E9283 /* SentryFeedbackAPI.h in Headers */,
8E4E7C7425DAAB49006AB9E2 /* SentrySpanProtocol.h in Headers */,
Expand Down Expand Up @@ -5959,6 +5966,7 @@
63FE710B20DA4C1000CDBAE8 /* SentryCrashMach.c in Sources */,
63FE707720DA4C1000CDBAE8 /* SentryDictionaryDeepSearch.m in Sources */,
FACEED132E3179A10007B4AC /* SentyOptionsInternal.m in Sources */,
FAE57A272E819ADC00B710F9 /* SentrySDK.m in Sources */,
8482FA9C2DD7C397000E9283 /* SentryFeedbackAPI.m in Sources */,
7BC9A20628F41781001E7C4C /* SentryMeasurementUnit.m in Sources */,
63FE71A020DA4C1100CDBAE8 /* SentryCrashInstallation.m in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion Sources/Sentry/PrivateSentrySDKOnly.m
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ + (NSString *__nullable)getReplayId
{
__block NSString *__nullable replayId;

[SentrySDK configureScope:^(SentryScope *_Nonnull scope) { replayId = scope.replayId; }];
[SentrySDKSwift configureScope:^(SentryScope *_Nonnull scope) { replayId = scope.replayId; }];

return replayId;
}
Expand Down
1 change: 1 addition & 0 deletions Sources/Sentry/Public/Sentry.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ FOUNDATION_EXPORT const unsigned char SentryVersionString[];
# import <Sentry/SentryOptions.h>
# import <Sentry/SentryReplayApi.h>
# import <Sentry/SentryRequest.h>
# import <Sentry/SentrySDK.h>
# import <Sentry/SentrySampleDecision.h>
# import <Sentry/SentrySamplingContext.h>
# import <Sentry/SentryScope.h>
Expand Down
Loading