Merge pull request #1870 from DataDog/develop

Dogfood recent changes (retry)
DataDog · May 29, 2024 · 9030adb · 9030adb
2 parents b05d123 + 2448074
commit 9030adb
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/DatadogSessionReplay/Sources/Recorder/Recorder.swift b/DatadogSessionReplay/Sources/Recorder/Recorder.swift
@@ -99,7 +99,7 @@ public class Recorder: Recording {
         snapshotProcessor: SnapshotProcessing,
         resourceProcessor: ResourceProcessing,
         telemetry: Telemetry,
-        methodCallTelemetrySamplingRate: Float = 5
+        methodCallTelemetrySamplingRate: Float = 0.1
     ) {
         self.uiApplicationSwizzler = uiApplicationSwizzler
         self.viewTreeSnapshotProducer = viewTreeSnapshotProducer
@@ -123,7 +123,7 @@ public class Recorder: Recording {
         let methodCalledTrace = telemetry.startMethodCalled(
             operationName: MethodCallConstants.captureRecordOperationName,
             callerClass: MethodCallConstants.className,
-            samplingRate: methodCallTelemetrySamplingRate // Effectively 3% * 5% = 0.15% of calls
+            samplingRate: methodCallTelemetrySamplingRate // Effectively 3% * 0.1% = 0.003% of calls
         )
         var isSuccessful = true
         do {

diff --git a/bitrise.yml b/bitrise.yml
@@ -536,6 +536,17 @@ workflows:
             set -e
             cd tools/distribution && make
             venv/bin/python3 -m pytest tests
+    - script:
+        title: Smoke test dogfooding (with dry-run)
+        run_if: '{{enveq "DD_RUN_TOOLS_TESTS" "1"}}'
+        inputs:
+        - content: |-
+            #!/usr/bin/env bash
+            set -e
+
+            export DD_DRY_RUN=yes
+            cd tools/distribution && make
+            venv/bin/python3 dogfood.py
     - script:
         title: Run tests for nightly-unit-tests tool
         run_if: '{{enveq "DD_RUN_TOOLS_TESTS" "1"}}'

diff --git a/tools/distribution/dogfood.py b/tools/distribution/dogfood.py
@@ -73,7 +73,7 @@ def dogfood(dry_run: bool, repository_url: str, repository_name: str, repository
                     else:
                         package.add_dependency(
                             package_id=dependency_id,
-                            repository_url=dependency['repositoryURL'],
+                            repository_url=dependency['location'],
                             branch=dependency['state'].get('branch'),
                             revision=dependency['state']['revision'],
                             version=dependency['state'].get('version'),
@@ -111,6 +111,8 @@ def dogfood(dry_run: bool, repository_url: str, repository_name: str, repository
 
     try:
         dry_run = os.environ.get('DD_DRY_RUN') == 'yes'
+        if dry_run:
+            print(f'ℹ️ Running in dry-run mode')
         skip_datadog_ios = os.environ.get('DD_SKIP_DATADOG_IOS') == 'yes'
         skip_shopist_ios = os.environ.get('DD_SKIP_SHOPIST_IOS') == 'yes'
 

diff --git a/tools/distribution/src/dogfood/package_resolved.py b/tools/distribution/src/dogfood/package_resolved.py
@@ -361,7 +361,7 @@ def __get_package(self, package_id: PackageID):
 
 class PackageResolvedContentV3(PackageResolvedContentV2):
     """
-    Example of `package.resolved` in version `2` looks this::
+    Example of `package.resolved` in version `3` looks this::
 
         {
             "originHash" : "b47de6af98c4a9811a8d2af11d70b960dfc66b7c8e4944b35bb74c8f8bb9c487",