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.

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

fix the new breaking zap logger hook #135

Merged
merged 1 commit into from
Nov 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/awscollector/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"aws-observability.io/collector/tools/version"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/service"
"go.uber.org/zap/zapcore"
"go.uber.org/zap"
)

// aws-otel-collector is built upon opentelemetry-collector.
Expand Down Expand Up @@ -57,7 +57,7 @@ func main() {
Factories: factories,
ApplicationStartInfo: info,
ConfigFactory: cfgFactory,
LoggingHooks: []func(entry zapcore.Entry) error{lumberHook}}); err != nil {
LoggingOptions: []zap.Option{zap.Hooks(lumberHook)}}); err != nil {
log.Fatal(err)
}

Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ module aws-observability.io/collector
go 1.14

require (
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.14.1-0.20201111210848-994cabe5d596
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.14.1-0.20201117192543-4a81c809e720
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.14.1-0.20201111210848-994cabe5d596
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.14.1-0.20201111210848-994cabe5d596
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.14.1-0.20201111210848-994cabe5d596
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.14.1-0.20201111210848-994cabe5d596
github.com/pkg/errors v0.9.1
github.com/spf13/viper v1.7.1
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.14.1-0.20201110213227-d322a4161b8d
go.opentelemetry.io/collector v0.14.1-0.20201112191733-c6d9a2be2223
go.uber.org/zap v1.16.0
golang.org/x/sys v0.0.0-20200821140526-fda516888d29
golang.org/x/sys v0.0.0-20201008064518-c1f3e3309c71
gopkg.in/natefinch/lumberjack.v2 v2.0.0
)

Expand Down