Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade deps, fix calls to deprecated funcs #8104

Merged
merged 1 commit into from
Feb 23, 2022
Merged

Upgrade deps, fix calls to deprecated funcs #8104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,7 @@ otelcontribcol-windows_amd64:

.PHONY: update-dep
update-dep:
$(MAKE) for-all CMD="$(PWD)/internal/buildscripts/update-dep"
$(MAKE) -j2 gotidy
$(MAKE) for-all-target TARGET="updatedep"
$(MAKE) otelcontribcol

.PHONY: update-otel
Expand Down
5 changes: 5 additions & 0 deletions Makefile.Common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,8 @@ impi:
.PHONY: moddownload
moddownload:
$(GOCMD) mod download

.PHONY: updatedep
updatedep:
$(PWD)/internal/buildscripts/update-dep
@$(MAKE) tidy
2 changes: 1 addition & 1 deletion cmd/configschema/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib v0.45.1
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.45.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d
go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75
go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a
go.uber.org/multierr v1.7.0
golang.org/x/mod v0.5.1
Expand Down
4 changes: 2 additions & 2 deletions cmd/configschema/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion cmd/mdatagen/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/go-playground/universal-translator v0.18.0
github.com/go-playground/validator/v10 v10.10.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d
go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75
go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/mdatagen/go.sum
View file
Open in desktop

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

9 changes: 4 additions & 5 deletions exporter/alibabacloudlogserviceexporter/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config"
"go.opentelemetry.io/collector/exporter/exporterhelper"
)

