Skip to content

Commit 7a6dbcc

Browse files
louiszawadzkilouiszawadzki
authored
Merge pull request #622 from DataDog/louiszawadzki/update-ios-2.7-android-2.6
Update Native SDKs
2 parents e51258c + 1f723e2 commit 7a6dbcc

File tree

15 files changed

+98
-94
lines changed

15 files changed

+98
-94
lines changed

‎example-new-architecture/ios/Podfile.lock‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
PODS:
22
- boost (1.76.0)
33
- CocoaAsyncSocket (7.6.5)
4-
- DatadogCore (2.6.0):
5-
- DatadogInternal (= 2.6.0)
6-
- DatadogCrashReporting (2.6.0):
7-
- DatadogInternal (= 2.6.0)
4+
- DatadogCore (2.7.1):
5+
- DatadogInternal (= 2.7.1)
6+
- DatadogCrashReporting (2.7.1):
7+
- DatadogInternal (= 2.7.1)
88
- PLCrashReporter (~> 1.11.1)
9-
- DatadogInternal (2.6.0)
10-
- DatadogLogs (2.6.0):
11-
- DatadogInternal (= 2.6.0)
12-
- DatadogRUM (2.6.0):
13-
- DatadogInternal (= 2.6.0)
9+
- DatadogInternal (2.7.1)
10+
- DatadogLogs (2.7.1):
11+
- DatadogInternal (= 2.7.1)
12+
- DatadogRUM (2.7.1):
13+
- DatadogInternal (= 2.7.1)
1414
- DatadogSDKReactNative (2.1.1):
15-
- DatadogCore (~> 2.6.0)
16-
- DatadogCrashReporting (~> 2.6.0)
17-
- DatadogLogs (~> 2.6.0)
18-
- DatadogRUM (~> 2.6.0)
19-
- DatadogTrace (~> 2.6.0)
20-
- DatadogWebViewTracking (~> 2.6.0)
15+
- DatadogCore (~> 2.7.1)
16+
- DatadogCrashReporting (~> 2.7.1)
17+
- DatadogLogs (~> 2.7.1)
18+
- DatadogRUM (~> 2.7.1)
19+
- DatadogTrace (~> 2.7.1)
20+
- DatadogWebViewTracking (~> 2.7.1)
2121
- RCT-Folly (= 2021.07.22.00)
2222
- RCTRequired
2323
- RCTTypeSafety
@@ -26,10 +26,10 @@ PODS:
2626
- React-RCTFabric
2727
- ReactCommon/turbomodule/bridging
2828
- ReactCommon/turbomodule/core
29-
- DatadogTrace (2.6.0):
30-
- DatadogInternal (= 2.6.0)
31-
- DatadogWebViewTracking (2.6.0):
32-
- DatadogInternal (= 2.6.0)
29+
- DatadogTrace (2.7.1):
30+
- DatadogInternal (= 2.7.1)
31+
- DatadogWebViewTracking (2.7.1):
32+
- DatadogInternal (= 2.7.1)
3333
- DoubleConversion (1.1.6)
3434
- FBLazyVector (0.71.10)
3535
- FBReactNativeSpec (0.71.10):
@@ -959,14 +959,14 @@ EXTERNAL SOURCES:
959959
SPEC CHECKSUMS:
960960
boost: 57d2868c099736d80fcd648bf211b4431e51a558
961961
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
962-
DatadogCore: 2b9cae7b3706ec29c6329f5b2e350bd70395bfb6
963-
DatadogCrashReporting: 0ebc16ea7f226805c19a7efa6dab47f3743c6d2c
964-
DatadogInternal: 6febbce547fac204638f2ef5fe53cea49d05215b
965-
DatadogLogs: 23905c3f91c8c3c9ab3bd0f00ec5c070fccafa36
966-
DatadogRUM: 691819a9d5fc1924f783af6ad6eb609e5ab35e72
967-
DatadogSDKReactNative: bc78bd07898791562a2509d9502efedbd1909905
968-
DatadogTrace: e099ae8cab89bd01575809a93acdc3f69b599cbe
969-
DatadogWebViewTracking: d1c6e9b349444d8996380dd0545bdb3abd620302
962+
DatadogCore: 4a4cdf7beca3aa12b7095bebd926acea1a865a99
963+
DatadogCrashReporting: f8b4ea638acaf58b68bbc51cb62a2d876f763241
964+
DatadogInternal: b9217da25018284c087a2ed4b9bb3b0f26c767c0
965+
DatadogLogs: 3b4132eefa67f196bb3ab2d603c1a2acd1292615
966+
DatadogRUM: 8845815ba89f5ab8ceee765ee268f7de36f3e35d
967+
DatadogSDKReactNative: edcd5a126670c46256ca7d51389fbb0cdd408a3e
968+
DatadogTrace: a63da746c609bd4c683bca61a94429889e33b11e
969+
DatadogWebViewTracking: 713f862ddd89173e0a3f5342cefa23def40f0f48
970970
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
971971
FBLazyVector: ddb55c55295ea51ed98aa7e2e08add2f826309d5
972972
FBReactNativeSpec: 33a87f65f1a467d5f63d11d0cc106a10d3b0639d

