Skip to content

Commit

Permalink
Upgrade to core latest PR, switch some scrapers to the new interface (o…
Browse files Browse the repository at this point in the history 
…pen-telemetry#5782)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
  • Loading branch information
@bogdandrutu
bogdandrutu authored Oct 18, 2021
1 parent 2c1f1ba commit f6aeccd
Show file tree
Hide file tree
Showing 330 changed files with 1,071 additions and 986 deletions.
7 changes: 2 additions & 5 deletions cmd/configschema/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib v0.37.1
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.37.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.37.0
go.opentelemetry.io/collector/model v0.37.0
go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058
go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058
golang.org/x/mod v0.4.2
)

Expand Down Expand Up @@ -261,7 +261,6 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.37.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.37.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.37.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.37.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.37.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.37.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.37.1 // indirect
Expand Down Expand Up @@ -565,8 +564,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafka

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver => ../../receiver/hostmetricsreceiver

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper => ../../receiver/scraperhelper

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver => ../../receiver/syslogreceiver

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver => ../../receiver/tcplogreceiver
Expand Down
8 changes: 4 additions & 4 deletions cmd/configschema/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions exporter/alibabacloudlogserviceexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.37.0
go.opentelemetry.io/collector/model v0.37.0
go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058
go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058
go.uber.org/zap v1.19.1
)

Expand Down
7 changes: 4 additions & 3 deletions exporter/alibabacloudlogserviceexporter/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions exporter/awscloudwatchlogsexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.17
require (
github.com/aws/aws-sdk-go v1.41.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.37.0
go.opentelemetry.io/collector/model v0.37.0
go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058
go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058
go.uber.org/zap v1.19.1
)

Expand Down
7 changes: 4 additions & 3 deletions exporter/awscloudwatchlogsexporter/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions exporter/awsemfexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.37.1
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.37.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.37.0
go.opentelemetry.io/collector/model v0.37.0
go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058
go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058
go.uber.org/zap v1.19.1
google.golang.org/protobuf v1.27.1
)
Expand Down
7 changes: 4 additions & 3 deletions exporter/awsemfexporter/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions exporter/awskinesisexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.37.1
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.37.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.37.0
go.opentelemetry.io/collector/model v0.37.0
go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058
go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058
go.uber.org/zap v1.19.1
)

Expand Down
7 changes: 4 additions & 3 deletions exporter/awskinesisexporter/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions exporter/awsprometheusremotewriteexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/aws/aws-sdk-go v1.41.1
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.37.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.37.0
go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058
)

require (
Expand All @@ -24,11 +24,9 @@ require (
github.com/mitchellh/mapstructure v1.4.2 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.37.1 // indirect
github.com/pelletier/go-toml v1.9.3 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/common v0.31.1 // indirect
github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02 // indirect
github.com/rogpeppe/go-internal v1.6.1 // indirect
github.com/rs/cors v1.8.0 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/tidwall/gjson v1.8.1 // indirect
Expand All @@ -37,7 +35,7 @@ require (
github.com/tidwall/tinylru v1.0.2 // indirect
github.com/tidwall/wal v0.1.5 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/collector/model v0.37.0 // indirect
go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 // indirect
go.opentelemetry.io/otel v1.0.1 // indirect
go.opentelemetry.io/otel/internal/metric v0.24.0 // indirect
Expand Down
7 changes: 4 additions & 3 deletions exporter/awsprometheusremotewriteexporter/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions exporter/awsxrayexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.37.1
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.37.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.37.0
go.opentelemetry.io/collector/model v0.37.0
go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058
go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058
go.uber.org/zap v1.19.1
)

Expand Down
7 changes: 4 additions & 3 deletions exporter/awsxrayexporter/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions exporter/azuremonitorexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.17
require (
github.com/microsoft/ApplicationInsights-Go v0.4.4
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.37.0
go.opentelemetry.io/collector/model v0.37.0
go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058
go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058
go.uber.org/zap v1.19.1
golang.org/x/net v0.0.0-20210614182718-04defd469f4e
)
Expand Down
7 changes: 4 additions & 3 deletions exporter/azuremonitorexporter/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions exporter/carbonexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.37.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.37.0
go.opentelemetry.io/collector/model v0.37.0
go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058
go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058
google.golang.org/protobuf v1.27.1

)
Expand Down
Loading

0 comments on commit f6aeccd

Please sign in to comment.