From 2408a53dca01782db0732e496bae86b78cceeb3b Mon Sep 17 00:00:00 2001 From: louiszawadzki Date: Mon, 14 Nov 2022 11:41:58 +0100 Subject: [PATCH 1/2] Fix ktlint in main --- .../kotlin/com/datadog/reactnative/DdSdk.kt | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdk.kt b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdk.kt index 7c5617543..1058fad1f 100644 --- a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdk.kt +++ b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdk.kt @@ -165,7 +165,7 @@ class DdSdk( @Suppress("ComplexMethod", "UnsafeCallOnNullableType") private fun buildConfiguration(configuration: DdSdkConfiguration): Configuration { - val additionalConfig = configuration.additionalConfig?.toMutableMap(); + val additionalConfig = configuration.additionalConfig?.toMutableMap() val versionSuffix = configuration.additionalConfig?.get(DD_VERSION_SUFFIX) as? String if (versionSuffix != null && additionalConfig != null) { @@ -189,7 +189,9 @@ class DdSdk( } configBuilder.useSite(buildSite(configuration.site)) - configBuilder.setVitalsUpdateFrequency(buildVitalUpdateFrequency(configuration.vitalsUpdateFrequency)) + configBuilder.setVitalsUpdateFrequency( + buildVitalUpdateFrequency(configuration.vitalsUpdateFrequency) + ) val telemetrySampleRate = (configuration.telemetrySampleRate as? Number)?.toFloat() telemetrySampleRate?.let { configBuilder.sampleTelemetry(it) } @@ -317,7 +319,12 @@ class DdSdk( val frameTimeCallback = buildFrameTimeCallback(vitalsUpdateFrequency) reactContext.runOnJSQueueThread { val vitalFrameCallback = - VitalFrameCallback(frameTimeCallback, ::handlePostFrameCallbackError) { initialized.get() } + VitalFrameCallback( + frameTimeCallback, + ::handlePostFrameCallbackError + ) { + initialized.get() + } try { Choreographer.getInstance().postFrameCallback(vitalFrameCallback) } catch (e: IllegalStateException) { @@ -327,11 +334,15 @@ class DdSdk( } } - private fun buildFrameTimeCallback(vitalsUpdateFrequency: VitalsUpdateFrequency): (frameTime: Double) -> Unit { + private fun buildFrameTimeCallback(vitalsUpdateFrequency: VitalsUpdateFrequency): + (frameTime: Double) -> Unit { val monitorJsRefreshRate = vitalsUpdateFrequency != VitalsUpdateFrequency.NEVER return { if (monitorJsRefreshRate && it > 0.0) { - GlobalRum.get()._getInternal()?.updatePerformanceMetric(RumPerformanceMetric.JS_FRAME_TIME, it) + GlobalRum.get()._getInternal()?.updatePerformanceMetric( + RumPerformanceMetric.JS_FRAME_TIME, + it + ) } if (it > longTaskThresholdNs) { // TODO: report long task From d7f800624fbe839a4ebd65b953f44258cff0a52c Mon Sep 17 00:00:00 2001 From: louiszawadzki Date: Mon, 14 Nov 2022 11:54:54 +0100 Subject: [PATCH 2/2] Fix ktlint for core package --- .../datadog/reactnative/DdSdkConfiguration.kt | 2 - .../datadog/reactnative/VitalFrameCallback.kt | 1 - .../com/datadog/reactnative/DdRumTest.kt | 9 +++- .../com/datadog/reactnative/DdSdkTest.kt | 52 ++++++++++++------- .../com/datadog/reactnative/DdTraceTest.kt | 6 ++- .../tools/unit/DdSdkConfigurationExt.kt | 2 +- .../com/datadog/tools/unit/GenericAssert.kt | 2 +- .../kotlin/com/datadog/tools/unit/MapExt.kt | 2 +- .../forge/DdSdkConfigurationForgeryFactory.kt | 12 +++-- .../unit/forge/PackageInfoForgeryFactory.kt | 5 +- 10 files changed, 59 insertions(+), 34 deletions(-) diff --git a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfiguration.kt b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfiguration.kt index ef74a6a9e..4cfb5e00d 100644 --- a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfiguration.kt +++ b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfiguration.kt @@ -6,8 +6,6 @@ package com.datadog.reactnative -import com.datadog.android.core.configuration.VitalsUpdateFrequency - /** * A configuration object to initialize Datadog's features. * @param clientToken A valid Datadog client token. diff --git a/packages/core/android/src/main/kotlin/com/datadog/reactnative/VitalFrameCallback.kt b/packages/core/android/src/main/kotlin/com/datadog/reactnative/VitalFrameCallback.kt index a0eb37e6c..81a796a1c 100644 --- a/packages/core/android/src/main/kotlin/com/datadog/reactnative/VitalFrameCallback.kt +++ b/packages/core/android/src/main/kotlin/com/datadog/reactnative/VitalFrameCallback.kt @@ -7,7 +7,6 @@ package com.datadog.reactnative import android.view.Choreographer -import java.util.concurrent.TimeUnit /** * Reads the javascript framerate based on the [Choreographer.FrameCallback]. diff --git a/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdRumTest.kt b/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdRumTest.kt index c73f00270..61cd3ad62 100644 --- a/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdRumTest.kt +++ b/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdRumTest.kt @@ -24,7 +24,6 @@ import fr.xgouchet.elmyr.Forge import fr.xgouchet.elmyr.annotation.DoubleForgery import fr.xgouchet.elmyr.annotation.Forgery import fr.xgouchet.elmyr.annotation.IntForgery -import fr.xgouchet.elmyr.annotation.LongForgery import fr.xgouchet.elmyr.annotation.StringForgery import fr.xgouchet.elmyr.annotation.StringForgeryType import fr.xgouchet.elmyr.junit5.ForgeConfiguration @@ -281,7 +280,13 @@ internal class DdRumTest { ) // Then - verify(mockRumMonitor).stopResource(key, statusCode, resourceSize.toLong(), kind, updatedContext) + verify(mockRumMonitor).stopResource( + key, + statusCode, + resourceSize.toLong(), + kind, + updatedContext + ) } @Test diff --git a/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt b/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt index 252eee384..e3989fa73 100644 --- a/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt +++ b/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt @@ -1,7 +1,13 @@ +/* + * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0. + * This product includes software developed at Datadog (https://www.datadoghq.com/). + * Copyright 2016-Present Datadog, Inc. + */ + package com.datadog.reactnative -import android.util.Log import android.content.pm.PackageInfo +import android.util.Log import com.datadog.android.DatadogEndpoint import com.datadog.android.core.configuration.BatchSize import com.datadog.android.core.configuration.Configuration @@ -46,8 +52,8 @@ import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.junit.jupiter.api.extension.Extensions -import org.mockito.Mock import org.mockito.Answers +import org.mockito.Mock import org.mockito.junit.jupiter.MockitoExtension import org.mockito.junit.jupiter.MockitoSettings import org.mockito.quality.Strictness @@ -81,7 +87,12 @@ internal class DdSdkTest { fun `set up`() { whenever(mockContext.applicationContext) doReturn mockContext whenever(mockContext.packageName) doReturn "packageName" - whenever(mockContext.packageManager.getPackageInfo("packageName", 0)) doReturn mockPackageInfo + whenever( + mockContext.packageManager.getPackageInfo( + "packageName", + 0 + ) + ) doReturn mockPackageInfo testedBridgeSdk = DdSdk(mockContext, mockDatadog) } @@ -278,7 +289,10 @@ internal class DdSdkTest { .hasField("rumConfig") { it.hasFieldEqualTo("plugins", emptyList()) it.hasFieldEqualTo("samplingRate", expectedRumSampleRate) - it.hasFieldEqualTo("vitalsMonitorUpdateFrequency", VitalsUpdateFrequency.AVERAGE) + it.hasFieldEqualTo( + "vitalsMonitorUpdateFrequency", + VitalsUpdateFrequency.AVERAGE + ) } .hasFieldEqualTo( "additionalConfig", @@ -1219,14 +1233,14 @@ internal class DdSdkTest { @Test fun `𝕄 set version 𝕎 initialize() {versionSuffix}`( - @Forgery configuration: DdSdkConfiguration, - @StringForgery versionSuffix: String + @Forgery configuration: DdSdkConfiguration, + @StringForgery versionSuffix: String ) { // Given val bridgeConfiguration = configuration.copy( - additionalConfig = mapOf( - DdSdk.DD_VERSION_SUFFIX to versionSuffix - ) + additionalConfig = mapOf( + DdSdk.DD_VERSION_SUFFIX to versionSuffix + ) ) val configCaptor = argumentCaptor() @@ -1235,19 +1249,19 @@ internal class DdSdkTest { // Then verify(mockDatadog).initialize( - same(mockContext), - any(), - configCaptor.capture(), - eq(configuration.trackingConsent.asTrackingConsent()) + same(mockContext), + any(), + configCaptor.capture(), + eq(configuration.trackingConsent.asTrackingConsent()) ) assertThat(configCaptor.firstValue) - .hasFieldEqualTo( - "additionalConfig", - mapOf( - DdSdk.DD_VERSION_SUFFIX to versionSuffix, - DdSdk.DD_VERSION to mockPackageInfo.versionName + versionSuffix - ) + .hasFieldEqualTo( + "additionalConfig", + mapOf( + DdSdk.DD_VERSION_SUFFIX to versionSuffix, + DdSdk.DD_VERSION to mockPackageInfo.versionName + versionSuffix ) + ) } // endregion diff --git a/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdTraceTest.kt b/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdTraceTest.kt index 750a042fc..ec4983ab8 100644 --- a/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdTraceTest.kt +++ b/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdTraceTest.kt @@ -98,7 +98,11 @@ internal class DdTraceTest { @BeforeEach fun `set up`() { whenever(mockTracer.buildSpan(fakeOperation)) doReturn mockSpanBuilder - whenever(mockSpanBuilder.withStartTimestamp(fakeTimestamp.toLong() * 1000)) doReturn mockSpanBuilder + whenever( + mockSpanBuilder.withStartTimestamp( + fakeTimestamp.toLong() * 1000 + ) + ) doReturn mockSpanBuilder whenever(mockSpanBuilder.start()) doReturn mockSpan whenever(mockSpan.context()) doReturn mockSpanContext whenever(mockSpanContext.toSpanId()) doReturn fakeSpanId diff --git a/packages/core/android/src/test/kotlin/com/datadog/tools/unit/DdSdkConfigurationExt.kt b/packages/core/android/src/test/kotlin/com/datadog/tools/unit/DdSdkConfigurationExt.kt index 2b338c883..53026d272 100644 --- a/packages/core/android/src/test/kotlin/com/datadog/tools/unit/DdSdkConfigurationExt.kt +++ b/packages/core/android/src/test/kotlin/com/datadog/tools/unit/DdSdkConfigurationExt.kt @@ -3,7 +3,7 @@ * This product includes software developed at Datadog (https://www.datadoghq.com/). * Copyright 2016-Present Datadog, Inc. */ - + package com.datadog.tools.unit import com.datadog.android.core.configuration.VitalsUpdateFrequency diff --git a/packages/core/android/src/test/kotlin/com/datadog/tools/unit/GenericAssert.kt b/packages/core/android/src/test/kotlin/com/datadog/tools/unit/GenericAssert.kt index eca6025b6..fee642e65 100644 --- a/packages/core/android/src/test/kotlin/com/datadog/tools/unit/GenericAssert.kt +++ b/packages/core/android/src/test/kotlin/com/datadog/tools/unit/GenericAssert.kt @@ -3,7 +3,7 @@ * This product includes software developed at Datadog (https://www.datadoghq.com/). * Copyright 2016-Present Datadog, Inc. */ - + package com.datadog.tools.unit import org.assertj.core.api.AbstractAssert diff --git a/packages/core/android/src/test/kotlin/com/datadog/tools/unit/MapExt.kt b/packages/core/android/src/test/kotlin/com/datadog/tools/unit/MapExt.kt index fb46ed98a..3becb8938 100644 --- a/packages/core/android/src/test/kotlin/com/datadog/tools/unit/MapExt.kt +++ b/packages/core/android/src/test/kotlin/com/datadog/tools/unit/MapExt.kt @@ -3,7 +3,7 @@ * This product includes software developed at Datadog (https://www.datadoghq.com/). * Copyright 2016-Present Datadog, Inc. */ - + package com.datadog.tools.unit import com.facebook.react.bridge.JavaOnlyMap diff --git a/packages/core/android/src/test/kotlin/com/datadog/tools/unit/forge/DdSdkConfigurationForgeryFactory.kt b/packages/core/android/src/test/kotlin/com/datadog/tools/unit/forge/DdSdkConfigurationForgeryFactory.kt index 6a4126030..502cccf20 100644 --- a/packages/core/android/src/test/kotlin/com/datadog/tools/unit/forge/DdSdkConfigurationForgeryFactory.kt +++ b/packages/core/android/src/test/kotlin/com/datadog/tools/unit/forge/DdSdkConfigurationForgeryFactory.kt @@ -3,10 +3,9 @@ * This product includes software developed at Datadog (https://www.datadoghq.com/). * Copyright 2016-Present Datadog, Inc. */ - + package com.datadog.tools.unit.forge -import com.datadog.android.core.configuration.VitalsUpdateFrequency import com.datadog.reactnative.DdSdkConfiguration import fr.xgouchet.elmyr.Forge import fr.xgouchet.elmyr.ForgeryFactory @@ -21,7 +20,14 @@ class DdSdkConfigurationForgeryFactory : ForgeryFactory { nativeCrashReportEnabled = forge.aNullable { aBool() }, sampleRate = forge.aNullable { aDouble(0.0, 100.0) }, telemetrySampleRate = forge.aNullable { aDouble(0.0, 100.0) }, - vitalsUpdateFrequency = forge.aNullable { anElementFrom("RARE", "NEVER", "FREQUENT", "AVERAGE") }, + vitalsUpdateFrequency = forge.aNullable { + anElementFrom( + "RARE", + "NEVER", + "FREQUENT", + "AVERAGE" + ) + }, site = forge.aNullable { anElementFrom("US", "EU", "GOV") }, additionalConfig = forge.aMap { forge.anAsciiString() to forge.anElementFrom( diff --git a/packages/core/android/src/test/kotlin/com/datadog/tools/unit/forge/PackageInfoForgeryFactory.kt b/packages/core/android/src/test/kotlin/com/datadog/tools/unit/forge/PackageInfoForgeryFactory.kt index 08487494d..c896a3655 100644 --- a/packages/core/android/src/test/kotlin/com/datadog/tools/unit/forge/PackageInfoForgeryFactory.kt +++ b/packages/core/android/src/test/kotlin/com/datadog/tools/unit/forge/PackageInfoForgeryFactory.kt @@ -3,17 +3,16 @@ * This product includes software developed at Datadog (https://www.datadoghq.com/). * Copyright 2016-Present Datadog, Inc. */ - + package com.datadog.tools.unit.forge import android.content.pm.PackageInfo import fr.xgouchet.elmyr.Forge import fr.xgouchet.elmyr.ForgeryFactory -import java.util.UUID class PackageInfoForgeryFactory : ForgeryFactory { override fun getForgery(forge: Forge): PackageInfo { - val packageInfo = PackageInfo(); + val packageInfo = PackageInfo() packageInfo.versionName = forge.aStringMatching("[0-9]\\.[0-9]\\.[0-9]") return packageInfo }