‎example/ios/DdSdkReactNativeExample.xcodeproj/xcshareddata/xcschemes/DdSdkReactNativeExample.xcscheme‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
1818
BuildableName = "ddSdkReactnativeExample.app"
1919
BlueprintName = "ddSdkReactnativeExample"
20-
ReferencedContainer = "container:ddSdkReactnativeExample.xcodeproj">
20+
ReferencedContainer = "container:DdSdkReactNativeExample.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
</BuildActionEntries>
@@ -35,7 +35,7 @@
3535
BlueprintIdentifier = "00E356ED1AD99517003FC87E"
3636
BuildableName = "ddSdkReactnativeExampleTests.xctest"
3737
BlueprintName = "ddSdkReactnativeExampleTests"
38-
ReferencedContainer = "container:ddSdkReactnativeExample.xcodeproj">
38+
ReferencedContainer = "container:DdSdkReactNativeExample.xcodeproj">
3939
</BuildableReference>
4040
</TestableReference>
4141
</Testables>
@@ -57,7 +57,7 @@
5757
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
5858
BuildableName = "ddSdkReactnativeExample.app"
5959
BlueprintName = "ddSdkReactnativeExample"
60-
ReferencedContainer = "container:ddSdkReactnativeExample.xcodeproj">
60+
ReferencedContainer = "container:DdSdkReactNativeExample.xcodeproj">
6161
</BuildableReference>
6262
</BuildableProductRunnable>
6363
</LaunchAction>
@@ -74,7 +74,7 @@
7474
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
7575
BuildableName = "ddSdkReactnativeExample.app"
7676
BlueprintName = "ddSdkReactnativeExample"
77-
ReferencedContainer = "container:ddSdkReactnativeExample.xcodeproj">
77+
ReferencedContainer = "container:DdSdkReactNativeExample.xcodeproj">
7878
</BuildableReference>
7979
</BuildableProductRunnable>
8080
</ProfileAction>

