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

dep: Update core and contrib to v0.28.0 #541

Merged
merged 1 commit into from
Jun 11, 2021
Merged

dep: Update core and contrib to v0.28.0 #541

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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/awscollector/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func main() {
Version: version.Version,
}

params := service.Parameters{
params := service.AppSettings{
Factories: factories,
BuildInfo: info,
ParserProvider: cfgFactory,
Expand All @@ -76,7 +76,7 @@ func main() {

}

func runInteractive(params service.Parameters) error {
func runInteractive(params service.AppSettings) error {
app, err := service.New(params)
if err != nil {
return fmt.Errorf("failed to construct the application: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion cmd/awscollector/main_others.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"go.opentelemetry.io/collector/service"
)

func run(params service.Parameters) error {
func run(params service.AppSettings) error {
// Try to switch user when the collector is running on a host.
// For container the user and group is determined by the deploy manifest.
if !extraconfig.IsRunningInContainer() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/awscollector/main_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"go.opentelemetry.io/collector/service"
)

func run(params service.Parameters) error {
func run(params service.AppSettings) error {
isInteractive, err := svc.IsAnInteractiveSession()
if err != nil {
return errors.Wrap(err, "failed to determine if we are running in an interactive session")
Expand All @@ -40,7 +40,7 @@ func run(params service.Parameters) error {
}
}

func runService(params service.Parameters) error {
func runService(params service.AppSettings) error {
// do not need to supply service name when startup is invoked through Service Control Manager directly
if err := svc.Run("", service.NewWindowsService(params)); err != nil {
return errors.Wrap(err, "failed to start service")
Expand Down
46 changes: 23 additions & 23 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,41 @@ go 1.14

require (
github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.27.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsprometheusremotewriteexporter v0.27.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.27.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.27.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.27.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.27.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/newrelicexporter v0.27.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.27.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.27.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.27.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.27.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.27.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.27.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.27.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsprometheusremotewriteexporter v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/newrelicexporter v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.28.0
github.com/opencontainers/runc v1.0.0-rc95
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.27.0
go.opentelemetry.io/collector v0.28.0
go.uber.org/zap v1.17.0
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
golang.org/x/sys v0.0.0-20210514084401-e8d321eab015
gopkg.in/natefinch/lumberjack.v2 v2.0.0
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.27.0
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.28.0

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk => github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.27.0
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk => github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.28.0

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.27.0
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.28.0

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.27.0
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.28.0

replace github.com/aws-observability/aws-otel-collector/pkg/lambdacomponents => ./pkg/lambdacomponents

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.27.0
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.28.0

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.27.0
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.28.0

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.27.0
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.28.0
Loading