Skip to content

Commit 81e86e1

Browse files
adinauerclaude
andcommitted
ref(core): Remove legacy Metrics warning inputs
Remove obsolete external and Android manifest parsing retained only for migration warnings that will not ship in v9. Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 136a434 commit 81e86e1

7 files changed

Lines changed: 0 additions & 64 deletions

File tree

‎sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,6 @@ final class ManifestMetadataReader {
196196

197197
static final String ENABLE_LOGCAT_LOGS = "io.sentry.logcat.logs.enabled";
198198

199-
static final String ENABLE_METRICS = "io.sentry.metrics.enabled";
200-
201199
static final String ENABLE_AUTO_TRACE_ID_GENERATION =
202200
"io.sentry.traces.enable-auto-id-generation";
203201

‎sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ import io.sentry.ProfileLifecycle
1313
import io.sentry.SentryLevel
1414
import io.sentry.SentryReplayOptions
1515
import io.sentry.TransactionOptions
16-
import io.sentry.test.createSentryClientMock
17-
import io.sentry.test.createTestScopes
1816
import kotlin.test.AfterTest
1917
import kotlin.test.BeforeTest
2018
import kotlin.test.Test
@@ -25,7 +23,6 @@ import kotlin.test.assertNull
2523
import kotlin.test.assertTrue
2624
import org.junit.runner.RunWith
2725
import org.mockito.kotlin.any
28-
import org.mockito.kotlin.anyOrNull
2926
import org.mockito.kotlin.eq
3027
import org.mockito.kotlin.mock
3128
import org.mockito.kotlin.never
@@ -2227,20 +2224,6 @@ class ManifestMetadataReaderTest {
22272224
assertThat(fixture.options.isEnableLogcatLogs).isFalse()
22282225
}
22292226

2230-
@Test
2231-
fun `legacy metrics metadata does not disable capture`() {
2232-
val bundle = bundleOf(ManifestMetadataReader.ENABLE_METRICS to false)
2233-
val context = fixture.getContext(metaData = bundle)
2234-
val client = createSentryClientMock()
2235-
2236-
ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
2237-
fixture.options.dsn = "https://key@sentry.io/proj"
2238-
val scopes = createTestScopes(fixture.options).also { it.bindClient(client) }
2239-
scopes.metrics().count("metric name")
2240-
2241-
verify(client).captureMetric(any(), anyOrNull(), anyOrNull())
2242-
}
2243-
22442227
@Test
22452228
fun `applyMetadata reads feedback name required and keep default value if not found`() {
22462229
// Arrange

‎sentry/api/sentry.api‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,6 @@ public final class io/sentry/ExternalOptions {
590590
public fun isEnableBackpressureHandling ()Ljava/lang/Boolean;
591591
public fun isEnableCacheTracing ()Ljava/lang/Boolean;
592592
public fun isEnableDatabaseTransactionTracing ()Ljava/lang/Boolean;
593-
public fun isEnableMetrics ()Ljava/lang/Boolean;
594593
public fun isEnablePrettySerializationOutput ()Ljava/lang/Boolean;
595594
public fun isEnableQueueTracing ()Ljava/lang/Boolean;
596595
public fun isEnableSpotlight ()Ljava/lang/Boolean;
@@ -610,7 +609,6 @@ public final class io/sentry/ExternalOptions {
610609
public fun setEnableCacheTracing (Ljava/lang/Boolean;)V
611610
public fun setEnableDatabaseTransactionTracing (Ljava/lang/Boolean;)V
612611
public fun setEnableDeduplication (Ljava/lang/Boolean;)V
613-
public fun setEnableMetrics (Ljava/lang/Boolean;)V
614612
public fun setEnablePrettySerializationOutput (Ljava/lang/Boolean;)V
615613
public fun setEnableQueueTracing (Ljava/lang/Boolean;)V
616614
public fun setEnableSpotlight (Ljava/lang/Boolean;)V

‎sentry/src/main/java/io/sentry/ExternalOptions.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ public final class ExternalOptions {
4646
private @Nullable Boolean enabled;
4747
private @Nullable Boolean enablePrettySerializationOutput;
4848
private @Nullable Boolean enableSpotlight;
49-
private @Nullable Boolean enableMetrics;
5049
private @Nullable String spotlightConnectionUrl;
5150

5251
private @Nullable List<String> ignoredCheckIns;
@@ -177,8 +176,6 @@ public final class ExternalOptions {
177176
options.setCaptureOpenTelemetryEvents(
178177
propertiesProvider.getBooleanProperty("capture-open-telemetry-events"));
179178

180-
options.setEnableMetrics(propertiesProvider.getBooleanProperty("metrics.enabled"));
181-
182179
for (final String ignoredExceptionType :
183180
propertiesProvider.getList("ignored-exceptions-for-type")) {
184181
try {
@@ -714,14 +711,6 @@ public void setCaptureOpenTelemetryEvents(final @Nullable Boolean captureOpenTel
714711
return captureOpenTelemetryEvents;
715712
}
716713

717-
public void setEnableMetrics(final @Nullable Boolean enableMetrics) {
718-
this.enableMetrics = enableMetrics;
719-
}
720-
721-
public @Nullable Boolean isEnableMetrics() {
722-
return enableMetrics;
723-
}
724-
725714
public @Nullable Double getProfileSessionSampleRate() {
726715
return profileSessionSampleRate;
727716
}

‎sentry/src/test/java/io/sentry/ExternalOptionsTest.kt‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -530,25 +530,6 @@ class ExternalOptionsTest {
530530
}
531531
}
532532

533-
@Test
534-
fun `creates options with enableMetrics set to true`() {
535-
withPropertiesFile("metrics.enabled=true") { options ->
536-
assertTrue(options.isEnableMetrics == true)
537-
}
538-
}
539-
540-
@Test
541-
fun `creates options with enableMetrics set to false`() {
542-
withPropertiesFile("metrics.enabled=false") { options ->
543-
assertTrue(options.isEnableMetrics == false)
544-
}
545-
}
546-
547-
@Test
548-
fun `creates options with enableMetrics set to null when not set`() {
549-
withPropertiesFile { assertNull(it.isEnableMetrics) }
550-
}
551-
552533
@Test
553534
fun `creates options with profileSessionSampleRate set to 0_8`() {
554535
withPropertiesFile("profile-session-sample-rate=0.8") { options ->

‎sentry/src/test/java/io/sentry/ScopesTest.kt‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3300,18 +3300,6 @@ class ScopesTest {
33003300
verify(mockClient, never()).captureMetric(any(), anyOrNull(), anyOrNull())
33013301
}
33023302

3303-
@Test
3304-
fun `legacy external metrics configuration does not disable capture`() {
3305-
val (sut, mockClient) =
3306-
getEnabledScopes { options ->
3307-
options.merge(ExternalOptions().also { it.isEnableMetrics = false })
3308-
}
3309-
3310-
sut.metrics().count("metric name")
3311-
3312-
verify(mockClient).captureMetric(any(), anyOrNull(), anyOrNull())
3313-
}
3314-
33153303
@Test
33163304
fun `creating count metric works`() {
33173305
val (sut, mockClient) = getEnabledScopes()

‎sentry/src/test/java/io/sentry/SentryOptionsTest.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,6 @@ class SentryOptionsTest {
579579
externalOptions.isEnableSpotlight = true
580580
externalOptions.spotlightConnectionUrl = "http://local.sentry.io:1234"
581581
externalOptions.isGlobalHubMode = true
582-
externalOptions.isEnableMetrics = false
583582
externalOptions.profileSessionSampleRate = 0.8
584583
externalOptions.profilingTracesDirPath = "/profiling-traces"
585584
externalOptions.profileLifecycle = ProfileLifecycle.TRACE

0 commit comments

Comments
 (0)