Skip to content

Commit

Permalink
Fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
maxep committed Mar 7, 2023
1 parent 3173fef commit 369467a
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion DatadogInternal.podspec
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion DatadogInternal/Sources/Attributes/Attributes.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion DatadogLogs.podspec
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion Sources/Datadog/Datadog.swift
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ public class Datadog {
)

if let configurationSampler = configuration.rum?.configurationTelemetrySampler {
telemetry.configurationExtraSampler = configurationSampler
telemetry?.configurationExtraSampler = configurationSampler
}

rum = try core.create(
Expand Down

0 comments on commit 369467a

Please sign in to comment.