Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Splitio.Domain;
using Splitio.Redis.Domain;
using Splitio.Redis.Services.Cache.Interfaces;
using Splitio.Redis.Services.Domain;
using Splitio.Services.Shared.Classes;
Expand Down Expand Up @@ -81,11 +82,7 @@ public async Task RecordImpressionsCountAsync(Dictionary<string, int> impression
// public for tests
public RedisValue[] GetImpressions(IList<KeyImpression> items)
{
var impressions = items.Select(item => JsonConvertWrapper.SerializeObjectIgnoreNullValue(new
{
m = new { s = SdkVersion, i = MachineIp, n = MachineName },
i = new { k = item.keyName, b = item.bucketingKey, f = item.feature, t = item.treatment, r = item.label, c = item.changeNumber, m = item.time, pt = item.previousTime, properties = item.properties }
}));
var impressions = items.Select(item => new RedisKeyImpression(item, SdkVersion, MachineIp, MachineName).ExportJson());

return impressions
.Select(i => (RedisValue)i)
Expand Down
57 changes: 57 additions & 0 deletions Splitio.Redis/Services/Domain/RedisKeyImpression.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
using Splitio.Domain;
using Splitio.Services.Shared.Classes;

namespace Splitio.Redis.Domain
{
public class RedisKeyImpression
{
public RedisKeyImpression(KeyImpression item, string SdkVersion, string MachineIp, string MachineName)
{
this.f = item.feature;
k = item.keyName;
this.t = item.treatment;
this.m = item.time;
this.c = item.changeNumber;
this.r = item.label;
this.b = item.bucketingKey;
this.pt = item.previousTime;
this.properties = item.properties;
this.s = SdkVersion;
this.i = MachineIp;
this.n = MachineName;
}

public string ExportJson()
{
if (string.IsNullOrEmpty(this.properties))
{
return JsonConvertWrapper.SerializeObject(new
{
m = new { s = this.s, i = this.i, n = this.n },
i = new { k = this.k, b = this.b, f = this.f, t = this.t, r = this.r, c = this.c, m = this.m, pt = this.pt }
});
} else {
return JsonConvertWrapper.SerializeObject(new
{
m = new { s = this.s, i = this.i, n = this.n },
i = new { k = this.k, b = this.b, f = this.f, t = this.t, r = this.r, c = this.c, m = this.m, pt = this.pt, properties = this.properties }
});
}
}

public string f { get; set; }
public string k { get; set; }
public string t { get; set; }
public long m { get; set; }
public long? c { get; set; }
public string r { get; set; }
public string b { get; set; }
public long? pt { get; set; }
public string properties { get; set; }

public string s { get; set; }
public string i { get; set; }
public string n { get; set; }

}
}
2 changes: 1 addition & 1 deletion Splitio.Redis/Splitio.Redis.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<Version>7.13.0-rc2</Version>
<Version>7.13.0-rc4</Version>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>SplitioRedis.snk</AssemblyOriginatorKeyFile>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
Expand Down
2 changes: 1 addition & 1 deletion src/Splitio/Splitio.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<Version>7.13.0-rc2</Version>
<Version>7.13.0-rc4</Version>
<RootNamespace>Splitio</RootNamespace>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Splitio.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ public void CorrectFormatStoreImpressions()

// Act.
var result = _cache.GetImpressions(impressions);
var impression1 = "{\"m\":{\"s\":\"version\",\"i\":\"ip\",\"n\":\"mm\"},\"i\":{\"k\":\"matching-key\",\"b\":\"bucketing-key\",\"f\":\"feature-1\",\"t\":\"treatment\",\"r\":\"label\",\"c\":3333444,\"m\":34534546}}";
var impression1 = "{\"m\":{\"s\":\"version\",\"i\":\"ip\",\"n\":\"mm\"},\"i\":{\"k\":\"matching-key\",\"b\":\"bucketing-key\",\"f\":\"feature-1\",\"t\":\"treatment\",\"r\":\"label\",\"c\":3333444,\"m\":34534546,\"pt\":null}}";
var impression2 = "{\"m\":{\"s\":\"version\",\"i\":\"ip\",\"n\":\"mm\"},\"i\":{\"k\":\"matching-key\",\"b\":\"bucketing-key\",\"f\":\"feature-1\",\"t\":\"treatment\",\"r\":\"label\",\"c\":3333444,\"m\":34534550,\"pt\":34534546}}";
var impression3 = "{\"m\":{\"s\":\"version\",\"i\":\"ip\",\"n\":\"mm\"},\"i\":{\"k\":\"matching-key\",\"b\":\"bucketing-key\",\"f\":\"feature-2\",\"t\":\"treatment\",\"r\":\"label\",\"c\":3333444,\"m\":34534546,\"properties\":\"{\\\"prop\\\":\\\"val\\\"}\"}}";
var impression3 = "{\"m\":{\"s\":\"version\",\"i\":\"ip\",\"n\":\"mm\"},\"i\":{\"k\":\"matching-key\",\"b\":\"bucketing-key\",\"f\":\"feature-2\",\"t\":\"treatment\",\"r\":\"label\",\"c\":3333444,\"m\":34534546,\"pt\":null,\"properties\":\"{\\\"prop\\\":\\\"val\\\"}\"}}";

// Assert.
Assert.AreEqual(impression1, result[0].ToString());
Expand Down