Skip to content

Commit

Permalink
ref: Remove SentryTransaction from public API. (#950)
Browse files Browse the repository at this point in the history
Co-authored-by: Sentry Github Bot <bot+github-bot@sentry.io>
  • Loading branch information
brustolin and getsentry-bot committed Feb 25, 2021
1 parent 4aaaa14 commit 9059a8d
Show file tree
Hide file tree
Showing 26 changed files with 618 additions and 675 deletions.
2 changes: 1 addition & 1 deletion Samples/iOS-Swift/iOS-Swift/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class ViewController: UIViewController {
}

@IBAction func captureTransaction(_ sender: Any) {
let transaction = SentrySDK.startTransaction(name: "Some Transaction")
let transaction = SentrySDK.startTransaction(name: "Some Transaction", operation: "Some Operation")
DispatchQueue.main.asyncAfter(deadline: .now() + Double.random(in: 0.4...0.6), execute: {
transaction.finish()
})
Expand Down
38 changes: 20 additions & 18 deletions Sentry.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -400,17 +400,18 @@
7DC8310C2398283C0043DD9A /* SentryCrashIntegration.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DC831092398283C0043DD9A /* SentryCrashIntegration.m */; };
861265F92404EC1500C4AFDE /* NSArray+SentrySanitize.h in Headers */ = {isa = PBXBuildFile; fileRef = 861265F72404EC1500C4AFDE /* NSArray+SentrySanitize.h */; };
861265FA2404EC1500C4AFDE /* NSArray+SentrySanitize.m in Sources */ = {isa = PBXBuildFile; fileRef = 861265F82404EC1500C4AFDE /* NSArray+SentrySanitize.m */; };
8E4E7C6D25DAAAFE006AB9E2 /* SentryTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E4E7C6B25DAAAFE006AB9E2 /* SentryTransaction.h */; };
8E4E7C6E25DAAAFE006AB9E2 /* SentrySpan.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E4E7C6C25DAAAFE006AB9E2 /* SentrySpan.h */; };
8E4E7C7425DAAB49006AB9E2 /* SentrySpanProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E4E7C7325DAAB49006AB9E2 /* SentrySpanProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
8E4E7C7D25DAB287006AB9E2 /* SentryTracer.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E4E7C7B25DAB287006AB9E2 /* SentryTracer.h */; };
8E4E7C8225DAB2A5006AB9E2 /* SentryTracer.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E4E7C8125DAB2A5006AB9E2 /* SentryTracer.m */; };
8E70B0FD25CB72BE002B3155 /* SentrySpanTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E70B0FC25CB72BE002B3155 /* SentrySpanTests.swift */; };
8E70B10125CB8695002B3155 /* SentrySpanIdTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E70B10025CB8695002B3155 /* SentrySpanIdTests.swift */; };
8E80D0C325BB29690029B150 /* SentryTransactionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E80D0C225BB29690029B150 /* SentryTransactionTests.swift */; };
8EBAF05A25CCD066006FDD53 /* SentryTransaction+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 8EC3AE9025CA3B6700E7591A /* SentryTransaction+Private.h */; };
8EC3AE7A25CA23B600E7591A /* SentrySpan.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EC3AE7925CA23B600E7591A /* SentrySpan.m */; };
8EC4CF4A25C38DAA0093DEE9 /* SentrySpanStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 8EC4CF4725C38CAF0093DEE9 /* SentrySpanStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
8EC4CF5025C3A0070093DEE9 /* SentrySpanContextTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8EC4CF4F25C3A0070093DEE9 /* SentrySpanContextTests.swift */; };
8ECC673C25C23996000E2BF6 /* SentrySpan.h in Headers */ = {isa = PBXBuildFile; fileRef = 8ECC673725C23995000E2BF6 /* SentrySpan.h */; settings = {ATTRIBUTES = (Public, ); }; };
8ECC673D25C23996000E2BF6 /* SentrySpanId.h in Headers */ = {isa = PBXBuildFile; fileRef = 8ECC673825C23995000E2BF6 /* SentrySpanId.h */; settings = {ATTRIBUTES = (Public, ); }; };
8ECC673E25C23996000E2BF6 /* SentrySpanContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 8ECC673925C23996000E2BF6 /* SentrySpanContext.h */; settings = {ATTRIBUTES = (Public, ); }; };
8ECC673F25C23996000E2BF6 /* SentryTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 8ECC673A25C23996000E2BF6 /* SentryTransaction.h */; settings = {ATTRIBUTES = (Public, ); }; };
8ECC674025C23996000E2BF6 /* SentryTransactionContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 8ECC673B25C23996000E2BF6 /* SentryTransactionContext.h */; settings = {ATTRIBUTES = (Public, ); }; };
8ECC674725C23A20000E2BF6 /* SentrySpanContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ECC674325C23A1F000E2BF6 /* SentrySpanContext.m */; };
8ECC674825C23A20000E2BF6 /* SentryTransaction.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ECC674425C23A1F000E2BF6 /* SentryTransaction.m */; };
Expand Down Expand Up @@ -865,18 +866,18 @@
7DC831092398283C0043DD9A /* SentryCrashIntegration.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryCrashIntegration.m; sourceTree = "<group>"; };
861265F72404EC1500C4AFDE /* NSArray+SentrySanitize.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "NSArray+SentrySanitize.h"; path = "include/NSArray+SentrySanitize.h"; sourceTree = "<group>"; };
861265F82404EC1500C4AFDE /* NSArray+SentrySanitize.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSArray+SentrySanitize.m"; sourceTree = "<group>"; };
8E70B0D125CB67F3002B3155 /* SentryTransaction+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SentryTransaction+Private.h"; sourceTree = "<group>"; };
8E4E7C6B25DAAAFE006AB9E2 /* SentryTransaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentryTransaction.h; path = include/SentryTransaction.h; sourceTree = "<group>"; };
8E4E7C6C25DAAAFE006AB9E2 /* SentrySpan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentrySpan.h; path = include/SentrySpan.h; sourceTree = "<group>"; };
8E4E7C7325DAAB49006AB9E2 /* SentrySpanProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentrySpanProtocol.h; path = Public/SentrySpanProtocol.h; sourceTree = "<group>"; };
8E4E7C7B25DAB287006AB9E2 /* SentryTracer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryTracer.h; path = include/SentryTracer.h; sourceTree = "<group>"; };
8E4E7C8125DAB2A5006AB9E2 /* SentryTracer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SentryTracer.m; sourceTree = "<group>"; };
8E70B0FC25CB72BE002B3155 /* SentrySpanTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySpanTests.swift; sourceTree = "<group>"; };
8E70B10025CB8695002B3155 /* SentrySpanIdTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySpanIdTests.swift; sourceTree = "<group>"; };
8E80D0C225BB29690029B150 /* SentryTransactionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryTransactionTests.swift; sourceTree = "<group>"; };
8EC3AE7925CA23B600E7591A /* SentrySpan.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentrySpan.m; sourceTree = "<group>"; };
8EC3AE9025CA3B6700E7591A /* SentryTransaction+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SentryTransaction+Private.h"; path = "include/SentryTransaction+Private.h"; sourceTree = "<group>"; };
8EC4CF4725C38CAF0093DEE9 /* SentrySpanStatus.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentrySpanStatus.h; path = Public/SentrySpanStatus.h; sourceTree = "<group>"; };
8EC4CF4F25C3A0070093DEE9 /* SentrySpanContextTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySpanContextTests.swift; sourceTree = "<group>"; };
8ECC673725C23995000E2BF6 /* SentrySpan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentrySpan.h; path = Public/SentrySpan.h; sourceTree = "<group>"; };
8ECC673825C23995000E2BF6 /* SentrySpanId.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentrySpanId.h; path = Public/SentrySpanId.h; sourceTree = "<group>"; };
8ECC673925C23996000E2BF6 /* SentrySpanContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentrySpanContext.h; path = Public/SentrySpanContext.h; sourceTree = "<group>"; };
8ECC673A25C23996000E2BF6 /* SentryTransaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentryTransaction.h; path = Public/SentryTransaction.h; sourceTree = "<group>"; };
8ECC673B25C23996000E2BF6 /* SentryTransactionContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentryTransactionContext.h; path = Public/SentryTransactionContext.h; sourceTree = "<group>"; };
8ECC674325C23A1F000E2BF6 /* SentrySpanContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SentrySpanContext.m; sourceTree = "<group>"; };
8ECC674425C23A1F000E2BF6 /* SentryTransaction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SentryTransaction.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1206,9 +1207,7 @@
7B0002332477F52D0035FEF1 /* SentrySessionTests.swift */,
7B944FAF2469B46000A10721 /* TestClient.swift */,
7B0A54552523178700A71716 /* SentryScopeSwiftTests.swift */,
8E70B0D125CB67F3002B3155 /* SentryTransaction+Private.h */,
8EC4CF4F25C3A0070093DEE9 /* SentrySpanContextTests.swift */,
8E80D0C225BB29690029B150 /* SentryTransactionTests.swift */,
8E70B0FC25CB72BE002B3155 /* SentrySpanTests.swift */,
8E70B10025CB8695002B3155 /* SentrySpanIdTests.swift */,
);
Expand Down Expand Up @@ -1664,16 +1663,18 @@
children = (
8ECC673925C23996000E2BF6 /* SentrySpanContext.h */,
8ECC674325C23A1F000E2BF6 /* SentrySpanContext.m */,
8ECC673725C23995000E2BF6 /* SentrySpan.h */,
8E4E7C7325DAAB49006AB9E2 /* SentrySpanProtocol.h */,
8E4E7C6C25DAAAFE006AB9E2 /* SentrySpan.h */,
8EC3AE7925CA23B600E7591A /* SentrySpan.m */,
8ECC673825C23995000E2BF6 /* SentrySpanId.h */,
8ECC674525C23A20000E2BF6 /* SentrySpanId.m */,
8ECC673A25C23996000E2BF6 /* SentryTransaction.h */,
8E4E7C6B25DAAAFE006AB9E2 /* SentryTransaction.h */,
8ECC674425C23A1F000E2BF6 /* SentryTransaction.m */,
8EC3AE9025CA3B6700E7591A /* SentryTransaction+Private.h */,
8ECC673B25C23996000E2BF6 /* SentryTransactionContext.h */,
8ECC674625C23A20000E2BF6 /* SentryTransactionContext.m */,
8EC4CF4725C38CAF0093DEE9 /* SentrySpanStatus.h */,
8E4E7C7B25DAB287006AB9E2 /* SentryTracer.h */,
8E4E7C8125DAB2A5006AB9E2 /* SentryTracer.m */,
);
name = Transaction;
sourceTree = "<group>";
Expand All @@ -1685,12 +1686,11 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
8E4E7C7425DAAB49006AB9E2 /* SentrySpanProtocol.h in Headers */,
8EC4CF4A25C38DAA0093DEE9 /* SentrySpanStatus.h in Headers */,
8ECC673D25C23996000E2BF6 /* SentrySpanId.h in Headers */,
8ECC673C25C23996000E2BF6 /* SentrySpan.h in Headers */,
8ECC673E25C23996000E2BF6 /* SentrySpanContext.h in Headers */,
8ECC674025C23996000E2BF6 /* SentryTransactionContext.h in Headers */,
8ECC673F25C23996000E2BF6 /* SentryTransaction.h in Headers */,
63FE71BA20DA4C1100CDBAE8 /* SentryCrashInstallation+Private.h in Headers */,
63FE71AE20DA4C1100CDBAE8 /* SentryCrashInstallation.h in Headers */,
63FE70F120DA4C1000CDBAE8 /* SentryCrashMonitorType.h in Headers */,
Expand All @@ -1709,6 +1709,7 @@
639FCFA41EBC809A00778193 /* SentryStacktrace.h in Headers */,
63FE716320DA4C1100CDBAE8 /* SentryCrashDynamicLinker.h in Headers */,
639FCF981EBC7B9700778193 /* SentryEvent.h in Headers */,
8E4E7C6D25DAAAFE006AB9E2 /* SentryTransaction.h in Headers */,
63FE715D20DA4C1100CDBAE8 /* SentryCrashSymbolicator.h in Headers */,
63FE718920DA4C1100CDBAE8 /* SentryCrash.h in Headers */,
63FE70FB20DA4C1000CDBAE8 /* SentryCrashMonitor_Zombie.h in Headers */,
Expand Down Expand Up @@ -1744,6 +1745,7 @@
63AA76971EB9C1C200D153DE /* Sentry.h in Headers */,
63FE711F20DA4C1000CDBAE8 /* SentryCrashObjC.h in Headers */,
7BC3936825B1AB3E004F03D3 /* SentryLevelMapper.h in Headers */,
8E4E7C6E25DAAAFE006AB9E2 /* SentrySpan.h in Headers */,
631E6D331EBC679C00712345 /* SentryQueueableRequestManager.h in Headers */,
7B3398632459C14000BD9C96 /* SentryEnvelopeRateLimit.h in Headers */,
6304360A1EC0595B00C4D3FA /* NSData+SentryCompression.h in Headers */,
Expand Down Expand Up @@ -1825,13 +1827,13 @@
7B04A9AF24EAC02C00E710B1 /* SentryRetryAfterHeaderParser.h in Headers */,
7DC83100239826280043DD9A /* SentryIntegrationProtocol.h in Headers */,
7BA61CB9247BC57B00C130A8 /* SentryCrashDefaultBinaryImageProvider.h in Headers */,
8E4E7C7D25DAB287006AB9E2 /* SentryTracer.h in Headers */,
7BC8523724588115005A70F0 /* SentryRateLimitCategory.h in Headers */,
63FE714B20DA4C1100CDBAE8 /* SentryCrashString.h in Headers */,
63FE715320DA4C1100CDBAE8 /* SentryCrashObjCApple.h in Headers */,
63FE710120DA4C1000CDBAE8 /* SentryCrashDate.h in Headers */,
7B4E24FC251C97B500060D68 /* SentrySession.h in Headers */,
7B7D872C2486480B00D2ECFF /* SentryStacktraceBuilder.h in Headers */,
8EBAF05A25CCD066006FDD53 /* SentryTransaction+Private.h in Headers */,
6334314120AD9AE40077E581 /* SentryMechanism.h in Headers */,
7B610D642512399600B0B5D9 /* SentryHub+Private.h in Headers */,
639FCF9C1EBC7F9500778193 /* SentryThread.h in Headers */,
Expand Down Expand Up @@ -2002,6 +2004,7 @@
63FE712120DA4C1000CDBAE8 /* SentryCrashSymbolicator.c in Sources */,
63FE70D720DA4C1000CDBAE8 /* SentryCrashMonitor_MachException.c in Sources */,
7BBD188B244841FB00427C76 /* SentryHttpDateParser.m in Sources */,
8E4E7C8225DAB2A5006AB9E2 /* SentryTracer.m in Sources */,
15E0A8E5240C457D00F044E3 /* SentryEnvelope.m in Sources */,
8EC3AE7A25CA23B600E7591A /* SentrySpan.m in Sources */,
6360850E1ED2AFE100E8599E /* SentryBreadcrumb.m in Sources */,
Expand Down Expand Up @@ -2162,7 +2165,6 @@
7B0A542E2521C62400A71716 /* SentryFrameRemoverTests.swift in Sources */,
7BA61CCC247D14E600C130A8 /* SentryThreadInspectorTests.swift in Sources */,
15360CF52433C59B00112302 /* SentryInstallationTests.m in Sources */,
8E80D0C325BB29690029B150 /* SentryTransactionTests.swift in Sources */,
7BB6550D253EEB3900887E87 /* SentryUserFeedbackTests.swift in Sources */,
7BBD18B7245180FF00427C76 /* SentryDsnTests.m in Sources */,
63FE721A20DA66EC00CDBAE8 /* SentryCrashSysCtl_Tests.m in Sources */,
Expand Down
3 changes: 1 addition & 2 deletions Sources/Sentry/Public/Sentry.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,12 @@ FOUNDATION_EXPORT const unsigned char SentryVersionString[];
#import "SentrySdkInfo.h"
#import "SentrySerializable.h"
#import "SentrySession.h"
#import "SentrySpan.h"
#import "SentrySpanContext.h"
#import "SentrySpanId.h"
#import "SentrySpanProtocol.h"
#import "SentrySpanStatus.h"
#import "SentryStacktrace.h"
#import "SentryThread.h"
#import "SentryTransaction.h"
#import "SentryTransactionContext.h"
#import "SentryUser.h"
#import "SentryUserFeedback.h"
3 changes: 0 additions & 3 deletions Sources/Sentry/Public/SentryClient.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ SENTRY_NO_INIT
- (SentryId *)captureEvent:(SentryEvent *)event
withScope:(SentryScope *)scope NS_SWIFT_NAME(capture(event:scope:));

