Skip to content

Commit

Permalink
[receiver/syslog] Migrate off of syslog parser fork (#31607)
Browse files Browse the repository at this point in the history
  • Loading branch information
@djaglowski
djaglowski committed Mar 6, 2024
1 parent c17762d commit 2f1fa0e
Show file tree
Hide file tree
Showing 44 changed files with 106 additions and 102 deletions.
2 changes: 1 addition & 1 deletion cmd/configschema/go.mod
View file
Expand Up @@ -379,7 +379,6 @@ require (
github.com/grobie/gomemcache v0.0.0-20230213081705-239240bbc445 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
github.com/haimrubinstein/go-syslog/v3 v3.0.0 // indirect
github.com/hashicorp/consul/api v1.28.2 // indirect
github.com/hashicorp/cronexpr v1.1.2 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand All @@ -400,6 +399,7 @@ require (
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect
github.com/influxdata/influxdb-observability/common v0.5.8 // indirect
github.com/influxdata/influxdb-observability/influx2otel v0.5.8 // indirect
github.com/influxdata/influxdb-observability/otel2influx v0.5.8 // indirect
Expand Down
3 changes: 0 additions & 3 deletions cmd/configschema/go.sum
View file

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

2 changes: 1 addition & 1 deletion cmd/otelcontribcol/builder-config.yaml
View file
Expand Up @@ -444,4 +444,4 @@ replaces:
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension => ../../extension/solarwindsapmsettingsextension
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/namedpipereceiver => ../../receiver/namedpipereceiver
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery => ../../internal/sqlquery
- github.com/haimrubinstein/go-syslog/v3 => github.com/haimrubinstein/go-syslog/v3 v3.0.0

4 changes: 1 addition & 3 deletions cmd/otelcontribcol/go.mod
View file
Expand Up @@ -432,7 +432,6 @@ require (
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/haimrubinstein/go-syslog/v3 v3.0.0 // indirect
github.com/hashicorp/consul/api v1.28.2 // indirect
github.com/hashicorp/cronexpr v1.1.2 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand All @@ -453,6 +452,7 @@ require (
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect
github.com/influxdata/influxdb-observability/common v0.5.8 // indirect
github.com/influxdata/influxdb-observability/influx2otel v0.5.8 // indirect
github.com/influxdata/influxdb-observability/otel2influx v0.5.8 // indirect
Expand Down Expand Up @@ -1190,5 +1190,3 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/sola
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/namedpipereceiver => ../../receiver/namedpipereceiver

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery => ../../internal/sqlquery

replace github.com/haimrubinstein/go-syslog/v3 => github.com/haimrubinstein/go-syslog/v3 v3.0.0
3 changes: 0 additions & 3 deletions cmd/otelcontribcol/go.sum
View file

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

2 changes: 1 addition & 1 deletion cmd/oteltestbedcol/go.mod
View file
Expand Up @@ -117,7 +117,6 @@ require (
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
github.com/haimrubinstein/go-syslog/v3 v3.0.0 // indirect
github.com/hashicorp/consul/api v1.25.1 // indirect
github.com/hashicorp/cronexpr v1.1.2 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand All @@ -136,6 +135,7 @@ require (
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect
github.com/ionos-cloud/sdk-go/v6 v6.1.9 // indirect
github.com/jaegertracing/jaeger v1.54.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
Expand Down
3 changes: 0 additions & 3 deletions cmd/oteltestbedcol/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 connector/datadogconnector/go.sum
View file

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

2 changes: 1 addition & 1 deletion exporter/datadogexporter/go.mod
View file
Expand Up @@ -140,7 +140,6 @@ require (
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
github.com/haimrubinstein/go-syslog/v3 v3.0.0 // indirect
github.com/hashicorp/consul/api v1.28.2 // indirect
github.com/hashicorp/cronexpr v1.1.2 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand All @@ -159,6 +158,7 @@ require (
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect
github.com/ionos-cloud/sdk-go/v6 v6.1.9 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
Expand Down
3 changes: 0 additions & 3 deletions exporter/datadogexporter/go.sum
View file

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

1 change: 0 additions & 1 deletion exporter/datadogexporter/integrationtest/go.mod
View file
Expand Up @@ -86,7 +86,6 @@ require (
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
github.com/haimrubinstein/go-syslog/v3 v3.0.3 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/iancoleman/strcase v0.3.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/datadogexporter/integrationtest/go.sum
View file

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

4 changes: 1 addition & 3 deletions go.mod
View file
Expand Up @@ -401,7 +401,6 @@ require (
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/haimrubinstein/go-syslog/v3 v3.0.0 // indirect
github.com/hashicorp/consul/api v1.28.2 // indirect
github.com/hashicorp/cronexpr v1.1.2 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand All @@ -422,6 +421,7 @@ require (
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect
github.com/influxdata/influxdb-observability/common v0.5.8 // indirect
github.com/influxdata/influxdb-observability/influx2otel v0.5.8 // indirect
github.com/influxdata/influxdb-observability/otel2influx v0.5.8 // indirect
Expand Down Expand Up @@ -1150,5 +1150,3 @@ replace (
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery => ./internal/sqlquery

replace github.com/haimrubinstein/go-syslog/v3 => github.com/haimrubinstein/go-syslog/v3 v3.0.0
3 changes: 0 additions & 3 deletions go.sum
View file

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

3 changes: 1 addition & 2 deletions pkg/stanza/go.mod
View file
Expand Up @@ -7,7 +7,7 @@ require (
github.com/cespare/xxhash/v2 v2.2.0
github.com/expr-lang/expr v1.16.1
github.com/fsnotify/fsnotify v1.7.0
github.com/haimrubinstein/go-syslog/v3 v3.0.0
github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4
github.com/jpillora/backoff v1.0.0
github.com/json-iterator/go v1.1.12
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.96.0
Expand Down Expand Up @@ -42,7 +42,6 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect
github.com/knadh/koanf/maps v0.1.1 // indirect
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
github.com/knadh/koanf/v2 v2.1.0 // indirect
Expand Down

0 comments on commit 2f1fa0e

Please sign in to comment.