Dogfood recent changes

.gitignore

@@ -7,8 +7,6 @@ Carthage/Build
 Carthage/Checkouts
 
 xcuserdata/
-instrumented-tests/DatadogSDKTesting.*
-instrumented-tests/LICENSE
 
 *.local.xcconfig
 
@@ -20,3 +18,7 @@ __pycache__
 *.swp
 .venv
 .vscode
+*.pytest_cache
+
+# CI job artifacts
+artifacts/

.gitlab-ci.yml

@@ -4,10 +4,19 @@ stages:
   - test
   - ui-test
   - smoke-test
+  - release-build
+  - release-publish
 
 variables:
   MAIN_BRANCH: "master"
   DEVELOP_BRANCH: "develop"
+  # Prefilled variables for running a pipeline manually:
+  # Ref.: https://docs.gitlab.com/ee/ci/pipelines/index.html#prefill-variables-in-manual-pipelines
+  RELEASE_GIT_TAG:
+    description: "The Git tag for the release pipeline. If set, release pipeline will be triggered for the given tag."
+  RELEASE_DRY_RUN:
+    value: "1"
+    description: "Controls the dry run mode for the release pipeline. If set to '1', the pipeline will execute all steps but will not publish artifacts. If set to '0', the pipeline will run fully."
 
 default:
   tags:
@@ -18,35 +27,39 @@ default:
 # │ Utility jobs: │
 # └───────────────┘
 
-# Trigger jobs on 'develop' and 'master' branches
-.run:when-develop-or-master:
-  rules:
-    - if: '$CI_COMMIT_BRANCH == $DEVELOP_BRANCH || $CI_COMMIT_BRANCH == $MAIN_BRANCH'
-      when: always
+# Utility jobs define rules for including or excluding dependent jobs from the pipeline.
+#
+# Ref.: https://docs.gitlab.com/ee/ci/jobs/job_rules.html
+# > Rules are evaluated in order until the first match. When a match is found, the job is either included or excluded
+# > from the pipeline, depending on the configuration.
 
-# Trigger jobs on SDK code changes, comparing against 'develop' branch
-.run:if-sdk-modified:
+.test-pipeline-job:
   rules:
-    - changes:
+    - if: '$CI_COMMIT_BRANCH == $DEVELOP_BRANCH || $CI_COMMIT_BRANCH == $MAIN_BRANCH' # always on main branches
+    - if: '$CI_COMMIT_BRANCH' # when on other branch with following changes compared to develop
+      changes:
         paths:
           - "Datadog*/**/*"
           - "IntegrationTests/**/*"
           - "TestUtilities/**/*"
           - "*" # match any file in the root directory
-        compare_to: 'develop' # cannot use variable due to: https://gitlab.com/gitlab-org/gitlab/-/issues/369916
+        compare_to: 'develop' # cannot use $DEVELOP_BRANCH var due to: https://gitlab.com/gitlab-org/gitlab/-/issues/369916
 
-# Trigger jobs on changes in `tools/*`, comparing against 'develop' branch
-.run:if-tools-modified:
-  rules:
-    - changes:
-        paths:
-          - "tools/**/*"
-          - "Makefile"
-          - ".gitlab-ci.yml"
-        compare_to: 'develop'
+.release-pipeline-job:
+  rules: 
+    - if: '$CI_COMMIT_TAG || $RELEASE_GIT_TAG'
+
+.release-pipeline-delayed-job:
+  rules: 
+    - if: '$CI_COMMIT_TAG || $RELEASE_GIT_TAG'
+      when: delayed
+      start_in: 20 minutes
 
 ENV check:
   stage: pre
+  rules: 
+    - !reference [.test-pipeline-job, rules]
+    - !reference [.release-pipeline-job, rules]
   script:
     - make env-check
 
@@ -57,8 +70,7 @@ ENV check:
 Lint:
   stage: lint
   rules: 