- (SentryId *)captureTransaction:(SentryTransaction *)transaction
NS_SWIFT_NAME(capture(transaction:));

/**
* Captures an error event and sends it to Sentry.
*
Expand Down
19 changes: 5 additions & 14 deletions Sources/Sentry/Public/SentryHub.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#import "SentryDefines.h"
#import "SentryIntegrationProtocol.h"
#import "SentrySpanProtocol.h"

@class SentryEvent, SentryClient, SentryScope, SentrySession, SentryUser, SentryBreadcrumb,
SentryId, SentryUserFeedback, SentryEnvelope, SentryTransactionContext, SentryTransaction;
SentryId, SentryUserFeedback, SentryEnvelope, SentryTransactionContext;

NS_ASSUME_NONNULL_BEGIN
@interface SentryHub : NSObject
Expand Down Expand Up @@ -42,16 +43,6 @@ SENTRY_NO_INIT
- (SentryId *)captureEvent:(SentryEvent *)event
withScope:(SentryScope *)scope NS_SWIFT_NAME(capture(event:scope:));

/**
* Captures a transaction and sends it to Sentry.
*
* @param transaction The transaction to send to Sentry.
*
* @return The SentryId of the transaction or SentryId.empty if the transaction is not sent.
*/
- (SentryId *)captureTransaction:(SentryTransaction *)transaction
NS_SWIFT_NAME(capture(transaction:));

