Skip to content

Commit

Permalink
Prepare for release
Browse files Browse the repository at this point in the history
  • Loading branch information
BenFradet authored and lukeindykiewicz committed Jun 5, 2020
1 parent c308ab7 commit a0c1ed0
Show file tree
Hide file tree
Showing 20 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion LICENSE-2.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copyright 2013-2017 Snowplow Analytics Ltd

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The Scala Stream Collector is an event collector for [Snowplow][snowplow], writt
It sets a third-party cookie, allowing user tracking across domains.

The Scala Stream Collector is designed to be easy to setup and store [Thrift][thrift] Snowplow
events to [Amazon Kinesis][kinesis], and is built on top of [akka-http][akka-http].
events to [Amazon Kinesis][kinesis], and is built on top of [akka-http][akka-http].

## Find out more

Expand All @@ -17,7 +17,7 @@ events to [Amazon Kinesis][kinesis], and is built on top of [akka-http][akka-htt

## Copyright and license

The Scala Stream Collector is copyright 2013-2014 Snowplow Analytics Ltd.
The Scala Stream Collector is copyright 2013-2017 Snowplow Analytics Ltd.

Licensed under the [Apache License, Version 2.0][license] (the "License");
you may not use this software except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2016 Snowplow Analytics Ltd. All rights reserved.
* Copyright (c) 2013-2017 Snowplow Analytics Ltd. All rights reserved.
*
* This program is licensed to you under the Apache License Version 2.0, and
* you may not use this file except in compliance with the Apache License
Expand Down
2 changes: 1 addition & 1 deletion examples/config.hocon.sample
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2013-2016 Snowplow Analytics Ltd. All rights reserved.
# Copyright (c) 2013-2017 Snowplow Analytics Ltd. All rights reserved.
#
# This program is licensed to you under the Apache License Version 2.0, and
# you may not use this file except in compliance with the Apache License
Expand Down
2 changes: 1 addition & 1 deletion project/BuildSettings.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2016 Snowplow Analytics Ltd. All rights reserved.
* Copyright (c) 2013-2017 Snowplow Analytics Ltd. All rights reserved.
*
* This program is licensed to you under the Apache License Version 2.0,
* and you may not use this file except in compliance with the
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2016 Snowplow Analytics Ltd. All rights reserved.
* Copyright (c) 2013-2017 Snowplow Analytics Ltd. All rights reserved.
*
* This program is licensed to you under the Apache License Version 2.0, and
* you may not use this file except in compliance with the Apache License
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2016 Snowplow Analytics Ltd. All rights reserved.
/*
* Copyright (c) 2013-2017 Snowplow Analytics Ltd. All rights reserved.
*
* This program is licensed to you under the Apache License Version 2.0, and
* you may not use this file except in compliance with the Apache License
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2014 Snowplow Analytics Ltd. All rights reserved.
* Copyright (c) 2013-2017 Snowplow Analytics Ltd. All rights reserved.
*
* This program is licensed to you under the Apache License Version 2.0, and
* you may not use this file except in compliance with the Apache License
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2014 Snowplow Analytics Ltd. All rights reserved.
* Copyright (c) 2013-2017 Snowplow Analytics Ltd. All rights reserved.
*
* This program is licensed to you under the Apache License Version 2.0, and
* you may not use this file except in compliance with the Apache License
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015 Snowplow Analytics Ltd. All rights reserved.
* Copyright (c) 2013-2017 Snowplow Analytics Ltd. All rights reserved.
*
* This program is licensed to you under the Apache License Version 2.0, and
* you may not use this file except in compliance with the Apache License
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2016 Snowplow Analytics Ltd. All rights reserved.
* Copyright (c) 2013-2017 Snowplow Analytics Ltd. All rights reserved.
*
* This program is licensed to you under the Apache License Version 2.0,
* and you may not use this file except in compliance with the Apache License Version 2.0.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2016 Snowplow Analytics Ltd. All rights reserved.
* Copyright (c) 2013-2017 Snowplow Analytics Ltd. All rights reserved.
*
* This program is licensed to you under the Apache License Version 2.0,
* and you may not use this file except in compliance with the Apache License Version 2.0.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2014 Snowplow Analytics Ltd.
* Copyright (c) 2013-2017 Snowplow Analytics Ltd.
* All rights reserved.
*
* This program is licensed to you under the Apache License Version 2.0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2014 Snowplow Analytics Ltd.
* Copyright (c) 2013-2017 Snowplow Analytics Ltd.
* All rights reserved.
*
* This program is licensed to you under the Apache License Version 2.0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2014 Snowplow Analytics Ltd. All rights reserved.
* Copyright (c) 2013-2017 Snowplow Analytics Ltd. All rights reserved.
*
* This program is licensed to you under the Apache License Version 2.0,
* and you may not use this file except in compliance with the Apache License Version 2.0.
Expand Down Expand Up @@ -91,8 +91,8 @@ object SplitBatch {
}

/**
* If the CollectorPayload is too big to fit
* in a single record, attempt to split it into
* If the CollectorPayload is too big to fit
* in a single record, attempt to split it into
* multiple records.
*
* @param event Incoming CollectorPayload
Expand All @@ -119,7 +119,7 @@ object SplitBatch {
try {
// Try to parse the body
val initialBody = parse(body)

// Event was a POST
val bodyDataArray = initialBody \ "data" match {
case JNothing => None
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2014 Snowplow Analytics Ltd. All rights reserved.
* Copyright (c) 2013-2017 Snowplow Analytics Ltd. All rights reserved.
*
* This program is licensed to you under the Apache License Version 2.0, and
* you may not use this file except in compliance with the Apache License
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2014 Snowplow Analytics Ltd. All rights reserved.
* Copyright (c) 2013-2017 Snowplow Analytics Ltd. All rights reserved.
*
* This program is licensed to you under the Apache License Version 2.0, and
* you may not use this file except in compliance with the Apache License
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2014 Snowplow Analytics Ltd.
* Copyright (c) 2013-2017 Snowplow Analytics Ltd.
* All rights reserved.
*
* This program is licensed to you under the Apache License Version 2.0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014-2016 Snowplow Analytics Ltd. All rights reserved.
* Copyright (c) 2014-2017 Snowplow Analytics Ltd. All rights reserved.
*
* This program is licensed to you under the Apache License Version 2.0, and
* you may not use this file except in compliance with the Apache License
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2014 Snowplow Analytics Ltd. All rights reserved.
* Copyright (c) 2013-2017 Snowplow Analytics Ltd. All rights reserved.
*
* This program is licensed to you under the Apache License Version 2.0, and
* you may not use this file except in compliance with the Apache License
Expand Down Expand Up @@ -106,7 +106,7 @@ class SplitBatchSpec extends Specification {
actual.bad.size must_== 1
parse(new String(actual.bad.head)) \ "errors" must_==
JArray(List(JObject(List(("level" ,JString("error")), ("message", JString("Even without the body, the serialized event is too large"))))))
}
}

"Split a CollectorPayload with three large events and four very large events" in {
val payload = new CollectorPayload()
Expand All @@ -126,6 +126,6 @@ class SplitBatchSpec extends Specification {
val actual = SplitBatch.splitAndSerializePayload(payload, 1000)
actual.bad.size must_== 4
actual.good.size must_== 2
}
}
}
}

0 comments on commit a0c1ed0

Please sign in to comment.