Bump opentelemetry to v0.15.0 (jaegertracing#2634)

* Bump opentelemetry to v0.15.0 Signed-off-by: Pavel Kositsyn <[email protected]> * add default value instead of nil value for jaegerreceiver config Signed-off-by: Pavel Kositsyn <[email protected]> * make lint Signed-off-by: Pavel Kositsyn <[email protected]>
k8battleship · Nov 23, 2020 · 71a88c3 · 71a88c3
1 parent a325408
commit 71a88c3
Show file tree

Hide file tree

Showing 21 changed files with 247 additions and 133 deletions.
diff --git a/cmd/opentelemetry/app/defaultconfig/default_config.go b/cmd/opentelemetry/app/defaultconfig/default_config.go
@@ -206,13 +206,15 @@ func createExporters(component ComponentType, storageTypes string, factories com
 
 func enableAgentUDPEndpoints(jaeger *jaegerreceiver.Config) {
 	if jaeger.ThriftCompact == nil {
-		jaeger.ThriftCompact = &confignet.TCPAddr{
-			Endpoint: udpThriftCompactEndpoint,
+		jaeger.ThriftCompact = &jaegerreceiver.ProtocolUDP{
+			Endpoint:        udpThriftCompactEndpoint,
+			ServerConfigUDP: jaegerreceiver.DefaultServerConfigUDP(),
 		}
 	}
 	if jaeger.ThriftBinary == nil {
-		jaeger.ThriftBinary = &confignet.TCPAddr{
-			Endpoint: udpThriftBinaryEndpoint,
+		jaeger.ThriftBinary = &jaegerreceiver.ProtocolUDP{
+			Endpoint:        udpThriftBinaryEndpoint,
+			ServerConfigUDP: jaegerreceiver.DefaultServerConfigUDP(),
 		}
 	}
 }

diff --git a/cmd/opentelemetry/app/defaultconfig/default_config_test.go b/cmd/opentelemetry/app/defaultconfig/default_config_test.go
@@ -203,9 +203,11 @@ func TestService(t *testing.T) {
 			cfg, err := createDefaultConfig(viper.New(), factories)
 			if test.err != "" {
 				require.Nil(t, cfg)
+				assert.Error(t, err)
 				assert.Contains(t, err.Error(), test.err)
 				return
 			}
+			require.NoError(t, err)
 			sort.Strings(test.service.Pipelines["traces"].Exporters)
 			sort.Strings(cfg.Service.Pipelines["traces"].Exporters)
 			sort.Strings(test.service.Pipelines["traces"].Receivers)

diff --git a/cmd/opentelemetry/app/defaultconfig/merge_test.go b/cmd/opentelemetry/app/defaultconfig/merge_test.go
@@ -61,8 +61,14 @@ func TestMergeConfigs(t *testing.T) {
 							Endpoint: "def",
 						},
 					},
-					ThriftCompact: &confignet.TCPAddr{
+					ThriftCompact: &jaegerreceiver.ProtocolUDP{
 						Endpoint: "def",
+						ServerConfigUDP: jaegerreceiver.ServerConfigUDP{
+							QueueSize:        100,
+							MaxPacketSize:    65_536,
+							Workers:          10,
+							SocketBufferSize: 65_536,
+						},
 					},
 				},
 			},
@@ -128,8 +134,14 @@ func TestMergeConfigs(t *testing.T) {
 							Endpoint: "master_jaeger_url",
 						},
 					},
-					ThriftCompact: &confignet.TCPAddr{
+					ThriftCompact: &jaegerreceiver.ProtocolUDP{
 						Endpoint: "def",
+						ServerConfigUDP: jaegerreceiver.ServerConfigUDP{
+							QueueSize:        100,
+							MaxPacketSize:    65_536,
+							Workers:          10,
+							SocketBufferSize: 65_536,
+						},
 					},
 				},
 			},

diff --git a/cmd/opentelemetry/app/exporter/cassandraexporter/factory_test.go b/cmd/opentelemetry/app/exporter/cassandraexporter/factory_test.go
@@ -39,6 +39,7 @@ func TestCreateTraceExporter(t *testing.T) {
 	}}
 	exporter, err := factory.CreateTracesExporter(context.Background(), component.ExporterCreateParams{}, factory.CreateDefaultConfig())
 	require.Nil(t, exporter)
+	require.Error(t, err)
 	assert.Contains(t, err.Error(), "gocql: unable to create session")
 }
 

