Skip to content

Commit b4640e5

Browse files
committed
fix: address some build warnings in the project
1 parent 8e63e8e commit b4640e5

9 files changed

Lines changed: 10 additions & 27 deletions

File tree

core/src/test/java/io/opentelemetry/android/SessionIdRatioBasedSamplerTest.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ internal class SessionIdRatioBasedSamplerTest {
3838
fun samplerDropsHigh() {
3939
every { sessionProvider.getSessionId() } returns HIGH_ID
4040

41-
val sampler = SessionIdRatioBasedSampler(0.5, sessionProvider!!)
41+
val sampler = SessionIdRatioBasedSampler(0.5, sessionProvider)
4242

4343
// Sampler drops if TraceIdRatioBasedSampler would drop this sessionId
4444
assertThat(shouldSample(sampler)).isEqualTo(SamplingDecision.DROP)
@@ -49,7 +49,7 @@ internal class SessionIdRatioBasedSamplerTest {
4949
// Sampler accepts if TraceIdRatioBasedSampler would accept this sessionId
5050
every { sessionProvider.getSessionId() } returns LOW_ID
5151

52-
val sampler = SessionIdRatioBasedSampler(0.5, sessionProvider!!)
52+
val sampler = SessionIdRatioBasedSampler(0.5, sessionProvider)
5353
assertThat(shouldSample(sampler)).isEqualTo(SamplingDecision.RECORD_AND_SAMPLE)
5454
}
5555

@@ -58,13 +58,13 @@ internal class SessionIdRatioBasedSamplerTest {
5858
every { sessionProvider.getSessionId() } returns HIGH_ID
5959

6060
val samplerHigh =
61-
SessionIdRatioBasedSampler(0.0, sessionProvider!!)
61+
SessionIdRatioBasedSampler(0.0, sessionProvider)
6262
assertThat(shouldSample(samplerHigh)).isEqualTo(SamplingDecision.DROP)
6363

6464
every { sessionProvider.getSessionId() } returns LOW_ID
6565

6666
val samplerLow =
67-
SessionIdRatioBasedSampler(0.0, sessionProvider!!)
67+
SessionIdRatioBasedSampler(0.0, sessionProvider)
6868
assertThat(shouldSample(samplerLow)).isEqualTo(SamplingDecision.DROP)
6969
}
7070

@@ -73,13 +73,13 @@ internal class SessionIdRatioBasedSamplerTest {
7373
every { sessionProvider.getSessionId() } returns HIGH_ID
7474

7575
val samplerHigh =
76-
SessionIdRatioBasedSampler(1.0, sessionProvider!!)
76+
SessionIdRatioBasedSampler(1.0, sessionProvider)
7777
assertThat(shouldSample(samplerHigh)).isEqualTo(SamplingDecision.RECORD_AND_SAMPLE)
7878

7979
every { sessionProvider.getSessionId() } returns LOW_ID
8080

8181
val samplerLow =
82-
SessionIdRatioBasedSampler(1.0, sessionProvider!!)
82+
SessionIdRatioBasedSampler(1.0, sessionProvider)
8383
assertThat(shouldSample(samplerLow)).isEqualTo(SamplingDecision.RECORD_AND_SAMPLE)
8484
}
8585

instrumentation/activity/src/main/java/io/opentelemetry/android/instrumentation/activity/startup/AppStartupTimer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public void detectBackgroundStart(Handler handler) {
134134
private static class StartFromBackgroundRunnable implements Runnable {
135135
private final AppStartupTimer startupTimer;
136136

137-
public StartFromBackgroundRunnable(AppStartupTimer startupTimer) {
137+
private StartFromBackgroundRunnable(AppStartupTimer startupTimer) {
138138
this.startupTimer = startupTimer;
139139
}
140140

instrumentation/httpurlconnection/library/src/main/java/io/opentelemetry/instrumentation/library/httpurlconnection/HttpUrlReplacements.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ private static class InstrumentedInputStream extends InputStream {
369369

370370
private final InputStream inputStream;
371371

372-
public InstrumentedInputStream(URLConnection connection, InputStream inputStream) {
372+
private InstrumentedInputStream(URLConnection connection, InputStream inputStream) {
373373
this.connection = connection;
374374
this.inputStream = inputStream;
375375
}

instrumentation/startup/src/test/java/io/opentelemetry/android/instrumentation/startup/SdkInitializationEventsTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import io.mockk.every
1010
import io.mockk.mockk
1111
import io.mockk.verify
1212
import io.opentelemetry.android.common.RumConstants
13-
import io.opentelemetry.android.test.common.hasEventName
1413
import io.opentelemetry.api.common.AttributeKey.stringKey
1514
import io.opentelemetry.api.common.Attributes
1615
import io.opentelemetry.api.common.Value

instrumentation/volley/library/consumer-rules.pro

Whitespace-only changes.

services/src/main/java/io/opentelemetry/android/internal/services/network/detector/PostApi28NetworkDetector.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ internal class PostApi28NetworkDetector
9191
return builder.build()
9292
}
9393

94+
@Suppress("DEPRECATION") // suppress deprecated network type
9495
private fun getDataNetworkTypeName(dataNetworkType: Int): String =
9596
when (dataNetworkType) {
9697
NETWORK_TYPE_1xRTT -> "1xRTT"

services/src/test/java/io/opentelemetry/android/internal/services/network/detector/SimpleNetworkDetectorTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.robolectric.annotation.Config;
2424
import org.robolectric.shadows.ShadowNetworkInfo;
2525

26+
@SuppressWarnings("deprecation") // suppress warnings around deprecated network state APIs
2627
@RunWith(AndroidJUnit4.class)
2728
@Config(sdk = Build.VERSION_CODES.P)
2829
public class SimpleNetworkDetectorTest {

session/consumer-rules.pro

Whitespace-only changes.

test-common/src/main/kotlin/io/opentelemetry/android/test/common/AssertionExtensions.kt

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)