‎example/ios/Podfile.lock‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
PODS:
22
- boost (1.76.0)
3-
- DatadogCore (2.6.0):
4-
- DatadogInternal (= 2.6.0)
5-
- DatadogCrashReporting (2.6.0):
6-
- DatadogInternal (= 2.6.0)
3+
- DatadogCore (2.7.1):
4+
- DatadogInternal (= 2.7.1)
5+
- DatadogCrashReporting (2.7.1):
6+
- DatadogInternal (= 2.7.1)
77
- PLCrashReporter (~> 1.11.1)
8-
- DatadogInternal (2.6.0)
9-
- DatadogLogs (2.6.0):
10-
- DatadogInternal (= 2.6.0)
11-
- DatadogRUM (2.6.0):
12-
- DatadogInternal (= 2.6.0)
8+
- DatadogInternal (2.7.1)
9+
- DatadogLogs (2.7.1):
10+
- DatadogInternal (= 2.7.1)
11+
- DatadogRUM (2.7.1):
12+
- DatadogInternal (= 2.7.1)
1313
- DatadogSDKReactNative (2.1.1):
14-
- DatadogCore (~> 2.6.0)
15-
- DatadogCrashReporting (~> 2.6.0)
16-
- DatadogLogs (~> 2.6.0)
17-
- DatadogRUM (~> 2.6.0)
18-
- DatadogTrace (~> 2.6.0)
19-
- DatadogWebViewTracking (~> 2.6.0)
14+
- DatadogCore (~> 2.7.1)
15+
- DatadogCrashReporting (~> 2.7.1)
16+
- DatadogLogs (~> 2.7.1)
17+
- DatadogRUM (~> 2.7.1)
18+
- DatadogTrace (~> 2.7.1)
19+
- DatadogWebViewTracking (~> 2.7.1)
2020
- React-Core
2121
- DatadogSDKReactNative/Tests (2.1.1):
22-
- DatadogCore (~> 2.6.0)
23-
- DatadogCrashReporting (~> 2.6.0)
24-
- DatadogLogs (~> 2.6.0)
25-
- DatadogRUM (~> 2.6.0)
26-
- DatadogTrace (~> 2.6.0)
27-
- DatadogWebViewTracking (~> 2.6.0)
22+
- DatadogCore (~> 2.7.1)
23+
- DatadogCrashReporting (~> 2.7.1)
24+
- DatadogLogs (~> 2.7.1)
25+
- DatadogRUM (~> 2.7.1)
26+
- DatadogTrace (~> 2.7.1)
27+
- DatadogWebViewTracking (~> 2.7.1)
2828
- React-Core
2929
- DatadogSDKReactNativeSessionReplay (2.1.1-alpha.0):
3030
- DatadogSDKReactNative
31-
- DatadogSessionReplay (~> 2.6.0)
31+
- DatadogSessionReplay (~> 2.7.1)
3232
- React-Core
3333
- DatadogSDKReactNativeSessionReplay/Tests (2.1.1-alpha.0):
3434
- DatadogSDKReactNative
35-
- DatadogSessionReplay (~> 2.6.0)
35+
- DatadogSessionReplay (~> 2.7.1)
3636
- React-Core
3737
- React-RCTText
38-
- DatadogSessionReplay (2.6.0):
39-
- DatadogInternal (= 2.6.0)
40-
- DatadogTrace (2.6.0):
41-
- DatadogInternal (= 2.6.0)
42-
- DatadogWebViewTracking (2.6.0):
43-
- DatadogInternal (= 2.6.0)
38+
- DatadogSessionReplay (2.7.1):
39+
- DatadogInternal (= 2.7.1)
40+
- DatadogTrace (2.7.1):
41+
- DatadogInternal (= 2.7.1)
42+
- DatadogWebViewTracking (2.7.1):
43+
- DatadogInternal (= 2.7.1)
4444
- DoubleConversion (1.1.6)
4545
- FBLazyVector (0.71.10)
4646
- FBReactNativeSpec (0.71.10):
@@ -572,16 +572,16 @@ EXTERNAL SOURCES:
572572

573573
SPEC CHECKSUMS:
574574
boost: 57d2868c099736d80fcd648bf211b4431e51a558
575-
DatadogCore: 2b9cae7b3706ec29c6329f5b2e350bd70395bfb6
576-
DatadogCrashReporting: 0ebc16ea7f226805c19a7efa6dab47f3743c6d2c
577-
DatadogInternal: 6febbce547fac204638f2ef5fe53cea49d05215b
578-
DatadogLogs: 23905c3f91c8c3c9ab3bd0f00ec5c070fccafa36
579-
DatadogRUM: 691819a9d5fc1924f783af6ad6eb609e5ab35e72
580-
DatadogSDKReactNative: 4d12e67f105155f600a87d54fc8a672ff81ba25d
581-
DatadogSDKReactNativeSessionReplay: 96c5d5bf6b854683bba0b7a4b6cee3e4d1d8d7a1
582-
DatadogSessionReplay: 0198de603c4d7d0755d61f33f13855b9743586af
583-
DatadogTrace: e099ae8cab89bd01575809a93acdc3f69b599cbe
584-
DatadogWebViewTracking: d1c6e9b349444d8996380dd0545bdb3abd620302
575+
DatadogCore: 4a4cdf7beca3aa12b7095bebd926acea1a865a99
576+
DatadogCrashReporting: f8b4ea638acaf58b68bbc51cb62a2d876f763241
577+
DatadogInternal: b9217da25018284c087a2ed4b9bb3b0f26c767c0
578+
DatadogLogs: 3b4132eefa67f196bb3ab2d603c1a2acd1292615
579+
DatadogRUM: 8845815ba89f5ab8ceee765ee268f7de36f3e35d
580+
DatadogSDKReactNative: ff81a887ec0702dac4f639c105cad2d14eee7726
581+
DatadogSDKReactNativeSessionReplay: edbfa199a3ffc4983538279db9583c97d4b92b64
582+
DatadogSessionReplay: f189054bd2fc2d14c487fd614f04b2b8041dd81f
583+
DatadogTrace: a63da746c609bd4c683bca61a94429889e33b11e
584+
DatadogWebViewTracking: 713f862ddd89173e0a3f5342cefa23def40f0f48
585585
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
586586
FBLazyVector: ddb55c55295ea51ed98aa7e2e08add2f826309d5
587587
FBReactNativeSpec: 90fc1a90b4b7a171e0a7c20ea426c1bf6ce4399c

