Skip to content

Commit 863da08

Browse files
ncreatedncreated
committed
Merge branch 'develop' into ncreated/chore/merge-app-state-enhancements-to-develop
# Conflicts: # Datadog/Datadog.xcodeproj/project.pbxproj # Datadog/IntegrationUnitTests/RUM/RUMAttributesIntegrationTests.swift # DatadogCore/Sources/Core/DatadogCore.swift # DatadogInternal/Sources/Context/DatadogContext.swift # DatadogInternal/Sources/Models/CrashReporting/CrashContext.swift # DatadogInternal/Sources/Models/RUM/RUMDataModels.swift # DatadogRUM/Sources/DataModels/RUMDataModels+objc.swift # DatadogRUM/Sources/Instrumentation/Views/SwiftUI/SwiftUIRUMViewsPredicate+objc.swift # DatadogRUM/Sources/RUMMetrics/TNSMetric.swift # DatadogRUM/Tests/RUMEvent/RUMDeviceInfoTests.swift # DatadogRUM/Tests/RUMMetrics/TNSMetricTests.swift # DatadogTrace/Sources/Integrations/TracingURLSessionHandler.swift # TestUtilities/Sources/Mocks/CrashReporting/CrashReportingFeatureMocks.swift # TestUtilities/Sources/Mocks/DatadogInternal/DatadogContextMock.swift # TestUtilities/Sources/Mocks/DatadogInternal/RUMDataModelMocks.swift
2 parents 7340705 + bd63f86 commit 863da08

179 files changed

Lines changed: 6228 additions & 742 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@
66

77
/docs/ @DataDog/documentation @DataDog/rum-mobile
88
*README.md @DataDog/documentation @DataDog/rum-mobile
9+
*MIGRATION.md @DataDog/documentation
10+
*CHANGELOG.md @DataDog/documentation

‎.github/chainguard/self.release.sts.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
issuer: https://gitlab.ddbuild.io
22

3-
subject_pattern: "project_path:DataDog/dd-sdk-ios:ref_type:tag:ref:refs/tags/.*"
3+
subject_pattern: "project_path:DataDog/dd-sdk-ios:ref_type:tag:ref:.*"
44

55
claim_pattern:
66
project_path: "DataDog/dd-sdk-ios"
77
ref_type: "tag"
8-
ref_protected: "true"
98
pipeline_source: "push"
10-
ci_config_ref_uri: "gitlab.ddbuild.io/DataDog/dd-sdk-ios//.gitlab-ci.yml@refs/heads/master"
9+
ci_config_ref_uri: "gitlab.ddbuild.io/DataDog/dd-sdk-ios//.gitlab-ci.yml@.*"
1110

1211
permissions:
1312
contents: write

‎.github/dependabot.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Dependabot configuration for GitHub Actions and Python dependencies
2+
# This will automatically create PRs to update GitHub Actions and Python packages to their latest versions
3+
4+
version: 2
5+
updates:
6+
- package-ecosystem: "github-actions"
7+
directory: "/"
8+
schedule:
9+
interval: "monthly"
10+
groups:
11+
gh-actions-packages:
12+
patterns:
13+
- "*"
14+
15+
- package-ecosystem: "pip"
16+
directory: "/tools/issue_handler"
17+
schedule:
18+
interval: "monthly"
19+
groups:
20+
python-packages:
21+
patterns:
22+
- "*"

‎.github/workflows/changelog-to-confluence.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
15+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1616

1717
- name: Prepare Only Changelog
1818
run: |

‎.github/workflows/issue_notification.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Github Issue Notification
2+
3+
on:
4+
workflow_dispatch: # Trigger manually
5+
inputs:
6+
issue_number:
7+
description: 'Issue number to process'
8+
required: true
9+
type: number
10+
11+
jobs:
12+
process_issue:
13+
runs-on: ubuntu-latest
14+
environment: protected-dev-env
15+
16+
steps:
17+
- name: Checkout Repository
18+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
19+
20+
- name: Set up Python 3.x
21+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
22+
with:
23+
python-version: '3.x'
24+
25+
- name: Install Dependencies
26+
run: |
27+
cd tools/issue_handler
28+
pip install -r requirements.txt
29+
30+
- name: Set Issue Number
31+
run: |
32+
if [ "${{ github.event_name }}" = "issues" ]; then
33+
echo "GITHUB_EVENT_NUMBER=${{ github.event.issue.number }}" >> $GITHUB_ENV
34+
else
35+
echo "GITHUB_EVENT_NUMBER=${{ github.event.inputs.issue_number }}" >> $GITHUB_ENV
36+
fi
37+
38+
- name: Run the Processing Script
39+
env:
40+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
41+
OPENAI_TOKEN: ${{ secrets.OPENAI_TOKEN }}
42+
OPENAI_SYSTEM_PROMPT: ${{ vars.OPENAI_SYSTEM_PROMPT }}
43+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
44+
SLACK_CHANNEL_ID: ${{ secrets.SLACK_CHANNEL_ID }}
45+
GITHUB_REPOSITORY: ${{ github.repository }}
46+
run: |
47+
cd tools/issue_handler
48+
# Add timeout to prevent hanging processes (5 minutes)
49+
timeout 300 python -m src.analyze_issue $GITHUB_EVENT_NUMBER

