Skip to content

Commit

Permalink
sample rate as string
Browse files Browse the repository at this point in the history
  • Loading branch information
brustolin committed Jul 7, 2022
1 parent ebd353c commit 1e20433
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Sources/Sentry/SentryBaggage.m
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ - (instancetype)initWithTraceId:(SentryId *)traceId
releaseName:(nullable NSString *)releaseName
environment:(nullable NSString *)environment
userSegment:(nullable NSString *)userSegment
sampleRate:(nullable NSNumber *)sampleRate
sampleRate:(nullable NSString *)sampleRate
{

if (self = [super init]) {
Expand Down
10 changes: 5 additions & 5 deletions Sources/Sentry/SentryTraceContext.m
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ - (instancetype)initWithTraceId:(SentryId *)traceId
releaseName:(nullable NSString *)releaseName
environment:(nullable NSString *)environment
userSegment:(nullable NSString *)userSegment
sampleRate:(nullable NSNumber *)sampleRate
sampleRate:(nullable NSString *)sampleRate
{
if (self = [super init]) {
_traceId = traceId;
Expand Down Expand Up @@ -53,9 +53,9 @@ - (nullable instancetype)initWithTracer:(SentryTracer *)tracer
[scope.userObject.data[@"segment"] isKindOfClass:[NSString class]])
userSegment = scope.userObject.data[@"segment"];

NSNumber *sampleRate = nil;
NSString *sampleRate = nil;
if ([tracer.context isKindOfClass:[SentryTransactionContext class]]) {
sampleRate = [(SentryTransactionContext *)tracer.context sampleRate];
sampleRate = [NSString stringWithFormat:@"%@", [(SentryTransactionContext *)tracer.context sampleRate]];
}

return [self initWithTraceId:tracer.context.traceId
Expand All @@ -81,7 +81,7 @@ - (nullable instancetype)initWithDict:(NSDictionary<NSString *, id> *)dictionary
} else {
userSegment = dictionary[@"user_segment"];
}

return [self initWithTraceId:traceId
publicKey:publicKey
releaseName:dictionary[@"release"]
Expand Down Expand Up @@ -116,7 +116,7 @@ - (SentryBaggage *)toBaggage
[result setValue:_userSegment forKey:@"user_segment"];

if (_sampleRate != nil)
[result setValue:[NSString stringWithFormat:@"%@", _sampleRate] forKey:@"sample_rate"];
[result setValue:_sampleRate forKey:@"sample_rate"];

return result;
}
Expand Down
4 changes: 2 additions & 2 deletions Sources/Sentry/include/SentryBaggage.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ static NSString *const SENTRY_BAGGAGE_HEADER = @"baggage";
/**
* The sample rate.
*/
@property (nullable, nonatomic, readonly) NSNumber *sampleRate;
@property (nullable, nonatomic, readonly) NSString *sampleRate;

- (instancetype)initWithTraceId:(SentryId *)traceId
publicKey:(NSString *)publicKey
releaseName:(nullable NSString *)releaseName
environment:(nullable NSString *)environment
userSegment:(nullable NSString *)userSegment
sampleRate:(nullable NSNumber *)sampleRate;
sampleRate:(nullable NSString *)sampleRate;

- (NSString *)toHTTPHeader;

Expand Down
4 changes: 2 additions & 2 deletions Sources/Sentry/include/SentryTraceContext.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ NS_ASSUME_NONNULL_BEGIN
/**
* Sample rate used for this trace.
*/
@property (nullable, nonatomic) NSNumber *sampleRate;
@property (nullable, nonatomic) NSString *sampleRate;

/**
* Initializes a SentryTraceContext with given properties.
Expand All @@ -47,7 +47,7 @@ NS_ASSUME_NONNULL_BEGIN
releaseName:(nullable NSString *)releaseName
environment:(nullable NSString *)environment
userSegment:(nullable NSString *)userSegment
sampleRate:(nullable NSNumber *)sampleRate;
sampleRate:(nullable NSString *)sampleRate;

/**
* Initializes a SentryTraceContext with data from scope and options.
Expand Down
2 changes: 1 addition & 1 deletion Tests/SentryTests/Helper/SentrySerializationTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class SentrySerializationTests: XCTestCase {

private class Fixture {
static var invalidData = "hi".data(using: .utf8)!
static var traceContext = SentryTraceContext(trace: SentryId(), publicKey: "PUBLIC_KEY", releaseName: "RELEASE_NAME", environment: "TEST", userSegment: "some segment", sampleRate: NSNumber(value: 0.25))
static var traceContext = SentryTraceContext(trace: SentryId(), publicKey: "PUBLIC_KEY", releaseName: "RELEASE_NAME", environment: "TEST", userSegment: "some segment", sampleRate: "0.25")
}

func testSentryEnvelopeSerializer_WithSingleEvent() {
Expand Down
2 changes: 1 addition & 1 deletion Tests/SentryTests/Transaction/SentryBaggageTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import XCTest
class SentryBaggageTests: XCTestCase {

func test_baggageToHeader() {
let header = SentryBaggage(trace: SentryId.empty, publicKey: "publicKey", releaseName: "release name", environment: "teste", userSegment: "test user", sampleRate: 0.49).toHTTPHeader()
let header = SentryBaggage(trace: SentryId.empty, publicKey: "publicKey", releaseName: "release name", environment: "teste", userSegment: "test user", sampleRate: "0.49").toHTTPHeader()

XCTAssertEqual(header, "sentry-environment=teste,sentry-public_key=publicKey,sentry-release=release%20name,sentry-sample_rate=0.49,sentry-trace_id=00000000000000000000000000000000,sentry-user_segment=test%20user")
}
Expand Down
2 changes: 1 addition & 1 deletion Tests/SentryTests/Transaction/SentryTraceStateTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class SentryTraceContextTests: XCTestCase {
let tracer: SentryTracer
let userId = "SomeUserID"
let userSegment = "Test Segment"
let sampleRate = NSNumber(value: 0.45)
let sampleRate = "0.45"
let traceId: SentryId
let publicKey = "SentrySessionTrackerTests"
let releaseName = "SentrySessionTrackerIntegrationTests"
Expand Down

0 comments on commit 1e20433

Please sign in to comment.