const (
Expand All @@ -29,12 +28,12 @@ const (

// NewFactory creates a factory for AlibabaCloud LogService exporter.
func NewFactory() component.ExporterFactory {
return exporterhelper.NewFactory(
return component.NewExporterFactory(
typeStr,
createDefaultConfig,
exporterhelper.WithTraces(createTracesExporter),
exporterhelper.WithMetrics(createMetricsExporter),
exporterhelper.WithLogs(createLogsExporter))
component.WithTracesExporter(createTracesExporter),
component.WithMetricsExporter(createMetricsExporter),
component.WithLogsExporter(createLogsExporter))
}

// CreateDefaultConfig creates the default configuration for exporter.
Expand Down
2 changes: 1 addition & 1 deletion exporter/alibabacloudlogserviceexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.45.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d
go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75
go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a
go.uber.org/zap v1.21.0
)
Expand Down
4 changes: 2 additions & 2 deletions exporter/alibabacloudlogserviceexporter/go.sum
View file
Open in desktop

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/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ import (
const typeStr = "awscloudwatchlogs"

func NewFactory() component.ExporterFactory {
return exporterhelper.NewFactory(
return component.NewExporterFactory(
typeStr,
createDefaultConfig,
exporterhelper.WithLogs(createLogsExporter))
component.WithLogsExporter(createLogsExporter))
}

func createDefaultConfig() config.Exporter {
Expand Down
2 changes: 1 addition & 1 deletion exporter/awscloudwatchlogsexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.45.1
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.45.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d
go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75
go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a
go.uber.org/zap v1.21.0
)
Expand Down
4 changes: 2 additions & 2 deletions exporter/awscloudwatchlogsexporter/go.sum
View file
Open in desktop

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

5 changes: 2 additions & 3 deletions exporter/awsemfexporter/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config"
"go.opentelemetry.io/collector/exporter/exporterhelper"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil"
)
Expand All @@ -31,10 +30,10 @@ const (

// NewFactory creates a factory for AWS EMF exporter.
func NewFactory() component.ExporterFactory {
return exporterhelper.NewFactory(
return component.NewExporterFactory(
typeStr,
createDefaultConfig,
exporterhelper.WithMetrics(createMetricsExporter))
component.WithMetricsExporter(createMetricsExporter))
}

// CreateDefaultConfig creates the default configuration for exporter.
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsemfexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.45.1
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.45.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d
go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75
go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a
go.uber.org/zap v1.21.0
google.golang.org/protobuf v1.27.1
Expand Down
4 changes: 2 additions & 2 deletions exporter/awsemfexporter/go.sum
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions exporter/awskinesisexporter/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ const (

// NewFactory creates a factory for Kinesis exporter.
func NewFactory() component.ExporterFactory {
return exporterhelper.NewFactory(
return component.NewExporterFactory(
typeStr,
createDefaultConfig,
exporterhelper.WithTraces(NewTracesExporter),
exporterhelper.WithMetrics(NewMetricsExporter),
exporterhelper.WithLogs(NewLogsExporter),
component.WithTracesExporter(NewTracesExporter),
component.WithMetricsExporter(NewMetricsExporter),
component.WithLogsExporter(NewLogsExporter),
)
}

Expand Down
2 changes: 1 addition & 1 deletion exporter/awskinesisexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.45.1
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.45.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d
go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75
go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a
go.uber.org/zap v1.21.0
)
Expand Down
4 changes: 2 additions & 2 deletions exporter/awskinesisexporter/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion exporter/awsprometheusremotewriteexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/aws/aws-sdk-go v1.43.4
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.45.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d
go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75
)

require (
Expand Down
4 changes: 2 additions & 2 deletions exporter/awsprometheusremotewriteexporter/go.sum
View file
Open in desktop

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

5 changes: 2 additions & 3 deletions exporter/awsxrayexporter/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config"
"go.opentelemetry.io/collector/exporter/exporterhelper"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil"
)
Expand All @@ -31,10 +30,10 @@ const (

// NewFactory creates a factory for AWS-Xray exporter.
func NewFactory() component.ExporterFactory {
return exporterhelper.NewFactory(
return component.NewExporterFactory(
typeStr,
createDefaultConfig,
exporterhelper.WithTraces(createTracesExporter))
component.WithTracesExporter(createTracesExporter))
}

func createDefaultConfig() config.Exporter {
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.45.1
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.45.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d
go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75
go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a
go.uber.org/zap v1.21.0
)
Expand Down
4 changes: 2 additions & 2 deletions exporter/awsxrayexporter/go.sum
View file
Open in desktop

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

7 changes: 3 additions & 4 deletions exporter/azuremonitorexporter/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"github.com/microsoft/ApplicationInsights-Go/appinsights"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config"
"go.opentelemetry.io/collector/exporter/exporterhelper"
"go.uber.org/zap"
)

Expand All @@ -39,11 +38,11 @@ var (
// NewFactory returns a factory for Azure Monitor exporter.
func NewFactory() component.ExporterFactory {
f := &factory{}
return exporterhelper.NewFactory(
return component.NewExporterFactory(
typeStr,
createDefaultConfig,
exporterhelper.WithTraces(f.createTracesExporter),
exporterhelper.WithLogs(f.createLogsExporter))
component.WithTracesExporter(f.createTracesExporter),
component.WithLogsExporter(f.createLogsExporter))
}

// Implements the interface from go.opentelemetry.io/collector/exporter/factory.go
Expand Down
2 changes: 1 addition & 1 deletion exporter/azuremonitorexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.17
require (
github.com/microsoft/ApplicationInsights-Go v0.4.4
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d
go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75
go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a
go.uber.org/zap v1.21.0
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
Expand Down
4 changes: 2 additions & 2 deletions exporter/azuremonitorexporter/go.sum
View file
Open in desktop

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

5 changes: 2 additions & 3 deletions exporter/carbonexporter/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config"
"go.opentelemetry.io/collector/exporter/exporterhelper"
)

const (
Expand All @@ -29,10 +28,10 @@ const (

// NewFactory creates a factory for Carbon exporter.
func NewFactory() component.ExporterFactory {
return exporterhelper.NewFactory(
return component.NewExporterFactory(
typeStr,
createDefaultConfig,
exporterhelper.WithMetrics(createMetricsExporter))
component.WithMetricsExporter(createMetricsExporter))
}

func createDefaultConfig() config.Exporter {
Expand Down
2 changes: 1 addition & 1 deletion exporter/carbonexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.45.1
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.45.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d
go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75
go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a
google.golang.org/protobuf v1.27.1

Expand Down
Loading