Merge pull request #47 from invenia/tl/memento13

Support Memento>=1.3

Project.toml

@@ -1,6 +1,6 @@
 name = "CloudWatchLogs"
 uuid = "c4c1e6a2-6bdd-52e0-b56d-1d4734724d2d"
-version = "2.0.0"
+version = "2.1.0"
 
 [deps]
 AWS = "fbe9abb3-538b-5e4e-ba9e-bc94f4f92ebc"
@@ -14,7 +14,7 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 [compat]
 AWS = "1"
 MbedTLS = "1"
-Memento = "~1.0, ~1.1, ~1.2"
+Memento = "1"
 Mocking = "0.7"
 TimeZones = "1"
 julia = "1.3"  # Minimum version for MbedTLS@1

src/handler.jl

@@ -112,6 +112,9 @@ end
 
 function Memento.emit(handler::CloudWatchLogHandler, record::Record)
     dt = isdefined(record, :date) ? record.date : Dates.now(tz"UTC")
+    # Memento@1.3 switched to only storing DateTime in order to make TimeZones.jl an
+    # optional dependency, but AWS requries timestamps in UTC, so we need a ZDT
+    dt = isa(dt, DateTime) ? astimezone(ZonedDateTime(dt, localzone()), tz"UTC") : dt
     message = format(handler.fmt, record)
     event = LogEvent(message, dt)
     return put!(handler.channel, event)

test/online.jl

@@ -263,21 +263,23 @@
             @test_throws LOGGER LogSubmissionException submit_logs(stream, events)
         end
 
-        @testset "Invalid sequence token" begin
-            stream = CloudWatchLogStream(
-                CFG,
-                TEST_LOG_GROUP,
-                create_stream(CFG, TEST_LOG_GROUP, new_stream("invalid_token")),
-            )
-
-            @test submit_log(stream, LogEvent("Foo")) == 1
-            CloudWatchLogs.update_sequence_token!(stream, "oops_invalid")
-            setlevel!(LOGGER, "debug") do
-                @test_log LOGGER "debug" "InvalidSequenceTokenException" begin
-                    submit_log(stream, LogEvent("Second time's the charm"))
-                end
-            end
-        end
+        # InvalidSequenceToken errors are no longer a thing:
+        #  - https://github.com/invenia/CloudWatchLogs.jl/issues/45
+        # @testset "Invalid sequence token" begin
+        #     stream = CloudWatchLogStream(
+        #         CFG,
+        #         TEST_LOG_GROUP,
+        #         create_stream(CFG, TEST_LOG_GROUP, new_stream("invalid_token")),
+        #     )
+
+        #     @test submit_log(stream, LogEvent("Foo")) == 1
+        #     CloudWatchLogs.update_sequence_token!(stream, "oops_invalid")
+        #     setlevel!(LOGGER, "debug") do
+        #         @test_log LOGGER "debug" "InvalidSequenceTokenException" begin
+        #             submit_log(stream, LogEvent("Second time's the charm"))
+        #         end
+        #     end
+        # end
 
         @testset "Unsorted logs" begin
             stream_name = new_stream("unsorted")