Skip to content

feat: cherry-pick otel crash reporting into 5.6-main#2555

Merged
abdulraqeeb33 merged 2 commits into5.6-mainfrom
cherry-pick/otel-crash-reporting-5.6
Mar 4, 2026
Merged

feat: cherry-pick otel crash reporting into 5.6-main#2555
abdulraqeeb33 merged 2 commits into5.6-mainfrom
cherry-pick/otel-crash-reporting-5.6

Conversation

@abdulraqeeb33
Copy link
Contributor

@abdulraqeeb33 abdulraqeeb33 commented Mar 4, 2026 •
edited by niels-s
Loading

Summary

  • Cherry-picks otel crash reporting feature from main (commit 30856ca, PR feat: tel crash reporting #2511) into 5.6-main
  • Adds the new otel module with crash reporting, ANR detection, and OpenTelemetry logging infrastructure
  • Integrates OtelLifecycleManager into the 5.6-main OneSignalImp initialization flow
  • Applies otel log-level refinements (error → warn/info/debug) to notification and HMS bridge code
  • Regenerates detekt baseline to accommodate both otel additions and 5.6-main specific code structure

Conflict Resolution Notes

Four files had merge conflicts due to structural differences between main and 5.6-main:

  • OneSignalImp.kt – Kept the 5.6-main class structure and added otel-specific changes (otelManager field, initialization, and config store subscription)
  • LoginHelper.kt – Removed (deleted in 5.6-main; otel only changed a log level in it)
  • OneSignalHmsEventBridge.kt – Kept 5.6-main structure, applied log-level change (error → warn)
  • NotificationLifecycleService.kt – Kept 5.6-main structure, applied log-level and exception-handling improvements

Test plan

  • Verify otel module compiles and unit tests pass
  • Verify OtelLifecycleManager initializes correctly in the 5.6-main init flow
  • Confirm no regressions in notification handling and HMS event bridge
  • Run full CI suite on 5.6-main

Made with Cursor

This change is Reviewable

abdulraqeeb33 and others added 2 commits March 4, 2026 11:41
@abdulraqeeb33 @jkasten2 @cursoragent
feat: tel crash reporting (#2511)
2f2af82 
Co-authored-by: Josh Kasten <josh@onesignal.com>
Co-authored-by: AR Abdul Azeez <abdul@onesignal.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
fix: replace OneSignalDispatchers with suspendifyOnThread for 5.6-mai…
02316a0 
…n compatibility

OneSignalDispatchers does not exist in 5.6-main. Use the equivalent
suspendifyOnThread utility that is available in this branch.

Made-with: Cursor
@github-actions
Copy link
Contributor

github-actions bot commented Mar 4, 2026

📊 Diff Coverage Report

Diff Coverage Report (Changed Lines Only)

Threshold: 80%

Changed Files Coverage

  • ❌ SyncJobService.kt: 0/4 changed lines (0.0%) (31 changed lines)
    • ⚠️ Below threshold: 4 uncovered changed lines
  • ❌ AndroidUtils.kt: 0/4 changed lines (0.0%) (22 changed lines)
    • ⚠️ Below threshold: 4 uncovered changed lines
  • ✅ JSONUtils.kt: 30/30 changed lines (100.0%) (58 changed lines)
  • ⚠️ CoreModule.kt: Not in coverage report (may not be compiled/tested)
  • ❌ IParamsBackendService.kt: 0/8 changed lines (0.0%) (11 changed lines)
    • ⚠️ Below threshold: 8 uncovered changed lines
  • ❌ ParamsBackendService.kt: 0/8 changed lines (0.0%) (12 changed lines)
    • ⚠️ Below threshold: 8 uncovered changed lines
  • ❌ BackgroundManager.kt: 0/1 changed lines (0.0%) (1 changed lines)
    • ⚠️ Below threshold: 1 uncovered changed lines
  • ❌ ConfigModel.kt: 0/14 changed lines (0.0%) (42 changed lines)
    • ⚠️ Below threshold: 14 uncovered changed lines
  • ❌ ConfigModelStore.kt: 0/1 changed lines (0.0%) (2 changed lines)
    • ⚠️ Below threshold: 1 uncovered changed lines
  • ❌ ConfigModelStoreListener.kt: 0/2 changed lines (0.0%) (3 changed lines)
    • ⚠️ Below threshold: 2 uncovered changed lines
  • ✅ HttpClient.kt: 3/3 changed lines (100.0%) (5 changed lines)
  • ❌ OperationModelStore.kt: 0/1 changed lines (0.0%) (3 changed lines)
    • ⚠️ Below threshold: 1 uncovered changed lines
  • ✅ OperationRepo.kt: 3/3 changed lines (100.0%) (3 changed lines)
  • ❌ Time.kt: 0/1 changed lines (0.0%) (6 changed lines)
    • ⚠️ Below threshold: 1 uncovered changed lines
  • ❌ LogLevel.kt: 0/1 changed lines (0.0%) (48 changed lines)
    • ⚠️ Below threshold: 1 uncovered changed lines
  • ❌ OneSignalCrashHandlerFactory.kt: 0/5 changed lines (0.0%) (38 changed lines)
    • ⚠️ Below threshold: 5 uncovered changed lines
  • ❌ OneSignalCrashUploaderWrapper.kt: 0/17 changed lines (0.0%) (60 changed lines)
    • ⚠️ Below threshold: 17 uncovered changed lines
  • ❌ OtelAnrDetector.kt: 0/100 changed lines (0.0%) (221 changed lines)
    • ⚠️ Below threshold: 100 uncovered changed lines
  • ❌ OtelSdkSupport.kt: 0/4 changed lines (0.0%) (27 changed lines)
    • ⚠️ Below threshold: 4 uncovered changed lines
  • ❌ Logging.kt: 4/24 changed lines (16.7%) (75 changed lines)
    • ⚠️ Below threshold: 20 uncovered changed lines
  • ✅ AndroidOtelLogger.kt: 9/9 changed lines (100.0%) (26 changed lines)
  • ❌ OtelIdResolver.kt: 0/96 changed lines (0.0%) (247 changed lines)
    • ⚠️ Below threshold: 96 uncovered changed lines
  • ❌ OtelPlatformProvider.kt: 0/76 changed lines (0.0%) (164 changed lines)
    • ⚠️ Below threshold: 76 uncovered changed lines
  • ❌ OneSignalImp.kt: 0/5 changed lines (0.0%) (14 changed lines)
    • ⚠️ Below threshold: 5 uncovered changed lines
  • ✅ OtelConfigEvaluator.kt: 20/20 changed lines (100.0%) (68 changed lines)
  • ❌ OtelLifecycleManager.kt: 0/117 changed lines (0.0%) (240 changed lines)
    • ⚠️ Below threshold: 117 uncovered changed lines
  • ❌ ChannelTracker.kt: 63/81 changed lines (77.8%) (128 changed lines)
    • ⚠️ Below threshold: 18 uncovered changed lines
  • ✅ OutcomeEventsController.kt: 5/5 changed lines (100.0%) (5 changed lines)
  • ❌ OutcomeSourceBody.kt: 2/8 changed lines (25.0%) (13 changed lines)
    • ⚠️ Below threshold: 6 uncovered changed lines
  • ❌ SessionListener.kt: 3/4 changed lines (75.0%) (6 changed lines)
    • ⚠️ Below threshold: 1 uncovered changed lines
  • ❌ IUserManager.kt: 0/3 changed lines (0.0%) (11 changed lines)
    • ⚠️ Below threshold: 3 uncovered changed lines
  • ⚠️ UserModule.kt: Not in coverage report (may not be compiled/tested)
  • ❌ UserManager.kt: 4/6 changed lines (66.7%) (16 changed lines)
    • ⚠️ Below threshold: 2 uncovered changed lines
  • ✅ CustomEventBackendService.kt: 20/21 changed lines (95.2%) (53 changed lines)
  • ✅ CustomEventController.kt: 15/15 changed lines (100.0%) (36 changed lines)
  • ✅ CustomEventMetadata.kt: 16/16 changed lines (100.0%) (49 changed lines)
  • ❌ IdentityModelStore.kt: 0/1 changed lines (0.0%) (3 changed lines)
    • ⚠️ Below threshold: 1 uncovered changed lines
  • ✅ TrackCustomEventOperation.kt: 28/35 changed lines (80.0%) (90 changed lines)
  • ❌ CustomEventOperationExecutor.kt: 26/33 changed lines (78.8%) (71 changed lines)
    • ⚠️ Below threshold: 7 uncovered changed lines
  • ❌ SubscriptionOperationExecutor.kt: 0/9 changed lines (0.0%) (10 changed lines)
    • ⚠️ Below threshold: 9 uncovered changed lines
  • ❌ InAppMessagesManager.kt: 14/28 changed lines (50.0%) (48 changed lines)
    • ⚠️ Below threshold: 14 uncovered changed lines
  • ✅ InAppBackendService.kt: 1/1 changed lines (100.0%) (1 changed lines)
  • ❌ InAppDisplayer.kt: 0/1 changed lines (0.0%) (1 changed lines)
    • ⚠️ Below threshold: 1 uncovered changed lines
  • ❌ InAppMessageView.kt: 0/3 changed lines (0.0%) (3 changed lines)
    • ⚠️ Below threshold: 3 uncovered changed lines
  • ❌ OneSignalBounceInterpolator.kt: 0/1 changed lines (0.0%) (1 changed lines)
    • ⚠️ Below threshold: 1 uncovered changed lines
  • ✅ InAppHydrator.kt: 1/1 changed lines (100.0%) (1 changed lines)
  • ✅ TriggerController.kt: 1/1 changed lines (100.0%) (4 changed lines)
  • ❌ LocationManager.kt: 0/1 changed lines (0.0%) (1 changed lines)
    • ⚠️ Below threshold: 1 uncovered changed lines
  • ❌ GmsLocationController.kt: 0/4 changed lines (0.0%) (5 changed lines)
    • ⚠️ Below threshold: 4 uncovered changed lines
  • ❌ HmsLocationController.kt: 0/7 changed lines (0.0%) (8 changed lines)
    • ⚠️ Below threshold: 7 uncovered changed lines
  • ❌ OneSignalHmsEventBridge.kt: 0/1 changed lines (0.0%) (1 changed lines)
    • ⚠️ Below threshold: 1 uncovered changed lines
  • ❌ NotificationChannelManager.kt: 0/2 changed lines (0.0%) (2 changed lines)
    • ⚠️ Below threshold: 2 uncovered changed lines
  • ❌ OSWorkManagerHelper.kt: 0/2 changed lines (0.0%) (2 changed lines)
    • ⚠️ Below threshold: 2 uncovered changed lines
  • ❌ NotificationRepository.kt: 0/4 changed lines (0.0%) (10 changed lines)
    • ⚠️ Below threshold: 4 uncovered changed lines
  • ❌ NotificationGenerationProcessor.kt: 0/3 changed lines (0.0%) (4 changed lines)
    • ⚠️ Below threshold: 3 uncovered changed lines
  • ❌ NotificationLifecycleService.kt: 0/8 changed lines (0.0%) (9 changed lines)
    • ⚠️ Below threshold: 8 uncovered changed lines
  • ✅ PushTokenManager.kt: 2/2 changed lines (100.0%) (3 changed lines)
  • ❌ ReceiveReceiptProcessor.kt: 0/1 changed lines (0.0%) (1 changed lines)
    • ⚠️ Below threshold: 1 uncovered changed lines
  • ❌ PushRegistratorADM.kt: 0/2 changed lines (0.0%) (2 changed lines)
    • ⚠️ Below threshold: 2 uncovered changed lines
  • ❌ PushRegistratorAbstractGoogle.kt: 0/7 changed lines (0.0%) (7 changed lines)
    • ⚠️ Below threshold: 7 uncovered changed lines
  • ❌ PushRegistratorHMS.kt: 0/2 changed lines (0.0%) (2 changed lines)
    • ⚠️ Below threshold: 2 uncovered changed lines
  • ❌ NotificationRestoreProcessor.kt: 0/1 changed lines (0.0%) (1 changed lines)
    • ⚠️ Below threshold: 1 uncovered changed lines
  • ❌ NotificationRestoreWorkManager.kt: 0/2 changed lines (0.0%) (2 changed lines)
    • ⚠️ Below threshold: 2 uncovered changed lines
  • ❌ ADMMessageHandler.kt: 0/2 changed lines (0.0%) (2 changed lines)
    • ⚠️ Below threshold: 2 uncovered changed lines
  • ❌ ADMMessageHandlerJob.kt: 0/2 changed lines (0.0%) (2 changed lines)
    • ⚠️ Below threshold: 2 uncovered changed lines
  • ❌ OneSignalOpenTelemetry.kt: 0/75 changed lines (0.0%) (148 changed lines)
    • ⚠️ Below threshold: 75 uncovered changed lines
  • ❌ OtelFactory.kt: 0/23 changed lines (0.0%) (112 changed lines)
    • ⚠️ Below threshold: 23 uncovered changed lines
  • ❌ OtelLoggingHelper.kt: 0/31 changed lines (0.0%) (65 changed lines)
    • ⚠️ Below threshold: 31 uncovered changed lines
  • ❌ OtelFieldsPerEvent.kt: 0/13 changed lines (0.0%) (35 changed lines)
    • ⚠️ Below threshold: 13 uncovered changed lines
  • ❌ OtelFieldsTopLevel.kt: 0/21 changed lines (0.0%) (42 changed lines)
    • ⚠️ Below threshold: 21 uncovered changed lines
  • ❌ OtelConfigCrashFile.kt: 0/19 changed lines (0.0%) (50 changed lines)
    • ⚠️ Below threshold: 19 uncovered changed lines
  • ❌ OtelConfigRemoteOneSignal.kt: 0/18 changed lines (0.0%) (57 changed lines)
    • ⚠️ Below threshold: 18 uncovered changed lines
  • ❌ OtelConfigShared.kt: 0/18 changed lines (0.0%) (58 changed lines)
    • ⚠️ Below threshold: 18 uncovered changed lines
  • ❌ OtelCrashHandler.kt: 0/46 changed lines (0.0%) (127 changed lines)
    • ⚠️ Below threshold: 46 uncovered changed lines
  • ❌ OtelCrashReporter.kt: 0/33 changed lines (0.0%) (63 changed lines)
    • ⚠️ Below threshold: 33 uncovered changed lines
  • ❌ OtelCrashUploader.kt: 0/29 changed lines (0.0%) (91 changed lines)
    • ⚠️ Below threshold: 29 uncovered changed lines
  • ⚠️ MockHelper.kt: Not in coverage report (may not be compiled/tested)

Overall Coverage (Changed Lines Only)

270/1206 changed lines covered (22.4%)

❌ Coverage Check Failed

Files below 80% threshold:

  • SyncJobService.kt: 0.0% (4 uncovered changed lines)

  • AndroidUtils.kt: 0.0% (4 uncovered changed lines)

  • IParamsBackendService.kt: 0.0% (8 uncovered changed lines)

  • ParamsBackendService.kt: 0.0% (8 uncovered changed lines)

  • BackgroundManager.kt: 0.0% (1 uncovered changed lines)

  • ConfigModel.kt: 0.0% (14 uncovered changed lines)

  • ConfigModelStore.kt: 0.0% (1 uncovered changed lines)

  • ConfigModelStoreListener.kt: 0.0% (2 uncovered changed lines)

  • OperationModelStore.kt: 0.0% (1 uncovered changed lines)

  • Time.kt: 0.0% (1 uncovered changed lines)

  • LogLevel.kt: 0.0% (1 uncovered changed lines)

  • OneSignalCrashHandlerFactory.kt: 0.0% (5 uncovered changed lines)

  • OneSignalCrashUploaderWrapper.kt: 0.0% (17 uncovered changed lines)

  • OtelAnrDetector.kt: 0.0% (100 uncovered changed lines)

  • OtelSdkSupport.kt: 0.0% (4 uncovered changed lines)

  • Logging.kt: 16.7% (20 uncovered changed lines)

  • OtelIdResolver.kt: 0.0% (96 uncovered changed lines)

  • OtelPlatformProvider.kt: 0.0% (76 uncovered changed lines)

  • OneSignalImp.kt: 0.0% (5 uncovered changed lines)

  • OtelLifecycleManager.kt: 0.0% (117 uncovered changed lines)

  • ChannelTracker.kt: 77.8% (18 uncovered changed lines)

  • OutcomeSourceBody.kt: 25.0% (6 uncovered changed lines)

  • SessionListener.kt: 75.0% (1 uncovered changed lines)

  • IUserManager.kt: 0.0% (3 uncovered changed lines)

  • UserManager.kt: 66.7% (2 uncovered changed lines)

  • IdentityModelStore.kt: 0.0% (1 uncovered changed lines)

  • CustomEventOperationExecutor.kt: 78.8% (7 uncovered changed lines)

  • SubscriptionOperationExecutor.kt: 0.0% (9 uncovered changed lines)

  • InAppMessagesManager.kt: 50.0% (14 uncovered changed lines)

  • InAppDisplayer.kt: 0.0% (1 uncovered changed lines)

  • InAppMessageView.kt: 0.0% (3 uncovered changed lines)

  • OneSignalBounceInterpolator.kt: 0.0% (1 uncovered changed lines)

  • LocationManager.kt: 0.0% (1 uncovered changed lines)

  • GmsLocationController.kt: 0.0% (4 uncovered changed lines)

  • HmsLocationController.kt: 0.0% (7 uncovered changed lines)

  • OneSignalHmsEventBridge.kt: 0.0% (1 uncovered changed lines)

  • NotificationChannelManager.kt: 0.0% (2 uncovered changed lines)

  • OSWorkManagerHelper.kt: 0.0% (2 uncovered changed lines)

  • NotificationRepository.kt: 0.0% (4 uncovered changed lines)

  • NotificationGenerationProcessor.kt: 0.0% (3 uncovered changed lines)

  • NotificationLifecycleService.kt: 0.0% (8 uncovered changed lines)

  • ReceiveReceiptProcessor.kt: 0.0% (1 uncovered changed lines)

  • PushRegistratorADM.kt: 0.0% (2 uncovered changed lines)

  • PushRegistratorAbstractGoogle.kt: 0.0% (7 uncovered changed lines)

  • PushRegistratorHMS.kt: 0.0% (2 uncovered changed lines)

  • NotificationRestoreProcessor.kt: 0.0% (1 uncovered changed lines)

  • NotificationRestoreWorkManager.kt: 0.0% (2 uncovered changed lines)

  • ADMMessageHandler.kt: 0.0% (2 uncovered changed lines)

  • ADMMessageHandlerJob.kt: 0.0% (2 uncovered changed lines)

  • OneSignalOpenTelemetry.kt: 0.0% (75 uncovered changed lines)

  • OtelFactory.kt: 0.0% (23 uncovered changed lines)

  • OtelLoggingHelper.kt: 0.0% (31 uncovered changed lines)

  • OtelFieldsPerEvent.kt: 0.0% (13 uncovered changed lines)

  • OtelFieldsTopLevel.kt: 0.0% (21 uncovered changed lines)

  • OtelConfigCrashFile.kt: 0.0% (19 uncovered changed lines)

  • OtelConfigRemoteOneSignal.kt: 0.0% (18 uncovered changed lines)

  • OtelConfigShared.kt: 0.0% (18 uncovered changed lines)

  • OtelCrashHandler.kt: 0.0% (46 uncovered changed lines)

  • OtelCrashReporter.kt: 0.0% (33 uncovered changed lines)

  • OtelCrashUploader.kt: 0.0% (29 uncovered changed lines)

📥 View workflow run

@nan-li nan-li self-requested a review March 4, 2026 18:04
@abdulraqeeb33 abdulraqeeb33 merged commit 244284e into 5.6-main Mar 4, 2026
3 of 5 checks passed
@abdulraqeeb33 abdulraqeeb33 deleted the cherry-pick/otel-crash-reporting-5.6 branch March 4, 2026 18:11
@github-actions github-actions bot mentioned this pull request Mar 4, 2026
Closed
abdulraqeeb33 added a commit that referenced this pull request Mar 4, 2026
@abdulraqeeb33
Revert "feat: cherry-pick otel crash reporting into 5.6-main (#2555)"
fea86dc 
This reverts commit 244284e.
@abdulraqeeb33 abdulraqeeb33 mentioned this pull request Mar 4, 2026
Merged
This was referenced Mar 4, 2026
Closed
Closed
Merged
Closed
Merged
@abdulraqeeb33 abdulraqeeb33 mentioned this pull request Mar 10, 2026
Merged
This was referenced Mar 10, 2026
Merged
Merged
Merged
Merged
Closed
@abdulraqeeb33 abdulraqeeb33 mentioned this pull request Mar 10, 2026
Merged
@onesignal-deploy onesignal-deploy mentioned this pull request Mar 10, 2026
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nan-li nan-li nan-li approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@abdulraqeeb33 @nan-li