diff --git a/cmd/opentelemetry/app/exporter/elasticsearchexporter/esmodeltranslator/modeltranslator.go b/cmd/opentelemetry/app/exporter/elasticsearchexporter/esmodeltranslator/modeltranslator.go
@@ -248,7 +248,7 @@ func traceIDToString(high, low uint64) string {
 }
 
 func (c *Translator) process(resource pdata.Resource) *dbmodel.Process {
-	if resource.IsNil() || resource.Attributes().Len() == 0 {
+	if resource.Attributes().Len() == 0 {
 		return nil
 	}
 	p := &dbmodel.Process{}

diff --git a/...pentelemetry/app/exporter/elasticsearchexporter/esmodeltranslator/modeltranslator_test.go b/...pentelemetry/app/exporter/elasticsearchexporter/esmodeltranslator/modeltranslator_test.go
@@ -258,7 +258,6 @@ func traces(serviceName string) pdata.Traces {
 	traces := pdata.NewTraces()
 	traces.ResourceSpans().Resize(1)
 	traces.ResourceSpans().At(0).InstrumentationLibrarySpans().Resize(1)
-	traces.ResourceSpans().At(0).Resource().InitEmpty()
 	traces.ResourceSpans().At(0).Resource().Attributes().InitFromMap(map[string]pdata.AttributeValue{conventions.AttributeServiceName: pdata.NewAttributeValueString(serviceName)})
 	return traces
 }

diff --git a/cmd/opentelemetry/app/exporter/elasticsearchexporter/factory_test.go b/cmd/opentelemetry/app/exporter/elasticsearchexporter/factory_test.go
@@ -42,13 +42,15 @@ func TestCreateTraceExporter(t *testing.T) {
 	config.Primary.Servers = []string{"http://foobardoesnotexists.test"}
 	exporter, err := factory.CreateTracesExporter(context.Background(), component.ExporterCreateParams{Logger: zap.NewNop()}, config)
 	require.Nil(t, exporter)
+	require.Error(t, err)
 	assert.Contains(t, err.Error(), "no such host")
 }
 
 func TestCreateTraceExporter_nilConfig(t *testing.T) {
 	factory := &Factory{}
 	exporter, err := factory.CreateTracesExporter(context.Background(), component.ExporterCreateParams{}, nil)
 	require.Nil(t, exporter)
+	require.Error(t, err)
 	assert.Contains(t, err.Error(), "could not cast configuration to jaeger_elasticsearch")
 }
 

diff --git a/cmd/opentelemetry/app/exporter/elasticsearchexporter/spanstore.go b/cmd/opentelemetry/app/exporter/elasticsearchexporter/spanstore.go
@@ -242,10 +242,7 @@ func bulkItemsToTraces(bulkItems []bulkItem) pdata.Traces {
 	for i, op := range bulkItems {
 		spanData := op.spanData
 		rss := traces.ResourceSpans().At(i)
-		if !spanData.Resource.IsNil() {
-			rss.Resource().InitEmpty()
-			spanData.Resource.Attributes().CopyTo(rss.Resource().Attributes())
-		}
+		spanData.Resource.Attributes().CopyTo(rss.Resource().Attributes())
 		rss.InstrumentationLibrarySpans().Resize(1)
 		ispans := rss.InstrumentationLibrarySpans().At(0)
 		ispans.InitEmpty()

diff --git a/cmd/opentelemetry/app/exporter/elasticsearchexporter/spanstore_test.go b/cmd/opentelemetry/app/exporter/elasticsearchexporter/spanstore_test.go
@@ -105,7 +105,6 @@ func TestBulkItemsToTraces(t *testing.T) {
 		span.InitEmpty()
 		span.SetName("name")
 		resource := pdata.NewResource()
-		resource.InitEmpty()
 		resource.Attributes().Insert("key", pdata.NewAttributeValueString("val"))
 		inst := pdata.NewInstrumentationLibrary()
 		inst.InitEmpty()
@@ -176,7 +175,6 @@ func TestWriteSpans(t *testing.T) {
 		span.InitEmpty()
 		span.SetName("name")
 		resource := pdata.NewResource()
-		resource.InitEmpty()
 		resource.Attributes().Insert("key", pdata.NewAttributeValueString("val"))
 		inst := pdata.NewInstrumentationLibrary()
 		inst.InitEmpty()

diff --git a/cmd/opentelemetry/app/exporter/grpcpluginexporter/factory_test.go b/cmd/opentelemetry/app/exporter/grpcpluginexporter/factory_test.go
@@ -38,6 +38,7 @@ func TestCreateTraceExporter(t *testing.T) {
 	}}
 	exporter, err := factory.CreateTracesExporter(context.Background(), component.ExporterCreateParams{}, factory.CreateDefaultConfig())
 	require.Nil(t, exporter)
+	require.Error(t, err)
 	assert.Contains(t, err.Error(), "error attempting to connect to plugin rpc client: fork/exec : no such file or directory")
 }
 

diff --git a/cmd/opentelemetry/app/exporter/kafkaexporter/kafka_exporter_test.go b/cmd/opentelemetry/app/exporter/kafkaexporter/kafka_exporter_test.go
@@ -65,6 +65,7 @@ func TestLoadConfigAndFlags(t *testing.T) {
 	}
 
 	factories, err := componenttest.ExampleComponents()
+	require.NoError(t, err)
 	factories.Exporters[TypeStr] = factory
 	cfg, err := configtest.LoadConfigFile(t, path.Join(".", "testdata", "config.yaml"), factories)
 	require.NoError(t, err)

diff --git a/cmd/opentelemetry/app/exporter/memoryexporter/factory_test.go b/cmd/opentelemetry/app/exporter/memoryexporter/factory_test.go
@@ -50,6 +50,7 @@ func TestCreateTraceExporter_nilConfig(t *testing.T) {
 	factory := &Factory{}
 	exporter, err := factory.CreateTracesExporter(context.Background(), component.ExporterCreateParams{}, nil)
 	require.Nil(t, exporter)
+	require.Error(t, err)
 	assert.Contains(t, err.Error(), "could not cast configuration to jaeger_memory")
 }
 

diff --git a/cmd/opentelemetry/app/exporter/span_writer_exporter_test.go b/cmd/opentelemetry/app/exporter/span_writer_exporter_test.go
@@ -127,6 +127,7 @@ func TestStore(t *testing.T) {
 			dropped, err := test.storage.traceDataPusher(context.Background(), test.data)
 			assert.Equal(t, test.dropped, dropped)
 			if test.err != "" {
+				assert.Error(t, err)
 				assert.Contains(t, err.Error(), test.err)
 			} else {
 				require.NoError(t, err)

diff --git a/cmd/opentelemetry/app/internal/esclient/client_test.go b/cmd/opentelemetry/app/internal/esclient/client_test.go
@@ -163,6 +163,7 @@ func testBulk(t *testing.T, clientFactory func(tripper http.RoundTripper) (Elast
 
 			bulkResp, err := client.Bulk(context.Background(), strings.NewReader("data"))
 			if test.err != "" {
+				assert.Error(t, err)
 				assert.Contains(t, err.Error(), test.err)
 				return
 			}

diff --git a/cmd/opentelemetry/app/internal/esclient/ping_test.go b/cmd/opentelemetry/app/internal/esclient/ping_test.go
@@ -90,6 +90,7 @@ func TestPing(t *testing.T) {
 			esPing := elasticsearchPing{}
 			version, err := esPing.getVersion(ts.URL)
 			if test.err != "" {
+				assert.Error(t, err)
 				assert.Contains(t, err.Error(), test.err)
 				assert.Equal(t, 0, version)
 			} else {

diff --git a/cmd/opentelemetry/app/internal/reader/es/esdependencyreader/dependency_store_test.go b/cmd/opentelemetry/app/internal/reader/es/esdependencyreader/dependency_store_test.go
@@ -111,6 +111,7 @@ func TestGetDependencies_err_unmarshall(t *testing.T) {
 	}
 	store := NewDependencyStore(client, zap.NewNop(), "foo", defaultMaxDocCount)
 	dependencies, err := store.GetDependencies(context.Background(), tsNow, time.Hour)
+	require.Error(t, err)
 	require.Contains(t, err.Error(), "invalid character")
 	assert.Nil(t, dependencies)
 }

diff --git a/cmd/opentelemetry/app/receiver/jaegerreceiver/jaeger_receiver.go b/cmd/opentelemetry/app/receiver/jaegerreceiver/jaeger_receiver.go
@@ -69,13 +69,15 @@ func configureAgent(v *viper.Viper, cfg *jaegerreceiver.Config) {
 	aOpts := agentApp.Builder{}
 	aOpts.InitFromViper(v)
 	if v.IsSet(thriftBinaryHostPort) {
-		cfg.ThriftBinary = &confignet.TCPAddr{
-			Endpoint: v.GetString(thriftBinaryHostPort),
+		cfg.ThriftBinary = &jaegerreceiver.ProtocolUDP{
+			Endpoint:        v.GetString(thriftBinaryHostPort),
+			ServerConfigUDP: jaegerreceiver.DefaultServerConfigUDP(),
 		}
 	}
 	if v.IsSet(thriftCompactHostPort) {
-		cfg.ThriftCompact = &confignet.TCPAddr{
-			Endpoint: v.GetString(thriftCompactHostPort),
+		cfg.ThriftCompact = &jaegerreceiver.ProtocolUDP{
+			Endpoint:        v.GetString(thriftCompactHostPort),
+			ServerConfigUDP: jaegerreceiver.DefaultServerConfigUDP(),
 		}
 	}
 }

diff --git a/cmd/opentelemetry/app/receiver/jaegerreceiver/jaeger_receiver_test.go b/cmd/opentelemetry/app/receiver/jaegerreceiver/jaeger_receiver_test.go
@@ -72,8 +72,9 @@ func TestDefaultValueFromViper(t *testing.T) {
 			flags: []string{fmt.Sprintf("--%s=%s", thriftCompactHostPort, "localhost:9999")},
 			expected: &jaegerreceiver.Config{
 				Protocols: jaegerreceiver.Protocols{
-					ThriftCompact: &confignet.TCPAddr{
-						Endpoint: "localhost:9999",
+					ThriftCompact: &jaegerreceiver.ProtocolUDP{
+						Endpoint:        "localhost:9999",
+						ServerConfigUDP: jaegerreceiver.DefaultServerConfigUDP(),
 					},
 				},
 			},
@@ -83,8 +84,9 @@ func TestDefaultValueFromViper(t *testing.T) {
 			flags: []string{fmt.Sprintf("--%s=%s", thriftBinaryHostPort, "localhost:8888")},
 			expected: &jaegerreceiver.Config{
 				Protocols: jaegerreceiver.Protocols{
-					ThriftBinary: &confignet.TCPAddr{
-						Endpoint: "localhost:8888",
+					ThriftBinary: &jaegerreceiver.ProtocolUDP{
+						Endpoint:        "localhost:8888",
+						ServerConfigUDP: jaegerreceiver.DefaultServerConfigUDP(),
 					},
 				},
 			},
@@ -121,8 +123,9 @@ func TestDefaultValueFromViper(t *testing.T) {
 					ThriftHTTP: &confighttp.HTTPServerSettings{
 						Endpoint: "localhost:8089",
 					},
-					ThriftBinary: &confignet.TCPAddr{
-						Endpoint: "localhost:2222",
+					ThriftBinary: &jaegerreceiver.ProtocolUDP{
+						Endpoint:        "localhost:2222",
+						ServerConfigUDP: jaegerreceiver.DefaultServerConfigUDP(),
 					},
 				},
 			},

diff --git a/cmd/opentelemetry/app/receiver/kafkareceiver/kafka_receiver_test.go b/cmd/opentelemetry/app/receiver/kafkareceiver/kafka_receiver_test.go
@@ -67,6 +67,7 @@ func TestLoadConfigAndFlags(t *testing.T) {
 	}
 
 	factories, err := componenttest.ExampleComponents()
+	require.NoError(t, err)
 	factories.Receivers[TypeStr] = factory
 	cfg, err := configtest.LoadConfigFile(t, path.Join(".", "testdata", "config.yaml"), factories)
 	require.NoError(t, err)

diff --git a/cmd/opentelemetry/go.mod b/cmd/opentelemetry/go.mod
@@ -5,18 +5,18 @@ go 1.14
 replace github.com/jaegertracing/jaeger => ./../../
 
 require (
-	github.com/Shopify/sarama v1.27.0
+	github.com/Shopify/sarama v1.27.2
 	github.com/elastic/go-elasticsearch/v6 v6.8.10
 	github.com/elastic/go-elasticsearch/v7 v7.0.0
 	github.com/imdario/mergo v0.3.9
-	github.com/jaegertracing/jaeger v1.20.0
+	github.com/jaegertracing/jaeger v1.21.0
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.7.1
 	github.com/stretchr/testify v1.6.1
 	github.com/uber/jaeger-client-go v2.25.0+incompatible
 	github.com/uber/jaeger-lib v2.4.0+incompatible
-	go.opencensus.io v0.22.4
-	go.opentelemetry.io/collector v0.14.0
+	go.opencensus.io v0.22.5
+	go.opentelemetry.io/collector v0.15.0
 	go.uber.org/zap v1.16.0
 )