-    - !reference [.run:when-develop-or-master, rules]
-    - !reference [.run:if-sdk-modified, rules]
+    - !reference [.test-pipeline-job, rules]
   script:
     - make clean repo-setup ENV=ci
     - make lint license-check
@@ -67,8 +79,8 @@ Lint:
 Unit Tests (iOS):
   stage: test
   rules: 
-    - !reference [.run:when-develop-or-master, rules]
-    - !reference [.run:if-sdk-modified, rules]
+    - !reference [.test-pipeline-job, rules]
+    - !reference [.release-pipeline-job, rules]
   variables:
     XCODE: "15.3.0"
     OS: "17.4"
@@ -82,8 +94,8 @@ Unit Tests (iOS):
 Unit Tests (tvOS):
   stage: test
   rules: 
-    - !reference [.run:when-develop-or-master, rules]
-    - !reference [.run:if-sdk-modified, rules]
+    - !reference [.test-pipeline-job, rules]
+    - !reference [.release-pipeline-job, rules]
   variables:
     XCODE: "15.3.0"
     OS: "17.4"
@@ -97,8 +109,8 @@ Unit Tests (tvOS):
 UI Tests:
   stage: ui-test
   rules: 
-    - !reference [.run:when-develop-or-master, rules]
-    - !reference [.run:if-sdk-modified, rules]
+    - !reference [.test-pipeline-job, rules]
+    - !reference [.release-pipeline-job, rules]
   variables:
     XCODE: "15.3.0"
     OS: "17.4"
@@ -118,15 +130,23 @@ UI Tests:
 
 Tools Tests:
   stage: test
-  rules: 
-    - !reference [.run:when-develop-or-master, rules]
-    - !reference [.run:if-tools-modified, rules]
+  rules:
+    - if: '$CI_COMMIT_BRANCH' # when on branch with following changes compared to develop
+      changes:
+        paths:
+          - "tools/**/*"
+          - "Makefile"
+          - ".gitlab-ci.yml"
+        compare_to: 'develop'
   script:
     - make clean repo-setup ENV=ci
     - make tools-test
 
 Smoke Tests (iOS):
   stage: smoke-test
+  rules: 
+    - !reference [.test-pipeline-job, rules]
+    - !reference [.release-pipeline-job, rules]
   tags:
     - macos:ventura
     - specific:true
@@ -136,13 +156,16 @@ Smoke Tests (iOS):
     PLATFORM: "iOS Simulator"
     DEVICE: "iPhone 15 Pro"
   script:
-    - ./tools/runner-setup.sh --xcode "$XCODE" --iOS --os "$OS" # temporary, waiting for AMI
+    - ./tools/runner-setup.sh --xcode "$XCODE" --iOS --tvOS --os "$OS" --ssh # temporary, waiting for AMI
     - make clean repo-setup ENV=ci
     - make spm-build-ios
     - make smoke-test-ios-all OS="$OS" PLATFORM="$PLATFORM" DEVICE="$DEVICE"
 
 Smoke Tests (tvOS):
   stage: smoke-test
+  rules: 
+    - !reference [.test-pipeline-job, rules]
+    - !reference [.release-pipeline-job, rules]
   tags:
     - macos:ventura
     - specific:true
@@ -152,13 +175,16 @@ Smoke Tests (tvOS):
     PLATFORM: "tvOS Simulator"
     DEVICE: "Apple TV"
   script:
-    - ./tools/runner-setup.sh --xcode "$XCODE" --tvOS --os "$OS" # temporary, waiting for AMI
+    - ./tools/runner-setup.sh --xcode "$XCODE" --iOS --tvOS --os "$OS" --ssh # temporary, waiting for AMI
     - make clean repo-setup ENV=ci
     - make spm-build-tvos
     - make smoke-test-tvos-all OS="$OS" PLATFORM="$PLATFORM" DEVICE="$DEVICE"
 
 Smoke Tests (visionOS):
   stage: smoke-test
