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.

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

Jump to bottom

Merge v2 to develop #1050

Merged
merged 115 commits into from
Nov 16, 2022
Merged

Merge v2 to develop #1050

merged 115 commits into from
Nov 16, 2022

Conversation

maxep
Copy link
Member

@maxep maxep commented Nov 14, 2022 •
edited
Loading

What and why?

merge v2 progress in develop branch.

Conflicts

The following PRs were conflicting with v2:

@fuzzybinary could you please double check?

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 added 30 commits July 12, 2022 11:05
@maxep
RUMM-2299 Create context provider
c81ab17
@maxep
RUMM-2299 Introduce ContextValuePublisher and ContextValueReader
2bb7484
@maxep
RUMM-2299 Revamp reader and publisher and assign context value using …
b136b5f 
…key-path
@maxep
RUMM-2299 Update doc
76c0497
@maxep
RUMM-2299 Keep ref to server time provider
03dcfd5
@maxep
RUMM-2299 Make ContextValuePublisherMock and `ContextValueReaderMoc…
f92121a 
…k`'s value atomic
@maxep
RUMM-2299 Add test coverage for readers and publishers
585f1f4
@maxep
RUMM-2299 Improve tests
1c83ac3
@maxep
RUMM-2299 Make NetworkConnectionInfo non optional
524d22c
@maxep
Merge pull request #916 from DataDog/maxep/RUMM-2299/core-context-pro…
c2214fb 
…vider

RUMM-2299 Core Context Provider
@maxep
RUMM-2299 Add user info publisher
50b4af1
@maxep
Merge pull request #927 from DataDog/maxep/RUMM-2299/core-context-use…
65a6d44 
…r-info-publisher

RUMM-2299 Core Context User Info Publisher
@maxep
RUMM-2299 Add application launch time reader
89963b4
@maxep
RUMM-2299 Fix documentation
3340c36
@maxep
RUMM-2299 Remove TODO
f21de51
@maxep
Merge pull request #926 from DataDog/maxep/RUMM-2299/core-context-lau…
cf2ddd3 
…nch-time-reader

RUMM-2299 Core Context Launch Time Reader
@maxep
RUMM-2299 Add application state publisher
e771966
@maxep
RUMM-2299 Add doc for UIKit extension
7c0931c
@maxep
RUMM-2299 Fix lint
f75119a
@maxep
Merge pull request #928 from DataDog/maxep/RUMM-2299/core-context-app…
6c7d84b 
…-state-publisher

RUMM-2299 Core Context Application State Publisher
@maxep
Merge branch 'develop' into 'feature/v2'
5b073a3 
# Conflicts:
#	Datadog/Datadog.xcodeproj/project.pbxproj
@maxep
RUMM-2207 Delegate building HTTP request to feature
2edeed1
@maxep
RUMM-2207 Rename payloads to events
dfa3f9b
@maxep
RUMM-2207 Fix doc
2df434c
@maxep
Merge pull request #939 from DataDog/maxep/RUMM-2207/feature-upload-r…
007e153 
…equest-builder

RUMM-2207 Delegate building HTTP request to features
@maxep
RUMM-2207 Introduce battery status reader
aa39aee
@maxep
RUMM-2207 Fix doc
4ada753
@maxep
Merge pull request #942 from DataDog/maxep/RUMM-2207/battery-status-r…
ba23be3 
…eader

RUMM-2207 Battery Status Reader and Low Battery Mode Publisher
@maxep
Merge commit 'develop' into maxep/merge/develop-v2
3289240 
# Conflicts:
#	Datadog/Datadog.xcodeproj/project.pbxproj
#	Tests/DatadogTests/Datadog/Core/System/Time/DateCorrectionTests.swift
@maxep
Fix benchmark tests
12fb3af
maxep and others added 19 commits October 14, 2022 12:07
@maxep
RUMM-2334 Update tests
e7cbfcb
@maxep
Merge pull request #989 from DataDog/maxep/RUMM-2334/tracing-with-rum…
0133fbf 
…-context

