Skip to content

Commit 75ebf14

Browse files
fractalwrenchfractalwrench
authored
Merge pull request #2591 from embrace-io/alter-internal-api-entrypoint
Alter internal api entrypoint
2 parents bf37ad4 + d35db73 commit 75ebf14

File tree

15 files changed

+67
-70
lines changed

15 files changed

+67
-70
lines changed

‎embrace-android-compose/src/main/java/io/embrace/android/embracesdk/compose/internal/ComposeInternalErrorLogger.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ import io.embrace.android.embracesdk.internal.EmbraceInternalApi
55
internal class ComposeInternalErrorLogger {
66

77
fun logError(throwable: Throwable) {
8-
EmbraceInternalApi.getInstance().internalInterface.logInternalError(throwable)
8+
EmbraceInternalApi.internalInterface.logInternalError(throwable)
99
}
1010
}

‎embrace-android-compose/src/main/java/io/embrace/android/embracesdk/compose/internal/EmbraceNodeIterator.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ internal class EmbraceNodeIterator {
2828

2929
findClickedElement(semanticsNodes, x, y)?.let {
3030
val clickedView = ClickedView(it, x, y)
31-
EmbraceInternalApi.getInstance().internalInterface.logComposeTap(
31+
EmbraceInternalApi.internalInterface.logComposeTap(
3232
Pair(clickedView.x, clickedView.y),
3333
clickedView.tag
3434
)

‎embrace-android-fcm/src/main/java/io/embrace/android/embracesdk/internal/instrumentation/bytecode/FcmBytecodeEntrypoint.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ object FcmBytecodeEntrypoint {
2828
message.data.isNotEmpty()
2929
)
3030
} catch (e: Exception) {
31-
EmbraceInternalApi.getInstance().internalInterface.logInternalError(e)
31+
EmbraceInternalApi.internalInterface.logInternalError(e)
3232
}
3333
}
3434
}