+  rules: 
+    - !reference [.test-pipeline-job, rules]
+    - !reference [.release-pipeline-job, rules]
   tags:
     - macos:ventura
     - specific:true
@@ -172,6 +198,9 @@ Smoke Tests (visionOS):
 
 Smoke Tests (macOS):
   stage: smoke-test
+  rules: 
+    - !reference [.test-pipeline-job, rules]
+    - !reference [.release-pipeline-job, rules]
   tags:
     - macos:ventura
     - specific:true
@@ -181,3 +210,88 @@ Smoke Tests (macOS):
     - ./tools/runner-setup.sh --xcode "$XCODE" # temporary, waiting for AMI
     - make clean repo-setup ENV=ci
     - make spm-build-macos
+
+# ┌──────────────┐
+# │ SDK release: │
+# └──────────────┘
+
+.release-before-script: &export_MAKE_release_params
+  - export GIT_TAG=${RELEASE_GIT_TAG:-$CI_COMMIT_TAG} # CI_COMMIT_TAG if set, otherwise default to RELEASE_GIT_TAG
+  - if [ -z "$GIT_TAG" ]; then echo "GIT_TAG is not set"; exit 1; fi # sanity check
+  - export ARTIFACTS_PATH="artifacts/$GIT_TAG"
+  - export DRY_RUN=${CI_COMMIT_TAG:+0} # 0 if CI_COMMIT_TAG is set
+  - export DRY_RUN=${DRY_RUN:-$RELEASE_DRY_RUN} # otherwise default to RELEASE_DRY_RUN
+
+Build Artifacts:
+  stage: release-build
+  rules: 
+    - !reference [.release-pipeline-job, rules]
+  variables:
+    XCODE: "15.3.0"
+  artifacts:
+    paths:
+      - artifacts
+    expire_in: 4 weeks
+  before_script:
+    - *export_MAKE_release_params
+  script:
+    - ./tools/runner-setup.sh --xcode "$XCODE" --iOS --tvOS --os "17.4" --ssh # temporary, waiting for AMI
+    - make env-check
+    - make clean
+    - make release-build release-validate
+
+Publish GH Asset:
+  stage: release-publish
+  rules: 
+    - !reference [.release-pipeline-job, rules]
+  variables:
+    XCODE: "15.3.0"
+  before_script:
+    - *export_MAKE_release_params
+  script:
+    - ./tools/runner-setup.sh --xcode "$XCODE" --iOS --tvOS --os "17.4" # temporary, waiting for AMI
+    - make env-check
+    - make clean
+    - make release-publish-github
+
+Publish CP podspecs (internal):
+  stage: release-publish
+  rules: 
+    - !reference [.release-pipeline-job, rules]
+  variables:
+    XCODE: "15.3.0"
+  before_script:
+    - *export_MAKE_release_params
+  script:
+    - ./tools/runner-setup.sh --xcode "$XCODE" --iOS --tvOS --os "17.4" # temporary, waiting for AMI
+    - make env-check
+    - make clean
+    - make release-publish-internal-podspecs
+
+Publish CP podspecs (dependent):
+  stage: release-publish
+  rules: 
+    - !reference [.release-pipeline-delayed-job, rules]
+  variables:
+    XCODE: "15.3.0"
+  before_script:
+    - *export_MAKE_release_params
+  script:
+    - ./tools/runner-setup.sh --xcode "$XCODE" --iOS --tvOS --os "17.4" # temporary, waiting for AMI
+    - make env-check
+    - make clean
+    - make release-publish-dependent-podspecs
+
+Publish CP podspecs (legacy):
+  stage: release-publish
+  rules: 
+    - !reference [.release-pipeline-delayed-job, rules]
+  variables:
+    XCODE: "15.3.0"
+  before_script:
+    - *export_MAKE_release_params
+  script:
+    - ./tools/runner-setup.sh --xcode "$XCODE" --iOS --tvOS --os "17.4" # temporary, waiting for AMI
+    - make env-check
+    - make clean
+    - make release-publish-legacy-podspecs