/**
* Creates a transaction bound to the hub and returns the instance.
*
Expand All @@ -60,8 +51,8 @@ SENTRY_NO_INIT
*
* @return The created transaction.
*/
- (SentryTransaction *)startTransactionWithName:(NSString *)name
operation:(NSString *)operation
- (id<SentrySpan>)startTransactionWithName:(NSString *)name
operation:(NSString *)operation
NS_SWIFT_NAME(startTransaction(name:operation:));

/**
Expand All @@ -71,7 +62,7 @@ SENTRY_NO_INIT
*
* @return The created transaction.
*/
- (SentryTransaction *)startTransactionWithContext:(SentryTransactionContext *)transactionContext
- (id<SentrySpan>)startTransactionWithContext:(SentryTransactionContext *)transactionContext
NS_SWIFT_NAME(startTransaction(transactionContext:));

/**
Expand Down
10 changes: 6 additions & 4 deletions Sources/Sentry/Public/SentrySDK.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

#import "SentryDefines.h"

@protocol SentrySpan;

@class SentryHub, SentryOptions, SentryEvent, SentryBreadcrumb, SentryScope, SentryUser, SentryId,
SentryUserFeedback, SentryTransaction, SentryTransactionContext;
SentryUserFeedback, SentryTransactionContext;

NS_ASSUME_NONNULL_BEGIN

Expand Down Expand Up @@ -89,8 +91,8 @@ SENTRY_NO_INIT
*
* @return The created transaction.
*/
+ (SentryTransaction *)startTransactionWithName:(NSString *)name
operation:(NSString *)operation
+ (id<SentrySpan>)startTransactionWithName:(NSString *)name
operation:(NSString *)operation
NS_SWIFT_NAME(startTransaction(name:operation:));

/**
Expand All @@ -99,7 +101,7 @@ SENTRY_NO_INIT
* @param transactionContext The transaction context.
* @return The created transaction.
*/
+ (SentryTransaction *)startTransactionWithContext:(SentryTransactionContext *)transactionContext
+ (id<SentrySpan>)startTransactionWithContext:(SentryTransactionContext *)transactionContext
NS_SWIFT_NAME(startTransaction(transactionContext:));

/**
Expand Down
Loading

0 comments on commit 9059a8d

Please sign in to comment.