Skip to content

Commit

Permalink
chore(deps): update Cocoa SDK to v8.35.0 (#3548)
Browse files Browse the repository at this point in the history
---------

Co-authored-by: GitHub <noreply@github.com>
Co-authored-by: James Crosswell <jamescrosswell@users.noreply.github.com>
  • Loading branch information
3 people authored Aug 22, 2024
1 parent 2562239 commit bddec9f
Show file tree
Hide file tree
Showing 4 changed files with 137 additions and 8 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
- fix: Prevent deadlock in `Hub.Dispose` (#3539) by @bitsandfoxes
- build(deps): bump github/codeql-action from 3.26.0 to 3.26.2 (#3543) by @dependabot

### Dependencies

- Bump Cocoa SDK from v8.34.0 to v8.35.0 ([#3548](https://github.com/getsentry/sentry-dotnet/pull/3548))
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8350)
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.34.0...8.35.0)

## Fixes

- Resolved a potential deadlock during SDK shutdown ([#3539](https://github.com/getsentry/sentry-dotnet/pull/3539))
Expand Down
2 changes: 1 addition & 1 deletion modules/sentry-cocoa
Submodule sentry-cocoa updated 54 files
+1 −1 .github/last-release-runid
+12 −0 CHANGELOG.md
+4 −4 Package.swift
+4 −4 Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj
+6 −3 Samples/iOS-Swift/iOS-Swift/Tools/TriggerAppHang.swift
+1 −1 Sentry.podspec
+16 −4 Sentry.xcodeproj/project.pbxproj
+1 −1 SentryPrivate.podspec
+2 −2 SentrySwiftUI.podspec
+5 −5 SentryTestUtils/TestTransportAdapter.swift
+1 −1 Sources/Configuration/SDK.xcconfig
+2 −0 Sources/Sentry/Public/Sentry.h
+1 −0 Sources/Sentry/Public/SentryBaggage.h
+12 −2 Sources/Sentry/Public/SentrySpanProtocol.h
+1 −0 Sources/Sentry/Public/SentryTraceContext.h
+2 −0 Sources/Sentry/Public/SentryWithoutUIKit.h
+102 −43 Sources/Sentry/SentryANRTrackerV2.m
+23 −22 Sources/Sentry/SentryANRTrackingIntegrationV2.m
+4 −2 Sources/Sentry/SentryDelayedFramesTracker.m
+26 −18 Sources/Sentry/SentryDependencyContainer.m
+6 −25 Sources/Sentry/SentryFileManager.m
+1 −1 Sources/Sentry/SentryMeta.m
+5 −3 Sources/Sentry/SentryScope.m
+10 −32 Sources/Sentry/SentrySerialization.m
+13 −0 Sources/Sentry/SentrySpan.m
+7 −4 Sources/Sentry/SentryTracer.m
+2 −0 Sources/Sentry/include/HybridPublic/SentryDependencyContainer.h
+2 −2 Sources/Sentry/include/HybridPublic/SentryEnvelope.h
+21 −12 Sources/Sentry/include/SentryANRTrackerV2.h
+8 −3 Sources/Sentry/include/SentryANRTrackingIntegrationV2.h
+1 −1 Sources/Sentry/include/SentryFileManager.h
+0 −1 Sources/Sentry/include/SentryPrivate.h
+0 −8 Sources/Sentry/include/SentrySerialization.h
+0 −5 Sources/Sentry/include/SentryTracer.h
+13 −0 Sources/Swift/Integrations/ANR/SentryANRTrackerV2Delegate.swift
+2 −2 Sources/Swift/Integrations/FramesTracking/SentryFramesDelayResult.swift
+1 −1 Tests/HybridSDKTest/HybridPod.podspec
+3 −6 Tests/SentryTests/Helper/SentryFileManagerTests.swift
+3 −3 Tests/SentryTests/Helper/SentrySerializationTests.swift
+368 −122 Tests/SentryTests/Integrations/ANR/SentryANRTrackerV2Tests.swift
+1 −1 Tests/SentryTests/Integrations/ANR/SentryANRTrackingIntegrationTests.swift
+12 −7 Tests/SentryTests/Integrations/ANR/SentryANRTrackingIntegrationV2Tests.swift
+1 −1 Tests/SentryTests/Integrations/Performance/Network/SentryNetworkTrackerIntegrationTests.swift
+3 −3 Tests/SentryTests/Integrations/Performance/Network/SentryNetworkTrackerTests.swift
+1 −1 Tests/SentryTests/Integrations/SessionReplay/SentrySessionReplayIntegrationTests.swift
+1 −2 Tests/SentryTests/Networking/SentryHttpTransportTests.swift
+1 −1 Tests/SentryTests/Protocol/SentryEnvelopeTests.swift
+1 −1 Tests/SentryTests/SentryClientTests.swift
+3 −3 Tests/SentryTests/SentrySDKTests.swift
+11 −0 Tests/SentryTests/SentryScopeSwiftTests.swift
+0 −1 Tests/SentryTests/SentryTests-Bridging-Header.h
+2 −2 Tests/SentryTests/Transaction/SentryBaggageTests.swift
+16 −0 Tests/SentryTests/Transaction/SentrySpanTests.swift
+9 −9 Tests/SentryTests/Transaction/SentryTraceStateTests.swift
130 changes: 130 additions & 0 deletions src/Sentry.Bindings.Cocoa/ApiDefinitions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,60 @@ interface SentryAttachment
string ContentType { get; }
}

// @interface SentryBaggage : NSObject
[BaseType (typeof(NSObject))]
[Internal]
interface SentryBaggage
{
// @property (readonly, nonatomic) SentryId * _Nonnull traceId;
[Export ("traceId")]
SentryId TraceId { get; }

// @property (readonly, nonatomic) NSString * _Nonnull publicKey;
[Export ("publicKey")]
string PublicKey { get; }

// @property (readonly, nonatomic) NSString * _Nullable releaseName;
[NullAllowed, Export ("releaseName")]
string ReleaseName { get; }

// @property (readonly, nonatomic) NSString * _Nullable environment;
[NullAllowed, Export ("environment")]
string Environment { get; }

// @property (readonly, nonatomic) NSString * _Nullable transaction;
[NullAllowed, Export ("transaction")]
string Transaction { get; }

// @property (readonly, nonatomic) NSString * _Nullable userId;
[NullAllowed, Export ("userId")]
string UserId { get; }

// @property (readonly, nonatomic) NSString * _Nullable userSegment;
[NullAllowed, Export ("userSegment")]
string UserSegment { get; }

// @property (readonly, nonatomic) NSString * _Nullable sampleRate;
[NullAllowed, Export ("sampleRate")]
string SampleRate { get; }

// @property (nonatomic, strong) NSString * _Nullable sampled;
[NullAllowed, Export ("sampled", ArgumentSemantic.Strong)]
string Sampled { get; set; }

// @property (nonatomic, strong) NSString * _Nullable replayId;
[NullAllowed, Export ("replayId", ArgumentSemantic.Strong)]
string ReplayId { get; set; }

// -(instancetype _Nonnull)initWithTraceId:(SentryId * _Nonnull)traceId publicKey:(NSString * _Nonnull)publicKey releaseName:(NSString * _Nullable)releaseName environment:(NSString * _Nullable)environment transaction:(NSString * _Nullable)transaction userSegment:(NSString * _Nullable)userSegment sampleRate:(NSString * _Nullable)sampleRate sampled:(NSString * _Nullable)sampled replayId:(NSString * _Nullable)replayId;
[Export ("initWithTraceId:publicKey:releaseName:environment:transaction:userSegment:sampleRate:sampled:replayId:")]
NativeHandle Constructor (SentryId traceId, string publicKey, [NullAllowed] string releaseName, [NullAllowed] string environment, [NullAllowed] string transaction, [NullAllowed] string userSegment, [NullAllowed] string sampleRate, [NullAllowed] string sampled, [NullAllowed] string replayId);

// -(NSString * _Nonnull)toHTTPHeaderWithOriginalBaggage:(NSDictionary * _Nullable)originalBaggage;
[Export ("toHTTPHeaderWithOriginalBaggage:")]
string ToHTTPHeaderWithOriginalBaggage ([NullAllowed] NSDictionary originalBaggage);
}

// @protocol SentrySerializable <NSObject>
[Protocol]
[Model]
Expand Down Expand Up @@ -751,6 +805,11 @@ interface SentrySpan : SentrySerializable
[Export ("isFinished")]
bool IsFinished { get; }

// @required @property (readonly, nonatomic) SentryTraceContext * _Nullable traceContext;
[Abstract]
[NullAllowed, Export ("traceContext")]
SentryTraceContext TraceContext { get; }

// @required -(id<SentrySpan> _Nonnull)startChildWithOperation:(NSString * _Nonnull)operation __attribute__((swift_name("startChild(operation:)")));
[Abstract]
[Export ("startChildWithOperation:")]
Expand Down Expand Up @@ -810,6 +869,11 @@ interface SentrySpan : SentrySerializable
[Abstract]
[Export ("toTraceHeader")]
SentryTraceHeader ToTraceHeader();

// @required -(NSString * _Nullable)baggageHttpHeader;
[Abstract]
[NullAllowed, Export ("baggageHttpHeader")]
string BaggageHttpHeader();
}

// @interface SentryHub : NSObject
Expand Down Expand Up @@ -1974,6 +2038,72 @@ interface SentryThread : SentrySerializable
NativeHandle Constructor (NSNumber threadId);
}

// @interface SentryTraceContext : NSObject <SentrySerializable>
[BaseType (typeof(NSObject))]
[Internal]
interface SentryTraceContext : SentrySerializable
{
// @property (readonly, nonatomic) SentryId * _Nonnull traceId;
[Export ("traceId")]
SentryId TraceId { get; }

// @property (readonly, nonatomic) NSString * _Nonnull publicKey;
[Export ("publicKey")]
string PublicKey { get; }

// @property (readonly, nonatomic) NSString * _Nullable releaseName;
[NullAllowed, Export ("releaseName")]
string ReleaseName { get; }

// @property (readonly, nonatomic) NSString * _Nullable environment;
[NullAllowed, Export ("environment")]
string Environment { get; }

// @property (readonly, nonatomic) NSString * _Nullable transaction;
[NullAllowed, Export ("transaction")]
string Transaction { get; }

// @property (readonly, nonatomic) NSString * _Nullable userSegment;
[NullAllowed, Export ("userSegment")]
string UserSegment { get; }

// @property (readonly, nonatomic) NSString * _Nullable sampleRate;
[NullAllowed, Export ("sampleRate")]
string SampleRate { get; }

// @property (readonly, nonatomic) NSString * _Nullable sampled;
[NullAllowed, Export ("sampled")]
string Sampled { get; }

// @property (readonly, nonatomic) NSString * _Nullable replayId;
[NullAllowed, Export ("replayId")]
string ReplayId { get; }

// -(instancetype _Nonnull)initWithTraceId:(SentryId * _Nonnull)traceId publicKey:(NSString * _Nonnull)publicKey releaseName:(NSString * _Nullable)releaseName environment:(NSString * _Nullable)environment transaction:(NSString * _Nullable)transaction userSegment:(NSString * _Nullable)userSegment sampleRate:(NSString * _Nullable)sampleRate sampled:(NSString * _Nullable)sampled replayId:(NSString * _Nullable)replayId;
[Export ("initWithTraceId:publicKey:releaseName:environment:transaction:userSegment:sampleRate:sampled:replayId:")]
NativeHandle Constructor (SentryId traceId, string publicKey, [NullAllowed] string releaseName, [NullAllowed] string environment, [NullAllowed] string transaction, [NullAllowed] string userSegment, [NullAllowed] string sampleRate, [NullAllowed] string sampled, [NullAllowed] string replayId);

// -(instancetype _Nullable)initWithScope:(SentryScope * _Nonnull)scope options:(SentryOptions * _Nonnull)options;
[Export ("initWithScope:options:")]
NativeHandle Constructor (SentryScope scope, SentryOptions options);

// -(instancetype _Nullable)initWithDict:(NSDictionary<NSString *,id> * _Nonnull)dictionary;
[Export ("initWithDict:")]
NativeHandle Constructor (NSDictionary<NSString, NSObject> dictionary);

// -(instancetype _Nullable)initWithTracer:(SentryTracer * _Nonnull)tracer scope:(SentryScope * _Nullable)scope options:(SentryOptions * _Nonnull)options;
[Export ("initWithTracer:scope:options:")]
NativeHandle Constructor (SentryTracer tracer, [NullAllowed] SentryScope scope, SentryOptions options);

// -(instancetype _Nonnull)initWithTraceId:(SentryId * _Nonnull)traceId options:(SentryOptions * _Nonnull)options userSegment:(NSString * _Nullable)userSegment replayId:(NSString * _Nullable)replayId;
[Export ("initWithTraceId:options:userSegment:replayId:")]
NativeHandle Constructor (SentryId traceId, SentryOptions options, [NullAllowed] string userSegment, [NullAllowed] string replayId);

// -(SentryBaggage * _Nonnull)toBaggage;
[Export ("toBaggage")]
SentryBaggage ToBaggage();
}

// @interface SentryTraceHeader : NSObject
[BaseType (typeof(NSObject))]
[DisableDefaultCtor]
Expand Down
7 changes: 0 additions & 7 deletions src/Sentry.Bindings.Cocoa/PrivateApiDefinitions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@ partial interface SentryScope
// The following types are type-forwarded in various public headers, but have no headers of their own.
// Generate stub classes so the APIs that use them can still operate.

[Internal]
[DisableDefaultCtor]
[BaseType (typeof(NSObject))]
interface SentryBaggage
{
}

[Internal]
[DisableDefaultCtor]
[BaseType (typeof(NSObject))]
Expand Down

0 comments on commit bddec9f

Please sign in to comment.