Merge branch 'master' into 779-ES-autogenerate-id

Author: tmszdmsk

.codecov.yml

@@ -1,12 +1,17 @@
-coverage:
-  range: 100..100
-  round: down
-  precision: 2
-
 codecov:
   notify:
     require_ci_to_pass: yes
+  strict_yaml_branch: master  # only use the latest copy on master branch
+
+coverage:
+  precision: 2
+  round: down
+  range: "100...100"
+
+  status:
+    project:
+      default:
+        target: 100
+    patch: yes
+    changes: no
 
-# see https://docs.codecov.io/docs/ignoring-paths
-ignore:
-  - "model.pb*.go"

plugin/storage/kafka/factory_test.go

@@ -71,15 +71,26 @@ func TestKafkaFactory(t *testing.T) {
 	assert.Error(t, err)
 }
 
-func TestKafkaFactoryProto(t *testing.T) {
-	f := NewFactory()
-	v, command := config.Viperize(f.AddFlags)
-	command.ParseFlags([]string{"--kafka.encoding=protobuf"})
-	f.InitFromViper(v)
-
-	f.config = &mockProducerBuilder{t: t}
-	assert.NoError(t, f.Initialize(metrics.NullFactory, zap.NewNop()))
-	assert.IsType(t, &protobufMarshaller{}, f.marshaller)
+func TestKafkaFactoryEncoding(t *testing.T) {
+	tests := []struct {
+		encoding   string
+		marshaller Marshaller
+	}{
+		{encoding: "protobuf", marshaller: new(protobufMarshaller)},
+		{encoding: "json", marshaller: new(jsonMarshaller)},
+	}
+	for _, test := range tests {
+		t.Run(test.encoding, func(t *testing.T) {
+			f := NewFactory()
+			v, command := config.Viperize(f.AddFlags)
+			command.ParseFlags([]string{"--kafka.encoding=" + test.encoding})
+			f.InitFromViper(v)
+
+			f.config = &mockProducerBuilder{t: t}
+			assert.NoError(t, f.Initialize(metrics.NullFactory, zap.NewNop()))
+			assert.IsType(t, test.marshaller, f.marshaller)
+		})
+	}
 }
 
 func TestKafkaFactoryMarshallerErr(t *testing.T) {