Bump OTEL and remove TODO

Signed-off-by: Pavol Loffay <[email protected]>
jaegertracing · May 6, 2020 · 0d5aeda · 0d5aeda
1 parent f605b95
commit 0d5aeda
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/cmd/opentelemetry-collector/app/defaults/defaults.go b/cmd/opentelemetry-collector/app/defaults/defaults.go
@@ -18,9 +18,9 @@ import (
 	"flag"
 
 	"github.com/open-telemetry/opentelemetry-collector/config"
-	otelJaegerEexporter "github.com/open-telemetry/opentelemetry-collector/exporter/jaegerexporter"
-	otelResourceprocessor "github.com/open-telemetry/opentelemetry-collector/processor/resourceprocessor"
-	otelJaegerreceiver "github.com/open-telemetry/opentelemetry-collector/receiver/jaegerreceiver"
+	otelJaegerExporter "github.com/open-telemetry/opentelemetry-collector/exporter/jaegerexporter"
+	otelResourceProcessor "github.com/open-telemetry/opentelemetry-collector/processor/resourceprocessor"
+	otelJaegerReceiver "github.com/open-telemetry/opentelemetry-collector/receiver/jaegerreceiver"
 	"github.com/open-telemetry/opentelemetry-collector/service/defaultcomponents"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
@@ -63,21 +63,20 @@ func Components(v *viper.Viper) config.Factories {
 	factories.Exporters[cassandraExp.Type()] = cassandraExp
 	factories.Exporters[esExp.Type()] = esExp
 
-	jaegerRec := factories.Receivers["jaeger"].(*otelJaegerreceiver.Factory)
+	jaegerRec := factories.Receivers["jaeger"].(*otelJaegerReceiver.Factory)
 	factories.Receivers["jaeger"] = &jaegerreceiver.Factory{
 		Wrapped: jaegerRec,
 		Viper:   v,
 	}
-	jaegerExp := factories.Exporters["jaeger"].(*otelJaegerEexporter.Factory)
+	jaegerExp := factories.Exporters["jaeger"].(*otelJaegerExporter.Factory)
 	factories.Exporters["jaeger"] = &jaegerexporter.Factory{
 		Wrapped: jaegerExp,
 		Viper:   v,
 	}
 
-	//TODO add test
-	// TODO consume from factories https://github.com/open-telemetry/opentelemetry-collector/pull/917
+	resourceProc := factories.Processors["resource"].(*otelResourceProcessor.Factory)
 	factories.Processors["resource"] = &resourceprocessor.Factory{
-		Wrapped: &otelResourceprocessor.Factory{},
+		Wrapped: resourceProc,
 		Viper:   v,
 	}
 	return factories

diff --git a/cmd/opentelemetry-collector/go.mod b/cmd/opentelemetry-collector/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/imdario/mergo v0.3.9
 	github.com/jaegertracing/jaeger v1.17.0
 	github.com/magiconair/properties v1.8.1
-	github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200503151053-5d1aacc0e168
+	github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200505202444-021607d68586
 	github.com/open-telemetry/opentelemetry-proto v0.3.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.6.2

diff --git a/cmd/opentelemetry-collector/go.sum b/cmd/opentelemetry-collector/go.sum
@@ -955,6 +955,8 @@ github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200501033637-a0f4cf
 github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200501033637-a0f4cf0384e4/go.mod h1:hIfP5/uuFbC++oHT4BzzFVcMWj7uH35EGwNJ03wyjJU=
 github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200503151053-5d1aacc0e168 h1:gmEYpU/2Nkqs7efKs89HcozlJQE8aDTVxqvC55GRDhE=
 github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200503151053-5d1aacc0e168/go.mod h1:hIfP5/uuFbC++oHT4BzzFVcMWj7uH35EGwNJ03wyjJU=
+github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200505202444-021607d68586 h1:HD0/Opa/WiWaG+B6LP+5XT9lYqpErWd6DjH3ah9mQrU=
+github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200505202444-021607d68586/go.mod h1:ht/uOm+HLoXWjhq6seX/BoTwlR0dtCKFe2Y23YRk2a4=
 github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30=
 github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
@@ -1103,6 +1105,7 @@ github.com/serenize/snaker v0.0.0-20171204205717-a683aaf2d516/go.mod h1:Yow6lPLS
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada h1:WokF3GuxBeL+n4Lk4Fa8v9mbdjlrl7bHuneF4N1bk2I=
 github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada/go.mod h1:WWnYX4lzhCH5h/3YBfyVA3VbLYjlMZZAQcW9ojMexNc=
+github.com/shirou/gopsutil v2.20.4+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 h1:udFKJ0aHUL60LboW/A+DfgoHVedieIzIXE8uylPue0U=
 github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=