‎embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/internal/instrumentation/bytecode/OkHttpBytecodeEntrypoint.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ object OkHttpBytecodeEntrypoint {
3535
* @param thiz the OkHttpClient builder in matter.
3636
*/
3737
private fun addEmbraceInterceptors(thiz: OkHttpClient.Builder) {
38-
val internalApi = EmbraceInternalApi.getInstance()
38+
val internalApi = EmbraceInternalApi
3939
try {
4040
val embrace = Embrace
4141
addInterceptor(

‎embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3ApplicationInterceptor.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package io.embrace.android.embracesdk.okhttp3
22

33
import io.embrace.android.embracesdk.Embrace
44
import io.embrace.android.embracesdk.internal.EmbraceInternalApi
5-
import io.embrace.android.embracesdk.internal.EmbraceInternalApi.Companion.CUSTOM_TRACE_ID_HEADER_NAME
5+
import io.embrace.android.embracesdk.internal.EmbraceInternalApi.CUSTOM_TRACE_ID_HEADER_NAME
66
import io.embrace.android.embracesdk.internal.network.http.EmbraceHttpPathOverride
77
import io.embrace.android.embracesdk.network.EmbraceNetworkRequest
88
import io.embrace.android.embracesdk.network.http.HttpMethod

‎embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3NetworkInterceptor.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package io.embrace.android.embracesdk.okhttp3
22

33
import io.embrace.android.embracesdk.Embrace
44
import io.embrace.android.embracesdk.internal.EmbraceInternalApi
5-
import io.embrace.android.embracesdk.internal.EmbraceInternalApi.Companion.CUSTOM_TRACE_ID_HEADER_NAME
5+
import io.embrace.android.embracesdk.internal.EmbraceInternalApi.CUSTOM_TRACE_ID_HEADER_NAME
66
import io.embrace.android.embracesdk.internal.clock.Clock
77
import io.embrace.android.embracesdk.internal.network.http.EmbraceHttpPathOverride
88
import io.embrace.android.embracesdk.internal.network.http.NetworkCaptureData

‎embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/EmbraceInternalInterfaceTest.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ internal class EmbraceInternalInterfaceTest {
4242
startSdk = false,
4343
testCaseAction = {
4444
assertFalse(embrace.isStarted)
45-
with(EmbraceInternalApi.getInstance().internalInterface) {
45+
with(EmbraceInternalApi.internalInterface) {
4646
logInfo("", null)
4747
logWarning("", null, null)
4848
logError("", null, null, false)
@@ -107,7 +107,7 @@ internal class EmbraceInternalInterfaceTest {
107107
testCaseAction = {
108108
recordSession {
109109
clock.tick()
110-
EmbraceInternalApi.getInstance().internalInterface.recordCompletedNetworkRequest(
110+
EmbraceInternalApi.internalInterface.recordCompletedNetworkRequest(
111111
url = URL,
112112
httpMethod = "GET",
113113
startTime = START_TIME,
@@ -119,7 +119,7 @@ internal class EmbraceInternalInterfaceTest {
119119
networkCaptureData = null
120120
)
121121

122-
EmbraceInternalApi.getInstance().internalInterface.recordIncompleteNetworkRequest(
122+
EmbraceInternalApi.internalInterface.recordIncompleteNetworkRequest(
123123
url = URL,
124124
httpMethod = "GET",
125125
startTime = START_TIME,
@@ -129,7 +129,7 @@ internal class EmbraceInternalInterfaceTest {
129129
networkCaptureData = null
130130
)
131131

132-
EmbraceInternalApi.getInstance().internalInterface.recordIncompleteNetworkRequest(
132+
EmbraceInternalApi.internalInterface.recordIncompleteNetworkRequest(
133133
url = URL,
134134
httpMethod = "GET",
135135
startTime = START_TIME,
@@ -140,7 +140,7 @@ internal class EmbraceInternalInterfaceTest {
140140
networkCaptureData = null
141141
)
142142

143-
EmbraceInternalApi.getInstance().internalInterface.recordNetworkRequest(
143+
EmbraceInternalApi.internalInterface.recordNetworkRequest(
144144
embraceNetworkRequest = EmbraceNetworkRequest.fromCompletedRequest(
145145
URL,
146146
HttpMethod.POST,
@@ -177,7 +177,7 @@ internal class EmbraceInternalInterfaceTest {
177177
testRule.runTest(
178178
testCaseAction = {
179179
recordSession {
180-
EmbraceInternalApi.getInstance().internalInterface.logComposeTap(
180+
EmbraceInternalApi.internalInterface.logComposeTap(
181181
Pair(expectedX, expectedY),
182182
expectedElementName
183183
)
@@ -213,19 +213,19 @@ internal class EmbraceInternalInterfaceTest {
213213
testCaseAction = {
214214
recordSession {
215215
assertTrue(
216-
EmbraceInternalApi.getInstance().internalInterface.shouldCaptureNetworkBody(
216+
EmbraceInternalApi.internalInterface.shouldCaptureNetworkBody(
217217
"capture.me",
218218
"GET"
219219
)
220220
)
221221
assertFalse(
222-
EmbraceInternalApi.getInstance().internalInterface.shouldCaptureNetworkBody(
222+
EmbraceInternalApi.internalInterface.shouldCaptureNetworkBody(
223223
"capture.me",
224224
"POST"
225225
)
226226
)
227-
assertFalse(EmbraceInternalApi.getInstance().internalInterface.shouldCaptureNetworkBody(URL, "GET"))
228-
assertFalse(EmbraceInternalApi.getInstance().internalInterface.isNetworkSpanForwardingEnabled())
227+
assertFalse(EmbraceInternalApi.internalInterface.shouldCaptureNetworkBody(URL, "GET"))
228+
assertFalse(EmbraceInternalApi.internalInterface.isNetworkSpanForwardingEnabled())
229229
}
230230
}
231231
)
@@ -236,7 +236,7 @@ internal class EmbraceInternalInterfaceTest {
236236
testRule.runTest(
237237
testCaseAction = {
238238
recordSession {
239-
with(EmbraceInternalApi.getInstance().internalInterface) {
239+
with(EmbraceInternalApi.internalInterface) {
240240
val parentSpanId = checkNotNull(startSpan(name = "tz-parent-span"))
241241
clock.tick(10)
242242
val childSpanId =
@@ -301,7 +301,7 @@ internal class EmbraceInternalInterfaceTest {
301301
fun `span logging across sessions`() {
302302
testRule.runTest(
303303
testCaseAction = {
304-
val internalInterface = checkNotNull(EmbraceInternalApi.getInstance().internalInterface)
304+
val internalInterface = checkNotNull(EmbraceInternalApi.internalInterface)
305305
var stoppedParentId = ""
306306
var activeParentId = ""
307307
recordSession {

‎embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/FlutterInternalInterfaceTest.kt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ internal class FlutterInternalInterfaceTest {
6969
instrumentedConfig = instrumentedConfig,
7070
testCaseAction = {
7171
recordSession {
72-
EmbraceInternalApi.getInstance().flutterInternalInterface.setDartVersion("28.9.1")
73-
EmbraceInternalApi.getInstance().flutterInternalInterface.setEmbraceFlutterSdkVersion("1.2.3")
72+
EmbraceInternalApi.flutterInternalInterface.setDartVersion("28.9.1")
73+
EmbraceInternalApi.flutterInternalInterface.setEmbraceFlutterSdkVersion("1.2.3")
7474
}
7575
},
7676
assertAction = {
@@ -89,8 +89,8 @@ internal class FlutterInternalInterfaceTest {
8989
instrumentedConfig = instrumentedConfig,
9090
testCaseAction = {
9191
recordSession {
92-
EmbraceInternalApi.getInstance().flutterInternalInterface.setDartVersion("28.9.1")
93-
EmbraceInternalApi.getInstance().flutterInternalInterface.setEmbraceFlutterSdkVersion("1.2.3")
92+
EmbraceInternalApi.flutterInternalInterface.setDartVersion("28.9.1")
93+
EmbraceInternalApi.flutterInternalInterface.setEmbraceFlutterSdkVersion("1.2.3")
9494
}
9595
recordSession()
9696
},
@@ -110,13 +110,13 @@ internal class FlutterInternalInterfaceTest {
110110
instrumentedConfig = instrumentedConfig,
111111
testCaseAction = {
112112
recordSession {
113-
EmbraceInternalApi.getInstance().flutterInternalInterface.setDartVersion("28.9.1")
114-
EmbraceInternalApi.getInstance().flutterInternalInterface.setEmbraceFlutterSdkVersion("1.2.3")
113+
EmbraceInternalApi.flutterInternalInterface.setDartVersion("28.9.1")
114+
EmbraceInternalApi.flutterInternalInterface.setEmbraceFlutterSdkVersion("1.2.3")
115115
}
116116

117117
recordSession {
118-
EmbraceInternalApi.getInstance().flutterInternalInterface.setDartVersion(null)
119-
EmbraceInternalApi.getInstance().flutterInternalInterface.setEmbraceFlutterSdkVersion(null)
118+
EmbraceInternalApi.flutterInternalInterface.setDartVersion(null)
119+
EmbraceInternalApi.flutterInternalInterface.setEmbraceFlutterSdkVersion(null)
120120
}
121121
},
122122
assertAction = {
@@ -135,13 +135,13 @@ internal class FlutterInternalInterfaceTest {
135135
instrumentedConfig = instrumentedConfig,
136136
testCaseAction = {
137137
recordSession {
138-
EmbraceInternalApi.getInstance().flutterInternalInterface.setDartVersion("28.9.1")
139-
EmbraceInternalApi.getInstance().flutterInternalInterface.setEmbraceFlutterSdkVersion("1.2.3")
138+
EmbraceInternalApi.flutterInternalInterface.setDartVersion("28.9.1")
139+
EmbraceInternalApi.flutterInternalInterface.setEmbraceFlutterSdkVersion("1.2.3")
140140
}
141141

142142
recordSession {
143-
EmbraceInternalApi.getInstance().flutterInternalInterface.setDartVersion("28.9.2")
144-
EmbraceInternalApi.getInstance().flutterInternalInterface.setEmbraceFlutterSdkVersion("1.2.4")
143+
EmbraceInternalApi.flutterInternalInterface.setDartVersion("28.9.2")
144+
EmbraceInternalApi.flutterInternalInterface.setEmbraceFlutterSdkVersion("1.2.4")
145145
}
146146
},
147147
assertAction = {
@@ -166,7 +166,7 @@ internal class FlutterInternalInterfaceTest {
166166
instrumentedConfig = instrumentedConfig,
167167
testCaseAction = {
168168
sessionStartTimeMs = recordSession {
169-
EmbraceInternalApi.getInstance().flutterInternalInterface.logHandledDartException(
169+
EmbraceInternalApi.flutterInternalInterface.logHandledDartException(
170170
expectedStacktrace,
171171
expectedName,
172172
expectedMessage,
@@ -212,7 +212,7 @@ internal class FlutterInternalInterfaceTest {
212212
instrumentedConfig = instrumentedConfig,
213213
testCaseAction = {
214214
sessionStartTimeMs = recordSession {
215-
EmbraceInternalApi.getInstance().flutterInternalInterface.logUnhandledDartException(
215+
EmbraceInternalApi.flutterInternalInterface.logUnhandledDartException(
216216
expectedStacktrace,
217217
expectedName,
218218
expectedMessage,

‎embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/ReactNativeInternalInterfaceTest.kt‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ internal class ReactNativeInternalInterfaceTest {
6060
instrumentedConfig = instrumentedConfig,
6161
testCaseAction = {
6262
recordSession {
63-
EmbraceInternalApi.getInstance().reactNativeInternalInterface.setReactNativeVersionNumber("28.9.1")
64-
EmbraceInternalApi.getInstance().reactNativeInternalInterface.setReactNativeSdkVersion("1.2.3")
65-
EmbraceInternalApi.getInstance().reactNativeInternalInterface.setJavaScriptPatchNumber("666")
63+
EmbraceInternalApi.reactNativeInternalInterface.setReactNativeVersionNumber("28.9.1")
64+
EmbraceInternalApi.reactNativeInternalInterface.setReactNativeSdkVersion("1.2.3")
65+
EmbraceInternalApi.reactNativeInternalInterface.setJavaScriptPatchNumber("666")
6666
}
6767
},
6868
assertAction = {
@@ -82,9 +82,9 @@ internal class ReactNativeInternalInterfaceTest {
8282
instrumentedConfig = instrumentedConfig,
8383
testCaseAction = {
8484
recordSession {
85-
EmbraceInternalApi.getInstance().reactNativeInternalInterface.setReactNativeVersionNumber("28.9.1")
86-
EmbraceInternalApi.getInstance().reactNativeInternalInterface.setReactNativeSdkVersion("1.2.3")
87-
EmbraceInternalApi.getInstance().reactNativeInternalInterface.setJavaScriptPatchNumber("666")
85+
EmbraceInternalApi.reactNativeInternalInterface.setReactNativeVersionNumber("28.9.1")
86+
EmbraceInternalApi.reactNativeInternalInterface.setReactNativeSdkVersion("1.2.3")
87+
EmbraceInternalApi.reactNativeInternalInterface.setJavaScriptPatchNumber("666")
8888
}
8989

9090
recordSession()
@@ -106,15 +106,15 @@ internal class ReactNativeInternalInterfaceTest {
106106
instrumentedConfig = instrumentedConfig,
107107
testCaseAction = {
108108
recordSession {
109-
EmbraceInternalApi.getInstance().reactNativeInternalInterface.setReactNativeVersionNumber("28.9.1")
110-
EmbraceInternalApi.getInstance().reactNativeInternalInterface.setReactNativeSdkVersion("1.2.3")
111-
EmbraceInternalApi.getInstance().reactNativeInternalInterface.setJavaScriptPatchNumber("666")
109+
EmbraceInternalApi.reactNativeInternalInterface.setReactNativeVersionNumber("28.9.1")
110+
EmbraceInternalApi.reactNativeInternalInterface.setReactNativeSdkVersion("1.2.3")
111+
EmbraceInternalApi.reactNativeInternalInterface.setJavaScriptPatchNumber("666")
112112
}
113113

114114
recordSession {
115-
EmbraceInternalApi.getInstance().reactNativeInternalInterface.setReactNativeVersionNumber("28.9.2")
116-
EmbraceInternalApi.getInstance().reactNativeInternalInterface.setReactNativeSdkVersion("1.2.4")
117-
EmbraceInternalApi.getInstance().reactNativeInternalInterface.setJavaScriptPatchNumber("999")
115+
EmbraceInternalApi.reactNativeInternalInterface.setReactNativeVersionNumber("28.9.2")
116+
EmbraceInternalApi.reactNativeInternalInterface.setReactNativeSdkVersion("1.2.4")
117+
EmbraceInternalApi.reactNativeInternalInterface.setJavaScriptPatchNumber("999")
118118
}
119119
},
120120
assertAction = {
@@ -135,7 +135,7 @@ internal class ReactNativeInternalInterfaceTest {
135135
instrumentedConfig = instrumentedConfig,
136136
testCaseAction = {
137137
recordSession {
138-
EmbraceInternalApi.getInstance().reactNativeInternalInterface.logRnAction(
138+
EmbraceInternalApi.reactNativeInternalInterface.logRnAction(
139139
"MyAction",
140140
1000,
141141
5000,
@@ -174,9 +174,9 @@ internal class ReactNativeInternalInterfaceTest {
174174
instrumentedConfig = instrumentedConfig,
175175
testCaseAction = {
176176
recordSession {
177-
EmbraceInternalApi.getInstance().reactNativeInternalInterface.logRnView("HomeScreen")
177+
EmbraceInternalApi.reactNativeInternalInterface.logRnView("HomeScreen")
178178
clock.tick(1000)
179-
EmbraceInternalApi.getInstance().reactNativeInternalInterface.logRnView("DetailsScreen")
179+
EmbraceInternalApi.reactNativeInternalInterface.logRnView("DetailsScreen")
180180
}
181181
},
182182
assertAction = {
@@ -197,9 +197,9 @@ internal class ReactNativeInternalInterfaceTest {
197197
instrumentedConfig = instrumentedConfig,
198198
testCaseAction = {
199199
recordSession {
200-
EmbraceInternalApi.getInstance().reactNativeInternalInterface.logRnView("HomeScreen")
200+
EmbraceInternalApi.reactNativeInternalInterface.logRnView("HomeScreen")
201201
clock.tick(1000)
202-
EmbraceInternalApi.getInstance().reactNativeInternalInterface.logRnView("HomeScreen")
202+
EmbraceInternalApi.reactNativeInternalInterface.logRnView("HomeScreen")
203203
}
204204
},
205205
assertAction = {

‎embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/UnityInternalInterfaceTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ internal class UnityInternalInterfaceTest {
5050
instrumentedConfig = instrumentedConfig,
5151
testCaseAction = {
5252
recordSession {
53-
EmbraceInternalApi.getInstance().unityInternalInterface.setUnityMetaData(
53+
EmbraceInternalApi.unityInternalInterface.setUnityMetaData(
5454
"28.9.1",
5555
"unity build id",
5656
"1.2.3"
@@ -74,7 +74,7 @@ internal class UnityInternalInterfaceTest {
7474
instrumentedConfig = instrumentedConfig,
7575
testCaseAction = {
7676
recordSession {
77-
EmbraceInternalApi.getInstance().unityInternalInterface.setUnityMetaData(
77+
EmbraceInternalApi.unityInternalInterface.setUnityMetaData(
7878
"28.9.1",
7979
"unity build id",
8080
"1.2.3"
@@ -99,15 +99,15 @@ internal class UnityInternalInterfaceTest {
9999
instrumentedConfig = instrumentedConfig,
100100
testCaseAction = {
101101
recordSession {
102-
EmbraceInternalApi.getInstance().unityInternalInterface.setUnityMetaData(
102+
EmbraceInternalApi.unityInternalInterface.setUnityMetaData(
103103
"28.9.1",
104104
"unity build id",
105105
"1.2.3"
106106
)
107107
}
108108

109109
recordSession {
110-
EmbraceInternalApi.getInstance().unityInternalInterface.setUnityMetaData(
110+
EmbraceInternalApi.unityInternalInterface.setUnityMetaData(
111111
"28.9.2",
112112
"new unity build id",
113113
"1.2.4"

0 commit comments

Comments
 (0)