Skip to content

Commit

Permalink
Merge branch 'master' into ncreated/RUMM-610-optimize-memory-usage-wh…
Browse files Browse the repository at this point in the history
…en-doing-intensive-logging

# Conflicts:
#	DatadogSDK.podspec
#	DatadogSDKObjc.podspec
#	Sources/Datadog/Datadog.swift
  • Loading branch information
ncreated committed Jul 17, 2020
2 parents 122bc42 + b165197 commit b887984
Show file tree
Hide file tree
Showing 247 changed files with 13,519 additions and 2,514 deletions.
25 changes: 0 additions & 25 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

46 changes: 46 additions & 0 deletions .github/ISSUE_TEMPLATE/compilation_issue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
---
name: Compilation Issue
about: Having a Cocoapods / Carthage / SPM problem when linking the SDK?
title: ''
labels: compilation issue
assignees: ''

---

### The issue

📝 Give us the error message you receive, describe the problem and answer the questions.

---

#### Datadog SDK version:

_Which version of the Datadog SDK causes this problem? e.g. `1.2.0`_

#### Last working Datadog SDK version:

_What is the last Datadog SDK version where this problem didn't occur? e.g. `1.1.0`_

#### Dependency Manager:

_Which dependency manager do you use? e.g. Cocoapods / Carthage / SPM / ..._

#### Other toolset:

_Do you use additional tools with your dependency manager? e.g. [CarthageCache](https://github.com/Wolox/carthage_cache)_

#### Xcode version:

_e.g. `Xcode 11.5 (11E608c)`_

#### Swift version:

_e.g. `5.1`_

#### Deployment Target:

_What is the Deployment Target of your app? e.g. `iOS 12`, `iPhone` + `iPad`_

#### macOS version:

_e.g. `macOS Catalina 10.15.5 (19F96)`_
42 changes: 42 additions & 0 deletions .github/ISSUE_TEMPLATE/crash_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
---
name: Crash
about: Noticed the SDK crash?
title: ''
labels: crash
assignees: ''

---

### The crash

📝 Give us the crash report or stack trace, describe the problem in details and answer the questions.

---

#### Datadog SDK versions:

_Which version(s) of the Datadog SDK you see this crash happening in?_

#### Last stable Datadog SDK version:

_What is the last Datadog SDK version where this crash doesn't happen?_

#### Volume:

_What % of your app sessions is impacted with this crash?_

#### OS version:

_Which iOS versions does this crash happen on?_

#### Deployment Target:

_What is the Deployment Target of your app? e.g. `iOS 12`, `iPhone` + `iPad`_

#### Device version:

_Which devices does this crash happen on? e.g. `iPhone X` only or various iPads_

#### Environment:

_Do you notice any environment correlation in crash reports? e.g. low battery, no internet connection, memory pressure_
20 changes: 0 additions & 20 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/other.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
name: Other
about: Noticed a bug, having a question or a feature request?
title: ''
assignees: ''

---

### The thing

Tell us the thing 🙂
50 changes: 50 additions & 0 deletions .github/workflows/all-platform-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Trigger all-platform tests

on:
pull_request:
types: [opened]
issue_comment:
types: [created]

jobs:
trigger-all-platform-tests:

# Only certain repository members can run it
if: github.actor == 'ncreated' || github.actor == 'buranmert' || github.actor == 'nachoBonafonte'

runs-on: ubuntu-latest
steps:
- name: Look for a keyword triggering the build on Bitrise
id: check-keyword-trigger
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
uses: khan/pull-request-comment-trigger@014b821
with:
trigger: '@test-all-platforms'
reaction: rocket
- name: Trigger Bitrise build
if: steps.check-keyword-trigger.outputs.triggered == 'true'
env:
BITRISE_APP_SLUG: ${{ secrets.BITRISE_APP_SLUG }}
BITRISE_TOKEN: ${{ secrets.BITRISE_TOKEN }}
CURRENT_PR_SOURCE_BRANCH: ${{ github.head_ref }}
COMMENT_BODY: ${{ github.event.comment.body }}
shell: bash
run: |
if [[ -z "${CURRENT_PR_SOURCE_BRANCH}" ]]; then
# when running on Pull Request comment (get the branch name from comment's body)
SANITIZED_COMMENT=${COMMENT_BODY//[^a-zA-Z0-9@ -\/]/} # sanitize the user input
BRANCH_NAME_REGEXP='[a-zA-Z0-9-]*\/[a-zA-Z0-9-]*'
CURRENT_BRANCH=$(echo "${SANITIZED_COMMENT}" | grep -oe '@test-all-platforms '$BRANCH_NAME_REGEXP | grep -oe $BRANCH_NAME_REGEXP)
else
# when running due to opening a Pull Request
CURRENT_BRANCH="${CURRENT_PR_SOURCE_BRANCH}"
fi
echo "Calling Bitrise API to run build for branch: $CURRENT_BRANCH"
curl -X POST "https://api.bitrise.io/v0.1/apps/${BITRISE_APP_SLUG}/builds" \
-H "accept: application/json" \
-H "Authorization: ${BITRISE_TOKEN}" \
-H "Content-Type: application/json" \
-d "{ \"build_params\": { \"branch\": \"${CURRENT_BRANCH}\", \"workflow_id\": \"trigger_all_platform_tests\" }, \"hook_info\": { \"type\": \"bitrise\" }}"
16 changes: 5 additions & 11 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ To propose improvements, feel free to submit a PR or open an Issue.

Many great ideas for new features come from the community, and we'd be happy to consider yours 👍.

To share your idea or request, [open a GitHub Issue](https://github.com/DataDog/dd-sdk-ios/issues/new) using dedicated issue template.
To share your idea or request, [open a GitHub Issue](https://github.com/DataDog/dd-sdk-ios/issues/new/choose) using dedicated issue template.

## Found a bug?

For any urgent matters (such as outages) or issues concerning the Datadog service or UI, contact our support team via https://docs.datadoghq.com/help/ for direct, faster assistance.

You may submit a bug report concerning the Datadog SDK for iOS by [opening a GitHub Issue](https://github.com/DataDog/dd-sdk-ios/issues/new). Use dedicated bug-issue template and provide all listed details to let us solve it better.
You may submit a bug report concerning the Datadog SDK for iOS by [opening a GitHub Issue](https://github.com/DataDog/dd-sdk-ios/issues/new/choose). Use appropriate template and provide all listed details to help us resolve the issue.

## Have a patch?

Expand All @@ -40,24 +40,18 @@ $ make

### Repo structure

#### Datadog
#### `Datadog.xcworkspace`

1. Datadog.xcodeproj
2. DatadogPrivate _(can be moved to `Sources`)_
* ObjC -> Swift bridge module
The workspace for SDK development and integration (tests, benchmarks, example app).

#### Sources

`Datadog` and `DatadogObjC` source files

#### Tests

`DatadogTests` (unit tests) and `DatadogIntegrationTests` source files
`DatadogTests` (unit tests), `DatadogIntegrationTests` (integration tests), and `DatadogBenchmarkTests` (benchmarks) source files

#### Dependency manager tests

Isolated example apps using `cocoapods`, `carthage` and `spm` to ensure SDK is well integrated with all supported dependency managers.

#### Examples (to be removed)

Example apps for different package managers
Loading

0 comments on commit b887984

Please sign in to comment.