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

Fix privacy manifest collision #1666

Merged
merged 6 commits into from
Feb 9, 2024
Merged

Conversation

maxep
Copy link
Member

@maxep maxep commented Feb 9, 2024

What and why?

When using static linkage in CocoaPods with use_frameworks! :linkage => :static. The pod's resource gets copied at root of the app bundle, resulting in collision with the app's PrivacyInfo.xcprivacy.

Resolve #1665

How?

Use resource_bundle to keep the PrivacyInfo.xcprivacy in it own bundle.

The smoke tests apps now all define privacy-manifest to catch any collision.

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 for Core, RUM, Trace, Logs, CR and WVT
  • Run unit tests for Session Replay
  • Run integration tests
  • Run smoke tests
  • Run tests for tools/

@datadog-datadog-prod-us1
Copy link

datadog-datadog-prod-us1 bot commented Feb 9, 2024

Datadog Report

Branch report: maxep/fix-privacy-manifest
Commit report: af3357a
Test service: dd-sdk-ios

✅ 0 Failed, 2491 Passed, 0 Skipped, 5m 22.94s Wall Time
🔻 Test Sessions change in coverage: 8 decreased, 4 increased, 1 no change

🔻 Code Coverage Decreases vs Default Branch (8)

This report shows up to 5 code coverage decreases.

  • test DatadogLogsTests tvOS 44.77% (-0.18%) - Details
  • test DatadogLogsTests iOS 44.72% (-0.17%) - Details
  • test DatadogCrashReportingTests tvOS 28.88% (-0.17%) - Details
  • test DatadogRUMTests iOS 79.25% (-0.16%) - Details
  • test DatadogWebViewTrackingTests iOS 22.93% (-0.15%) - Details

@maxep maxep marked this pull request as ready for review February 9, 2024 13:47
@maxep maxep requested review from a team as code owners February 9, 2024 13:47
@maxep maxep marked this pull request as draft February 9, 2024 13:48
@maxep maxep marked this pull request as ready for review February 9, 2024 16:03
Comment on lines -44 to -49
// DDURLSessionDelegate APIs must be visible:
_ = DDURLSessionDelegate()
_ = DatadogURLSessionDelegate()
class CustomDelegate: NSObject, __URLSessionDelegateProviding {
var ddURLSessionDelegate: DatadogURLSessionDelegate { DatadogURLSessionDelegate() }
}
Copy link
Collaborator

Choose a reason for hiding this comment

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

q/ Why this removal? Due to deprecation warnings treated as build error?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, and because it's deprecated anyway.

Copy link
Collaborator

@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.

👌 Great we cover this in smoke tests now 👍

@maxep maxep merged commit 0b7b73a into release/2.7.1 Feb 9, 2024
16 checks passed
@maxep maxep deleted the maxep/fix-privacy-manifest branch February 9, 2024 17:07
@maxep maxep mentioned this pull request Feb 9, 2024
8 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

2 participants