Fixed detekt and lint

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/capture/EmbracePerformanceInfoService.kt

@@ -6,14 +6,11 @@ import io.embrace.android.embracesdk.capture.connectivity.NetworkConnectivitySer
 import io.embrace.android.embracesdk.capture.metadata.MetadataService
 import io.embrace.android.embracesdk.capture.monitor.ResponsivenessMonitorService
 import io.embrace.android.embracesdk.logging.InternalEmbraceLogger
-import io.embrace.android.embracesdk.network.logging.NetworkLoggingService
-import io.embrace.android.embracesdk.payload.NetworkRequests
 import io.embrace.android.embracesdk.payload.PerformanceInfo
 import io.embrace.android.embracesdk.session.captureDataSafely
 
 internal class EmbracePerformanceInfoService(
  private val networkConnectivityService: NetworkConnectivityService,
- private val networkLoggingService: NetworkLoggingService,
  private val metadataService: MetadataService,
  private val googleAnrTimestampRepository: GoogleAnrTimestampRepository,
  private val nativeThreadSamplerService: NativeThreadSamplerService?,

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/injection/CustomerLogModule.kt

@@ -7,12 +7,12 @@ import io.embrace.android.embracesdk.internal.logs.EmbraceLogService
 import io.embrace.android.embracesdk.internal.logs.LogOrchestrator
 import io.embrace.android.embracesdk.internal.logs.LogOrchestratorImpl
 import io.embrace.android.embracesdk.internal.logs.LogService
+import io.embrace.android.embracesdk.network.logging.EmbraceDomainCountLimiter
 import io.embrace.android.embracesdk.network.logging.EmbraceNetworkCaptureService
 import io.embrace.android.embracesdk.network.logging.EmbraceNetworkLoggingService
 import io.embrace.android.embracesdk.network.logging.NetworkCaptureDataSource
 import io.embrace.android.embracesdk.network.logging.NetworkCaptureDataSourceImpl
 import io.embrace.android.embracesdk.network.logging.NetworkCaptureService
-import io.embrace.android.embracesdk.network.logging.EmbraceDomainCountLimiter
 import io.embrace.android.embracesdk.network.logging.NetworkLoggingService
 import io.embrace.android.embracesdk.worker.WorkerName
 import io.embrace.android.embracesdk.worker.WorkerThreadModule

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/injection/DataContainerModule.kt

@@ -25,6 +25,7 @@ internal class DataContainerModuleImpl(
  @Suppress("UNUSED_PARAMETER")
  dataCaptureServiceModule: DataCaptureServiceModule,
  anrModule: AnrModule,
+ @Suppress("UNUSED_PARAMETER")
  customerLogModule: CustomerLogModule,
  deliveryModule: DeliveryModule,
  nativeModule: NativeModule,
@@ -34,7 +35,6 @@ internal class DataContainerModuleImpl(
  override val performanceInfoService: PerformanceInfoService by singleton {
  EmbracePerformanceInfoService(
  essentialServiceModule.networkConnectivityService,
- customerLogModule.networkLoggingService,
  essentialServiceModule.metadataService,
  anrModule.googleAnrTimestampRepository,
  nativeModule.nativeThreadSamplerService,

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/logging/DomainCountLimiter.kt

@@ -8,4 +8,4 @@ internal interface DomainCountLimiter {
  * @return true if the network request should be logged, false otherwise
  */
  fun canLogNetworkRequest(domain: String): Boolean
-}
+}

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/logging/EmbraceDomainCountLimiter.kt

@@ -27,8 +27,9 @@ internal class EmbraceDomainCountLimiter(
  return ipAddressNetworkCallCount.getAndIncrement() < defaultPerDomainSuffixCallLimit
  }
 
- if (!domainSetting.containsKey(domain))
+ if (!domainSetting.containsKey(domain)) {
  createLimitForDomain(domain)
+ }
 
  val settings = domainSetting[domain]
  if (settings == null) {
@@ -85,5 +86,4 @@ internal class EmbraceDomainCountLimiter(
  ipAddressNetworkCallCount.set(0)
  untrackedNetworkCallCount.set(0)
  }
-
 }

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/logging/EmbraceNetworkLoggingService.kt

@@ -31,7 +31,7 @@ internal class EmbraceNetworkLoggingService(
  private fun logNetworkCaptureData(networkRequest: EmbraceNetworkRequest) {
  if (networkRequest.networkCaptureData != null) {
  networkCaptureService.logNetworkCapturedData(
- networkRequest.url, //TODO: This used the non-stripped URL, is that correct?
+ networkRequest.url, // TODO: This used the non-stripped URL, is that correct?
  networkRequest.httpMethod,
  networkRequest.responseCode ?: NETWORK_ERROR_CODE,
  networkRequest.startTime,
@@ -71,5 +71,4 @@ internal class EmbraceNetworkLoggingService(
  )
  }
  }
-
 }

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/EmbracePerformanceInfoServiceTest.kt

@@ -5,9 +5,7 @@ import io.embrace.android.embracesdk.capture.EmbracePerformanceInfoService
 import io.embrace.android.embracesdk.capture.monitor.NoOpResponsivenessMonitorService
 import io.embrace.android.embracesdk.fakes.FakeMetadataService
 import io.embrace.android.embracesdk.fakes.FakeNetworkConnectivityService
-import io.embrace.android.embracesdk.fakes.FakeNetworkLoggingService
 import io.embrace.android.embracesdk.logging.InternalEmbraceLogger
-import io.embrace.android.embracesdk.payload.NetworkRequests
 import io.embrace.android.embracesdk.payload.PerformanceInfo
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotSame
@@ -21,7 +19,6 @@ internal class EmbracePerformanceInfoServiceTest {
 
  private lateinit var service: EmbracePerformanceInfoService
  private val networkConnectivityService = FakeNetworkConnectivityService()
- private val networkLoggingService = FakeNetworkLoggingService()
  private val metadataService = FakeMetadataService()
  private val googleAnrTimestampRepository = GoogleAnrTimestampRepository(InternalEmbraceLogger())
  private val monitoringServiceRule = NoOpResponsivenessMonitorService()
@@ -30,7 +27,6 @@ internal class EmbracePerformanceInfoServiceTest {
  fun setUp() {
  service = EmbracePerformanceInfoService(
  networkConnectivityService,
- networkLoggingService,
  metadataService,
  googleAnrTimestampRepository,
  null,

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/fakes/FakeDomainCountLimiter.kt

@@ -8,4 +8,4 @@ internal class FakeDomainCountLimiter : DomainCountLimiter {
  override fun canLogNetworkRequest(domain: String): Boolean {
  return canLog
  }
-}
+}

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/fakes/FakeNetworkLoggingService.kt

@@ -1,13 +1,10 @@
 package io.embrace.android.embracesdk.fakes
 
-import io.embrace.android.embracesdk.internal.network.http.NetworkCaptureData
 import io.embrace.android.embracesdk.network.EmbraceNetworkRequest
 import io.embrace.android.embracesdk.network.logging.NetworkLoggingService
-import io.embrace.android.embracesdk.payload.NetworkSessionV2
 
 internal class FakeNetworkLoggingService : NetworkLoggingService {
  override fun logNetworkRequest(networkRequest: EmbraceNetworkRequest) {
  TODO("Not yet implemented")
  }
-
 }

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/network/logging/EmbraceDomainCountLimiterTest.kt

@@ -236,4 +236,4 @@ internal class EmbraceDomainCountLimiterTest {
  // logging another one is not
  assertFalse(domainCountLimiter.canLogNetworkRequest("www.overLimit1.com"))
  }
-}
+}

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/network/logging/EmbraceNetworkLoggingServiceTest.kt

@@ -113,19 +113,24 @@ internal class EmbraceNetworkLoggingServiceTest {
  assertEquals(2, spanService.createdSpans.size)
  }
 
- private fun logNetworkRequest(url: String, startTime: Long = 100, endTime: Long = 200, networkCaptureData: NetworkCaptureData? = null) {
+ private fun logNetworkRequest(
+ url: String,
+ startTime: Long = 100,
+ endTime: Long = 200,
+ networkCaptureData: NetworkCaptureData? = null
+ ) {
  networkLoggingService.logNetworkRequest(
  EmbraceNetworkRequest.fromCompletedRequest(
- /* url = */ url,
- /* httpMethod = */ HttpMethod.GET,
- /* startTime = */ startTime,
- /* endTime = */ endTime,
- /* bytesSent = */ 100L,
- /* bytesReceived = */ 1000L,
- /* statusCode = */ 200,
- /* traceId = */ null,
- /* w3cTraceparent = */ null,
- /* networkCaptureData = */ networkCaptureData
+ url,
+ HttpMethod.GET,
+ startTime,
+ endTime,
+ 100L,
+ 1000L,
+ 200,
+ null,
+ null,
+ networkCaptureData
  )
  )
  }