Remove Zipkin specific translation constants, move to internal (open-telemetry#3112)

* Remove Zipkin specific translation constants, move to internal

Signed-off-by: Bogdan Drutu <[email protected]>

* Update changelog

Signed-off-by: Bogdan Drutu <[email protected]>

Author: bogdandrutu

CHANGELOG.md

@@ -5,6 +5,7 @@
 ## 🛑 Breaking changes 🛑
 
 - Remove OpenCensus conventions, should not be used (#3113)
+- Remove Zipkin specific translation constants, move to internal (#3112)
 - Remove tracetranslator.TagHTTPStatusCode, use conventions.AttributeHTTPStatusCode (#3111)
 - Remove OpenCensus status constants and transformation (#3110)
 - Remove `tracetranslator.AttributeArrayToSlice`, not used in core or contrib (#3109)

translator/trace/protospan_translation.go

@@ -29,13 +29,10 @@ const (
 
 	TagSpanKind = "span.kind"
 
-	TagStatusCode          = "status.code"
-	TagStatusMsg           = "status.message"
-	TagError               = "error"
-	TagHTTPStatusMsg       = "http.status_message"
-	TagZipkinCensusCode    = "census.status_code"
-	TagZipkinCensusMsg     = "census.status_description"
-	TagZipkinOpenCensusMsg = "opencensus.status_description"
+	TagStatusCode    = "status.code"
+	TagStatusMsg     = "status.message"
+	TagError         = "error"
+	TagHTTPStatusMsg = "http.status_message"
 
 	TagW3CTraceState     = "w3c.tracestate"
 	TagServiceNameSource = "otlp.service.name.source"
@@ -62,11 +59,6 @@ const (
 	OpenTracingSpanKindInternal    OpenTracingSpanKind = "internal"
 )
 
-const (
-	SpanLinkDataFormat  = "%s|%s|%s|%s|%d"
-	SpanEventDataFormat = "%s|%s|%d"
-)
-
 type attrValDescript struct {
 	regex    *regexp.Regexp
 	attrType pdata.AttributeValueType

translator/trace/zipkin/status_code.go

@@ -30,6 +30,12 @@ type status struct {
 	message string
 }
 
+const (
+	tagZipkinCensusCode    = "census.status_code"
+	tagZipkinCensusMsg     = "census.status_description"
+	tagZipkinOpenCensusMsg = "opencensus.status_description"
+)
+
 // statusMapper contains codes translated from different sources to OC status codes
 type statusMapper struct {
 	// oc status code extracted from "status.code" tags
@@ -84,14 +90,14 @@ func (m *statusMapper) ocStatus() *tracepb.Status {
 
 func (m *statusMapper) fromAttribute(key string, attrib *tracepb.AttributeValue) bool {
 	switch key {
-	case tracetranslator.TagZipkinCensusCode:
+	case tagZipkinCensusCode:
 		code, err := attribToStatusCode(attrib)
 		if err == nil {
 			m.fromCensus.codePtr = &code
 		}
 		return true
 
-	case tracetranslator.TagZipkinCensusMsg, tracetranslator.TagZipkinOpenCensusMsg:
+	case tagZipkinCensusMsg, tagZipkinOpenCensusMsg:
 		m.fromCensus.message = attrib.GetStringValue().GetValue()
 		return true
 

translator/trace/zipkin/traces_to_zipkinv2.go

@@ -29,12 +29,16 @@ import (
 	tracetranslator "go.opentelemetry.io/collector/translator/trace"
 )
 
+const (
+	spanEventDataFormat = "%s|%s|%d"
+	spanLinkDataFormat  = "%s|%s|%s|%s|%d"
+)
+
 var sampled = true
 
 // InternalTracesToZipkinSpans translates internal trace data into Zipkin v2 spans.
 // Returns a slice of Zipkin SpanModel's.
 func InternalTracesToZipkinSpans(td pdata.Traces) ([]*zipkinmodel.SpanModel, error) {
-
 	resourceSpans := td.ResourceSpans()
 	if resourceSpans.Len() == 0 {
 		return nil, nil
@@ -196,7 +200,7 @@ func spanEventsToZipkinAnnotations(events pdata.SpanEventSlice, zs *zipkinmodel.
 				}
 				zAnnos[i] = zipkinmodel.Annotation{
 					Timestamp: event.Timestamp().AsTime(),
-					Value: fmt.Sprintf(tracetranslator.SpanEventDataFormat, event.Name(), jsonStr,
+					Value: fmt.Sprintf(spanEventDataFormat, event.Name(), jsonStr,
 						event.DroppedAttributesCount()),
 				}
 			}
@@ -214,7 +218,7 @@ func spanLinksToZipkinTags(links pdata.SpanLinkSlice, zTags map[string]string) e
 		if err != nil {
 			return err
 		}
-		zTags[key] = fmt.Sprintf(tracetranslator.SpanLinkDataFormat, link.TraceID().HexString(),
+		zTags[key] = fmt.Sprintf(spanLinkDataFormat, link.TraceID().HexString(),
 			link.SpanID().HexString(), link.TraceState(), jsonStr, link.DroppedAttributesCount())
 	}
 	return nil