Skip to content

Update DTO and property names to shrink JSON #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sanzmauro merged 2 commits into from
Sep 14, 2020
Merged

Update DTO and property names to shrink JSON #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e15875
updated dto and tests
sanzmauro Sep 14, 2020
019999c
added header and removed ip logic
sanzmauro Sep 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions lib/splitclient-rb/cache/senders/impressions_formatter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@ def call(fetch_all_impressions, raw_impressions = nil)

formatted_impressions = unique_features(filtered_impressions).each_with_object([]) do |feature, memo|
feature_impressions = feature_impressions(filtered_impressions, feature)
ip = feature_impressions.first[:m][:i]
current_impressions = current_impressions(feature_impressions)
memo << {
testName: feature.to_sym,
keyImpressions: current_impressions,
ip: ip
f: feature.to_sym,
i: current_impressions
}
end

Expand All @@ -40,13 +38,13 @@ def feature_impressions(filtered_impressions, feature)
def current_impressions(feature_impressions)
feature_impressions.map do |impression|
{
keyName: impression[:i][:k],
treatment: impression[:i][:t],
time: impression[:i][:m],
bucketingKey: impression[:i][:b],
label: impression[:i][:r],
changeNumber: impression[:i][:c],
previousTime: impression[:i][:pt]
k: impression[:i][:k],
t: impression[:i][:t],
m: impression[:i][:m],
b: impression[:i][:b],
r: impression[:i][:r],
c: impression[:i][:c],
pt: impression[:i][:pt]
}
end
end
Expand Down
27 changes: 13 additions & 14 deletions lib/splitclient-rb/engine/api/impressions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,30 @@ def post(impressions)
return
end

impressions_by_ip(impressions).each do |ip, impressions_ip|
response = post_api("#{@config.events_uri}/testImpressions/bulk", @api_key, impressions_ip)

if response.success?
@config.split_logger.log_if_debug("Impressions reported: #{total_impressions(impressions)}")
else
@config.logger.error("Unexpected status code while posting impressions: #{response.status}." \
' - Check your API key and base URI')
raise 'Split SDK failed to connect to backend to post impressions'
end
response = post_api("#{@config.events_uri}/testImpressions/bulk", @api_key, impressions, impressions_headers)

if response.success?
@config.split_logger.log_if_debug("Impressions reported: #{total_impressions(impressions)}")
else
@config.logger.error("Unexpected status code while posting impressions: #{response.status}." \
' - Check your API key and base URI')
raise 'Split SDK failed to connect to backend to post impressions'
end
end

def total_impressions(impressions)
return 0 if impressions.nil?

impressions.reduce(0) do |impressions_count, impression|
impressions_count += impression[:keyImpressions].length
impressions_count += impression[:i].length
end
end

private

def impressions_by_ip(impressions)
impressions.group_by { |impression| impression[:ip] }
def impressions_headers
{
'SplitImpressionsMode' => @config.impressions_mode.to_s
}
end
end
end
Expand Down
87 changes: 43 additions & 44 deletions spec/cache/senders/impressions_formatter_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,24 @@
it 'formats impressions to be sent' do
expect(formatted_impressions)
.to match_array([{
testName: :foo1,
keyImpressions: [{ keyName: 'matching_key',
treatment: 'on',
time: 1_478_113_516_002,
bucketingKey: 'foo1', label: 'custom_label1',
changeNumber: 123_456,
previousTime: nil }],
ip: ip
f: :foo1,
i: [{ k: 'matching_key',
t: 'on',
m: 1_478_113_516_002,
b: 'foo1',
r: 'custom_label1',
c: 123_456,
pt: nil }]
},
{
testName: :foo2,
keyImpressions: [{ keyName: 'matching_key2',
treatment: 'off',
time: 1_478_113_518_285,
bucketingKey: 'foo2',
label: 'custom_label2',
changeNumber: 123_499,
previousTime: nil }],
ip: ip
f: :foo2,
i: [{ k: 'matching_key2',
t: 'off',
m: 1_478_113_518_285,
b: 'foo2',
r: 'custom_label2',
c: 123_499,
pt: nil }]
}])
end

Expand All @@ -56,39 +55,39 @@
impressions << impressions_manager.build_impression('matching_key3', nil, 'foo2', treatment3, params)
impressions_manager.track(impressions)

