Skip to content

Commit 0d5aeda

Browse files
pavolloffaypavolloffay
committed
Bump OTEL and remove TODO
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
1 parent f605b95 commit 0d5aeda

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

‎cmd/opentelemetry-collector/app/defaults/defaults.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import (
1818
"flag"
1919

2020
"github.com/open-telemetry/opentelemetry-collector/config"
21-
otelJaegerEexporter "github.com/open-telemetry/opentelemetry-collector/exporter/jaegerexporter"
22-
otelResourceprocessor "github.com/open-telemetry/opentelemetry-collector/processor/resourceprocessor"
23-
otelJaegerreceiver "github.com/open-telemetry/opentelemetry-collector/receiver/jaegerreceiver"
21+
otelJaegerExporter "github.com/open-telemetry/opentelemetry-collector/exporter/jaegerexporter"
22+
otelResourceProcessor "github.com/open-telemetry/opentelemetry-collector/processor/resourceprocessor"
23+
otelJaegerReceiver "github.com/open-telemetry/opentelemetry-collector/receiver/jaegerreceiver"
2424
"github.com/open-telemetry/opentelemetry-collector/service/defaultcomponents"
2525
"github.com/spf13/pflag"
2626
"github.com/spf13/viper"
@@ -63,21 +63,20 @@ func Components(v *viper.Viper) config.Factories {
6363
factories.Exporters[cassandraExp.Type()] = cassandraExp
6464
factories.Exporters[esExp.Type()] = esExp
6565

66-
jaegerRec := factories.Receivers["jaeger"].(*otelJaegerreceiver.Factory)
66+
jaegerRec := factories.Receivers["jaeger"].(*otelJaegerReceiver.Factory)
6767
factories.Receivers["jaeger"] = &jaegerreceiver.Factory{
6868
Wrapped: jaegerRec,
6969
Viper: v,
7070
}
71-
jaegerExp := factories.Exporters["jaeger"].(*otelJaegerEexporter.Factory)
71+
jaegerExp := factories.Exporters["jaeger"].(*otelJaegerExporter.Factory)
7272
factories.Exporters["jaeger"] = &jaegerexporter.Factory{
7373
Wrapped: jaegerExp,
7474
Viper: v,
7575
}
7676

77-
//TODO add test
78-
// TODO consume from factories https://github.com/open-telemetry/opentelemetry-collector/pull/917
77+
resourceProc := factories.Processors["resource"].(*otelResourceProcessor.Factory)
7978
factories.Processors["resource"] = &resourceprocessor.Factory{
80-
Wrapped: &otelResourceprocessor.Factory{},
79+
Wrapped: resourceProc,
8180
Viper: v,
8281
}
8382
return factories

‎cmd/opentelemetry-collector/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/imdario/mergo v0.3.9
1212
github.com/jaegertracing/jaeger v1.17.0
1313
github.com/magiconair/properties v1.8.1
14-
github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200503151053-5d1aacc0e168
14+
github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200505202444-021607d68586
1515
github.com/open-telemetry/opentelemetry-proto v0.3.0
1616
github.com/spf13/pflag v1.0.5
1717
github.com/spf13/viper v1.6.2

‎cmd/opentelemetry-collector/go.sum‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -955,6 +955,8 @@ github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200501033637-a0f4cf
955955
github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200501033637-a0f4cf0384e4/go.mod h1:hIfP5/uuFbC++oHT4BzzFVcMWj7uH35EGwNJ03wyjJU=
956956
github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200503151053-5d1aacc0e168 h1:gmEYpU/2Nkqs7efKs89HcozlJQE8aDTVxqvC55GRDhE=
957957
github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200503151053-5d1aacc0e168/go.mod h1:hIfP5/uuFbC++oHT4BzzFVcMWj7uH35EGwNJ03wyjJU=
958+
github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200505202444-021607d68586 h1:HD0/Opa/WiWaG+B6LP+5XT9lYqpErWd6DjH3ah9mQrU=
959+
github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200505202444-021607d68586/go.mod h1:ht/uOm+HLoXWjhq6seX/BoTwlR0dtCKFe2Y23YRk2a4=
958960
github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30=
959961
github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8=
960962
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
11031105
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
11041106
github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada h1:WokF3GuxBeL+n4Lk4Fa8v9mbdjlrl7bHuneF4N1bk2I=
11051107
github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada/go.mod h1:WWnYX4lzhCH5h/3YBfyVA3VbLYjlMZZAQcW9ojMexNc=
1108+
github.com/shirou/gopsutil v2.20.4+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
11061109
github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 h1:udFKJ0aHUL60LboW/A+DfgoHVedieIzIXE8uylPue0U=
11071110
github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc=
11081111
github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=

0 commit comments

Comments
 (0)