Skip to content

Commit 7b46b9e

Browse files
pjanottipjanotti
authored
Upgrace OTelCol to v0.2.10 (#157)
* Upgrace OTelCol to v0.2.10 * Updates to go.sum after rebase * Another go.mod rebased
1 parent 66b4ed0 commit 7b46b9e

File tree

42 files changed

+10266
-473
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+10266
-473
lines changed

‎exporter/awsxrayexporter/awsxray.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func NewTraceExporter(config configmodels.Exporter, logger *zap.Logger, cn connA
3737
return nil, err
3838
}
3939
xrayClient := NewXRay(logger, awsConfig, session)
40-
return exporterhelper.NewTraceExporter(
40+
return exporterhelper.NewTraceExporterOld(
4141
config,
4242
func(ctx context.Context, td consumerdata.TraceData) (int, error) {
4343
logger.Debug("TraceExporter", typeLog, nameLog, zap.Int("#spans", len(td.Spans)))

‎exporter/awsxrayexporter/go.mod

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxra
33
go 1.14
44

55
require (
6-
github.com/aws/aws-sdk-go v1.23.12
6+
github.com/aws/aws-sdk-go v1.23.19
77
github.com/census-instrumentation/opencensus-proto v0.2.1
8-
github.com/golang/protobuf v1.3.2
9-
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
8+
github.com/golang/protobuf v1.3.5
109
github.com/mattn/go-isatty v0.0.10 // indirect
11-
github.com/open-telemetry/opentelemetry-collector v0.2.8
10+
github.com/open-telemetry/opentelemetry-collector v0.2.10
1211
github.com/stretchr/testify v1.4.0
1312
go.uber.org/zap v1.10.0
14-
golang.org/x/net v0.0.0-20190923162816-aa69164e4478
13+
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa
1514
)

‎exporter/awsxrayexporter/go.sum

Lines changed: 576 additions & 25 deletions
Large diffs are not rendered by default.

‎exporter/azuremonitorexporter/go.mod

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,16 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azurem
33
go 1.14
44

55
require (
6-
cloud.google.com/go v0.45.1 // indirect
76
code.cloudfoundry.org/clock v0.0.0-20180518195852-02e53af36e6c // indirect
87
github.com/Microsoft/ApplicationInsights-Go v0.4.2
98
github.com/aws/aws-sdk-go v1.23.20 // indirect
109
github.com/census-instrumentation/opencensus-proto v0.2.1
11-
github.com/golang/protobuf v1.3.2
12-
github.com/open-telemetry/opentelemetry-collector v0.2.8
13-
github.com/satori/go.uuid v1.2.0 // indirect
10+
github.com/golang/protobuf v1.3.5
11+
github.com/open-telemetry/opentelemetry-collector v0.2.10
1412
github.com/stretchr/testify v1.4.0
1513
github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
1614
go.uber.org/multierr v1.4.0 // indirect
1715
go.uber.org/zap v1.13.0
18-
golang.org/x/net v0.0.0-20191119073136-fc4aabc6c914 // indirect
1916
google.golang.org/appengine v1.6.2 // indirect
2017
google.golang.org/genproto v0.0.0-20191115221424-83cc0476cb11 // indirect
2118
google.golang.org/grpc v1.25.1

‎exporter/azuremonitorexporter/go.sum

Lines changed: 567 additions & 24 deletions
Large diffs are not rendered by default.

‎exporter/azuremonitorexporter/traceexporter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ func newTraceExporter(config *Config, transportChannel transportChannel, logger
711711
logger: logger,
712712
}
713713

714-
exp, err := exporterhelper.NewTraceExporter(
714+
exp, err := exporterhelper.NewTraceExporterOld(
715715
config,
716716
exporter.pushTraceData)
717717

‎exporter/carbonexporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.14
44

55
require (
66
github.com/census-instrumentation/opencensus-proto v0.2.1
7-
github.com/open-telemetry/opentelemetry-collector v0.2.8
7+
github.com/open-telemetry/opentelemetry-collector v0.2.10
88
github.com/stretchr/testify v1.4.0
99
go.uber.org/zap v1.10.0
1010
)

‎exporter/carbonexporter/go.sum

Lines changed: 577 additions & 26 deletions
Large diffs are not rendered by default.

‎exporter/honeycombexporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.14
44

55
require (
66
github.com/honeycombio/opentelemetry-exporter-go v0.3.1
7-
github.com/open-telemetry/opentelemetry-collector v0.2.8
7+
github.com/open-telemetry/opentelemetry-collector v0.2.10
88
github.com/stretchr/testify v1.5.1
99
go.opentelemetry.io/otel v0.3.0
1010
go.uber.org/zap v1.14.0

‎exporter/honeycombexporter/go.sum

Lines changed: 570 additions & 22 deletions
Large diffs are not rendered by default.

‎exporter/honeycombexporter/honeycomb.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func newHoneycombTraceExporter(cfg *Config) (component.TraceExporterOld, error)
4646
hce := HoneycombExporter{
4747
exporter: exporter,
4848
}
49-
return exporterhelper.NewTraceExporter(
49+
return exporterhelper.NewTraceExporterOld(
5050
cfg,
5151
hce.pushTraceData,
5252
exporterhelper.WithShutdown(hce.Shutdown))

‎exporter/kinesisexporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kinesi
33
go 1.14
44

55
require (
6-
github.com/open-telemetry/opentelemetry-collector v0.2.8
6+
github.com/open-telemetry/opentelemetry-collector v0.2.10
77
github.com/signalfx/opencensus-go-exporter-kinesis v0.4.2
88
github.com/stretchr/testify v1.4.0
99
go.uber.org/zap v1.10.0

‎exporter/kinesisexporter/go.sum

Lines changed: 571 additions & 22 deletions
Large diffs are not rendered by default.

‎exporter/lightstepexporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.14
44

55
require (
66
github.com/lightstep/opentelemetry-exporter-go v0.1.5
7-
github.com/open-telemetry/opentelemetry-collector v0.2.8
7+
github.com/open-telemetry/opentelemetry-collector v0.2.10
88
github.com/stretchr/testify v1.4.0
99
go.opentelemetry.io/otel v0.2.3
1010
go.uber.org/zap v1.14.0

‎exporter/lightstepexporter/go.sum

Lines changed: 568 additions & 8 deletions
Large diffs are not rendered by default.

‎exporter/lightstepexporter/lightstep.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func newLightStepTraceExporter(cfg *Config) (component.TraceExporterOld, error)
4747
exporter: exporter,
4848
}
4949

50-
return exporterhelper.NewTraceExporter(
50+
return exporterhelper.NewTraceExporterOld(
5151
cfg,
5252
lsExporter.pushTraceData,
5353
exporterhelper.WithShutdown(lsExporter.Shutdown))

‎exporter/sapmexporter/exporter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func newSAPMTraceExporter(cfg *Config, logger *zap.Logger) (component.TraceExpor
5252
client: client,
5353
logger: logger,
5454
}
55-
return exporterhelper.NewTraceExporter(
55+
return exporterhelper.NewTraceExporterOld(
5656
cfg,
5757
se.pushTraceData,
5858
exporterhelper.WithShutdown(se.Shutdown))

‎exporter/sapmexporter/go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmex
33
go 1.14
44

55
require (
6-
github.com/open-telemetry/opentelemetry-collector v0.2.8
6+
github.com/open-telemetry/opentelemetry-collector v0.2.10
77
github.com/signalfx/sapm-proto v0.3.0
88
github.com/stretchr/testify v1.4.0
9-
go.uber.org/atomic v1.5.1 // indirect
109
go.uber.org/multierr v1.4.0 // indirect
1110
go.uber.org/zap v1.13.0
1211
google.golang.org/genproto v0.0.0-20191115221424-83cc0476cb11 // indirect

0 commit comments

Comments
 (0)