Remove otlp to/from oc converters and use internal converters (#720)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
open-telemetry · Mar 27, 2020 · 19cedfb · 19cedfb
1 parent 50cbc17
commit 19cedfb
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 1,515 deletions.
diff --git a/exporter/otlpexporter/otlp.go b/exporter/otlpexporter/otlp.go
@@ -27,9 +27,10 @@ import (
 	"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
 	"github.com/open-telemetry/opentelemetry-collector/consumer/consumerdata"
 	"github.com/open-telemetry/opentelemetry-collector/exporter/exporterhelper"
+	"github.com/open-telemetry/opentelemetry-collector/internal/data"
 	"github.com/open-telemetry/opentelemetry-collector/oterr"
+	"github.com/open-telemetry/opentelemetry-collector/translator/internaldata"
 	metricstranslator "github.com/open-telemetry/opentelemetry-collector/translator/metrics"
-	tracetranslator "github.com/open-telemetry/opentelemetry-collector/translator/trace"
 )
 
 type otlpExporter struct {
@@ -169,7 +170,7 @@ func (oce *otlpExporter) pushTraceData(ctx context.Context, td consumerdata.Trac
 
 	// Perform the request.
 	request := &otlptrace.ExportTraceServiceRequest{
-		ResourceSpans: tracetranslator.OCToOTLP(td),
+		ResourceSpans: data.TraceDataToOtlp(internaldata.OCToTraceData(td)),
 	}
 	err := exporter.exportTrace(ctx, request)
 

diff --git a/receiver/otlpreceiver/otlp_test.go b/receiver/otlpreceiver/otlp_test.go
@@ -163,6 +163,9 @@ func TestGrpcGateway_endToEnd(t *testing.T) {
 							},
 						},
 					},
+					// TODO: Remove this after PR:691 is merged
+					// https://github.com/open-telemetry/opentelemetry-collector/pull/691
+					Status: &octrace.Status{},
 				},
 			},
 			SourceFormat: "otlp_trace",

diff --git a/receiver/otlpreceiver/trace/otlp.go b/receiver/otlpreceiver/trace/otlp.go
@@ -18,14 +18,14 @@ import (
 	"context"
 
 	collectortrace "github.com/open-telemetry/opentelemetry-proto/gen/go/collector/trace/v1"
-	otlptrace "github.com/open-telemetry/opentelemetry-proto/gen/go/trace/v1"
 
 	"github.com/open-telemetry/opentelemetry-collector/client"
 	"github.com/open-telemetry/opentelemetry-collector/consumer"
 	"github.com/open-telemetry/opentelemetry-collector/consumer/consumerdata"
+	"github.com/open-telemetry/opentelemetry-collector/internal/data"
 	"github.com/open-telemetry/opentelemetry-collector/obsreport"
 	"github.com/open-telemetry/opentelemetry-collector/oterr"
-	tracetranslator "github.com/open-telemetry/opentelemetry-collector/translator/trace"
+	"github.com/open-telemetry/opentelemetry-collector/translator/internaldata"
 )
 
 const (
@@ -61,8 +61,17 @@ func (r *Receiver) Export(ctx context.Context, req *collectortrace.ExportTraceSe
 	// We need to ensure that it propagates the receiver name as a tag
 	ctxWithReceiverName := obsreport.ReceiverContext(ctx, r.instanceName, receiverTransport, receiverTagValue)
 
-	for _, resourceMetrics := range req.ResourceSpans {
-		err := r.processReceivedSpans(ctxWithReceiverName, resourceMetrics)
+	td := data.TraceDataFromOtlp(req.ResourceSpans)
+	rss := td.ResourceSpans()
+	for i := 0; i < rss.Len(); i++ {
+		rs := rss.Get(i)
+
+		if rs.InstrumentationLibrarySpans().Len() == 0 {
+			continue
+		}
+
+		octd := internaldata.ResourceSpansToOC(rs)
+		err := r.sendToNextConsumer(ctxWithReceiverName, &octd)
 		if err != nil {
 			return nil, err
 		}
@@ -71,15 +80,6 @@ func (r *Receiver) Export(ctx context.Context, req *collectortrace.ExportTraceSe
 	return &collectortrace.ExportTraceServiceResponse{}, nil
 }
 
-func (r *Receiver) processReceivedSpans(ctx context.Context, resourceSpans *otlptrace.ResourceSpans) error {
-	if len(resourceSpans.InstrumentationLibrarySpans) == 0 {
-		return nil
-	}
-
-	td := tracetranslator.ResourceSpansToTraceData(resourceSpans)
-	return r.sendToNextConsumer(ctx, &td)
-}
-
 func (r *Receiver) sendToNextConsumer(ctx context.Context, td *consumerdata.TraceData) error {
 	if c, ok := client.FromGRPC(ctx); ok {
 		ctx = client.NewContext(ctx, c)

diff --git a/receiver/otlpreceiver/trace/otlp_test.go b/receiver/otlpreceiver/trace/otlp_test.go
@@ -167,7 +167,7 @@ func TestExport(t *testing.T) {
 							},
 						},
 					},
-					DroppedMessageEventsCount: 2,
+					DroppedAnnotationsCount: 2,
 				},
 				Links: &octrace.Span_Links{
 					Link: []*octrace.Span_Link{

diff --git a/translator/opencensus/oc_to_internal.go → translator/internaldata/oc_to_traces.go b/translator/opencensus/oc_to_internal.go → translator/internaldata/oc_to_traces.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package opencensus
+package internaldata
 
 import (
 	"strings"
@@ -29,7 +29,8 @@ import (
 	tracetranslator "github.com/open-telemetry/opentelemetry-collector/translator/trace"
 )
 
-func ocToInternal(td consumerdata.TraceData) data.TraceData {
+// OCToTraceData converts OC data format to TraceData.
+func OCToTraceData(td consumerdata.TraceData) data.TraceData {
 	traceData := data.NewTraceData()
 	if td.Node == nil && td.Resource == nil && len(td.Spans) == 0 {
 		return traceData

diff --git a/translator/opencensus/oc_to_internal_test.go → translator/internaldata/oc_to_traces_test.go b/translator/opencensus/oc_to_internal_test.go → translator/internaldata/oc_to_traces_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package opencensus
+package internaldata
 
 import (
 	"strings"
@@ -431,7 +431,7 @@ func TestOcToInternal(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.Name, func(t *testing.T) {
-			got := ocToInternal(test.oc)
+			got := OCToTraceData(test.oc)
 			assert.EqualValues(t, test.TraceData, got)
 		})
 	}

diff --git a/translator/internaldata/traces_to_oc.go b/translator/internaldata/traces_to_oc.go
@@ -27,7 +27,7 @@ import (
 	tracetranslator "github.com/open-telemetry/opentelemetry-collector/translator/trace"
 )
 
-const sourceFormat = "otel_internal_trace"
+const sourceFormat = "otlp_trace"
 
 var (
 	defaultProcessID = 0