Skip to content

Commit

Permalink
Improve tracking event marshaling
Browse files Browse the repository at this point in the history
  • Loading branch information
@timdp
timdp committed Jul 4, 2016
1 parent 5b53738 commit f3c0348
Show file tree
Hide file tree
Showing 16 changed files with 151 additions and 76 deletions.
36 changes: 24 additions & 12 deletions test/integration/expected/kaltura/vast3_demo.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,32 +56,38 @@
"_value": {
"complete": [
{
"_uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=232859236;ko=1;cid=39455789;rid=39473576;rv=1;timestamp=1768586;eid1=13;ecn1=1;etm1=0;"
"_type": "TrackingEvent",
"uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=232859236;ko=1;cid=39455789;rid=39473576;rv=1;timestamp=1768586;eid1=13;ecn1=1;etm1=0;"
}
],
"fullscreen": [
{
"_uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=232859236;ko=1;cid=39455789;rid=39473576;rv=1;timestamp=1768586;eid1=19;ecn1=1;etm1=0;"
"_type": "TrackingEvent",
"uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=232859236;ko=1;cid=39455789;rid=39473576;rv=1;timestamp=1768586;eid1=19;ecn1=1;etm1=0;"
}
],
"midpoint": [
{
"_uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=232859236;ko=1;cid=39455789;rid=39473576;rv=1;timestamp=1768586;eid1=18;ecn1=1;etm1=0;"
"_type": "TrackingEvent",
"uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=232859236;ko=1;cid=39455789;rid=39473576;rv=1;timestamp=1768586;eid1=18;ecn1=1;etm1=0;"
}
],
"mute": [
{
"_uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=232859236;ko=1;cid=39455789;rid=39473576;rv=1;timestamp=1768586;eid1=16;ecn1=1;etm1=0;"
"_type": "TrackingEvent",
"uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=232859236;ko=1;cid=39455789;rid=39473576;rv=1;timestamp=1768586;eid1=16;ecn1=1;etm1=0;"
}
],
"pause": [
{
"_uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=232859236;ko=1;cid=39455789;rid=39473576;rv=1;timestamp=1768586;eid1=15;ecn1=1;etm1=0;"
"_type": "TrackingEvent",
"uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=232859236;ko=1;cid=39455789;rid=39473576;rv=1;timestamp=1768586;eid1=15;ecn1=1;etm1=0;"
}
],
"start": [
{
"_uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=232859236;ko=1;cid=39455789;rid=39473576;rv=1;timestamp=1768586;eid1=11;ecn1=1;etm1=0;"
"_type": "TrackingEvent",
"uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=232859236;ko=1;cid=39455789;rid=39473576;rv=1;timestamp=1768586;eid1=11;ecn1=1;etm1=0;"
}
]
}
Expand Down Expand Up @@ -278,32 +284,38 @@
"_value": {
"complete": [
{
"_uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=236336770;ko=1;cid=40670887;rid=40688674;rv=1;timestamp=1763492;eid1=13;ecn1=1;etm1=0;"
"_type": "TrackingEvent",
"uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=236336770;ko=1;cid=40670887;rid=40688674;rv=1;timestamp=1763492;eid1=13;ecn1=1;etm1=0;"
}
],
"fullscreen": [
{
"_uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=236336770;ko=1;cid=40670887;rid=40688674;rv=1;timestamp=1763492;eid1=19;ecn1=1;etm1=0;"
"_type": "TrackingEvent",
"uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=236336770;ko=1;cid=40670887;rid=40688674;rv=1;timestamp=1763492;eid1=19;ecn1=1;etm1=0;"
}
],
"midpoint": [
{
"_uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=236336770;ko=1;cid=40670887;rid=40688674;rv=1;timestamp=1763492;eid1=18;ecn1=1;etm1=0;"
"_type": "TrackingEvent",
"uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=236336770;ko=1;cid=40670887;rid=40688674;rv=1;timestamp=1763492;eid1=18;ecn1=1;etm1=0;"
}
],
"mute": [
{
"_uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=236336770;ko=1;cid=40670887;rid=40688674;rv=1;timestamp=1763492;eid1=16;ecn1=1;etm1=0;"
"_type": "TrackingEvent",
"uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=236336770;ko=1;cid=40670887;rid=40688674;rv=1;timestamp=1763492;eid1=16;ecn1=1;etm1=0;"
}
],
"pause": [
{
"_uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=236336770;ko=1;cid=40670887;rid=40688674;rv=1;timestamp=1763492;eid1=15;ecn1=1;etm1=0;"
"_type": "TrackingEvent",
"uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=236336770;ko=1;cid=40670887;rid=40688674;rv=1;timestamp=1763492;eid1=15;ecn1=1;etm1=0;"
}
],
"start": [
{
"_uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=236336770;ko=1;cid=40670887;rid=40688674;rv=1;timestamp=1763492;eid1=11;ecn1=1;etm1=0;"
"_type": "TrackingEvent",
"uri": "http://ad.doubleclick.net/activity;src=1248596;met=1;v=1;pid=13452535;aid=236336770;ko=1;cid=40670887;rid=40688674;rv=1;timestamp=1763492;eid1=11;ecn1=1;etm1=0;"
}
]
}
Expand Down
21 changes: 14 additions & 7 deletions test/integration/expected/tremor-video/vast_inline_linear.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,32 +39,38 @@
"_value": {
"complete": [
{
"_uri": "http://myTrackingURL/complete"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/complete"
}
],
"creativeView": [
{
"_uri": "http://myTrackingURL/creativeView"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/creativeView"
}
],
"firstQuartile": [
{
"_uri": "http://myTrackingURL/firstQuartile"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/firstQuartile"
}
],
"midpoint": [
{
"_uri": "http://myTrackingURL/midpoint"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/midpoint"
}
],
"start": [
{
"_uri": "http://myTrackingURL/start"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/start"
}
],
"thirdQuartile": [
{
"_uri": "http://myTrackingURL/thirdQuartile"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/thirdQuartile"
}
]
}
Expand Down Expand Up @@ -108,7 +114,8 @@
"_value": {
"creativeView": [
{
"_uri": "http://myTrackingURL/firstCompanionCreativeView"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/firstCompanionCreativeView"
}
]
}
Expand Down
18 changes: 12 additions & 6 deletions test/integration/expected/tremor-video/vast_inline_nonlinear.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,27 +59,32 @@
"_value": {
"acceptInvitation": [
{
"_uri": "http://myTrackingURL/nonlinear/acceptInvitation"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/nonlinear/acceptInvitation"
}
],
"close": [
{
"_uri": "http://myTrackingURL/nonlinear/close"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/nonlinear/close"
}
],
"collapse": [
{
"_uri": "http://myTrackingURL/nonlinear/collapse"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/nonlinear/collapse"
}
],
"creativeView": [
{
"_uri": "http://myTrackingURL/nonlinear/creativeView"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/nonlinear/creativeView"
}
],
"expand": [
{
"_uri": "http://myTrackingURL/nonlinear/expand"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/nonlinear/expand"
}
]
}
Expand Down Expand Up @@ -129,7 +134,8 @@
"_value": {
"creativeView": [
{
"_uri": "http://myTrackingURL/secondCompanion"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/secondCompanion"
}
]
}
Expand Down
33 changes: 22 additions & 11 deletions test/integration/expected/tremor-video/vast_wrapper_linear_1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,57 +27,68 @@
"_value": {
"complete": [
{
"_uri": "http://myTrackingURL/wrapper/complete"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/wrapper/complete"
}
],
"creativeView": [
{
"_uri": "http://myTrackingURL/wrapper/creativeView"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/wrapper/creativeView"
}
],
"firstQuartile": [
{
"_uri": "http://myTrackingURL/wrapper/firstQuartile"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/wrapper/firstQuartile"
}
],
"fullscreen": [
{
"_uri": "http://myTrackingURL/wrapper/fullscreen"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/wrapper/fullscreen"
}
],
"midpoint": [
{
"_uri": "http://myTrackingURL/wrapper/midpoint"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/wrapper/midpoint"
}
],
"mute": [
{
"_uri": "http://myTrackingURL/wrapper/mute"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/wrapper/mute"
}
],
"pause": [
{
"_uri": "http://myTrackingURL/wrapper/pause"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/wrapper/pause"
}
],
"resume": [
{
"_uri": "http://myTrackingURL/wrapper/resume"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/wrapper/resume"
}
],
"start": [
{
"_uri": "http://myTrackingURL/wrapper/start"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/wrapper/start"
}
],
"thirdQuartile": [
{
"_uri": "http://myTrackingURL/wrapper/thirdQuartile"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/wrapper/thirdQuartile"
}
],
"unmute": [
{
"_uri": "http://myTrackingURL/wrapper/unmute"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/wrapper/unmute"
}
]
}
Expand Down
3 changes: 2 additions & 1 deletion test/integration/expected/tremor-video/vast_wrapper_linear_2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@
"_value": {
"creativeView": [
{
"_uri": "http://myTrackingURL/wrapper/firstCompanionCreativeView"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/wrapper/firstCompanionCreativeView"
}
]
}
Expand Down
15 changes: 10 additions & 5 deletions test/integration/expected/tremor-video/vast_wrapper_nonlinear_1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,27 +47,32 @@
"_value": {
"acceptInvitation": [
{
"_uri": "http://myTrackingURL/wrapper/nonlinear/creativeView/acceptInvitation"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/wrapper/nonlinear/creativeView/acceptInvitation"
}
],
"close": [
{
"_uri": "http://myTrackingURL/wrapper/nonlinear/creativeView/close"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/wrapper/nonlinear/creativeView/close"
}
],
"collapse": [
{
"_uri": "http://myTrackingURL/wrapper/nonlinear/creativeView/collapse"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/wrapper/nonlinear/creativeView/collapse"
}
],
"creativeView": [
{
"_uri": "http://myTrackingURL/wrapper/nonlinear/creativeView/creativeView"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/wrapper/nonlinear/creativeView/creativeView"
}
],
"expand": [
{
"_uri": "http://myTrackingURL/wrapper/nonlinear/creativeView/expand"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/wrapper/nonlinear/creativeView/expand"
}
]
}
Expand Down
3 changes: 2 additions & 1 deletion test/integration/expected/tremor-video/vast_wrapper_nonlinear_2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@
"_value": {
"creativeView": [
{
"_uri": "http://myTrackingURL/wrapper/firstCompanionCreativeView"
"_type": "TrackingEvent",
"uri": "http://myTrackingURL/wrapper/firstCompanionCreativeView"
}
]
}
Expand Down
6 changes: 4 additions & 2 deletions test/integration/expected/unruly/wrapper/vast_wrapper_with-click-track-with-no-ids.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,12 @@
"_value": {
"start": [
{
"_uri": "http://example.com/start?d=[CACHEBUSTER]"
"_type": "TrackingEvent",
"uri": "http://example.com/start?d=[CACHEBUSTER]"
},
{
"_uri": "http://example.com/start2?d=[CACHEBUSTER]"
"_type": "TrackingEvent",
"uri": "http://example.com/start2?d=[CACHEBUSTER]"
}
]
}
Expand Down
6 changes: 4 additions & 2 deletions test/integration/expected/unruly/wrapper/vast_wrapper_with-extensions-with-property.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,12 @@
"_value": {
"start": [
{
"_uri": "http://example.com/start?d=[CACHEBUSTER]"
"_type": "TrackingEvent",
"uri": "http://example.com/start?d=[CACHEBUSTER]"
},
{
"_uri": "http://example.com/start2?d=[CACHEBUSTER]"
"_type": "TrackingEvent",
"uri": "http://example.com/start2?d=[CACHEBUSTER]"
}
]
}
Expand Down
3 changes: 2 additions & 1 deletion test/integration/expected/unruly/wrapper/vast_wrapper_with-linear-ad-only.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
"_value": {
"start": [
{
"_uri": "http://example.com/start"
"_type": "TrackingEvent",
"uri": "http://example.com/start"
}
]
}
Expand Down
Loading

0 comments on commit f3c0348

Please sign in to comment.