‎packages/core/DatadogSDKReactNative.podspec‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ Pod::Spec.new do |s|
1919
s.dependency "React-Core"
2020

2121
# /!\ Remember to keep the versions in sync with DatadogSDKReactNativeSessionReplay.podspec
22-
s.dependency 'DatadogCore', '~> 2.6.0'
23-
s.dependency 'DatadogLogs', '~> 2.6.0'
24-
s.dependency 'DatadogTrace', '~> 2.6.0'
25-
s.dependency 'DatadogRUM', '~> 2.6.0'
26-
s.dependency 'DatadogCrashReporting', '~> 2.6.0'
27-
s.dependency 'DatadogWebViewTracking', '~> 2.6.0'
22+
s.dependency 'DatadogCore', '~> 2.7.1'
23+
s.dependency 'DatadogLogs', '~> 2.7.1'
24+
s.dependency 'DatadogTrace', '~> 2.7.1'
25+
s.dependency 'DatadogRUM', '~> 2.7.1'
26+
s.dependency 'DatadogCrashReporting', '~> 2.7.1'
27+
s.dependency 'DatadogWebViewTracking', '~> 2.7.1'
2828

2929
s.test_spec 'Tests' do |test_spec|
3030
test_spec.source_files = 'ios/Tests/*.swift'

