Skip to content

Commit 4694204

Browse files
romtsngetsentry-botlbloderadinauer
authored
feat: Send SDK Integration List, add missing packages (getsentry#2179)
Co-authored-by: Roman Zavarnitsyn <rom4ek93@gmail.com> Co-authored-by: Sentry Github Bot <bot+github-bot@sentry.io> Co-authored-by: Lukas Bloder <lukas.bloder@gmail.com> Co-authored-by: Alexander Dinauer <alexander.dinauer@sentry.io> Co-authored-by: Alexander Dinauer <adinauer@users.noreply.github.com>
1 parent e9b703c commit 4694204

81 files changed

Lines changed: 667 additions & 123 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
- If set to `true`, performance is enabled, even if no `tracesSampleRate` or `tracesSampler` have been configured.
1111
- If set to `false` performance is disabled, regardless of `tracesSampleRate` and `tracesSampler` options.
1212
- Detect dependencies by listing MANIFEST.MF files at runtime ([#2538](https://github.com/getsentry/sentry-java/pull/2538))
13+
- Report integrations in use, report packages in use more consistently ([#2179](https://github.com/getsentry/sentry-java/pull/2179))
1314

1415
### Fixes
1516

‎buildSrc/src/main/java/Config.kt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,17 @@ object Config {
210210
val SENTRY_JUL_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.jul"
211211
val SENTRY_LOG4J2_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.log4j2"
212212
val SENTRY_SPRING_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.spring"
213+
val SENTRY_SPRING_JAKARTA_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.spring.jakarta"
213214
val SENTRY_SPRING_BOOT_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.spring-boot"
214215
val SENTRY_SPRING_BOOT_JAKARTA_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.spring-boot.jakarta"
215216
val SENTRY_OPENTELEMETRY_AGENT_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.opentelemetry.agent"
217+
val SENTRY_APOLLO3_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.apollo3"
218+
val SENTRY_APOLLO_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.apollo"
219+
val SENTRY_GRAPHQL_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.graphql"
220+
val SENTRY_JDBC_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.jdbc"
221+
val SENTRY_SERVLET_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.servlet"
222+
val SENTRY_SERVLET_JAKARTA_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.servlet.jakarta"
223+
val SENTRY_COMPOSE_HELPER_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.compose.helper"
216224
val group = "io.sentry"
217225
val description = "SDK for sentry.io"
218226
val versionNameProp = "versionName"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ public void register(final @NotNull IHub hub, final @NotNull SentryOptions optio
121121
if (this.options.isEnableActivityLifecycleBreadcrumbs() || performanceEnabled) {
122122
application.registerActivityLifecycleCallbacks(this);
123123
this.options.getLogger().log(SentryLevel.DEBUG, "ActivityLifecycleIntegration installed.");
124+
addIntegrationToSdkVersion();
124125
}
125126
}
126127

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ private void register(final @NotNull IHub hub, final @NotNull SentryAndroidOptio
7373
anrWatchDog.start();
7474

7575
options.getLogger().log(SentryLevel.DEBUG, "AnrIntegration installed.");
76+
addIntegrationToSdkVersion();
7677
}
7778
}
7879
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public void register(final @NotNull IHub hub, final @NotNull SentryOptions optio
5353
options
5454
.getLogger()
5555
.log(SentryLevel.DEBUG, "AppComponentsBreadcrumbsIntegration installed.");
56+
addIntegrationToSdkVersion();
5657
} catch (Throwable e) {
5758
this.options.setEnableAppComponentBreadcrumbs(false);
5859
options.getLogger().log(SentryLevel.INFO, e, "ComponentCallbacks2 is not available.");

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ private void addObserver(final @NotNull IHub hub) {
9494
try {
9595
ProcessLifecycleOwner.get().getLifecycle().addObserver(watcher);
9696
options.getLogger().log(SentryLevel.DEBUG, "AppLifecycleIntegration installed.");
97+
addIntegrationToSdkVersion();
9798
} catch (Throwable e) {
9899
// This is to handle a potential 'AbstractMethodError' gracefully. The error is triggered in
99100
// connection with conflicting dependencies of the androidx.lifecycle.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public final void register(final @NotNull IHub hub, final @NotNull SentryOptions
5353
method.invoke(null, args);
5454

5555
this.options.getLogger().log(SentryLevel.DEBUG, "NdkIntegration installed.");
56+
addIntegrationToSdkVersion();
5657
} catch (NoSuchMethodException e) {
5758
disableNdkIntegration(this.options);
5859
this.options

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public void register(final @NotNull IHub hub, final @NotNull SentryOptions optio
5353
telephonyManager.listen(listener, android.telephony.PhoneStateListener.LISTEN_CALL_STATE);
5454

5555
options.getLogger().log(SentryLevel.DEBUG, "PhoneStateBreadcrumbsIntegration installed.");
56+
addIntegrationToSdkVersion();
5657
} catch (Throwable e) {
5758
this.options
5859
.getLogger()

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ public void register(@NotNull IHub hub, @NotNull SentryOptions options) {
7373
.log(SentryLevel.DEBUG, "Synchronous send timed out, continuing in the background.");
7474
}
7575
}
76-
7776
androidOptions.getLogger().log(SentryLevel.DEBUG, "SendCachedEnvelopeIntegration installed.");
7877
} catch (Throwable e) {
7978
androidOptions

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ public void register(final @NotNull IHub hub, final @NotNull SentryOptions optio
103103
this.options
104104
.getLogger()
105105
.log(SentryLevel.DEBUG, "SystemEventsBreadcrumbsIntegration installed.");
106+
addIntegrationToSdkVersion();
106107
} catch (Throwable e) {
107108
this.options.setEnableSystemEventBreadcrumbs(false);
108109
this.options

0 commit comments

Comments
 (0)