Merge pull request #317 from robertcheramy/fix/316-syslog-timestamp

Fix syslog messages contains two timestamps

Author: reidmorrison

CHANGELOG.md

@@ -5,7 +5,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [unreleased]
 
+## [4.17.0]
+
 - Correct `source_code_uri` URL
+- Add :notime as a time_format for Formatters
+- Fix #316: syslog messages contains two timestamps
 - Add appender for CloudWatch Logs
 - NR Integration: Ensures key/values are not nested under `messages`
 - NR Integration: Ensures structures are built for all nested json (I.E build an actual object instead of doing `span.id` as the key)

lib/semantic_logger/appender/syslog.rb

@@ -215,7 +215,7 @@ def flush
       def default_formatter
         if protocol == :syslog
           # Format is text output without the time
-          SemanticLogger::Formatters::Default.new(time_format: nil)
+          SemanticLogger::Formatters::Default.new(time_format: :notime)
         else
           SemanticLogger::Formatters::Syslog.new(facility: facility, level_map: level_map, max_size: max_size)
         end

lib/semantic_logger/formatters/base.rb

@@ -23,6 +23,7 @@ class Base
       #     See Time#strftime for the format of this string.
       #     :iso_8601 Outputs an ISO8601 Formatted timestamp.
       #     :ms       Output in miliseconds since epoch.
+      #     :notime   Returns an empty string for time ( no time is output ).
       #     Default: '%Y-%m-%d %H:%M:%S.%<precision>N'
       #   log_host: [Boolean]
       #     Whether or not to include hostname in logs
@@ -81,7 +82,7 @@ def format_time(time)
           time
         when :seconds
           time.to_f
-        when nil
+        when :notime
           ""
         else
           time.strftime(time_format)

test/appender/syslog_test.rb

@@ -14,7 +14,7 @@ class SyslogTest < Minitest::Test
             syslog_appender.debug "AppenderSyslogTest log message"
           end
         end
-        assert_match(/D (.*?) SemanticLogger::Appender::Syslog -- AppenderSyslogTest log message/, message)
+        assert_match(/^ D (.*?) SemanticLogger::Appender::Syslog -- AppenderSyslogTest log message/, message)
       end
 
       it "handle remote syslog over TCP" do