Skip to content

feat(android): [Logs and Metrics Enable Flags 13] Warn for legacy Metrics metadata #5954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adinauer wants to merge 3 commits into
base: feat/remove-metrics-enable-flag
Choose a base branch
from
+63 −2
Open

feat(android): [Logs and Metrics Enable Flags 13] Warn for legacy Metrics metadata #5954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01b74ec
feat(android): Warn for legacy Metrics metadata
adinauer Aug 13, 2026
def8c18
Merge branch 'feat/remove-metrics-enable-flag' into feat/warn-legacy-…
adinauer Aug 13, 2026
281f533
Merge branch 'feat/remove-metrics-enable-flag' into feat/warn-legacy-…
adinauer Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,21 @@ static void applyMetadata(
}
}

if (metadata.containsKey(ENABLE_METRICS)) {
final boolean enableMetrics = readBool(metadata, logger, ENABLE_METRICS, false);
if (enableMetrics) {
logger.log(
SentryLevel.WARNING,
"The Android manifest option 'io.sentry.metrics.enabled' is no longer supported. "
+ "Manual Sentry.metrics() calls no longer require it.");
} else {
logger.log(
SentryLevel.WARNING,
"The Android manifest option 'io.sentry.metrics.enabled' no longer disables "
+ "manual Sentry.metrics() calls.");
}
}

options.setEnableTimberLogs(
readBool(metadata, logger, ENABLE_TIMBER_LOGS, options.isEnableTimberLogs()));

Expand Down
50 changes: 48 additions & 2 deletions sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2054,8 +2054,22 @@ class ManifestMetadataReaderTest {
}

@Test
fun `legacy metrics metadata does not disable capture`() {
val bundle = bundleOf(ManifestMetadataReader.ENABLE_METRICS to false)
fun `applyMetadata does not warn when legacy metrics enabled metadata is absent`() {

@lbloder lbloder Aug 18, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Identical to the same test for logs. Does it make sense to keep both? Or should we merge them together into one test?

fixture.options.isDebug = true
val context = fixture.getContext()

ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)

verify(fixture.logger, never()).log(eq(SentryLevel.WARNING), any<String>())
}

@Test
fun `applyMetadata warns when legacy metrics enabled metadata is true`() {
val bundle =
bundleOf(
ManifestMetadataReader.DEBUG to true,
ManifestMetadataReader.ENABLE_METRICS to true,
)
val context = fixture.getContext(metaData = bundle)
val client = createSentryClientMock()

Expand All @@ -2064,6 +2078,38 @@ class ManifestMetadataReaderTest {
val scopes = createTestScopes(fixture.options).also { it.bindClient(client) }
scopes.metrics().count("metric name")

verify(fixture.logger)
.log(
SentryLevel.WARNING,
"The Android manifest option 'io.sentry.metrics.enabled' is no longer supported. " +
"Manual Sentry.metrics() calls no longer require it.",
*emptyArray(),
)
verify(client).captureMetric(any(), anyOrNull(), anyOrNull())
}

@Test
fun `applyMetadata warns when legacy metrics enabled metadata is false`() {
val bundle =
bundleOf(
ManifestMetadataReader.DEBUG to true,
ManifestMetadataReader.ENABLE_METRICS to false,
)
val context = fixture.getContext(metaData = bundle)
val client = createSentryClientMock()

ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
fixture.options.dsn = "https://key@sentry.io/proj"
val scopes = createTestScopes(fixture.options).also { it.bindClient(client) }
scopes.metrics().count("metric name")

verify(fixture.logger)
.log(
SentryLevel.WARNING,
"The Android manifest option 'io.sentry.metrics.enabled' no longer disables manual " +
"Sentry.metrics() calls.",
*emptyArray(),
)
verify(client).captureMetric(any(), anyOrNull(), anyOrNull())
}

Expand Down
Loading