Skip to content

Commit 78cb7b9

Browse files
maxepmaxep
committed
Merge branch 'develop' into hotfix/3.5.1
2 parents 1fb84ed + d8db9d9 commit 78cb7b9

File tree

79 files changed

+2337
-433
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+2337
-433
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ A brief description of implementation details of this PR.
1010
- [ ] Feature or bugfix MUST have appropriate tests (unit, integration)
1111
- [ ] Make sure each commit and the PR mention the Issue number or JIRA reference
1212
- [ ] Add CHANGELOG entry for user facing changes
13-
- [ ] Add Objective-C interface for public APIs (see our [guidelines](https://datadoghq.atlassian.net/wiki/spaces/RUMP/pages/3157787243/RFC+-+Modular+Objective-C+Interface#Recommended-solution) (internal) and run `make api-surface`)
13+
- [ ] Add Objective-C interface for public APIs - see our [guidelines](https://datadoghq.atlassian.net/wiki/spaces/RUMP/pages/3157787243/RFC+-+Modular+Objective-C+Interface#Recommended-solution) (internal)
14+
- [ ] Run `make api-surface` when adding new APIs

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# 3.5.1 / 23-01-2025
44

55
- [FIX] Fix crash in App Hangs backtrace generation. See [#2647][]
6+
- [IMPROVEMENT] Add `DDLogEventUserInfo.anonymousId` property in ObjC API. See [#2640][]
7+
- [FEATURE] Support manually keeping or dropping a trace. See [#2639][]
68

79
# 3.5.0 / 12-01-2025
810

@@ -1024,6 +1026,8 @@ Release `2.0` introduces breaking changes. Follow the [Migration Guide](MIGRATIO
10241026
[#2631]: https://github.com/DataDog/dd-sdk-ios/pull/2631
10251027
[#2633]: https://github.com/DataDog/dd-sdk-ios/pull/2633
10261028
[#2647]: https://github.com/DataDog/dd-sdk-ios/pull/2647
1029+
[#2640]: https://github.com/DataDog/dd-sdk-ios/pull/2640
1030+
[#2639]: https://github.com/DataDog/dd-sdk-ios/pull/2639
10271031

10281032
[@00fa9a]: https://github.com/00FA9A
10291033
[@britton-earnin]: https://github.com/Britton-Earnin

‎Datadog/Datadog.xcodeproj/project.pbxproj‎

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@
1010
0904F9F42EE1DA6800ED9A22 /* UIKitExtensionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0904F9F32EE1DA6800ED9A22 /* UIKitExtensionsTests.swift */; };
1111
0904F9F52EE1DA6800ED9A22 /* UIKitExtensionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0904F9F32EE1DA6800ED9A22 /* UIKitExtensionsTests.swift */; };
1212
0904F9F62EE1DA6800ED9A22 /* UIKitExtensionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0904F9F32EE1DA6800ED9A22 /* UIKitExtensionsTests.swift */; };
13+
09A9369D2F0EB989000B6379 /* SamplingMechanismType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09A9369A2F0EB989000B6379 /* SamplingMechanismType.swift */; };
14+
09A9369E2F0EB989000B6379 /* SamplingPriority.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09A9369B2F0EB989000B6379 /* SamplingPriority.swift */; };
15+
09A9369F2F0EB989000B6379 /* SpanContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09A9369C2F0EB989000B6379 /* SpanContext.swift */; };
16+
09A936A02F0EB989000B6379 /* SamplingMechanismType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09A9369A2F0EB989000B6379 /* SamplingMechanismType.swift */; };
17+
09A936A12F0EB989000B6379 /* SamplingPriority.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09A9369B2F0EB989000B6379 /* SamplingPriority.swift */; };
18+
09A936A22F0EB989000B6379 /* SpanContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09A9369C2F0EB989000B6379 /* SpanContext.swift */; };
19+
09D2B7EB2EF4258D0089F05B /* SamplingDecision.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09D2B7EA2EF4258D0089F05B /* SamplingDecision.swift */; };
20+
09D2B7EC2EF4258D0089F05B /* SamplingDecision.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09D2B7EA2EF4258D0089F05B /* SamplingDecision.swift */; };
1321
11030D5F2D959EAD00732D5F /* DatadogLogs.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D207317C29A5226A00ECBF94 /* DatadogLogs.framework */; };
1422
11030D642D959EC300732D5F /* DatadogLogs.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D20731B429A5279D00ECBF94 /* DatadogLogs.framework */; };
1523
11030D692D959F1700732D5F /* DatadogWebViewTracking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CE119FE29F7BE0100202522 /* DatadogWebViewTracking.framework */; };
@@ -1740,8 +1748,8 @@
17401748
D2BEEDB92B3360F50065F3AC /* URLSessionTaskDelegateSwizzlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2BEEDB72B3360F50065F3AC /* URLSessionTaskDelegateSwizzlerTests.swift */; };
17411749
D2BEEDBA2B33638F0065F3AC /* NetworkInstrumentationSwizzler.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2181A8A2B0500BB00A518C0 /* NetworkInstrumentationSwizzler.swift */; };
17421750
D2BEEDBB2B3363900065F3AC /* NetworkInstrumentationSwizzler.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2181A8A2B0500BB00A518C0 /* NetworkInstrumentationSwizzler.swift */; };
1743-
D2C179E12DD2388800556F68 /* SpanCoreContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2C179E02DD2388800556F68 /* SpanCoreContext.swift */; };
1744-
D2C179E22DD2388800556F68 /* SpanCoreContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2C179E02DD2388800556F68 /* SpanCoreContext.swift */; };
1751+
D2C179E12DD2388800556F68 /* TraceCoreContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2C179E02DD2388800556F68 /* TraceCoreContext.swift */; };
1752+
D2C179E22DD2388800556F68 /* TraceCoreContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2C179E02DD2388800556F68 /* TraceCoreContext.swift */; };
17451753
D2C1A4FA29C4C4CB00946C31 /* SpanSanitizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61122ECD25B1B74500F9C7F5 /* SpanSanitizer.swift */; };
17461754
D2C1A4FB29C4C4CB00946C31 /* MessageReceivers.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2546C0A29AF56270054E00B /* MessageReceivers.swift */; };
17471755
D2C1A4FC29C4C4CB00946C31 /* RequestBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2546C0729AF55E90054E00B /* RequestBuilder.swift */; };
@@ -2539,6 +2547,10 @@
25392547