‎.github/workflows/stale.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: 'Automatically close stale issues'
2+
3+
on:
4+
schedule:
5+
# Runs every day at 8:00 AM CET
6+
- cron: '0 7 * * *'
7+
workflow_dispatch:
8+
9+
permissions:
10+
issues: write
11+
12+
jobs:
13+
stale:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
17+
with:
18+
repo-token: ${{ secrets.GITHUB_TOKEN }}
19+
stale-issue-message: |
20+
This issue has been automatically marked as stale because it has not had recent activity and has the `awaiting-response` label.
21+
22+
It will be closed if no further activity occurs within 3 days.
23+
24+
# The label that will be added to the issues when automatically marked as stale
25+
stale-issue-label: 'stale'
26+
# The label that will be added to the issues when automatically marked as stale
27+
close-issue-label: 'automatically closed'
28+
# Only target issues with 'awaiting-response' label
29+
only-labels: 'awaiting response'
30+
# Mark issues as stale after 14 days
31+
days-before-issue-stale: 14
32+
# Close issues after 3 days of being marked stale
33+
days-before-issue-close: 3
34+
# Automatically remove the stale label when the issues or the pull requests are updated
35+
remove-stale-when-updated: true
36+
# Specify the reason used when closing issues: `completed` or `not_planned`
37+
close-issue-reason: completed
38+
# Run the stale workflow as dry-run.
39+
# No GitHub API calls that can alter the issues and pull requests will happen.
40+
# Useful to debug or when you want to configure the stale workflow safely.
41+
debug-only: false

‎.gitlab-ci.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ Tools Tests:
209209
compare_to: 'develop'
210210
script:
211211
- make clean repo-setup ENV=ci
212+
- ./tools/runner-setup.sh --python
212213
- make tools-test
213214

214215
Benchmark Build:
@@ -277,6 +278,16 @@ SPM Build (Swift 5.9):
277278
- make spm-build-macos
278279
- make spm-build-watchos
279280

281+
SPI Docs Build:
282+
stage: lint
283+
rules:
284+
- !reference [.test-pipeline-job, rules]
285+
- !reference [.release-pipeline-job, rules]
286+
script:
287+
- ./tools/runner-setup.sh --xcode "$DEFAULT_XCODE" --iOS
288+
- make clean repo-setup ENV=ci
289+
- make spi-docs-build
290+
280291
# ┌──────────────────────┐
281292
# │ E2E Test app upload: │
282293
# └──────────────────────┘
@@ -373,6 +384,8 @@ Publish GH Asset:
373384
stage: release-publish
374385
rules:
375386
- !reference [.release-pipeline-job, rules]
387+
id_tokens:
388+
<<: *dd-octo-sts-id-token
376389
before_script:
377390
- *export_MAKE_release_params
378391
script:

‎.spi.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,11 @@ version: 1
22
builder:
33
configs:
44
- platform: ios
5-
documentation_targets: ["DatadogInternal", "DatadogCore", "DatadogLogs", "DatadogTrace", "DatadogRUM", "DatadogSessionReplay", "DatadogCrashReporting", "DatadogWebViewTracking"]
5+
documentation_targets:
6+
- DatadogCore iOS
7+
- DatadogLogs iOS
8+
- DatadogTrace iOS
9+
- DatadogRUM iOS
10+
- DatadogSessionReplay iOS
11+
- DatadogCrashReporting iOS
12+
- DatadogWebViewTracking iOS

‎BenchmarkTests/Runner/Scenarios/RUM/RUMAuto/RUMAutoScenario.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ struct RUMAutoScenario: Scenario {
2424
applicationID: info.applicationID,
2525
uiKitViewsPredicate: DefaultUIKitRUMViewsPredicate(),
2626
uiKitActionsPredicate: DefaultUIKitRUMActionsPredicate(),
27-
swiftUIViewsPredicate: DefaultSwiftUIRUMViewsPredicate()
27+
swiftUIViewsPredicate: DefaultSwiftUIRUMViewsPredicate(),
28+
swiftUIActionsPredicate: DefaultSwiftUIRUMActionsPredicate(isLegacyDetectionEnabled: true)
2829
)
2930
)
3031

0 commit comments

Comments
 (0)