expect(formatted_impressions.find { |i| i[:testName] == :foo1 }[:keyImpressions]).to match_array(
expect(formatted_impressions.find { |i| i[:f] == :foo1 }[:i]).to match_array(
[
{
keyName: 'matching_key',
treatment: 'on',
time: 1_478_113_516_002,
bucketingKey: 'foo1',
label: 'custom_label1',
changeNumber: 123_456,
previousTime: nil
k: 'matching_key',
t: 'on',
m: 1_478_113_516_002,
b: 'foo1',
r: 'custom_label1',
c: 123_456,
pt: nil
}
]
)

expect(formatted_impressions.find { |i| i[:testName] == :foo2 }[:keyImpressions]).to match_array(
expect(formatted_impressions.find { |i| i[:f] == :foo2 }[:i]).to match_array(
[
{
keyName: 'matching_key2',
treatment: 'off',
time: 1_478_113_518_285,
bucketingKey: 'foo2',
label: 'custom_label2',
changeNumber: 123_499,
previousTime: nil
k: 'matching_key2',
t: 'off',
m: 1_478_113_518_285,
b: 'foo2',
r: 'custom_label2',
c: 123_499,
pt: nil
},
{
keyName: 'matching_key3',
treatment: 'off',
time: 1_478_113_518_900,
bucketingKey: nil,
label: nil,
changeNumber: nil,
previousTime: nil
k: 'matching_key3',
t: 'off',
m: 1_478_113_518_900,
b: nil,
r: nil,
c: nil,
pt: nil
}
]
)
Expand All @@ -97,15 +96,15 @@
it 'filters out impressions with the same key/treatment' do
impressions_manager.track(@impressions)

expect(formatted_impressions.find { |i| i[:testName] == :foo1 }[:keyImpressions].size).to eq(1)
expect(formatted_impressions.find { |i| i[:testName] == :foo2 }[:keyImpressions].size).to eq(1)
expect(formatted_impressions.find { |i| i[:f] == :foo1 }[:i].size).to eq(1)
expect(formatted_impressions.find { |i| i[:f] == :foo2 }[:i].size).to eq(1)
end

it 'filters out impressions with the same key/treatment legacy' do
impressions_manager.track(@impressions)

expect(formatted_impressions.find { |i| i[:testName] == :foo1 }[:keyImpressions].size).to eq(1)
expect(formatted_impressions.find { |i| i[:testName] == :foo2 }[:keyImpressions].size).to eq(1)
expect(formatted_impressions.find { |i| i[:f] == :foo1 }[:i].size).to eq(1)
expect(formatted_impressions.find { |i| i[:f] == :foo2 }[:i].size).to eq(1)
end
end

Expand Down
42 changes: 20 additions & 22 deletions spec/cache/senders/impressions_sender_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,34 +42,32 @@
.with(
body: [
{
testName: 'foo1',
keyImpressions: [
f: 'foo1',
i: [
{
keyName: 'matching_key',
treatment: 'on',
time: 1_478_113_516_002,
bucketingKey: 'foo1',
label: 'custom_label1',
changeNumber: 123_456,
previousTime: nil
k: 'matching_key',
t: 'on',
m: 1_478_113_516_002,
b: 'foo1',
r: 'custom_label1',
c: 123_456,
pt: nil
}
],
ip: config.machine_ip
]
},
{
testName: 'foo2',
keyImpressions: [
f: 'foo2',
i: [
{
keyName: 'matching_key2',
treatment: 'off',
time: 1_478_113_518_285,
bucketingKey: 'foo2',
label: 'custom_label2',
changeNumber: 123_499,
previousTime: nil
k: 'matching_key2',
t: 'off',
m: 1_478_113_518_285,
b: 'foo2',
r: 'custom_label2',
c: 123_499,
pt: nil
}
],
ip: config.machine_ip
]
}
].to_json
)).to have_been_made
Expand Down
11 changes: 7 additions & 4 deletions spec/engine/api/impressions_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
[
{
ip: '192.168.1.1',
keyImpressions: ['test']
i: ['test']
}
]
end
Expand All @@ -29,7 +29,8 @@
'SplitSDKVersion' => "#{config.language}-#{config.version}",
'Content-Type' => 'application/json',
'SplitSDKMachineIP' => config.machine_ip,
'SplitSDKMachineName' => config.machine_name
'SplitSDKMachineName' => config.machine_name,
'SplitImpressionsMode' => config.impressions_mode.to_s
})
.to_return(status: 200, body: 'ok')

Expand Down Expand Up @@ -82,15 +83,17 @@
'SplitSDKVersion' => "#{config.language}-#{config.version}",
'Content-Type' => 'application/json',
'SplitSDKMachineIP' => config.machine_ip,
'SplitSDKMachineName' => config.machine_name
'SplitSDKMachineName' => config.machine_name,
'SplitImpressionsMode' => config.impressions_mode.to_s
})
.to_return(status: [500, 'Internal Server Error'])

stub_request(:post, 'https://events.split.io/api/testImpressions/bulk')
.with(headers: {
'Authorization' => 'Bearer',
'SplitSDKVersion' => "#{config.language}-#{config.version}",
'Content-Type' => 'application/json'
'Content-Type' => 'application/json',
'SplitImpressionsMode' => config.impressions_mode.to_s
})
.to_return(status: 200, body: 'ok')

Expand Down
2 changes: 1 addition & 1 deletion spec/engine_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@
expect(SplitIoClient::Cache::Senders::ImpressionsFormatter
.new(subject.instance_variable_get(:@impressions_repository))
.call(true, impressions)
.select { |im| im[:testName] == :new_feature }[0][:keyImpressions].size).to eq(2)
.select { |im| im[:f] == :new_feature }[0][:i].size).to eq(2)
end

it 'validates the feature by bucketing_key' do
Expand Down