Bump OpenTelemetry version to latest (#2333)

Signed-off-by: Pavol Loffay <[email protected]>
jaegertracing · Jul 8, 2020 · cb42903 · cb42903
1 parent c549252
commit cb42903
Show file tree

Hide file tree

Showing 6 changed files with 164 additions and 60 deletions.
diff --git a/cmd/opentelemetry/app/defaultconfig/default_config.go b/cmd/opentelemetry/app/defaultconfig/default_config.go
@@ -22,6 +22,7 @@ import (
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/config/configmodels"
+	"go.opentelemetry.io/collector/config/confignet"
 	"go.opentelemetry.io/collector/config/configprotocol"
 	"go.opentelemetry.io/collector/processor/batchprocessor"
 	"go.opentelemetry.io/collector/processor/queuedprocessor"
@@ -124,7 +125,9 @@ func createReceivers(component ComponentType, zipkinHostPort string, factories c
 	// we do not want to override it here
 	if jaeger.GRPC == nil {
 		jaeger.GRPC = &configgrpc.GRPCServerSettings{
-			Endpoint: gRPCEndpoint,
+			NetAddr: confignet.NetAddr{
+				Endpoint: gRPCEndpoint,
+			},
 		}
 	}
 	if jaeger.ThriftHTTP == nil {

diff --git a/cmd/opentelemetry/app/defaultconfig/merge_test.go b/cmd/opentelemetry/app/defaultconfig/merge_test.go
@@ -25,6 +25,7 @@ import (
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/config/configmodels"
+	"go.opentelemetry.io/collector/config/confignet"
 	"go.opentelemetry.io/collector/config/configprotocol"
 	"go.opentelemetry.io/collector/processor/attributesprocessor"
 	"go.opentelemetry.io/collector/processor/batchprocessor"
@@ -55,7 +56,9 @@ func TestMergeConfigs(t *testing.T) {
 			"jaeger": &jaegerreceiver.Config{
 				Protocols: jaegerreceiver.Protocols{
 					GRPC: &configgrpc.GRPCServerSettings{
-						Endpoint: "def",
+						NetAddr: confignet.NetAddr{
+							Endpoint: "def",
+						},
 					},
 					ThriftCompact: &configprotocol.ProtocolServerSettings{
 						Endpoint: "def",
@@ -83,7 +86,9 @@ func TestMergeConfigs(t *testing.T) {
 			"jaeger": &jaegerreceiver.Config{
 				Protocols: jaegerreceiver.Protocols{
 					GRPC: &configgrpc.GRPCServerSettings{
-						Endpoint: "master_jaeger_url",
+						NetAddr: confignet.NetAddr{
+							Endpoint: "master_jaeger_url",
+						},
 					},
 				},
 			},
@@ -116,7 +121,9 @@ func TestMergeConfigs(t *testing.T) {
 			"jaeger": &jaegerreceiver.Config{
 				Protocols: jaegerreceiver.Protocols{
 					GRPC: &configgrpc.GRPCServerSettings{
-						Endpoint: "master_jaeger_url",
+						NetAddr: confignet.NetAddr{
+							Endpoint: "master_jaeger_url",
+						},
 					},
 					ThriftCompact: &configprotocol.ProtocolServerSettings{
 						Endpoint: "def",

diff --git a/cmd/opentelemetry/app/receiver/jaegerreceiver/jaeger_receiver.go b/cmd/opentelemetry/app/receiver/jaegerreceiver/jaeger_receiver.go
@@ -22,6 +22,7 @@ import (
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/config/configmodels"
+	"go.opentelemetry.io/collector/config/confignet"
 	"go.opentelemetry.io/collector/config/configprotocol"
 	"go.opentelemetry.io/collector/config/configtls"
 	"go.opentelemetry.io/collector/consumer"
@@ -83,7 +84,9 @@ func configureCollector(v *viper.Viper, cfg *jaegerreceiver.Config) {
 	cOpts.InitFromViper(v)
 	if v.IsSet(collectorApp.CollectorGRPCHostPort) {
 		cfg.GRPC = &configgrpc.GRPCServerSettings{
-			Endpoint: cOpts.CollectorGRPCHostPort,
+			NetAddr: confignet.NetAddr{
+				Endpoint: cOpts.CollectorGRPCHostPort,
+			},
 		}
 		if cOpts.TLS.CertPath != "" && cOpts.TLS.KeyPath != "" {
 			cfg.GRPC.TLSSetting = &configtls.TLSServerSetting{

diff --git a/cmd/opentelemetry/app/receiver/jaegerreceiver/jaeger_receiver_test.go b/cmd/opentelemetry/app/receiver/jaegerreceiver/jaeger_receiver_test.go
@@ -28,6 +28,7 @@ import (
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/config/configmodels"
+	"go.opentelemetry.io/collector/config/confignet"
 	"go.opentelemetry.io/collector/config/configprotocol"
 	"go.opentelemetry.io/collector/config/configtls"
 	"go.opentelemetry.io/collector/receiver/jaegerreceiver"
@@ -94,7 +95,9 @@ func TestDefaultValueFromViper(t *testing.T) {
 			expected: &jaegerreceiver.Config{
 				Protocols: jaegerreceiver.Protocols{
 					GRPC: &configgrpc.GRPCServerSettings{
-						Endpoint: "localhost:7894",
+						NetAddr: confignet.NetAddr{
+							Endpoint: "localhost:7894",
+						},
 					},
 				},
 			},

diff --git a/cmd/opentelemetry/go.mod b/cmd/opentelemetry/go.mod
@@ -13,19 +13,17 @@ require (
 	github.com/golang/protobuf v1.4.2 // indirect
 	github.com/google/go-cmp v0.5.0 // indirect
 	github.com/imdario/mergo v0.3.9
-	github.com/jaegertracing/jaeger v1.18.2-0.20200626141145-be17169a4179
+	github.com/jaegertracing/jaeger v1.18.2-0.20200707061226-97d2319ff2be
 	github.com/olivere/elastic v6.2.27+incompatible
 	github.com/opentracing/opentracing-go v1.1.1-0.20190913142402-a7454ce5950e
 	github.com/shirou/gopsutil v2.20.4+incompatible // indirect
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.6.2
+	github.com/spf13/viper v1.7.0
 	github.com/stretchr/testify v1.6.1
 	github.com/uber/jaeger-client-go v2.22.1+incompatible
 	github.com/uber/jaeger-lib v2.2.0+incompatible
-	go.opentelemetry.io/collector v0.4.1-0.20200630185005-55b645853826
+	go.opentelemetry.io/collector v0.5.1-0.20200708032135-c966e140fd4f
 	go.uber.org/zap v1.13.0
-	golang.org/x/tools v0.0.0-20200428211428-0c9eba77bc32 // indirect
-	google.golang.org/api v0.10.0 // indirect
 	google.golang.org/genproto v0.0.0-20200624020401-64a14ca9d1ad // indirect
 	k8s.io/client-go v12.0.0+incompatible // indirect
 )