From 369467a3303a935f6ffaca4224386020ab7429eb Mon Sep 17 00:00:00 2001
From: Maxime Epain <maxime.epain@datadoghq.com>
Date: Mon, 6 Mar 2023 17:59:32 +0100
Subject: [PATCH] Fix merge conflict

---
 DatadogInternal.podspec                                       | 2 +-
 DatadogInternal/Sources/Attributes/Attributes.swift           | 2 +-
 DatadogLogs.podspec                                           | 2 +-
 .../Scenarios/RUM/RUMTapActionScenarioTests.swift             | 4 ++--
 Sources/Datadog/Datadog.swift                                 | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/DatadogInternal.podspec b/DatadogInternal.podspec
index e429b04e72..08743c9f99 100644
--- a/DatadogInternal.podspec
+++ b/DatadogInternal.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogInternal"
-  s.version      = "1.15.0"
+  s.version      = "1.16.0"
   s.summary      = "Datadog Internal Package. This module is not for public use."
   
   s.homepage     = "https://www.datadoghq.com"
diff --git a/DatadogInternal/Sources/Attributes/Attributes.swift b/DatadogInternal/Sources/Attributes/Attributes.swift
index 54c63b549a..404edcb6da 100644
--- a/DatadogInternal/Sources/Attributes/Attributes.swift
+++ b/DatadogInternal/Sources/Attributes/Attributes.swift
@@ -89,7 +89,7 @@ public struct CrossPlatformAttributes {
 
     /// The sampling rate for configuration telemetry events. Mostly used to enable or disable telemetry events when running test scenarios
     /// Expects `Double` value between `0.0` and `100.0`.
-    static let telemetryConfigurationSampleRate = "_dd.telemetry.configuration_sample_rate"
+    public static let telemetryConfigurationSampleRate = "_dd.telemetry.configuration_sample_rate"
 
     /// Event timestamp passed from CP SDK. Used for all RUM events issued by cross platform SDK.
     /// It should replace event time obtained from `DateProvider` to ensure that events are not skewed due to time difference in native and cross-platform SDKs.
diff --git a/DatadogLogs.podspec b/DatadogLogs.podspec
index e2f696d6b8..ff849f07a1 100644
--- a/DatadogLogs.podspec
+++ b/DatadogLogs.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogLogs"
-  s.version      = "1.15.0"
+  s.version      = "1.16.0"
   s.summary      = "Datadog Logs Module."
   
   s.homepage     = "https://www.datadoghq.com"
diff --git a/IntegrationTests/IntegrationScenarios/Scenarios/RUM/RUMTapActionScenarioTests.swift b/IntegrationTests/IntegrationScenarios/Scenarios/RUM/RUMTapActionScenarioTests.swift
index 7e04608c81..65dd50ae49 100644
--- a/IntegrationTests/IntegrationScenarios/Scenarios/RUM/RUMTapActionScenarioTests.swift
+++ b/IntegrationTests/IntegrationScenarios/Scenarios/RUM/RUMTapActionScenarioTests.swift
@@ -125,8 +125,8 @@ class RUMTapActionScenarioTests: IntegrationTests, RUMCommonAsserts {
         XCTAssertEqual(session.viewVisits[0].name, "MenuView")
         XCTAssertEqual(session.viewVisits[0].path, "Runner.RUMTASScreen1ViewController")
         XCTAssertEqual(session.viewVisits[0].actionEvents.count, 2)
-        XCTAssertEqual(session.viewVisits[0].actionEvents[1].action.target?.name, "UIButton")
-        XCTAssertEqual(session.viewVisits[0].actionEvents[2].action.target?.name, "UIButton(Show UITableView)")
+        XCTAssertEqual(session.viewVisits[0].actionEvents[0].action.target?.name, "UIButton")
+        XCTAssertEqual(session.viewVisits[0].actionEvents[1].action.target?.name, "UIButton(Show UITableView)")
 
         XCTAssertEqual(session.viewVisits[1].name, "TableView")
         XCTAssertEqual(session.viewVisits[1].path, "Runner.RUMTASTableViewController")
diff --git a/Sources/Datadog/Datadog.swift b/Sources/Datadog/Datadog.swift
index 506ea91e70..5e84124e38 100644
--- a/Sources/Datadog/Datadog.swift
+++ b/Sources/Datadog/Datadog.swift
@@ -224,7 +224,7 @@ public class Datadog {
             )
 
             if let configurationSampler = configuration.rum?.configurationTelemetrySampler {
-                telemetry.configurationExtraSampler = configurationSampler
+                telemetry?.configurationExtraSampler = configurationSampler
             }
 
             rum = try core.create(