Merge branch 'master' into expose-opts-via-expvar

Author: dstdfx

cmd/opentelemetry/app/exporter/elasticsearchexporter/esmodeltranslator/modeltranslator.go

@@ -367,8 +367,7 @@ func getTagFromSpanKind(spanKind pdata.SpanKind) (dbmodel.KeyValue, bool) {
 
 func getTagFromStatusCode(statusCode pdata.StatusCode) (dbmodel.KeyValue, bool) {
 	return dbmodel.KeyValue{
-		Key: tracetranslator.TagStatusCode,
-		// TODO is this ok?
+		Key:   tracetranslator.TagStatusCode,
 		Value: statusCode.String(),
 		Type:  dbmodel.StringType,
 	}, true

cmd/opentelemetry/app/exporter/elasticsearchexporter/esmodeltranslator/modeltranslator_test.go

@@ -151,7 +151,7 @@ func TestConvertSpan(t *testing.T) {
 				StartTimeMillis: 1,
 				Tags: []dbmodel.KeyValue{
 					{Key: "span.kind", Type: dbmodel.StringType, Value: "client"},
-					{Key: "status.code", Type: dbmodel.StringType, Value: "Cancelled"},
+					{Key: "status.code", Type: dbmodel.StringType, Value: "STATUS_CODE_CANCELLED"},
 					{Key: "error", Type: dbmodel.BoolType, Value: "true"},
 					{Key: "status.message", Type: dbmodel.StringType, Value: "messagetext"},
 					{Key: "foo", Type: dbmodel.BoolType, Value: "true"},