‎packages/core/android/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,10 @@ dependencies {
186186
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
187187
compileOnly "com.squareup.okhttp3:okhttp:3.12.13"
188188

189-
implementation "com.datadoghq:dd-sdk-android-rum:2.5.0"
190-
implementation "com.datadoghq:dd-sdk-android-logs:2.5.0"
191-
implementation "com.datadoghq:dd-sdk-android-trace:2.5.0"
192-
implementation "com.datadoghq:dd-sdk-android-webview:2.5.0"
189+
implementation "com.datadoghq:dd-sdk-android-rum:2.6.2"
190+
implementation "com.datadoghq:dd-sdk-android-logs:2.6.2"
191+
implementation "com.datadoghq:dd-sdk-android-trace:2.6.2"
192+
implementation "com.datadoghq:dd-sdk-android-webview:2.6.2"
193193
testImplementation "org.junit.platform:junit-platform-launcher:1.6.2"
194194
testImplementation "org.junit.jupiter:junit-jupiter-api:5.6.2"
195195
testImplementation "org.junit.jupiter:junit-jupiter-engine:5.6.2"

‎packages/core/android/src/main/kotlin/com/datadog/reactnative/DdRumImplementation.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,9 @@ class DdRumImplementation(private val datadog: DatadogWrapper = DatadogSDKWrappe
314314
"patch" -> RumResourceMethod.PATCH
315315
"put" -> RumResourceMethod.PUT
316316
"post" -> RumResourceMethod.POST
317+
"trace" -> RumResourceMethod.TRACE
318+
"options" -> RumResourceMethod.OPTIONS
319+
"connect" -> RumResourceMethod.CONNECT
317320
else -> {
318321
Log.w(
319322
DdRum::class.java.canonicalName,

‎packages/core/android/src/test/kotlin/com/datadog/tools/unit/forge/ActionEventForgeryFactory.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ internal class ActionEventForgeryFactory :
3737
)
3838
}
3939
),
40-
view = ActionEvent.View(
40+
view = ActionEvent.ActionEventView(
4141
id = forge.getForgery<UUID>().toString(),
4242
url = forge.aStringMatching("https://[a-z]+.[a-z]{3}/[a-z0-9_/]+"),
4343
referrer = forge.aNullable { getForgery<URL>().toString() },

‎packages/core/android/src/test/kotlin/com/datadog/tools/unit/forge/ResourceEventForgeryFactory.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ internal class ResourceEventForgeryFactory :
4545
)
4646
}
4747
),
48-
view = ResourceEvent.View(
48+
view = ResourceEvent.ResourceEventView(
4949
id = forge.getForgery<UUID>().toString(),
5050
url = forge.aStringMatching("https://[a-z]+.[a-z]{3}/[a-z0-9_/]+"),
5151
referrer = forge.aNullable { getForgery<URL>().toString() },

‎packages/core/ios/Sources/DatadogSDKWrapper.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,39 +72,39 @@ public class DatadogSDKWrapper {
7272
if let core = coreInstance {
7373
RUM.enable(with: configuration, in: core)
7474
} else {
75-
consolePrint("Core instance was not found when initializing RUM.")
75+
consolePrint("Core instance was not found when initializing RUM.", .critical)
7676
}
7777
}
7878

7979
internal func enableLogs(with configuration: Logs.Configuration) {
8080
if let core = coreInstance {
8181
Logs.enable(with: configuration, in: core)
8282
} else {
83-
consolePrint("Core instance was not found when initializing Logs.")
83+
consolePrint("Core instance was not found when initializing Logs.", .critical)
8484
}
8585
}
8686

8787
internal func enableTrace(with configuration: Trace.Configuration) {
8888
if let core = coreInstance {
8989
Trace.enable(with: configuration, in: core)
9090
} else {
91-
consolePrint("Core instance was not found when initializing Trace.")
91+
consolePrint("Core instance was not found when initializing Trace.", .critical)
9292
}
9393
}
9494

9595
internal func enableCrashReporting() {
9696
if let core = coreInstance {
9797
CrashReporting.enable(in: core)
9898
} else {
99-
consolePrint("Core instance was not found when initializing CrashReporting.")
99+
consolePrint("Core instance was not found when initializing CrashReporting.", .critical)
100100
}
101101
}
102102

103103
internal func createLogger() -> LoggerProtocol {
104104
if let core = coreInstance {
105105
return Logger.create(with: Logger.Configuration(networkInfoEnabled: true, consoleLogFormat: .short), in: core)
106106
} else {
107-
consolePrint("Core instance was not found when creating Logger.")
107+
consolePrint("Core instance was not found when creating Logger.", .critical)
108108
return Logger.create(with: Logger.Configuration(networkInfoEnabled: true, consoleLogFormat: .short))
109109
}
110110
}
@@ -151,7 +151,7 @@ public class DatadogSDKWrapper {
151151
if let core = coreInstance {
152152
webviewMessageEmitter = WebViewTracking._internal.messageEmitter(in: core)
153153
} else {
154-
consolePrint("Core instance was not found when initializing Webview tracking.")
154+
consolePrint("Core instance was not found when initializing Webview tracking.", .critical)
155155
}
156156
}
157157

‎packages/core/ios/Sources/DdSdkImplementation.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public class DdSdkImplementation: NSObject {
6868
if DatadogSDKWrapper.shared.isInitialized() {
6969
// Initializing the SDK twice results in Global.rum and
7070
// Global.sharedTracer to be set to no-op instances
71-
consolePrint("Datadog SDK is already initialized, skipping initialization.")
71+
consolePrint("Datadog SDK is already initialized, skipping initialization.", .debug)
7272
DatadogSDKWrapper.shared.telemetryDebug(id: "datadog_react_native: RN SDK was already initialized in native", message: "RN SDK was already initialized in native")
7373

7474
// This block is called when SDK is reinitialized and the javascript has been wiped out.

0 commit comments

Comments
 (0)