Skip to content
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.

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

RUMM-3239 Fix RUM Context in Logs #1264

Merged
merged 3 commits into from Apr 25, 2023

Conversation

maxep
Copy link
Member

@maxep maxep commented Apr 25, 2023

What and why?

Fix RUM context not being attached to log when no user action exists.

How?

Allow nil values in RUM context.

Review checklist

  • Feature or bugfix MUST have appropriate tests (unit, integration)
  • Make sure each commit and the PR mention the Issue number or JIRA reference
  • Add CHANGELOG entry for user facing changes

Custom CI job configuration (optional)

  • Run unit tests
  • Run integration tests
  • Run smoke tests

@maxep maxep self-assigned this Apr 25, 2023
@maxep maxep requested a review from a team as a code owner April 25, 2023 12:00
@maxep maxep force-pushed the maxep/RUMM-3239/fix-rum-context-in-logs branch from 64dcdfb to 35f40b3 Compare April 25, 2023 12:02
@datadog-datadog-prod-us1
Copy link

datadog-datadog-prod-us1 bot commented Apr 25, 2023

Datadog Report

Branch report: maxep/RUMM-3239/fix-rum-context-in-logs
Commit report: 660aa75

❄️ dd-sdk-ios: 0 Failed, 1 New Flaky, 2118 Passed, 0 Skipped, 8m 44.81s Wall Time

New Flaky Tests (1)

  • testWhenDataIsBeingUploaded_itPrintsUploadProgressInformation - DataUploadWorkerTests - Last Failure

    Expand for error
     
     Assertion Failure at DataUploadWorkerTests.swift:305: XCTAssertEqual failed: ("3") is not equal to ("2")
     Assertion Failure at DataUploadWorkerTests.swift:307: XCTAssertEqual failed: ("NTP time synchronization completed.
     Server time will be used for signing events (0.015s difference with device time).") is not equal to ("⏳ (ND13kzLu2a) Uploading batch...") - Batch start information should be printed to \`userLogger\`. All captured logs:
     [(level: Datadog.CoreLoggerLevel.debug, message: "NTP time synchronization completed.\nServer time will be used for signing events (0.015s difference with device time).", error: nil), (level: Datadog.CoreLoggerLevel.debug, message: "⏳ (ND13kzLu2a) Uploading batch...", error: nil), (level: Datadog.CoreLoggerLevel.debug, message: "   → (ND13kzLu2a) not delivered, will be retransmitted: JqqIwBnINC", error: nil)]
     Assertion Failure at DataUploadWorkerTests.swift:313: XCTAssertEqual failed: ("⏳ (ND13kzLu2a) Uploading batch...") is not equal to ("   → (ND13kzLu2a) not delivered, will be retransmitted: JqqIwBnINC") - Batch completion information should be printed to \`userLogger\`. All captured logs:
     [(level: Datadog.CoreLoggerLevel.debug, message: "NTP time synchronization completed.\nServer time will be used for signing events (0.015s difference with device time).", error: nil), (level: Datadog.CoreLoggerLevel.debug, message: "⏳ (ND13kzLu2a) Uploading batch...", error: nil), (level: Datadog.CoreLoggerLevel.debug, message: "   → (ND13kzLu2a) not delivered, will be retransmitted: JqqIwBnINC", error: nil)]
    

@maxep
Copy link
Member Author

maxep commented Apr 25, 2023

image

@maxep maxep merged commit 69ff9fe into develop Apr 25, 2023
5 of 6 checks passed
@maxep maxep deleted the maxep/RUMM-3239/fix-rum-context-in-logs branch April 25, 2023 17:11
@ncreated ncreated mentioned this pull request Apr 26, 2023
6 tasks
@maxep maxep mentioned this pull request Apr 26, 2023
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants