Merge pull request #171 from mozilla-services/sprintSept18

Sprint sep18

Author: Mike Trinkala

CMakeLists.txt

@@ -81,6 +81,7 @@ lfs
 lpeg
 lsb
 moz_ingest
+moz_logging
 moz_pioneer
 moz_security
 moz_telemetry

aws/CMakeLists.txt

@@ -3,13 +3,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 cmake_minimum_required(VERSION 3.5)
-project(aws VERSION 0.0.1 LANGUAGES C CXX)
+project(aws VERSION 0.0.2 LANGUAGES C CXX)
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "AWS Lua Modules")
 
 find_package(aws-cpp-sdk-core 1.1.46 REQUIRED CONFIG)
 find_package(aws-cpp-sdk-kinesis 1.1.46 REQUIRED CONFIG)
+find_package(aws-cpp-sdk-monitoring 1.1.46 REQUIRED CONFIG)
 
 set(MODULE_SRCS kinesis.cpp aws.def)
 set(INSTALL_MODULE_PATH ${INSTALL_IOMODULE_PATH})
 include(sandbox_module)
-target_link_libraries(aws aws-cpp-sdk-kinesis)
+target_link_libraries(aws aws-cpp-sdk-kinesis aws-cpp-sdk-monitoring)

aws/index.md

@@ -55,7 +55,7 @@ local writer = aws.kinesis.simple_producer(streamName, clientConfig, credentialP
 ```
 
 *Arguments*
-* clientConfig (table/nil) - https://sdk.amazonaws.com/cpp/api/LATEST/struct_aws_1_1_client_1_1_client_configuration.html
+* clientConfig (table/nil) https://sdk.amazonaws.com/cpp/api/LATEST/struct_aws_1_1_client_1_1_client_configuration.html
 * credentialProvider (enum/nil)
     * CHAIN
     * INSTANCE (default)
@@ -77,7 +77,7 @@ local records, checkpoints = reader:receive()
 * none
 
 *Returns*
-* records (array) Zero or more data records (throws on a non recoverable error)
+* records (array) Zero or more data records (throws on error)
 * checkpoints (string/nil) TSV of shardId, sequenceId items (one per line)
 
 ### simple_producer Methods