Change zipkin V1 conversion to use pdata, removes one extra step (ope…

…n-telemetry#14592) Signed-off-by: Bogdan Drutu <[email protected]> Signed-off-by: Bogdan Drutu <[email protected]>
indrekj · Sep 30, 2022 · d31a5c3 · d31a5c3
1 parent 5273fbe
commit d31a5c3
Show file tree

Hide file tree

Showing 21 changed files with 776 additions and 1,263 deletions.
diff --git a/exporter/zipkinexporter/go.mod b/exporter/zipkinexporter/go.mod
@@ -15,13 +15,11 @@ require (
 require (
  github.com/apache/thrift v0.17.0 // indirect
  github.com/cenkalti/backoff/v4 v4.1.3 // indirect
- github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
  github.com/felixge/httpsnoop v1.0.3 // indirect
  github.com/go-logr/logr v1.2.3 // indirect
  github.com/go-logr/stdr v1.2.2 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
- github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
  github.com/golang/protobuf v1.5.2 // indirect
  github.com/golang/snappy v0.0.4 // indirect
  github.com/jaegertracing/jaeger v1.38.0 // indirect
@@ -34,7 +32,6 @@ require (
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  github.com/modern-go/reflect2 v1.0.2 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.61.0 // indirect
- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.61.0 // indirect
  github.com/opentracing/opentracing-go v1.2.0 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
  github.com/rs/cors v1.8.2 // indirect

diff --git a/exporter/zipkinexporter/go.sum b/exporter/zipkinexporter/go.sum
diff --git a/pkg/translator/zipkin/go.mod b/pkg/translator/zipkin/go.mod
@@ -3,24 +3,18 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/
 go 1.18
 
 require (
- github.com/census-instrumentation/opencensus-proto v0.4.1
- github.com/google/go-cmp v0.5.9
  github.com/jaegertracing/jaeger v1.38.0
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.61.0
- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.61.0
  github.com/openzipkin/zipkin-go v0.4.0
  github.com/stretchr/testify v1.8.0
  go.opentelemetry.io/collector/pdata v0.61.0
  go.opentelemetry.io/collector/semconv v0.61.0
- google.golang.org/protobuf v1.28.1
-
 )
 
 require (
  github.com/apache/thrift v0.17.0 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
- github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
  github.com/golang/protobuf v1.5.2 // indirect
  github.com/json-iterator/go v1.1.12 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -29,7 +23,6 @@ require (
  github.com/pmezard/go-difflib v1.0.0 // indirect
  github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
  github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
- go.opencensus.io v0.23.0 // indirect
  go.uber.org/atomic v1.10.0 // indirect
  go.uber.org/multierr v1.8.0 // indirect
  go.uber.org/zap v1.23.0 // indirect
@@ -38,9 +31,8 @@ require (
  golang.org/x/text v0.3.7 // indirect
  google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc // indirect
  google.golang.org/grpc v1.49.0 // indirect
+ google.golang.org/protobuf v1.28.1 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../../internal/coreinternal
-
-replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus => ../../../pkg/translator/opencensus
diff --git a/pkg/translator/zipkin/go.sum b/pkg/translator/zipkin/go.sum
diff --git a/pkg/translator/zipkin/zipkinv1/consumerdata.go b/pkg/translator/zipkin/zipkinv1/consumerdata.go
diff --git a/pkg/translator/zipkin/zipkinv1/grpc_http_mapper.go b/pkg/translator/zipkin/zipkinv1/grpc_http_mapper.go
diff --git a/pkg/translator/zipkin/zipkinv1/grpc_http_mapper_test.go b/pkg/translator/zipkin/zipkinv1/grpc_http_mapper_test.go