Merge pull request #32 from lestrrat-go/makasimorg-custom-marshaller

rebase #30

buffered.go

@@ -17,6 +17,7 @@ import (
 //   - fluent.WithJSONMarshaler
 //   - fluent.WithMaxConnAttempts
 //   - fluent.WithMsgpackMarshaler
+//   - fluent.WithMarshaller
 //   - fluent.WithNetwork
 //   - fluent.WithTagPrefix
 //   - fluent.WithWriteThreshold

fluent_test.go

@@ -255,7 +255,8 @@ func TestConnectOnStart(t *testing.T) {
 			// find a port that is not available (this may be timing dependent)
 			var dialer net.Dialer
 			port := 22412
-			for range 1000 {
+			//nolint:intrange
+			for i := 0; i < 1000; i++ {
 				ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
 				conn, err := dialer.DialContext(ctx, `net`, fmt.Sprintf(`127.0.0.1:%d`, port))
 				cancel()
@@ -672,7 +673,8 @@ func TestPing(t *testing.T) {
 				// find a port that is not available (this may be timing dependent)
 				var dialer net.Dialer
 				port := 22412
-				for range 1000 {
+				//nolint:intrange
+				for i := 0; i < 1000; i++ {
 					ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
 					conn, err := dialer.DialContext(ctx, `net`, fmt.Sprintf(`127.0.0.1:%d`, port))
 					cancel()

options.go

@@ -56,6 +56,12 @@ func WithJSONMarshaler() Option {
 	return option.New(identMarshaler{}, marshalFunc(jsonMarshal))
 }
 
+// WithMarshaller specifies a custom marshaling to be used when
+// sending messages to fluentd. Used for `fluent.New`
+func WithMarshaller(m marshaler) Option {
+	return option.New(identMarshaler{}, m)
+}
+
 // WithMsgpackMarshaler specifies msgpack marshaling to be used when
 // sending messages to fluentd. Used in `fluent.New`
 func WithMsgpackMarshaler() Option {