25402548
/* Begin PBXFileReference section */
25412549
0904F9F32EE1DA6800ED9A22 /* UIKitExtensionsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIKitExtensionsTests.swift; sourceTree = "<group>"; };
2550+
09A9369A2F0EB989000B6379 /* SamplingMechanismType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SamplingMechanismType.swift; sourceTree = "<group>"; };
2551+
09A9369B2F0EB989000B6379 /* SamplingPriority.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SamplingPriority.swift; sourceTree = "<group>"; };
2552+
09A9369C2F0EB989000B6379 /* SpanContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpanContext.swift; sourceTree = "<group>"; };
2553+
09D2B7EA2EF4258D0089F05B /* SamplingDecision.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SamplingDecision.swift; sourceTree = "<group>"; };
25422554
11030D752D96EC5300732D5F /* ViewHitchesMetric.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewHitchesMetric.swift; sourceTree = "<group>"; };
25432555
110311752EF96ED000750DD4 /* DDLogs+apiTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "DDLogs+apiTests.m"; sourceTree = "<group>"; };
25442556
110B0ECA2DF0ABBE008ABA19 /* DeterministicSampler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeterministicSampler.swift; sourceTree = "<group>"; };
@@ -3598,7 +3610,7 @@
35983610
D2BEEDB12B335DA90065F3AC /* URLSessionTaskDelegateSwizzler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLSessionTaskDelegateSwizzler.swift; sourceTree = "<group>"; };
35993611
D2BEEDB42B33607D0065F3AC /* URLSessionSwizzler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLSessionSwizzler.swift; sourceTree = "<group>"; };
36003612
D2BEEDB72B3360F50065F3AC /* URLSessionTaskDelegateSwizzlerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLSessionTaskDelegateSwizzlerTests.swift; sourceTree = "<group>"; };
3601-
D2C179E02DD2388800556F68 /* SpanCoreContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpanCoreContext.swift; sourceTree = "<group>"; };
3613+
D2C179E02DD2388800556F68 /* TraceCoreContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TraceCoreContext.swift; sourceTree = "<group>"; };
36023614
D2C1A55A29C4F2DF00946C31 /* DatadogTrace.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DatadogTrace.framework; sourceTree = BUILT_PRODUCTS_DIR; };
36033615
D2C1A57329C4F2E800946C31 /* DatadogTraceTests tvOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "DatadogTraceTests tvOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
36043616
D2C5D52A2B84F6AB00B63F36 /* WebViewRecordReceiver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebViewRecordReceiver.swift; sourceTree = "<group>"; };
@@ -6978,6 +6990,7 @@
69786990
61A2CC382A44B0EA0000FF25 /* Trace.swift */,
69796991
61A2CC352A44B0A20000FF25 /* TraceConfiguration.swift */,
69806992
61A2CC3B2A44BED30000FF25 /* Tracer.swift */,
6993+
09D2B7EA2EF4258D0089F05B /* SamplingDecision.swift */,
69816994
D2546C0629AF55CE0054E00B /* Feature */,
69826995
D21C26E928AF9D22005DD405 /* Integrations */,
69836996
11F55FEA2DCE501A00DE4944 /* Objc */,
@@ -7254,9 +7267,14 @@
72547267
D2D748342DC223EE00C61353 /* Trace */ = {
72557268
isa = PBXGroup;
72567269
children = (
7257-
D2C179E02DD2388800556F68 /* SpanCoreContext.swift */,
7270+
D2C179E02DD2388800556F68 /* TraceCoreContext.swift */,
72587271
D2D748382DC2306100C61353 /* TraceID.swift */,
7272+
09A9369A2F0EB989000B6379 /* SamplingMechanismType.swift */,
7273+
09A9369B2F0EB989000B6379 /* SamplingPriority.swift */,
7274+
09A9369C2F0EB989000B6379 /* SpanContext.swift */,
7275+
D2C179E02DD2388800556F68 /* SpanCoreContext.swift */,
72597276
D2D748392DC2306100C61353 /* SpanID.swift */,
7277+
D2D748382DC2306100C61353 /* TraceID.swift */,
72607278
);
72617279
path = Trace;
72627280
sourceTree = "<group>";
@@ -9742,6 +9760,9 @@
97429760
D23039FA298D5236001A1FA3 /* Telemetry.swift in Sources */,
97439761
D23039FC298D5236001A1FA3 /* DataFormat.swift in Sources */,
97449762
D2160CED29C0E0E600FAA9A5 /* DatadogURLSessionHandler.swift in Sources */,
9763+
09A936A02F0EB989000B6379 /* SamplingMechanismType.swift in Sources */,
9764+
09A936A12F0EB989000B6379 /* SamplingPriority.swift in Sources */,
9765+
09A936A22F0EB989000B6379 /* SpanContext.swift in Sources */,
97459766
D2160C9E29C0DE5700FAA9A5 /* TracingHeaderType.swift in Sources */,
97469767
D23039F5298D5236001A1FA3 /* AnyEncodable.swift in Sources */,
97479768
D2303A00298D5236001A1FA3 /* DatadogExtended.swift in Sources */,
@@ -9802,7 +9823,7 @@
98029823
D23039E0298D5235001A1FA3 /* DatadogCoreProtocol.swift in Sources */,
98039824
5BFDD7A92E28FDD3009A2CEE /* RUMWebViewContext.swift in Sources */,
98049825
D23039FD298D5236001A1FA3 /* DataCompression.swift in Sources */,
9805-
D2C179E12DD2388800556F68 /* SpanCoreContext.swift in Sources */,
9826+
D2C179E12DD2388800556F68 /* TraceCoreContext.swift in Sources */,
98069827
B3E46CAE2D91B40000BABF66 /* NetworkContext.swift in Sources */,
98079828
D2EA0F462C0E1AE300CB20F8 /* SessionReplayConfiguration.swift in Sources */,
98089829
6167E6F92B81E95900C3CA2D /* BinaryImage.swift in Sources */,
@@ -10252,6 +10273,7 @@
1025210273
D2C1A51429C4C53F00946C31 /* OTSpanContext.swift in Sources */,
1025310274
3C6C7FEB2B459AAA006F5CBC /* OTelTraceId+Datadog.swift in Sources */,
1025410275
3C6C7FE92B459AAA006F5CBC /* OTelSpanBuilder.swift in Sources */,
10276+
09D2B7EC2EF4258D0089F05B /* SamplingDecision.swift in Sources */,
1025510277
D2C1A51329C4C53F00946C31 /* OTReference.swift in Sources */,
1025610278
3C6C7FEF2B459AAA006F5CBC /* OTelSpanId+Datadog.swift in Sources */,
1025710279
D2C1A4FB29C4C4CB00946C31 /* MessageReceivers.swift in Sources */,
@@ -10550,6 +10572,7 @@
1055010572
D2C1A53E29C4F2DF00946C31 /* OTSpanContext.swift in Sources */,
1055110573
3C6C7FEC2B459AAA006F5CBC /* OTelTraceId+Datadog.swift in Sources */,
1055210574
3C6C7FEA2B459AAA006F5CBC /* OTelSpanBuilder.swift in Sources */,
10575+
09D2B7EB2EF4258D0089F05B /* SamplingDecision.swift in Sources */,
1055310576
D2C1A53F29C4F2DF00946C31 /* OTReference.swift in Sources */,
1055410577
3C6C7FF02B459AAA006F5CBC /* OTelSpanId+Datadog.swift in Sources */,
1055510578
D2C1A54129C4F2DF00946C31 /* MessageReceivers.swift in Sources */,
@@ -10958,6 +10981,9 @@
1095810981
D2D3199B29E98D970004F169 /* DefaultJSONEncoder.swift in Sources */,
1095910982
D2D748322DC220B100C61353 /* LogMessage.swift in Sources */,
1096010983
6128F56B2BA2237300D35B08 /* DataStore.swift in Sources */,
10984+
09A9369D2F0EB989000B6379 /* SamplingMechanismType.swift in Sources */,
10985+
09A9369E2F0EB989000B6379 /* SamplingPriority.swift in Sources */,
10986+
09A9369F2F0EB989000B6379 /* SpanContext.swift in Sources */,
1096110987
3C3EF2B12C1AEBAB009E9E57 /* LaunchReport.swift in Sources */,
1096210988
6167E7012B81EF7500C3CA2D /* BacktraceReportingFeature.swift in Sources */,
1096310989
D2EBEE3529BA161100B15732 /* B3HTTPHeadersWriter.swift in Sources */,
@@ -10981,7 +11007,7 @@
1098111007
D2DA237D298D57AA00C6C7E6 /* DataCompression.swift in Sources */,
1098211008
5BFDD7AA2E28FDD3009A2CEE /* RUMWebViewContext.swift in Sources */,
1098311009
D2C9A26A2C0F3F5A007526F5 /* SessionReplayConfiguration.swift in Sources */,
10984-
D2C179E22DD2388800556F68 /* SpanCoreContext.swift in Sources */,
11010+
D2C179E22DD2388800556F68 /* TraceCoreContext.swift in Sources */,
1098511011
B3E46CAF2D91B40000BABF66 /* NetworkContext.swift in Sources */,
1098611012
6167E6FA2B81E95900C3CA2D /* BinaryImage.swift in Sources */,
1098711013
618031F92D6DC430007027E3 /* Threading.swift in Sources */,

‎Datadog/IntegrationUnitTests/RUM/WatchdogTerminationsMonitoringTests.swift‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ class WatchdogTerminationsMonitoringTests: XCTestCase {
2121
isSimulator: false,
2222
vendorId: .mockAny(),
2323
isDebugging: false,
24-
systemBootTime: .init()
24+
systemBootTime: .init(),
25+
logicalCpuCount: .mockRandom(),
26+
totalRam: .mockRandom()
2527
)
2628

2729
override func setUp() {

0 commit comments

Comments
 (0)