Support otlp-proto encoding for kafka in OTel app

Signed-off-by: Sam Xie <xsambundy@gmail.com>
jaegertracing · Oct 23, 2020 · a99043c · a99043c
1 parent ec31e8a
commit a99043c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/cmd/opentelemetry/app/exporter/kafkaexporter/flags.go b/cmd/opentelemetry/app/exporter/kafkaexporter/flags.go
@@ -16,12 +16,25 @@ package kafkaexporter
 
 import (
 	"flag"
+	"fmt"
 
 	"github.com/jaegertracing/jaeger/plugin/storage/kafka"
 )
 
+const (
+	// encodingOTLPProto is used for spans encoded as OTLP Protobuf.
+	encodingOTLPProto = "otlp-proto"
+)
+
 // AddFlags adds Ingester flags.
 func AddFlags(flags *flag.FlagSet) {
 	opts := &kafka.Options{}
 	opts.AddOTELFlags(flags)
+	// Modify kafka.producer.encoding flag
+	flags.Lookup("kafka.producer.encoding").Usage = fmt.Sprintf(
+		`Encoding of spans ("%s", "%s" or "%s") sent to kafka.`,
+		kafka.EncodingJSON,
+		kafka.EncodingProto,
+		encodingOTLPProto,
+	)
 }
diff --git a/cmd/opentelemetry/app/exporter/kafkaexporter/kafka_exporter.go b/cmd/opentelemetry/app/exporter/kafkaexporter/kafka_exporter.go
@@ -134,6 +134,8 @@ func mustOtelEncodingForJaegerEncoding(jaegerEncoding string) string {
 		return "jaeger_proto"
 	case kafka.EncodingJSON:
 		return "jaeger_json"
+	case encodingOTLPProto:
+		return "otlp_proto"
 	}
 
 	panic(jaegerEncoding + " is not a supported kafka encoding in the OTEL collector.")

diff --git a/cmd/opentelemetry/app/exporter/kafkaexporter/kafka_exporter_test.go b/cmd/opentelemetry/app/exporter/kafkaexporter/kafka_exporter_test.go
@@ -102,6 +102,10 @@ func TestMustOtelEncodingForJaegerEncoding(t *testing.T) {
 			in:       kafka.EncodingJSON,
 			expected: "jaeger_json",
 		},
+		{
+			in:       encodingOTLPProto,
+			expected: "otlp_proto",
+		},
 		{
 			in:           "not-an-encoding",
 			expectsPanic: true,