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

Merge feature/v2 to develop #1366

Merged
merged 316 commits into from
Jul 11, 2023
Merged

Merge feature/v2 to develop #1366

merged 316 commits into from
Jul 11, 2023

Conversation

maxep
Copy link
Member

@maxep maxep commented Jul 10, 2023

What and why?

Merge feature/v2 to develop

How?

The following conflicts were resolved during the merge. Authors of the following PRs are invited to review their respective changes.

Additionally, the E2E Tests have been migrated, see 16f13ad

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 and others added 30 commits March 30, 2023 15:11
Co-Authored-By: Maciek Grzybowski <maciek.grzybowski@datadoghq.com>
…entation

RUMM-2616 RUM Resource Instrumentation v2
…o-provider

RUMM-2616 Remove User Info Provider
@maxep maxep self-assigned this Jul 10, 2023
@datadog-datadog-prod-us1
Copy link

datadog-datadog-prod-us1 bot commented Jul 10, 2023

Datadog Report

Branch report: maxep/v2-develop-merge
Commit report: 02bce4c

dd-sdk-ios: 0 Failed, 0 New Flaky, 116 Passed, 0 Skipped, 2m 29.56s Wall Time

@maxep
Copy link
Member Author

maxep commented Jul 10, 2023

image

@maxep maxep marked this pull request as ready for review July 10, 2023 15:32
@maxep maxep requested review from a team as code owners July 10, 2023 15:32
Copy link

@buraizu buraizu left a comment

Choose a reason for hiding this comment

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

Not sure a docs team review is needed here, but LGTM

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 good, except that we also need to fix E2E tests build by updating the API to 2.0.0 (it uses V1 on feature/v2):

Screenshot 2023-07-11 at 08 44 49

Otherwise, all monitors we define in MI org will fail in next nightly build. The E2E tests are safe to try in local, as they send data to different env:

https://github.com/DataDog/dd-sdk-ios/blob/develop/Datadog/E2E/E2EConfig.swift#L48-L53

@maxep
Copy link
Member Author

maxep commented Jul 11, 2023

@ncreated! Indeed, I was planning on doing it after the merge but better to do it now 👍
E2E Tests are now migrated and data is coming through.

I have also updated the api-surface.

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.

🚀

@maxep maxep merged commit b54b417 into develop Jul 11, 2023
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.

6 participants