Skip to content

Commit

Permalink
cmd/otelopscol: remove error filter (#82)
Browse files Browse the repository at this point in the history
* cmd/otelopscol: remove error filter

This was only useful when the upstream fix didn't exist. The upstream
fixed is now much more desirable than this one.

* go.mod: remove zapfilter and tidy
  • Loading branch information
braydonk authored Feb 1, 2022
1 parent 16598c4 commit dbfa430
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 184 deletions.
83 changes: 0 additions & 83 deletions cmd/otelopscol/filters.go

This file was deleted.

88 changes: 0 additions & 88 deletions cmd/otelopscol/filters_test.go

This file was deleted.

11 changes: 2 additions & 9 deletions cmd/otelopscol/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/service"
"go.uber.org/zap"

"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/internal/env"
"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/internal/version"
Expand All @@ -42,15 +41,9 @@ func main() {
Version: version.Version,
}

loggingOptions := append(
[]zap.Option{},
errorFilterOptions()...,
)

params := service.CollectorSettings{
Factories: factories,
BuildInfo: info,
LoggingOptions: loggingOptions,
Factories: factories,
BuildInfo: info,
}

if err := run(params); err != nil {
Expand Down
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ require (
go.uber.org/multierr v1.7.0
go.uber.org/zap v1.20.0
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9
moul.io/zapfilter v1.6.1
)

require (
Expand Down
3 changes: 0 additions & 3 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1726,7 +1726,6 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
go.uber.org/zap v1.14.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI=
go.uber.org/zap v1.20.0 h1:N4oPlghZwYG55MlU6LXk/Zp00FVNE9X9wrYO8CEs4lc=
Expand Down Expand Up @@ -2485,8 +2484,6 @@ k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b h1:wxEMGetGMur3J1xuGLQY7GEQYg9bZxKn3tKo5k/eYcs=
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
moul.io/zapfilter v1.6.1 h1:D5ySvqGTADgtOmjhKCrCOnH3DHZjIqIAQD0kwCeyBIw=
moul.io/zapfilter v1.6.1/go.mod h1:zfT2z4z2YfI63Kifpe8GMt0M+sBXs8WQ4mfne4bGmic=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
Expand Down

0 comments on commit dbfa430

Please sign in to comment.