Update trace/jaeger paths to point to contrib pkg/translator/jaeger (#…

…4863) * Fix jaeger paths * Update testbed go mod * Make go mod update
open-telemetry · Aug 25, 2021 · 3496f0d · 3496f0d
1 parent d4d8ef7
commit 3496f0d
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 7 deletions.
diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod
@@ -4,9 +4,14 @@ go 1.16
 
 require (
  github.com/mattn/go-colorable v0.1.7 // indirect
+ github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.0.0-00010101000000-000000000000
  github.com/signalfx/opencensus-go-exporter-kinesis v0.6.3
  github.com/stretchr/testify v1.7.0
  go.opentelemetry.io/collector v0.33.1-0.20210820002854-d3000232f8f6
  go.opentelemetry.io/collector/model v0.33.1-0.20210820002854-d3000232f8f6
  go.uber.org/zap v1.19.0
 )
+
+replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger => ../../pkg/translator/jaeger
+
+replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
diff --git a/exporter/awskinesisexporter/internal/translate/translate_jaeger.go b/exporter/awskinesisexporter/internal/translate/translate_jaeger.go
@@ -18,7 +18,8 @@ import (
  awskinesis "github.com/signalfx/opencensus-go-exporter-kinesis"
  "go.opentelemetry.io/collector/consumer/consumererror"
  "go.opentelemetry.io/collector/model/pdata"
- jaegertranslator "go.opentelemetry.io/collector/translator/trace/jaeger"
+
+ jaegertranslator "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
 )
 
 type jaeger struct {

diff --git a/exporter/logzioexporter/exporter.go b/exporter/logzioexporter/exporter.go
@@ -25,7 +25,8 @@ import (
  "go.opentelemetry.io/collector/component"
  "go.opentelemetry.io/collector/exporter/exporterhelper"
  "go.opentelemetry.io/collector/model/pdata"
- "go.opentelemetry.io/collector/translator/trace/jaeger"
+
+ "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
 )
 
 const (

diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod
@@ -6,6 +6,7 @@ require (
  github.com/hashicorp/go-hclog v0.16.2
  github.com/jaegertracing/jaeger v1.25.0
  github.com/logzio/jaeger-logzio v1.0.3
+ github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.0.0-00010101000000-000000000000
  github.com/stretchr/testify v1.7.0
  go.opentelemetry.io/collector v0.33.1-0.20210820002854-d3000232f8f6
  go.opentelemetry.io/collector/model v0.33.1-0.20210820002854-d3000232f8f6
@@ -14,3 +15,7 @@ require (
 
 // see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/4433
 exclude github.com/StackExchange/wmi v1.2.0
+
+replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger => ../../pkg/translator/jaeger
+
+replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
diff --git a/exporter/sapmexporter/exporter.go b/exporter/sapmexporter/exporter.go
@@ -25,9 +25,10 @@ import (
  "go.opentelemetry.io/collector/consumer/consumererror"
  "go.opentelemetry.io/collector/exporter/exporterhelper"
  "go.opentelemetry.io/collector/model/pdata"
- "go.opentelemetry.io/collector/translator/trace/jaeger"
  "go.uber.org/zap"
 
+ "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
+
  "github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk"
  "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr"
 )

diff --git a/exporter/sapmexporter/exporter_test.go b/exporter/sapmexporter/exporter_test.go
@@ -29,7 +29,8 @@ import (
  "go.opentelemetry.io/collector/component/componenttest"
  "go.opentelemetry.io/collector/config"
  "go.opentelemetry.io/collector/model/pdata"
- "go.opentelemetry.io/collector/translator/trace/jaeger"
+
+ "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
 
  "github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk"
 )

diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod
@@ -6,6 +6,7 @@ require (
  github.com/jaegertracing/jaeger v1.25.0
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.0.0-00010101000000-000000000000
  github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.0.0-00010101000000-000000000000
+ github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.0.0-00010101000000-000000000000
  github.com/signalfx/sapm-proto v0.7.0
  github.com/stretchr/testify v1.7.0
  go.opentelemetry.io/collector v0.33.1-0.20210820002854-d3000232f8f6
@@ -16,3 +17,7 @@ require (
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk => ../../internal/splunk
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr => ../../pkg/batchperresourceattr
+
+replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger => ../../pkg/translator/jaeger
+
+replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
diff --git a/internal/coreinternal/go.mod b/internal/coreinternal/go.mod
@@ -12,3 +12,4 @@ require (
  go.opentelemetry.io/collector/model v0.33.1-0.20210820002854-d3000232f8f6
  google.golang.org/protobuf v1.27.1
 )
+
diff --git a/receiver/jaegerreceiver/jaeger_agent_test.go b/receiver/jaegerreceiver/jaeger_agent_test.go
@@ -39,8 +39,9 @@ import (
  "go.opentelemetry.io/collector/model/pdata"
  "go.opentelemetry.io/collector/testutil"
  conventions "go.opentelemetry.io/collector/translator/conventions/v1.5.0"
- "go.opentelemetry.io/collector/translator/trace/jaeger"
  "google.golang.org/grpc"
+
+ "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
 )
 
 var jaegerAgent = config.NewIDWithName(typeStr, "agent_test")

diff --git a/receiver/jaegerreceiver/trace_receiver_test.go b/receiver/jaegerreceiver/trace_receiver_test.go
@@ -49,10 +49,11 @@ import (
  "go.opentelemetry.io/collector/obsreport"
  "go.opentelemetry.io/collector/testutil"
  conventions "go.opentelemetry.io/collector/translator/conventions/v1.5.0"
- "go.opentelemetry.io/collector/translator/trace/jaeger"
  "go.uber.org/zap"
  "google.golang.org/grpc"
  "google.golang.org/grpc/credentials"
+
+ "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
 )
 
 var jaegerReceiver = config.NewIDWithName("jaeger", "receiver_test")

diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod
@@ -6,6 +6,7 @@ require (
  github.com/gorilla/mux v1.8.0
  github.com/jaegertracing/jaeger v1.25.0
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.0.0-00010101000000-000000000000
+ github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.0.0-00010101000000-000000000000
  github.com/signalfx/sapm-proto v0.7.0
  github.com/stretchr/testify v1.7.0
  go.opencensus.io v0.23.0
@@ -15,3 +16,7 @@ require (
 )
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk => ../../internal/splunk
+
+replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger => ../../pkg/translator/jaeger
+
+replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
diff --git a/receiver/sapmreceiver/trace_receiver.go b/receiver/sapmreceiver/trace_receiver.go
@@ -29,9 +29,10 @@ import (
  "go.opentelemetry.io/collector/component"
  "go.opentelemetry.io/collector/consumer"
  "go.opentelemetry.io/collector/obsreport"
- "go.opentelemetry.io/collector/translator/trace/jaeger"
  "go.uber.org/zap"
 
+ "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
+
  "github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk"
 )
 

diff --git a/testbed/go.mod b/testbed/go.mod
@@ -86,3 +86,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splun
 replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver => ../receiver/zipkinreceiver
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/testbed/mockdatareceivers/mockawsxrayreceiver => ../testbed/mockdatareceivers/mockawsxrayreceiver
+
+replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger => ../pkg/translator/jaeger
+
+replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../internal/coreinternal