RUMM-2334 Tracing with RUM Through Core Context
@maxep @ncreated
Apply suggestions from code review
8c5675a 
Co-Authored-By: Maciek Grzybowski <maciek.grzybowski@datadoghq.com>
@maxep
Merge pull request #1018 from DataDog/maxep/v2-feature-registration
2723b6b 
RUMM-2603 Create V2 Registration Interfaces
@maxep
RUMM-2606 Battery Status Publisher
7e0a9c9
@maxep
RUMM-2606 set initial battery status
434366b
@maxep
RUMM-2606 connect low power mode publisher
7ec2bad
@maxep
RUMM-2606 revert dev team
ad79682
@maxep
RUMM-2606 Fix ref doc
bcb1cf9
@maxep
Merge pull request #1020 from DataDog/maxep/RUMM-2606/battery-status-…
fc1b57c 
…publisher

RUMM-2606 Battery Status Publisher
@maxep
RUMM-2606 Launch Time Publisher
60a8aff
@maxep
RUMM-2606 avoid recursive lock
fbc11e4
@maxep @ncreated
Apply suggestions from code review
f4d4fef 
Co-Authored-By: Maciek Grzybowski <maciek.grzybowski@datadoghq.com>
@maxep
RUMM-2606 Make launchTime optional
3be6dc8
@maxep @ncreated
Update Sources/Datadog/DatadogInternal/Context/LaunchTime.swift
e747497 
Co-authored-by: Maciek Grzybowski <maciek.grzybowski@datadoghq.com>
@maxep
Merge pull request #1030 from DataDog/maxep/RUMM-2606/launch-time-pub…
d620fe0 
…lisher

RUMM-2606 Launch Time Publisher
@maxep
RUMM-2381 Add internal proxy API for customising app version
739884b
@maxep
Merge pull request #1048 from DataDog/maxep/RUMM-2732/app-version-pub…
c76d87e 
…lisher

RUMM-2381 Add internal proxy API for customising app version
@maxep
Merge branch 'develop' into feature/v2
1522911
@maxep maxep self-assigned this Nov 14, 2022
@datadog-datadog-prod-us1
Copy link

datadog-datadog-prod-us1 bot commented Nov 14, 2022 •
edited
Loading

Datadog Report

Branch report: feature/v2
Commit report: 7a6bef9

✅ dd-sdk-ios 0 Failed, 0 New Flaky, 2007 Passed, 0 Skipped, 20m 56.69s Wall Time

maxep added 2 commits November 15, 2022 13:16
@maxep
Merge branch 'develop' into feature/v2
52e12f6 
# Conflicts:
#	Sources/Datadog/Core/FeaturesConfiguration.swift
#	Tests/DatadogTests/Datadog/Mocks/CoreMocks.swift
@maxep
Fix merge conflict
7a6bef9
@maxep maxep marked this pull request as ready for review November 15, 2022 13:23
@maxep maxep requested a review from a team as a code owner November 15, 2022 13:23
ncreated
ncreated approved these changes Nov 16, 2022
View reviewed changes
Copy link
Member

@ncreated ncreated left a comment

Choose a reason for hiding this comment

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

Looks OK 👍. Because of the size of this PR: do you think there are there particular things we may want to look at @maxep? I double checked the "merge branch develop" commits that annotate conflicted files and the last "fix merge conflict" change - it's all fine 👍 + the work from conflicted PRs seems good as well.

On top of human review, I think we must rely on tests 🤖 for ultimate qualification. I see that all were included 👍👌, so it's good to go for me.

@maxep
Copy link
Member Author

maxep commented Nov 16, 2022

do you think there are there particular things we may want to look at @maxep?

The only things are the conflicts I mentioned. The most impactful was tackled and reviewed in #1048 👍
Others were easier:

  • Add variant property to v2 context
  • Use RUM context from FeatureBaggage when logging configuration Telemetry

@maxep maxep merged commit f6a228c into develop Nov 16, 2022
@ncreated ncreated mentioned this pull request Nov 16, 2022
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ncreated ncreated ncreated approved these changes

Assignees

@maxep maxep

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@maxep @ncreated