CHANGELOG.md

@@ -1,7 +1,24 @@
 # Unreleased
 
+# 2.14.1 / 09-07-2024
+
+- [FIX] Objc attributes interop for KMP. See [#1947][]
+- [FIX] Inject backtrace reporter into Logs feature. See [#1948][]
+
+# 2.14.0 / 04-07-2024
+
+- [IMPROVEMENT] Use `#fileID` over `#filePath` as the default argument in errors. See [#1938][]
 - [FEATURE] Add support for Watchdog Terminations tracking in RUM. See [#1917][] [#1911][] [#1912][] [#1889][]
+- [IMPROVEMENT] Tabbar Icon Default Tint Color in Session Replay. See [#1906][]
+- [IMPROVEMENT] Improve Nav Bar Support in Session Replay. See [#1916][]
+- [IMPROVEMENT] Record Activity Indicator in Session Replay. See [#1934][]
 - [IMPROVEMENT] Allow disabling app hang monitoring in ObjC API. See [#1908][]
+- [IMPROVEMENT] Update RUM and Telemetry models with KMP source. See [#1925][]
+- [IMPROVEMENT] Use otel-swift fork that only has APIs. See [#1930][]
+
+# 2.11.1 / 01-07-2024
+
+- [FIX] Fix compilation issues on Xcode 16 beta. See [#1898][]
 
 # 2.13.0 / 13-06-2024
 
@@ -686,12 +703,20 @@ Release `2.0` introduces breaking changes. Follow the [Migration Guide](MIGRATIO
 [#1828]: https://github.com/DataDog/dd-sdk-ios/pull/1828
 [#1835]: https://github.com/DataDog/dd-sdk-ios/pull/1835
 [#1886]: https://github.com/DataDog/dd-sdk-ios/pull/1886
+[#1889]: https://github.com/DataDog/dd-sdk-ios/pull/1889
 [#1898]: https://github.com/DataDog/dd-sdk-ios/pull/1898
+[#1906]: https://github.com/DataDog/dd-sdk-ios/pull/1906
 [#1908]: https://github.com/DataDog/dd-sdk-ios/pull/1908
-[#1917]: https://github.com/DataDog/dd-sdk-ios/pull/1917
 [#1911]: https://github.com/DataDog/dd-sdk-ios/pull/1911
 [#1912]: https://github.com/DataDog/dd-sdk-ios/pull/1912
-[#1889]: https://github.com/DataDog/dd-sdk-ios/pull/1889
+[#1916]: https://github.com/DataDog/dd-sdk-ios/pull/1916
+[#1917]: https://github.com/DataDog/dd-sdk-ios/pull/1917
+[#1925]: https://github.com/DataDog/dd-sdk-ios/pull/1925
+[#1930]: https://github.com/DataDog/dd-sdk-ios/pull/1930
+[#1934]: https://github.com/DataDog/dd-sdk-ios/pull/1934
+[#1938]: https://github.com/DataDog/dd-sdk-ios/pull/1938
+[#1947]: https://github.com/DataDog/dd-sdk-ios/pull/1947
+[#1948]: https://github.com/DataDog/dd-sdk-ios/pull/1948
 [@00fa9a]: https://github.com/00FA9A
 [@britton-earnin]: https://github.com/Britton-Earnin
 [@hengyu]: https://github.com/Hengyu

Cartfile

@@ -1,2 +1,2 @@
 github "microsoft/plcrashreporter" ~> 1.11.2
-binary "https://raw.githubusercontent.com/DataDog/opentelemetry-swift-packages/main/OpenTelemetryApi.json" ~> 1.6.0
+binary "https://raw.githubusercontent.com/DataDog/opentelemetry-swift-packages/main/OpenTelemetryApi.json" == 1.6.0