diff --git a/.circleci/config.yml b/.circleci/config.yml index 010c54a0fedfd..3daec86da98b4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,16 +4,16 @@ orbs: aws-cli: circleci/aws-cli@1.4.0 executors: - go-1_15: + go-1_16: working_directory: '/go/src/github.com/influxdata/telegraf' docker: - - image: 'quay.io/influxdb/telegraf-ci:1.15.8' + - image: 'quay.io/influxdb/telegraf-ci:1.16.7' environment: GOFLAGS: -p=8 - go-1_16: + go-1_17: working_directory: '/go/src/github.com/influxdata/telegraf' docker: - - image: 'quay.io/influxdb/telegraf-ci:1.16.6' + - image: 'quay.io/influxdb/telegraf-ci:1.17.0' environment: GOFLAGS: -p=8 mac: @@ -88,7 +88,7 @@ commands: - 'dist' jobs: deps: - executor: go-1_16 + executor: go-1_17 steps: - checkout - restore_cache: @@ -105,21 +105,21 @@ jobs: root: '/go' paths: - '*' - test-go-1_15: - executor: go-1_15 + test-go-1_16: + executor: go-1_16 steps: - test-go - test-go-1_15-386: - executor: go-1_15 + test-go-1_16-386: + executor: go-1_16 steps: - test-go: goarch: "386" - test-go-1_16: - executor: go-1_16 + test-go-1_17: + executor: go-1_17 steps: - test-go - test-go-1_16-386: - executor: go-1_16 + test-go-1_17-386: + executor: go-1_17 steps: - test-go: goarch: "386" @@ -150,79 +150,79 @@ jobs: steps: - checkout - check-changed-files-or-halt-windows - - run: choco upgrade golang --version=1.16.6 + - run: choco upgrade golang --version=1.17.0 - run: choco install make - run: git config --system core.longpaths true - run: make test-windows windows-package: - executor: go-1_16 + executor: go-1_17 steps: - package-build: type: windows darwin-package: - executor: go-1_16 + executor: go-1_17 steps: - package-build: type: darwin i386-package: - executor: go-1_16 + executor: go-1_17 steps: - package-build: type: i386 ppc641e-package: - executor: go-1_16 + executor: go-1_17 steps: - package-build: type: ppc641e s390x-package: - executor: go-1_16 + executor: go-1_17 steps: - package-build: type: s390x armel-package: - executor: go-1_16 + executor: go-1_17 steps: - package-build: type: armel amd64-package: - executor: go-1_16 + executor: go-1_17 steps: - package-build: type: amd64 arm64-package: - executor: go-1_16 + executor: go-1_17 steps: - package-build: type: arm64 mipsel-package: - executor: go-1_16 + executor: go-1_17 steps: - package-build: type: mipsel mips-package: - executor: go-1_16 + executor: go-1_17 steps: - package-build: type: mips static-package: - executor: go-1_16 + executor: go-1_17 steps: - package-build: type: static armhf-package: - executor: go-1_16 + executor: go-1_17 steps: - package-build: type: armhf release: - executor: go-1_16 + executor: go-1_17 steps: - package-build: release: true nightly: - executor: go-1_16 + executor: go-1_17 steps: - package-build: nightly: true @@ -277,7 +277,7 @@ jobs: path: './dist' destination: 'build/dist' test-awaiter: - executor: go-1_16 + executor: go-1_17 steps: - run: command: | @@ -299,25 +299,25 @@ workflows: filters: tags: only: /.*/ - - 'test-go-1_15': + - 'test-go-1_16': requires: - 'deps' filters: tags: only: /.*/ - - 'test-go-1_15-386': + - 'test-go-1_16-386': requires: - 'deps' filters: tags: only: /.*/ - - 'test-go-1_16': + - 'test-go-1_17': requires: - 'deps' filters: tags: only: /.*/ - - 'test-go-1_16-386': + - 'test-go-1_17-386': requires: - 'deps' filters: @@ -333,10 +333,10 @@ workflows: only: /.*/ - 'test-awaiter': requires: - - 'test-go-1_15' - - 'test-go-1_15-386' - 'test-go-1_16' - 'test-go-1_16-386' + - 'test-go-1_17' + - 'test-go-1_17-386' - 'windows-package': requires: - 'test-go-windows' @@ -395,10 +395,10 @@ workflows: requires: - 'test-go-windows' - 'test-go-mac' - - 'test-go-1_15' - - 'test-go-1_15-386' - 'test-go-1_16' - 'test-go-1_16-386' + - 'test-go-1_17' + - 'test-go-1_17-386' filters: tags: only: /.*/ @@ -420,16 +420,16 @@ workflows: nightly: jobs: - 'deps' - - 'test-go-1_15': + - 'test-go-1_16': requires: - 'deps' - - 'test-go-1_15-386': + - 'test-go-1_16-386': requires: - 'deps' - - 'test-go-1_16': + - 'test-go-1_17': requires: - 'deps' - - 'test-go-1_16-386': + - 'test-go-1_17-386': requires: - 'deps' - 'test-go-mac' @@ -438,10 +438,10 @@ workflows: requires: - 'test-go-windows' - 'test-go-mac' - - 'test-go-1_15' - - 'test-go-1_15-386' - 'test-go-1_16' - 'test-go-1_16-386' + - 'test-go-1_17' + - 'test-go-1_17-386' triggers: - schedule: cron: "0 7 * * *" diff --git a/Makefile b/Makefile index 5cf7d2383604f..f0bb01dd2a35e 100644 --- a/Makefile +++ b/Makefile @@ -194,15 +194,15 @@ plugin-%: @echo "Starting dev environment for $${$(@)} input plugin..." @docker-compose -f plugins/inputs/$${$(@)}/dev/docker-compose.yml up -.PHONY: ci-1.15 -ci-1.15: - docker build -t quay.io/influxdb/telegraf-ci:1.15.8 - < scripts/ci-1.15.docker - docker push quay.io/influxdb/telegraf-ci:1.15.8 - .PHONY: ci-1.16 ci-1.16: - docker build -t quay.io/influxdb/telegraf-ci:1.16.6 - < scripts/ci-1.16.docker - docker push quay.io/influxdb/telegraf-ci:1.16.6 + docker build -t quay.io/influxdb/telegraf-ci:1.16.7 - < scripts/ci-1.16.docker + docker push quay.io/influxdb/telegraf-ci:1.16.7 + +.PHONY: ci-1.17 +ci-1.17: + docker build -t quay.io/influxdb/telegraf-ci:1.17.0 - < scripts/ci-1.17.docker + docker push quay.io/influxdb/telegraf-ci:1.17.0 .PHONY: install install: $(buildbin) diff --git a/agent/agent_posix.go b/agent/agent_posix.go index 09552cac07026..e43c3a7817a88 100644 --- a/agent/agent_posix.go +++ b/agent/agent_posix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package agent diff --git a/agent/agent_windows.go b/agent/agent_windows.go index 94ed9d006acb2..3196dc70e78e2 100644 --- a/agent/agent_windows.go +++ b/agent/agent_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package agent diff --git a/cmd/telegraf/telegraf_posix.go b/cmd/telegraf/telegraf_posix.go index a2d6b1e4e365c..21ad935b7147e 100644 --- a/cmd/telegraf/telegraf_posix.go +++ b/cmd/telegraf/telegraf_posix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package main diff --git a/cmd/telegraf/telegraf_windows.go b/cmd/telegraf/telegraf_windows.go index 8bd14d64eaa19..38222f2d0871d 100644 --- a/cmd/telegraf/telegraf_windows.go +++ b/cmd/telegraf/telegraf_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package main diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md index ca0ef3e401bd9..1ec09fe87f486 100644 --- a/docs/LICENSE_OF_DEPENDENCIES.md +++ b/docs/LICENSE_OF_DEPENDENCIES.md @@ -38,7 +38,6 @@ following works: - github.com/aws/aws-sdk-go-v2/credentials [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/credentials/LICENSE.txt) - github.com/aws/aws-sdk-go-v2/feature/ec2/imds [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/feature/ec2/imds/LICENSE.txt) - github.com/aws/aws-sdk-go-v2/feature/s3/manager [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/LICENSE.txt) -- github.com/aws/aws-sdk-go-v2/internal/ini [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/config/LICENSE.txt) - github.com/aws/aws-sdk-go-v2/service/ec2 [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/service/ec2/LICENSE.txt) - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/service/internal/accept-encoding/LICENSE.txt) - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/service/internal/presigned-url/LICENSE.txt) diff --git a/go.mod b/go.mod index de630f9a84fd2..f09d594111d42 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/influxdata/telegraf -go 1.16 +go 1.17 require ( cloud.google.com/go v0.56.0 @@ -8,73 +8,137 @@ require ( cloud.google.com/go/pubsub v1.2.0 code.cloudfoundry.org/clock v1.0.0 // indirect collectd.org v0.5.0 + github.com/Azure/azure-amqp-common-go/v3 v3.0.0 // indirect github.com/Azure/azure-event-hubs-go/v3 v3.2.0 github.com/Azure/azure-kusto-go v0.3.2 + github.com/Azure/azure-pipeline-go v0.2.3 // indirect + github.com/Azure/azure-sdk-for-go v45.1.0+incompatible // indirect + github.com/Azure/azure-storage-blob-go v0.13.0 // indirect github.com/Azure/azure-storage-queue-go v0.0.0-20191125232315-636801874cdd + github.com/Azure/go-amqp v0.12.6 // indirect + github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect + github.com/Azure/go-autorest v14.2.0+incompatible // indirect github.com/Azure/go-autorest/autorest v0.11.17 github.com/Azure/go-autorest/autorest/adal v0.9.10 github.com/Azure/go-autorest/autorest/azure/auth v0.5.6 + github.com/Azure/go-autorest/autorest/azure/cli v0.4.2 // indirect + github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect + github.com/Azure/go-autorest/autorest/to v0.3.0 // indirect + github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect + github.com/Azure/go-autorest/logger v0.2.0 // indirect + github.com/Azure/go-autorest/tracing v0.6.0 // indirect github.com/BurntSushi/toml v0.3.1 github.com/Mellanox/rdmamap v0.0.0-20191106181932-7c3c4763a6ee + github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3 // indirect + github.com/Microsoft/hcsshim v0.8.16 // indirect github.com/Shopify/sarama v1.27.2 github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect github.com/aerospike/aerospike-client-go v1.27.0 + github.com/alecthomas/participle v0.4.1 // indirect github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d github.com/aliyun/alibaba-cloud-sdk-go v1.61.1004 github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9 github.com/antchfx/jsonquery v1.1.4 github.com/antchfx/xmlquery v1.3.5 github.com/antchfx/xpath v1.1.11 + github.com/apache/arrow/go/arrow v0.0.0-20200601151325-b2287a20f230 // indirect github.com/apache/thrift v0.13.0 github.com/aristanetworks/glog v0.0.0-20191112221043-67e8567f59f3 // indirect github.com/aristanetworks/goarista v0.0.0-20190325233358-a123909ec740 + github.com/armon/go-metrics v0.3.3 // indirect github.com/aws/aws-sdk-go v1.38.69 - github.com/aws/aws-sdk-go-v2 v1.8.0 - github.com/aws/aws-sdk-go-v2/config v1.6.0 - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.4.0 + github.com/aws/aws-sdk-go-v2 v1.3.2 + github.com/aws/aws-sdk-go-v2/config v1.1.5 + github.com/aws/aws-sdk-go-v2/credentials v1.1.5 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.6 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.1.2 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.1.0 - github.com/aws/smithy-go v1.7.0 + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.0.4 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.6 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.2 // indirect + github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.1.5 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.2.2 // indirect + github.com/aws/smithy-go v1.3.1 github.com/benbjohnson/clock v1.0.3 + github.com/beorn7/perks v1.0.1 // indirect github.com/bitly/go-hostpool v0.1.0 // indirect github.com/bmatcuk/doublestar/v3 v3.0.0 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 github.com/caio/go-tdigest v3.1.0+incompatible + github.com/cenkalti/backoff v2.2.1+incompatible // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect github.com/cisco-ie/nx-telemetry-proto v0.0.0-20190531143454-82441e232cf6 + github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68 // indirect + github.com/containerd/containerd v1.5.0-beta.4 // indirect + github.com/coreos/go-semver v0.3.0 // indirect github.com/couchbase/go-couchbase v0.1.0 github.com/couchbase/gomemcached v0.1.3 // indirect github.com/couchbase/goutils v0.1.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect github.com/denisenkom/go-mssqldb v0.10.0 + github.com/devigned/tab v0.1.1 // indirect + github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1 github.com/dimchansky/utfbom v1.1.1 - github.com/docker/docker v20.10.7+incompatible + github.com/docker/distribution v2.7.1+incompatible // indirect + github.com/docker/docker v20.10.6+incompatible + github.com/docker/go-connections v0.4.0 // indirect + github.com/docker/go-units v0.4.0 // indirect github.com/doclambda/protobufquery v0.0.0-20210317203640-88ffabe06a60 github.com/dynatrace-oss/dynatrace-metric-utils-go v0.2.0 + github.com/eapache/go-resiliency v1.2.0 // indirect + github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect + github.com/eapache/queue v1.1.0 // indirect + github.com/echlebek/timeproxy v1.0.0 // indirect github.com/eclipse/paho.mqtt.golang v1.3.0 + github.com/fatih/color v1.9.0 // indirect github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 github.com/go-logfmt/logfmt v0.5.0 + github.com/go-logr/logr v0.4.0 // indirect + github.com/go-ole/go-ole v1.2.4 // indirect github.com/go-ping/ping v0.0.0-20210201095549-52eed920f98c github.com/go-redis/redis v6.15.9+incompatible github.com/go-sql-driver/mysql v1.6.0 + github.com/go-stack/stack v1.8.0 // indirect github.com/goburrow/modbus v0.1.0 // indirect github.com/goburrow/serial v0.1.0 // indirect github.com/gobwas/glob v0.2.3 github.com/gofrs/uuid v3.3.0+incompatible + github.com/gogo/googleapis v1.4.0 // indirect github.com/gogo/protobuf v1.3.2 + github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect github.com/golang/geo v0.0.0-20190916061304-5b978397cfec + github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect github.com/golang/protobuf v1.5.2 - github.com/golang/snappy v0.0.4 + github.com/golang/snappy v0.0.3 + github.com/google/flatbuffers v1.11.0 // indirect github.com/google/go-cmp v0.5.6 github.com/google/go-github/v32 v32.1.0 + github.com/google/go-querystring v1.0.0 // indirect + github.com/google/gofuzz v1.1.0 // indirect + github.com/google/uuid v1.2.0 // indirect + github.com/googleapis/gax-go/v2 v2.0.5 // indirect + github.com/googleapis/gnostic v0.4.1 // indirect github.com/gopcua/opcua v0.1.13 github.com/gorilla/mux v1.7.3 github.com/gorilla/websocket v1.4.2 github.com/gosnmp/gosnmp v1.32.0 github.com/grid-x/modbus v0.0.0-20210224155242-c4a3d042e99b + github.com/grid-x/serial v0.0.0-20191104121038-e24bc9bf6f08 // indirect + github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect github.com/harlow/kinesis-consumer v0.3.1-0.20181230152818-2f58b136fee0 github.com/hashicorp/consul/api v1.9.1 + github.com/hashicorp/go-cleanhttp v0.5.1 // indirect + github.com/hashicorp/go-hclog v0.12.2 // indirect + github.com/hashicorp/go-immutable-radix v1.2.0 // indirect github.com/hashicorp/go-msgpack v0.5.5 // indirect + github.com/hashicorp/go-rootcerts v1.0.2 // indirect + github.com/hashicorp/go-uuid v1.0.2 // indirect + github.com/hashicorp/golang-lru v0.5.4 // indirect + github.com/hashicorp/serf v0.9.5 // indirect github.com/influxdata/go-syslog/v3 v3.0.0 github.com/influxdata/influxdb-observability/common v0.2.4 github.com/influxdata/influxdb-observability/influx2otel v0.2.4 @@ -82,88 +146,187 @@ require ( github.com/influxdata/tail v1.0.1-0.20210707231403-b283181d1fa7 github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65 github.com/influxdata/wlog v0.0.0-20160411224016-7c63b0a71ef8 + github.com/jackc/chunkreader/v2 v2.0.1 // indirect + github.com/jackc/pgconn v1.5.0 // indirect + github.com/jackc/pgio v1.0.0 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgproto3/v2 v2.0.1 // indirect + github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8 // indirect + github.com/jackc/pgtype v1.3.0 // indirect github.com/jackc/pgx/v4 v4.6.0 + github.com/jaegertracing/jaeger v1.15.1 // indirect github.com/james4k/rcon v0.0.0-20120923215419-8fbb8268b60a + github.com/jcmturner/gofork v1.0.0 // indirect github.com/jhump/protoreflect v1.8.3-0.20210616212123-6cc1efa697ca github.com/jmespath/go-jmespath v0.4.0 + github.com/jpillora/backoff v1.0.0 // indirect + github.com/json-iterator/go v1.1.10 // indirect + github.com/jstemmer/go-junit-report v0.9.1 // indirect github.com/kardianos/service v1.0.0 github.com/karrick/godirwalk v1.16.1 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 github.com/klauspost/compress v1.13.1 // indirect + github.com/kr/pretty v0.2.1 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/kylelemons/godebug v1.1.0 // indirect + github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165 // indirect github.com/lib/pq v1.3.0 // indirect + github.com/mailru/easyjson v0.7.1 // indirect + github.com/mattn/go-colorable v0.1.6 // indirect + github.com/mattn/go-ieproxy v0.0.1 // indirect + github.com/mattn/go-isatty v0.0.12 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 github.com/mdlayher/apcupsd v0.0.0-20200608131503-2bf01da7bf1b + github.com/mdlayher/genetlink v1.0.0 // indirect + github.com/mdlayher/netlink v1.1.0 // indirect github.com/microsoft/ApplicationInsights-Go v0.4.4 github.com/miekg/dns v1.1.31 + github.com/minio/highwayhash v1.0.1 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/mapstructure v1.2.2 // indirect github.com/moby/ipvs v1.0.1 + github.com/moby/sys/mount v0.2.0 // indirect + github.com/moby/sys/mountinfo v0.4.1 // indirect + github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/morikuni/aec v1.0.0 // indirect github.com/multiplay/go-ts3 v1.0.0 github.com/naoina/go-stringutil v0.1.0 // indirect + github.com/nats-io/jwt/v2 v2.0.2 // indirect github.com/nats-io/nats-server/v2 v2.2.6 github.com/nats-io/nats.go v1.11.0 + github.com/nats-io/nkeys v0.3.0 // indirect + github.com/nats-io/nuid v1.0.1 // indirect github.com/newrelic/newrelic-telemetry-sdk-go v0.5.1 github.com/nsqio/go-nsq v1.0.8 github.com/openconfig/gnmi v0.0.0-20180912164834-33a1865c3029 + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.0.1 // indirect + github.com/opencontainers/runc v1.0.0-rc93 // indirect + github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 // indirect + github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/openzipkin/zipkin-go-opentracing v0.3.4 + github.com/philhofer/fwd v1.1.1 // indirect + github.com/pierrec/lz4 v2.5.2+incompatible // indirect github.com/pion/dtls/v2 v2.0.9 + github.com/pion/logging v0.2.2 // indirect + github.com/pion/transport v0.12.3 // indirect + github.com/pion/udp v0.1.1 // indirect + github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4 // indirect github.com/pkg/errors v0.9.1 + github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.7.1 github.com/prometheus/client_model v0.2.0 github.com/prometheus/common v0.15.0 github.com/prometheus/procfs v0.6.0 github.com/prometheus/prometheus v1.8.2-0.20200911110723-e83ef207b6c2 + github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect + github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect github.com/riemann/riemann-go-client v0.5.0 + github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff // indirect + github.com/robfig/cron/v3 v3.0.1 // indirect github.com/safchain/ethtool v0.0.0-20200218184317-f459e2d13664 + github.com/samuel/go-zookeeper v0.0.0-20200724154423-2164a8ac840e // indirect + github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b // indirect github.com/sensu/sensu-go/api/core/v2 v2.9.0 github.com/shirou/gopsutil v3.21.6-0.20210624221800-cb512c850043+incompatible github.com/shopspring/decimal v0.0.0-20200105231215-408a2507e114 // indirect + github.com/signalfx/com_signalfx_metrics_protobuf v0.0.2 // indirect + github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083 // indirect github.com/signalfx/golib/v3 v3.3.34 - github.com/sirupsen/logrus v1.8.1 + github.com/signalfx/sapm-proto v0.4.0 // indirect + github.com/sirupsen/logrus v1.7.0 github.com/sleepinggenius2/gosmi v0.4.3 github.com/snowflakedb/gosnowflake v1.5.0 github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271 + github.com/stretchr/objx v0.2.0 // indirect github.com/stretchr/testify v1.7.0 github.com/tbrandon/mbserver v0.0.0-20170611213546-993e1772cc62 - github.com/testcontainers/testcontainers-go v0.11.1 + github.com/testcontainers/testcontainers-go v0.11.0 github.com/tidwall/gjson v1.8.0 + github.com/tidwall/match v1.0.3 // indirect + github.com/tidwall/pretty v1.1.0 // indirect github.com/tinylib/msgp v1.1.5 github.com/tklauser/go-sysconf v0.3.5 // indirect + github.com/tklauser/numcpus v0.2.2 // indirect github.com/vapourismo/knx-go v0.0.0-20201122213738-75fe09ace330 + github.com/vishvananda/netlink v1.1.0 // indirect + github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect github.com/vjeantet/grok v1.0.1 github.com/vmware/govmomi v0.26.0 github.com/wavefronthq/wavefront-sdk-go v0.9.7 github.com/wvanbergen/kafka v0.0.0-20171203153745-e2edea948ddf github.com/wvanbergen/kazoo-go v0.0.0-20180202103751-f72d8611297a // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.0.2 // indirect + github.com/xdg-go/stringprep v1.0.2 // indirect github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c + github.com/xdg/stringprep v1.0.0 // indirect github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect github.com/yuin/gopher-lua v0.0.0-20180630135845-46796da1b0b4 // indirect + go.etcd.io/etcd/api/v3 v3.5.0 // indirect go.mongodb.org/mongo-driver v1.5.3 + go.opencensus.io v0.22.3 // indirect go.opentelemetry.io/collector/model v0.0.0-20210723184018-3b7d6ce4830c go.starlark.net v0.0.0-20210406145628-7a1108eaa012 + go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect + golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect + golang.org/x/mod v0.4.2 // indirect golang.org/x/net v0.0.0-20210610132358-84b48f89b13b golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d golang.org/x/sync v0.0.0-20210220032951-036812b2e83c golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect golang.org/x/text v0.3.6 + golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect golang.org/x/tools v0.1.2 + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + golang.zx2c4.com/wireguard v0.0.20200121 // indirect golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200205215550-e35592f146e4 google.golang.org/api v0.29.0 + google.golang.org/appengine v1.6.6 // indirect google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08 google.golang.org/grpc v1.39.0 google.golang.org/protobuf v1.27.1 + gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect gopkg.in/djherbis/times.v1 v1.2.0 gopkg.in/fatih/pool.v2 v2.0.0 // indirect + gopkg.in/fsnotify.v1 v1.4.7 // indirect gopkg.in/gorethink/gorethink.v3 v3.0.5 + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/ini.v1 v1.42.0 // indirect + gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect + gopkg.in/jcmturner/dnsutils.v1 v1.0.1 // indirect + gopkg.in/jcmturner/gokrb5.v7 v7.5.0 // indirect + gopkg.in/jcmturner/rpc.v1 v1.1.0 // indirect gopkg.in/ldap.v3 v3.1.0 gopkg.in/olivere/elastic.v5 v5.0.70 + gopkg.in/sourcemap.v1 v1.0.5 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 + gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 // indirect gopkg.in/yaml.v2 v2.4.0 + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect gotest.tools v2.2.0+incompatible + honnef.co/go/tools v0.0.1-2020.1.4 // indirect k8s.io/api v0.20.4 k8s.io/apimachinery v0.21.1 k8s.io/client-go v0.20.4 + k8s.io/klog/v2 v2.8.0 // indirect + k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect + modernc.org/cc/v3 v3.33.5 // indirect + modernc.org/ccgo/v3 v3.9.4 // indirect + modernc.org/libc v1.9.5 // indirect + modernc.org/mathutil v1.2.2 // indirect + modernc.org/memory v1.0.4 // indirect + modernc.org/opt v0.1.1 // indirect modernc.org/sqlite v1.10.8 + modernc.org/strutil v1.1.0 // indirect + modernc.org/token v1.0.0 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect + sigs.k8s.io/yaml v1.2.0 // indirect ) // replaced due to https://github.com/satori/go.uuid/issues/73 diff --git a/go.sum b/go.sum index 1b482f7449834..d17f8209df7da 100644 --- a/go.sum +++ b/go.sum @@ -228,44 +228,34 @@ github.com/aws/aws-sdk-go v1.38.69 h1:V489lmrdkIQSfF6OAGZZ1Cavcm7eczCm2JcGvX+yHR github.com/aws/aws-sdk-go v1.38.69/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.1.0/go.mod h1:smfAbmpW+tcRVuNUjo3MOArSZmW72t62rkCzc2i0TWM= +github.com/aws/aws-sdk-go-v2 v1.3.2 h1:RQj8l98yKUm0UV2Wd3w/Ms+TXV9Rs1E6Kr5tRRMfyU4= github.com/aws/aws-sdk-go-v2 v1.3.2/go.mod h1:7OaACgj2SX3XGWnrIjGlJM22h6yD6MEWKvm7levnnM8= -github.com/aws/aws-sdk-go-v2 v1.8.0 h1:HcN6yDnHV9S7D69E7To0aUppJhiJNEzQSNcUxc7r3qo= -github.com/aws/aws-sdk-go-v2 v1.8.0/go.mod h1:xEFuWz+3TYdlPRuo+CqATbeDWIWyaT5uAPwPaWtgse0= +github.com/aws/aws-sdk-go-v2/config v1.1.5 h1:imDWOGwlIrRpHLallJ9mli2SIQ4egtGKtFUFsuGRIaQ= github.com/aws/aws-sdk-go-v2/config v1.1.5/go.mod h1:P3F1hku7qzC81txjwXnwOM6Ex6ezkU6+/557Teyb64E= -github.com/aws/aws-sdk-go-v2/config v1.6.0 h1:rtoCnNObhVm7me+v9sA2aY+NtHNZjjWWC3ifXVci+wE= -github.com/aws/aws-sdk-go-v2/config v1.6.0/go.mod h1:TNtBVmka80lRPk5+S9ZqVfFszOQAGJJ9KbT3EM3CHNU= +github.com/aws/aws-sdk-go-v2/credentials v1.1.5 h1:R9v/eN5cXv5yMLC619xRYl5PgCSuy5SarizmM7+qqSA= github.com/aws/aws-sdk-go-v2/credentials v1.1.5/go.mod h1:Ir1R6tPiR1/2y1hes8yOijFMz54hzSmgcmCDo6F45Qc= -github.com/aws/aws-sdk-go-v2/credentials v1.3.2 h1:Uud/fZzm0lqqhE8kvXYJFAJ3PGnagKoUcvHq1hXfBZw= -github.com/aws/aws-sdk-go-v2/credentials v1.3.2/go.mod h1:PACKuTJdt6AlXvEq8rFI4eDmoqDFC5DpVKQbWysaDgM= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.6 h1:zoOz5V56jO/rGixsCDnrQtAzYRYM2hGA/43U6jVMFbo= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.6/go.mod h1:0+fWMitrmIpENiY8/1DyhdYPUCAPvd9UNz9mtCsEoLQ= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.4.0 h1:SGqDJun6tydgsSIFxv9+EYBJVqVUwg2QMJp6PbNq8C8= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.4.0/go.mod h1:Mj/U8OpDbcVcoctrYwA2bak8k/HFPdcLzI/vaiXMwuM= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.1.2 h1:Doa5wabOIDA0XZzBX5yCTAPGwDCVZ8Ux0wh29AUDmN4= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.1.2/go.mod h1:Azf567f5wBUfUbwpyJJnLM/geFFIzEulGR30L+nQZOE= -github.com/aws/aws-sdk-go-v2/internal/ini v1.2.0 h1:xu45foJnwMwBqSkIMKyJP9kbyHi5hdhZ/WiJ7D2sHZ0= -github.com/aws/aws-sdk-go-v2/internal/ini v1.2.0/go.mod h1:Q5jATQc+f1MfZp3PDMhn6ry18hGvE0i8yvbXoKbnZaE= github.com/aws/aws-sdk-go-v2/service/ec2 v1.1.0 h1:+VnEgB1yp+7KlOsk6FXX/v/fU9uL5oSujIMkKQBBmp8= github.com/aws/aws-sdk-go-v2/service/ec2 v1.1.0/go.mod h1:/6514fU/SRcY3+ousB1zjUqiXjruSuti2qcfE70osOc= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.0.4 h1:8yeByqOL6UWBsOOXsHnW93/ukwL66O008tRfxXxnTwA= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.0.4/go.mod h1:BCfU3Uo2fhKcMZFp9zU5QQGQxqWCOYmZ/27Dju3S/do= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.1/go.mod h1:PISaKWylTYAyruocNk4Lr9miOOJjOcVBd7twCPbydDk= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.6 h1:ldYIsOP4WyjdzW8t6RC/aSieajrlx+3UN3UCZy1KM5Y= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.6/go.mod h1:L0KWr0ASo83PRZu9NaZaDsw3koS6PspKv137DMDZjHo= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.2.2 h1:Xv1rGYgsRRn0xw9JFNnfpBMZam54PrWpC4rJOJ9koA8= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.2.2/go.mod h1:NXmNI41bdEsJMrD0v9rUvbGCB5GwdBEpKvUvIY3vTFg= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.2 h1:aU8H58DoYxNo8R1TaSPTofkuxfQNnoqZmWL+G3+k/vA= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.2/go.mod h1:nnutjMLuna0s3GVY/MAkpLX03thyNER06gXvnMAPj5g= github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0 h1:VbwXUI3L0hyhVmrFxbDxrs6cBX8TNFX0YxCpooMNjvY= github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0/go.mod h1:uwA7gs93Qcss43astPUb1eq4RyceNmYWAQjZFDOAMLo= +github.com/aws/aws-sdk-go-v2/service/sso v1.1.5 h1:B7ec5wE4+3Ldkurmq0C4gfQFtElGTG+/iTpi/YPMzi4= github.com/aws/aws-sdk-go-v2/service/sso v1.1.5/go.mod h1:bpGz0tidC4y39sZkQSkpO/J0tzWCMXHbw6FZ0j1GkWM= -github.com/aws/aws-sdk-go-v2/service/sso v1.3.2 h1:b+U3WrF9ON3f32FH19geqmiod4uKcMv/q+wosQjjyyM= -github.com/aws/aws-sdk-go-v2/service/sso v1.3.2/go.mod h1:J21I6kF+d/6XHVk7kp/cx9YVD2TMD2TbLwtRGVcinXo= +github.com/aws/aws-sdk-go-v2/service/sts v1.2.2 h1:fKw6QSGcFlvZCBPYx3fo4sL0HfTmaT06ZtMHJfQQNQQ= github.com/aws/aws-sdk-go-v2/service/sts v1.2.2/go.mod h1:ssRzzJ2RZOVuKj2Vx1YE7ypfil/BIlgmQnCSW4DistU= -github.com/aws/aws-sdk-go-v2/service/sts v1.6.1 h1:1Pls85C5CFjhE3aH+h85/hyAk89kQNlAWlEQtIkaFyc= -github.com/aws/aws-sdk-go-v2/service/sts v1.6.1/go.mod h1:hLZ/AnkIKHLuPGjEiyghNEdvJ2PP0MgOxcmv9EBJ4xs= github.com/aws/smithy-go v1.0.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw= +github.com/aws/smithy-go v1.3.1 h1:xJFO4pK0y9J8fCl34uGsSJX5KNnGbdARDlA5BPhXnwE= github.com/aws/smithy-go v1.3.1/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= -github.com/aws/smithy-go v1.7.0 h1:+cLHMRrDZvQ4wk+KuQ9yH6eEg6KZEJ9RI2IkDqnygCg= -github.com/aws/smithy-go v1.7.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -467,8 +457,8 @@ github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v17.12.0-ce-rc1.0.20200706150819-a40b877fbb9e+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.7+incompatible h1:Z6O9Nhsjv+ayUEeI1IojKbYcsGdgYSNqxe1s2MYzUhQ= -github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.6+incompatible h1:oXI3Vas8TI8Eu/EjH4srKHJBVqraSzJybhxY7Om9faQ= +github.com/docker/docker v20.10.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= @@ -735,9 +725,8 @@ github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= -github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/addlicense v0.0.0-20190510175307-22550fa7c1b0/go.mod h1:QtPG26W17m+OIQgE6gQ24gC1M6pUaMBAbFrTIDtwG/E= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= @@ -1421,9 +1410,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sleepinggenius2/gosmi v0.4.3 h1:99Zwzy1Cvgsh396sw07oR2G4ab88ILGZFMxSlGWnR6o= github.com/sleepinggenius2/gosmi v0.4.3/go.mod h1:l8OniPmd3bJzw0MXP2/qh7AhP/e+bTY2CNivIhsnDT0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= @@ -1475,8 +1463,8 @@ github.com/tbrandon/mbserver v0.0.0-20170611213546-993e1772cc62 h1:Oj2e7Sae4XrOs github.com/tbrandon/mbserver v0.0.0-20170611213546-993e1772cc62/go.mod h1:qUzPVlSj2UgxJkVbH0ZwuuiR46U8RBMDT5KLY78Ifpw= github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= -github.com/testcontainers/testcontainers-go v0.11.1 h1:FiYsB83LSGbiawoV8TpAZGfcCUbtaeeg1SXqEKUxh08= -github.com/testcontainers/testcontainers-go v0.11.1/go.mod h1:/V0UVq+1e7NWYoqTPog179clf0Qp9TOyp4EcXaEFQz8= +github.com/testcontainers/testcontainers-go v0.11.0 h1:HO5YOx2DYBHqcg4MzVWPj3FuHAv7USWVu94vCSsgiaM= +github.com/testcontainers/testcontainers-go v0.11.0/go.mod h1:HztBCODzuA+YpMXGK8amjO8j50jz2gcT0BOzSKUiYIs= github.com/tidwall/gjson v1.8.0 h1:Qt+orfosKn0rbNTZqHYDqBrmm3UDA4KRkv70fDzG+PQ= github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk= github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE= diff --git a/internal/exec_unix.go b/internal/exec_unix.go index 60b606cfb5f32..0f5d3fca037db 100644 --- a/internal/exec_unix.go +++ b/internal/exec_unix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package internal diff --git a/internal/exec_windows.go b/internal/exec_windows.go index 7bab1baf3ac3f..708051dda3a2c 100644 --- a/internal/exec_windows.go +++ b/internal/exec_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package internal diff --git a/internal/globpath/globpath_test.go b/internal/globpath/globpath_test.go index 33779f912a027..bc286bc75419e 100644 --- a/internal/globpath/globpath_test.go +++ b/internal/globpath/globpath_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows // TODO: Windows - should be enabled for Windows when super asterisk is fixed on Windows diff --git a/internal/goplugin/noplugin.go b/internal/goplugin/noplugin.go index 089972d465196..65fcee418e388 100644 --- a/internal/goplugin/noplugin.go +++ b/internal/goplugin/noplugin.go @@ -1,3 +1,4 @@ +//go:build !goplugin // +build !goplugin package goplugin diff --git a/internal/goplugin/plugin.go b/internal/goplugin/plugin.go index 7e58ec32e92c2..3af051833b6a7 100644 --- a/internal/goplugin/plugin.go +++ b/internal/goplugin/plugin.go @@ -1,3 +1,4 @@ +//go:build goplugin // +build goplugin package goplugin diff --git a/internal/process/process_posix.go b/internal/process/process_posix.go index 7b42b7da13214..8f736bc673592 100644 --- a/internal/process/process_posix.go +++ b/internal/process/process_posix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package process diff --git a/internal/process/process_test.go b/internal/process/process_test.go index b9cad3598ce13..228f2f1e1b28d 100644 --- a/internal/process/process_test.go +++ b/internal/process/process_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package process diff --git a/internal/process/process_windows.go b/internal/process/process_windows.go index 0995d52469b07..3aefd20f4aa9c 100644 --- a/internal/process/process_windows.go +++ b/internal/process/process_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package process diff --git a/internal/usage.go b/internal/usage.go index 1a4b3a3496281..916b5cb86e908 100644 --- a/internal/usage.go +++ b/internal/usage.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package internal diff --git a/internal/usage_windows.go b/internal/usage_windows.go index 236e1426b345c..9a1169851cd74 100644 --- a/internal/usage_windows.go +++ b/internal/usage_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package internal diff --git a/logger/event_logger.go b/logger/event_logger.go index 44d5bce656a04..bb0672de76c5c 100644 --- a/logger/event_logger.go +++ b/logger/event_logger.go @@ -1,4 +1,5 @@ -//+build windows +//go:build windows +// +build windows package logger diff --git a/logger/event_logger_test.go b/logger/event_logger_test.go index 05c27b1757e87..d268252779867 100644 --- a/logger/event_logger_test.go +++ b/logger/event_logger_test.go @@ -1,4 +1,5 @@ -//+build windows +//go:build windows +// +build windows package logger diff --git a/plugins/inputs/bcache/bcache.go b/plugins/inputs/bcache/bcache.go index 8c21c701f3da3..3195cf4dabcbb 100644 --- a/plugins/inputs/bcache/bcache.go +++ b/plugins/inputs/bcache/bcache.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows // bcache doesn't aim for Windows diff --git a/plugins/inputs/bcache/bcache_test.go b/plugins/inputs/bcache/bcache_test.go index b9d786fa91bec..857538a8d6f72 100644 --- a/plugins/inputs/bcache/bcache_test.go +++ b/plugins/inputs/bcache/bcache_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package bcache diff --git a/plugins/inputs/bcache/bcache_windows.go b/plugins/inputs/bcache/bcache_windows.go index 9a580cc940106..faeba8888bb3b 100644 --- a/plugins/inputs/bcache/bcache_windows.go +++ b/plugins/inputs/bcache/bcache_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package bcache diff --git a/plugins/inputs/cgroup/cgroup_linux.go b/plugins/inputs/cgroup/cgroup_linux.go index 43aa68f233fc1..d1eda6e7a3b07 100644 --- a/plugins/inputs/cgroup/cgroup_linux.go +++ b/plugins/inputs/cgroup/cgroup_linux.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package cgroup diff --git a/plugins/inputs/cgroup/cgroup_notlinux.go b/plugins/inputs/cgroup/cgroup_notlinux.go index 2bc227410a6e2..1c9c08ec41ac5 100644 --- a/plugins/inputs/cgroup/cgroup_notlinux.go +++ b/plugins/inputs/cgroup/cgroup_notlinux.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package cgroup diff --git a/plugins/inputs/cgroup/cgroup_test.go b/plugins/inputs/cgroup/cgroup_test.go index bd7a191b31df7..ba74247eeb1f3 100644 --- a/plugins/inputs/cgroup/cgroup_test.go +++ b/plugins/inputs/cgroup/cgroup_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package cgroup diff --git a/plugins/inputs/conntrack/conntrack.go b/plugins/inputs/conntrack/conntrack.go index bf6c021c80f4a..f1b04fb0d965a 100644 --- a/plugins/inputs/conntrack/conntrack.go +++ b/plugins/inputs/conntrack/conntrack.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package conntrack diff --git a/plugins/inputs/conntrack/conntrack_notlinux.go b/plugins/inputs/conntrack/conntrack_notlinux.go index 11948731bb88d..6ad8e4a10e3c5 100644 --- a/plugins/inputs/conntrack/conntrack_notlinux.go +++ b/plugins/inputs/conntrack/conntrack_notlinux.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package conntrack diff --git a/plugins/inputs/conntrack/conntrack_test.go b/plugins/inputs/conntrack/conntrack_test.go index e554f4e90d262..50f56d831791e 100644 --- a/plugins/inputs/conntrack/conntrack_test.go +++ b/plugins/inputs/conntrack/conntrack_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package conntrack diff --git a/plugins/inputs/diskio/diskio_linux_test.go b/plugins/inputs/diskio/diskio_linux_test.go index ede35b5befead..1a97aabf40db5 100644 --- a/plugins/inputs/diskio/diskio_linux_test.go +++ b/plugins/inputs/diskio/diskio_linux_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package diskio diff --git a/plugins/inputs/diskio/diskio_other.go b/plugins/inputs/diskio/diskio_other.go index 1c883e904f92c..458a64c13f7bb 100644 --- a/plugins/inputs/diskio/diskio_other.go +++ b/plugins/inputs/diskio/diskio_other.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package diskio diff --git a/plugins/inputs/dmcache/dmcache_linux.go b/plugins/inputs/dmcache/dmcache_linux.go index 8e8d7de918560..712e67900ba4d 100644 --- a/plugins/inputs/dmcache/dmcache_linux.go +++ b/plugins/inputs/dmcache/dmcache_linux.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package dmcache diff --git a/plugins/inputs/dmcache/dmcache_linux_test.go b/plugins/inputs/dmcache/dmcache_linux_test.go index 30e32b1e876a4..93cd1e85e79bb 100644 --- a/plugins/inputs/dmcache/dmcache_linux_test.go +++ b/plugins/inputs/dmcache/dmcache_linux_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package dmcache diff --git a/plugins/inputs/dmcache/dmcache_notlinux.go b/plugins/inputs/dmcache/dmcache_notlinux.go index ee1065638cab7..96aa0c65712ff 100644 --- a/plugins/inputs/dmcache/dmcache_notlinux.go +++ b/plugins/inputs/dmcache/dmcache_notlinux.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package dmcache diff --git a/plugins/inputs/dpdk/dpdk.go b/plugins/inputs/dpdk/dpdk.go index 293dbee90adf3..261784942232c 100644 --- a/plugins/inputs/dpdk/dpdk.go +++ b/plugins/inputs/dpdk/dpdk.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package dpdk diff --git a/plugins/inputs/dpdk/dpdk_connector.go b/plugins/inputs/dpdk/dpdk_connector.go index 1129d16d31604..9cd9c81c4362b 100644 --- a/plugins/inputs/dpdk/dpdk_connector.go +++ b/plugins/inputs/dpdk/dpdk_connector.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package dpdk diff --git a/plugins/inputs/dpdk/dpdk_connector_test.go b/plugins/inputs/dpdk/dpdk_connector_test.go index a322964979fe8..f5580417c3c67 100644 --- a/plugins/inputs/dpdk/dpdk_connector_test.go +++ b/plugins/inputs/dpdk/dpdk_connector_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package dpdk diff --git a/plugins/inputs/dpdk/dpdk_notlinux.go b/plugins/inputs/dpdk/dpdk_notlinux.go index a86625ff5c93f..1831b1212ae78 100644 --- a/plugins/inputs/dpdk/dpdk_notlinux.go +++ b/plugins/inputs/dpdk/dpdk_notlinux.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package dpdk diff --git a/plugins/inputs/dpdk/dpdk_test.go b/plugins/inputs/dpdk/dpdk_test.go index cfee021e9e6bb..41d2da3d07777 100644 --- a/plugins/inputs/dpdk/dpdk_test.go +++ b/plugins/inputs/dpdk/dpdk_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package dpdk diff --git a/plugins/inputs/dpdk/dpdk_utils.go b/plugins/inputs/dpdk/dpdk_utils.go index 962186a424893..b7049d8365597 100644 --- a/plugins/inputs/dpdk/dpdk_utils.go +++ b/plugins/inputs/dpdk/dpdk_utils.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package dpdk diff --git a/plugins/inputs/dpdk/dpdk_utils_test.go b/plugins/inputs/dpdk/dpdk_utils_test.go index 6697e9ab38113..87e8a6c8248c3 100644 --- a/plugins/inputs/dpdk/dpdk_utils_test.go +++ b/plugins/inputs/dpdk/dpdk_utils_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package dpdk diff --git a/plugins/inputs/ethtool/ethtool_linux.go b/plugins/inputs/ethtool/ethtool_linux.go index 08e21db50dede..6c0116e6e8089 100644 --- a/plugins/inputs/ethtool/ethtool_linux.go +++ b/plugins/inputs/ethtool/ethtool_linux.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package ethtool diff --git a/plugins/inputs/ethtool/ethtool_notlinux.go b/plugins/inputs/ethtool/ethtool_notlinux.go index b022e0a46bb72..ce149ecd6e69c 100644 --- a/plugins/inputs/ethtool/ethtool_notlinux.go +++ b/plugins/inputs/ethtool/ethtool_notlinux.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package ethtool diff --git a/plugins/inputs/ethtool/ethtool_test.go b/plugins/inputs/ethtool/ethtool_test.go index 87bc136d2db11..14cf14d811683 100644 --- a/plugins/inputs/ethtool/ethtool_test.go +++ b/plugins/inputs/ethtool/ethtool_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package ethtool diff --git a/plugins/inputs/exec/exec_test.go b/plugins/inputs/exec/exec_test.go index bdd11433d1ab6..d0647476c77ae 100644 --- a/plugins/inputs/exec/exec_test.go +++ b/plugins/inputs/exec/exec_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows // TODO: Windows - should be enabled for Windows when super asterisk is fixed on Windows diff --git a/plugins/inputs/execd/execd_posix.go b/plugins/inputs/execd/execd_posix.go index 9593aaba0af29..a90b1a92dddf5 100644 --- a/plugins/inputs/execd/execd_posix.go +++ b/plugins/inputs/execd/execd_posix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package execd diff --git a/plugins/inputs/execd/execd_windows.go b/plugins/inputs/execd/execd_windows.go index 15e6798f2389b..9b1f22204bdc4 100644 --- a/plugins/inputs/execd/execd_windows.go +++ b/plugins/inputs/execd/execd_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package execd diff --git a/plugins/inputs/execd/shim/goshim_posix.go b/plugins/inputs/execd/shim/goshim_posix.go index 4e4a04f141b65..8d7faa2268878 100644 --- a/plugins/inputs/execd/shim/goshim_posix.go +++ b/plugins/inputs/execd/shim/goshim_posix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package shim diff --git a/plugins/inputs/execd/shim/goshim_windows.go b/plugins/inputs/execd/shim/goshim_windows.go index 317f8a2f3d4cb..90adfeff6f6c9 100644 --- a/plugins/inputs/execd/shim/goshim_windows.go +++ b/plugins/inputs/execd/shim/goshim_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package shim diff --git a/plugins/inputs/execd/shim/shim_posix_test.go b/plugins/inputs/execd/shim/shim_posix_test.go index 75484c45c78a0..36e0afcd83167 100644 --- a/plugins/inputs/execd/shim/shim_posix_test.go +++ b/plugins/inputs/execd/shim/shim_posix_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package shim diff --git a/plugins/inputs/file/file_test.go b/plugins/inputs/file/file_test.go index e633559236bd2..ab09753ca1145 100644 --- a/plugins/inputs/file/file_test.go +++ b/plugins/inputs/file/file_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows // TODO: Windows - should be enabled for Windows when super asterisk is fixed on Windows diff --git a/plugins/inputs/filecount/filecount_test.go b/plugins/inputs/filecount/filecount_test.go index 74a3e2ec391c5..d02c28fb6f170 100644 --- a/plugins/inputs/filecount/filecount_test.go +++ b/plugins/inputs/filecount/filecount_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows // TODO: Windows - should be enabled for Windows when super asterisk is fixed on Windows diff --git a/plugins/inputs/filecount/filesystem_helpers_test.go b/plugins/inputs/filecount/filesystem_helpers_test.go index 8a6d9cf2aa035..a3a3310d3fb4e 100644 --- a/plugins/inputs/filecount/filesystem_helpers_test.go +++ b/plugins/inputs/filecount/filesystem_helpers_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows // TODO: Windows - should be enabled for Windows when super asterisk is fixed on Windows diff --git a/plugins/inputs/filestat/filestat_test.go b/plugins/inputs/filestat/filestat_test.go index ea1bee47e4fb4..ac2a9f9a9f75b 100644 --- a/plugins/inputs/filestat/filestat_test.go +++ b/plugins/inputs/filestat/filestat_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows // TODO: Windows - should be enabled for Windows when super asterisk is fixed on Windows diff --git a/plugins/inputs/http_response/http_response_test.go b/plugins/inputs/http_response/http_response_test.go index 557639027ff03..40917bba1bc39 100644 --- a/plugins/inputs/http_response/http_response_test.go +++ b/plugins/inputs/http_response/http_response_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows // TODO: Windows - should be enabled for Windows when https://github.com/influxdata/telegraf/issues/8451 is fixed diff --git a/plugins/inputs/infiniband/infiniband_linux.go b/plugins/inputs/infiniband/infiniband_linux.go index 224d35bc2fce0..2868c683e7ebb 100644 --- a/plugins/inputs/infiniband/infiniband_linux.go +++ b/plugins/inputs/infiniband/infiniband_linux.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package infiniband diff --git a/plugins/inputs/infiniband/infiniband_notlinux.go b/plugins/inputs/infiniband/infiniband_notlinux.go index 5b19672d975d8..8ad6731c17bd7 100644 --- a/plugins/inputs/infiniband/infiniband_notlinux.go +++ b/plugins/inputs/infiniband/infiniband_notlinux.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package infiniband diff --git a/plugins/inputs/infiniband/infiniband_test.go b/plugins/inputs/infiniband/infiniband_test.go index 7f747eb5fd89f..c382a1fdf9dd0 100644 --- a/plugins/inputs/infiniband/infiniband_test.go +++ b/plugins/inputs/infiniband/infiniband_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package infiniband diff --git a/plugins/inputs/intel_powerstat/file.go b/plugins/inputs/intel_powerstat/file.go index 7953726fd9ba8..a07dd57e16a57 100644 --- a/plugins/inputs/intel_powerstat/file.go +++ b/plugins/inputs/intel_powerstat/file.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package intel_powerstat diff --git a/plugins/inputs/intel_powerstat/intel_powerstat.go b/plugins/inputs/intel_powerstat/intel_powerstat.go index 9340fdec814b1..181e7642da4b8 100644 --- a/plugins/inputs/intel_powerstat/intel_powerstat.go +++ b/plugins/inputs/intel_powerstat/intel_powerstat.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package intel_powerstat diff --git a/plugins/inputs/intel_powerstat/intel_powerstat_notlinux.go b/plugins/inputs/intel_powerstat/intel_powerstat_notlinux.go index f46755cee92b7..256e64970094e 100644 --- a/plugins/inputs/intel_powerstat/intel_powerstat_notlinux.go +++ b/plugins/inputs/intel_powerstat/intel_powerstat_notlinux.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package intel_powerstat diff --git a/plugins/inputs/intel_powerstat/intel_powerstat_test.go b/plugins/inputs/intel_powerstat/intel_powerstat_test.go index d65756595927e..ce01e77997cdc 100644 --- a/plugins/inputs/intel_powerstat/intel_powerstat_test.go +++ b/plugins/inputs/intel_powerstat/intel_powerstat_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package intel_powerstat diff --git a/plugins/inputs/intel_powerstat/msr.go b/plugins/inputs/intel_powerstat/msr.go index 8d39164d6e783..6c19b56eb7cc5 100644 --- a/plugins/inputs/intel_powerstat/msr.go +++ b/plugins/inputs/intel_powerstat/msr.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package intel_powerstat diff --git a/plugins/inputs/intel_powerstat/msr_test.go b/plugins/inputs/intel_powerstat/msr_test.go index 945716e15a105..b03d2b00960a9 100644 --- a/plugins/inputs/intel_powerstat/msr_test.go +++ b/plugins/inputs/intel_powerstat/msr_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package intel_powerstat diff --git a/plugins/inputs/intel_powerstat/rapl.go b/plugins/inputs/intel_powerstat/rapl.go index 1e4b465fd7974..32d60ac89c705 100644 --- a/plugins/inputs/intel_powerstat/rapl.go +++ b/plugins/inputs/intel_powerstat/rapl.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package intel_powerstat diff --git a/plugins/inputs/intel_powerstat/rapl_test.go b/plugins/inputs/intel_powerstat/rapl_test.go index 551f06f890ea4..5333ec13aaa79 100644 --- a/plugins/inputs/intel_powerstat/rapl_test.go +++ b/plugins/inputs/intel_powerstat/rapl_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package intel_powerstat diff --git a/plugins/inputs/intel_powerstat/unit_converter.go b/plugins/inputs/intel_powerstat/unit_converter.go index 43dc79e6efc4a..7dd8c0d0d1aa0 100644 --- a/plugins/inputs/intel_powerstat/unit_converter.go +++ b/plugins/inputs/intel_powerstat/unit_converter.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package intel_powerstat diff --git a/plugins/inputs/intel_rdt/intel_rdt.go b/plugins/inputs/intel_rdt/intel_rdt.go index 69cc914227fc8..89370062d730e 100644 --- a/plugins/inputs/intel_rdt/intel_rdt.go +++ b/plugins/inputs/intel_rdt/intel_rdt.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package intel_rdt diff --git a/plugins/inputs/intel_rdt/intel_rdt_test.go b/plugins/inputs/intel_rdt/intel_rdt_test.go index 7e876425724ec..1eecbc5018125 100644 --- a/plugins/inputs/intel_rdt/intel_rdt_test.go +++ b/plugins/inputs/intel_rdt/intel_rdt_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package intel_rdt diff --git a/plugins/inputs/intel_rdt/intel_rdt_windows.go b/plugins/inputs/intel_rdt/intel_rdt_windows.go index e3ab0978fb374..64f9ebbe94b68 100644 --- a/plugins/inputs/intel_rdt/intel_rdt_windows.go +++ b/plugins/inputs/intel_rdt/intel_rdt_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package intel_rdt diff --git a/plugins/inputs/intel_rdt/processes.go b/plugins/inputs/intel_rdt/processes.go index ff86a4e6b745c..dd172b6d92dd2 100644 --- a/plugins/inputs/intel_rdt/processes.go +++ b/plugins/inputs/intel_rdt/processes.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package intel_rdt diff --git a/plugins/inputs/intel_rdt/publisher.go b/plugins/inputs/intel_rdt/publisher.go index a01d730382da9..a567e1aacb1fa 100644 --- a/plugins/inputs/intel_rdt/publisher.go +++ b/plugins/inputs/intel_rdt/publisher.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package intel_rdt diff --git a/plugins/inputs/intel_rdt/publisher_test.go b/plugins/inputs/intel_rdt/publisher_test.go index 5248ede7a16db..7db71e9ac5afa 100644 --- a/plugins/inputs/intel_rdt/publisher_test.go +++ b/plugins/inputs/intel_rdt/publisher_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package intel_rdt diff --git a/plugins/inputs/iptables/iptables.go b/plugins/inputs/iptables/iptables.go index e56f8b31d5725..89924b88de7c8 100644 --- a/plugins/inputs/iptables/iptables.go +++ b/plugins/inputs/iptables/iptables.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package iptables diff --git a/plugins/inputs/iptables/iptables_nocompile.go b/plugins/inputs/iptables/iptables_nocompile.go index f71b4208e62fb..17c0eaced90e5 100644 --- a/plugins/inputs/iptables/iptables_nocompile.go +++ b/plugins/inputs/iptables/iptables_nocompile.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package iptables diff --git a/plugins/inputs/iptables/iptables_test.go b/plugins/inputs/iptables/iptables_test.go index 681d8bbfc130e..4c62ef6d6a86a 100644 --- a/plugins/inputs/iptables/iptables_test.go +++ b/plugins/inputs/iptables/iptables_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package iptables diff --git a/plugins/inputs/ipvs/ipvs.go b/plugins/inputs/ipvs/ipvs.go index 65db5efe3bf7f..7dea5240aab0f 100644 --- a/plugins/inputs/ipvs/ipvs.go +++ b/plugins/inputs/ipvs/ipvs.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package ipvs diff --git a/plugins/inputs/ipvs/ipvs_notlinux.go b/plugins/inputs/ipvs/ipvs_notlinux.go index bbbb1240b62a8..b46035f2c2b3c 100644 --- a/plugins/inputs/ipvs/ipvs_notlinux.go +++ b/plugins/inputs/ipvs/ipvs_notlinux.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package ipvs diff --git a/plugins/inputs/kernel/kernel.go b/plugins/inputs/kernel/kernel.go index 404c62d88c2b8..22311e9a0f12d 100644 --- a/plugins/inputs/kernel/kernel.go +++ b/plugins/inputs/kernel/kernel.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package kernel diff --git a/plugins/inputs/kernel/kernel_notlinux.go b/plugins/inputs/kernel/kernel_notlinux.go index 05f6e55c453c5..838a97071a6d4 100644 --- a/plugins/inputs/kernel/kernel_notlinux.go +++ b/plugins/inputs/kernel/kernel_notlinux.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package kernel diff --git a/plugins/inputs/kernel/kernel_test.go b/plugins/inputs/kernel/kernel_test.go index 2068237d5b60f..462624c2eb40d 100644 --- a/plugins/inputs/kernel/kernel_test.go +++ b/plugins/inputs/kernel/kernel_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package kernel diff --git a/plugins/inputs/kernel_vmstat/kernel_vmstat.go b/plugins/inputs/kernel_vmstat/kernel_vmstat.go index 66e7c7d664748..2019e0cbfddb3 100644 --- a/plugins/inputs/kernel_vmstat/kernel_vmstat.go +++ b/plugins/inputs/kernel_vmstat/kernel_vmstat.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package kernel_vmstat diff --git a/plugins/inputs/kernel_vmstat/kernel_vmstat_notlinux.go b/plugins/inputs/kernel_vmstat/kernel_vmstat_notlinux.go index 11a5d2e553dff..d687b13a9e72d 100644 --- a/plugins/inputs/kernel_vmstat/kernel_vmstat_notlinux.go +++ b/plugins/inputs/kernel_vmstat/kernel_vmstat_notlinux.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package kernel_vmstat diff --git a/plugins/inputs/kernel_vmstat/kernel_vmstat_test.go b/plugins/inputs/kernel_vmstat/kernel_vmstat_test.go index eca873ff71896..6bbb9d7b5b12f 100644 --- a/plugins/inputs/kernel_vmstat/kernel_vmstat_test.go +++ b/plugins/inputs/kernel_vmstat/kernel_vmstat_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package kernel_vmstat diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go index 5fec865eaa8d7..83f5abd210bdd 100644 --- a/plugins/inputs/logparser/logparser.go +++ b/plugins/inputs/logparser/logparser.go @@ -1,3 +1,4 @@ +//go:build !solaris // +build !solaris package logparser diff --git a/plugins/inputs/logparser/logparser_solaris.go b/plugins/inputs/logparser/logparser_solaris.go index 28afe26772846..da482b97d27be 100644 --- a/plugins/inputs/logparser/logparser_solaris.go +++ b/plugins/inputs/logparser/logparser_solaris.go @@ -1,3 +1,4 @@ +//go:build solaris // +build solaris package logparser diff --git a/plugins/inputs/lustre2/lustre2.go b/plugins/inputs/lustre2/lustre2.go index 5327386339f84..00aa288b316a8 100644 --- a/plugins/inputs/lustre2/lustre2.go +++ b/plugins/inputs/lustre2/lustre2.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows // Package lustre2 (doesn't aim for Windows) diff --git a/plugins/inputs/lustre2/lustre2_test.go b/plugins/inputs/lustre2/lustre2_test.go index e89c33b5a46e3..52c7e87f08fc6 100644 --- a/plugins/inputs/lustre2/lustre2_test.go +++ b/plugins/inputs/lustre2/lustre2_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package lustre2 diff --git a/plugins/inputs/lustre2/lustre2_windows.go b/plugins/inputs/lustre2/lustre2_windows.go index 0c4d970608e09..cd3aea1b534f1 100644 --- a/plugins/inputs/lustre2/lustre2_windows.go +++ b/plugins/inputs/lustre2/lustre2_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package lustre2 diff --git a/plugins/inputs/mongodb/mongodb_server_test.go b/plugins/inputs/mongodb/mongodb_server_test.go index 2cf58689a6eab..64fb191639105 100644 --- a/plugins/inputs/mongodb/mongodb_server_test.go +++ b/plugins/inputs/mongodb/mongodb_server_test.go @@ -1,3 +1,4 @@ +//go:build integration // +build integration package mongodb diff --git a/plugins/inputs/mongodb/mongodb_test.go b/plugins/inputs/mongodb/mongodb_test.go index 9484118dd19ab..24aa2fe3e0d04 100644 --- a/plugins/inputs/mongodb/mongodb_test.go +++ b/plugins/inputs/mongodb/mongodb_test.go @@ -1,3 +1,4 @@ +//go:build integration // +build integration package mongodb diff --git a/plugins/inputs/nats/nats.go b/plugins/inputs/nats/nats.go index 53f688bb3bcd9..c2adab29b324d 100644 --- a/plugins/inputs/nats/nats.go +++ b/plugins/inputs/nats/nats.go @@ -1,3 +1,4 @@ +//go:build !freebsd || (freebsd && cgo) // +build !freebsd freebsd,cgo package nats diff --git a/plugins/inputs/nats/nats_freebsd.go b/plugins/inputs/nats/nats_freebsd.go index 08d08ba760df0..f50ba2cfcf678 100644 --- a/plugins/inputs/nats/nats_freebsd.go +++ b/plugins/inputs/nats/nats_freebsd.go @@ -1,3 +1,4 @@ +//go:build freebsd && !cgo // +build freebsd,!cgo package nats diff --git a/plugins/inputs/nats/nats_test.go b/plugins/inputs/nats/nats_test.go index 7207df94cfd02..135951405feda 100644 --- a/plugins/inputs/nats/nats_test.go +++ b/plugins/inputs/nats/nats_test.go @@ -1,3 +1,4 @@ +//go:build !freebsd || (freebsd && cgo) // +build !freebsd freebsd,cgo package nats diff --git a/plugins/inputs/phpfpm/phpfpm_test.go b/plugins/inputs/phpfpm/phpfpm_test.go index 50d8d604efb5b..d51c576aad7f0 100644 --- a/plugins/inputs/phpfpm/phpfpm_test.go +++ b/plugins/inputs/phpfpm/phpfpm_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows // TODO: Windows - should be enabled for Windows when super asterisk is fixed on Windows diff --git a/plugins/inputs/ping/ping_notwindows.go b/plugins/inputs/ping/ping_notwindows.go index a014a8237e8e7..f6bd751c2a4e3 100644 --- a/plugins/inputs/ping/ping_notwindows.go +++ b/plugins/inputs/ping/ping_notwindows.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package ping diff --git a/plugins/inputs/ping/ping_test.go b/plugins/inputs/ping/ping_test.go index 895b9c1fdf5b9..7faba097c4562 100644 --- a/plugins/inputs/ping/ping_test.go +++ b/plugins/inputs/ping/ping_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package ping diff --git a/plugins/inputs/ping/ping_windows.go b/plugins/inputs/ping/ping_windows.go index f53d6f09a7373..1d3d933e7736b 100644 --- a/plugins/inputs/ping/ping_windows.go +++ b/plugins/inputs/ping/ping_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package ping diff --git a/plugins/inputs/ping/ping_windows_test.go b/plugins/inputs/ping/ping_windows_test.go index 0986d58bc74a8..6df8af3732a5f 100644 --- a/plugins/inputs/ping/ping_windows_test.go +++ b/plugins/inputs/ping/ping_windows_test.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package ping diff --git a/plugins/inputs/postfix/postfix.go b/plugins/inputs/postfix/postfix.go index f72474a114f94..e2d271f51cba1 100644 --- a/plugins/inputs/postfix/postfix.go +++ b/plugins/inputs/postfix/postfix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows // postfix doesn't aim for Windows diff --git a/plugins/inputs/postfix/postfix_test.go b/plugins/inputs/postfix/postfix_test.go index ad997eebdbbe7..782a0c78c95b9 100644 --- a/plugins/inputs/postfix/postfix_test.go +++ b/plugins/inputs/postfix/postfix_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package postfix diff --git a/plugins/inputs/postfix/postfix_windows.go b/plugins/inputs/postfix/postfix_windows.go index 122c1543da55d..3a2c5e5cb3619 100644 --- a/plugins/inputs/postfix/postfix_windows.go +++ b/plugins/inputs/postfix/postfix_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package postfix diff --git a/plugins/inputs/postfix/stat_ctim.go b/plugins/inputs/postfix/stat_ctim.go index 456df5ffd4dd2..06ddccb178fce 100644 --- a/plugins/inputs/postfix/stat_ctim.go +++ b/plugins/inputs/postfix/stat_ctim.go @@ -1,3 +1,4 @@ +//go:build dragonfly || linux || netbsd || openbsd || solaris // +build dragonfly linux netbsd openbsd solaris package postfix diff --git a/plugins/inputs/postfix/stat_ctimespec.go b/plugins/inputs/postfix/stat_ctimespec.go index 40e0de6cc4a40..03f4e0a435f2c 100644 --- a/plugins/inputs/postfix/stat_ctimespec.go +++ b/plugins/inputs/postfix/stat_ctimespec.go @@ -1,3 +1,4 @@ +//go:build darwin || freebsd // +build darwin freebsd package postfix diff --git a/plugins/inputs/postfix/stat_none.go b/plugins/inputs/postfix/stat_none.go index d9b67b1663af8..c1ca6a41c662f 100644 --- a/plugins/inputs/postfix/stat_none.go +++ b/plugins/inputs/postfix/stat_none.go @@ -1,3 +1,4 @@ +//go:build !dragonfly && !linux && !netbsd && !openbsd && !solaris && !darwin && !freebsd // +build !dragonfly,!linux,!netbsd,!openbsd,!solaris,!darwin,!freebsd package postfix diff --git a/plugins/inputs/processes/processes_notwindows.go b/plugins/inputs/processes/processes_notwindows.go index 9faec83afa7d0..3c685cf1ebf7f 100644 --- a/plugins/inputs/processes/processes_notwindows.go +++ b/plugins/inputs/processes/processes_notwindows.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package processes diff --git a/plugins/inputs/processes/processes_test.go b/plugins/inputs/processes/processes_test.go index de04fecb56fc1..144b80f3fc1ec 100644 --- a/plugins/inputs/processes/processes_test.go +++ b/plugins/inputs/processes/processes_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package processes diff --git a/plugins/inputs/processes/processes_windows.go b/plugins/inputs/processes/processes_windows.go index 567373c7c7260..f798a1668c738 100644 --- a/plugins/inputs/processes/processes_windows.go +++ b/plugins/inputs/processes/processes_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package processes diff --git a/plugins/inputs/procstat/native_finder_notwindows.go b/plugins/inputs/procstat/native_finder_notwindows.go index 9d7409ba1df8e..528b083ae628b 100644 --- a/plugins/inputs/procstat/native_finder_notwindows.go +++ b/plugins/inputs/procstat/native_finder_notwindows.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package procstat diff --git a/plugins/inputs/procstat/win_service_notwindows.go b/plugins/inputs/procstat/win_service_notwindows.go index a0a776d33736f..b7efcee17cdc1 100644 --- a/plugins/inputs/procstat/win_service_notwindows.go +++ b/plugins/inputs/procstat/win_service_notwindows.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package procstat diff --git a/plugins/inputs/procstat/win_service_windows.go b/plugins/inputs/procstat/win_service_windows.go index 06dffc8472089..5d9c196e388c0 100644 --- a/plugins/inputs/procstat/win_service_windows.go +++ b/plugins/inputs/procstat/win_service_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package procstat diff --git a/plugins/inputs/ras/ras.go b/plugins/inputs/ras/ras.go index a8599c4a78d0f..a8d4ba727d7df 100644 --- a/plugins/inputs/ras/ras.go +++ b/plugins/inputs/ras/ras.go @@ -1,3 +1,4 @@ +//go:build linux && (386 || amd64 || arm || arm64) // +build linux // +build 386 amd64 arm arm64 diff --git a/plugins/inputs/ras/ras_notlinux.go b/plugins/inputs/ras/ras_notlinux.go index 74f0aaf9fc59f..b0795fd794f6f 100644 --- a/plugins/inputs/ras/ras_notlinux.go +++ b/plugins/inputs/ras/ras_notlinux.go @@ -1,3 +1,4 @@ +//go:build !linux || (linux && !386 && !amd64 && !arm && !arm64) // +build !linux linux,!386,!amd64,!arm,!arm64 package ras diff --git a/plugins/inputs/ras/ras_test.go b/plugins/inputs/ras/ras_test.go index a90258bb4423b..656200fde95cc 100644 --- a/plugins/inputs/ras/ras_test.go +++ b/plugins/inputs/ras/ras_test.go @@ -1,3 +1,4 @@ +//go:build linux && (386 || amd64 || arm || arm64) // +build linux // +build 386 amd64 arm arm64 diff --git a/plugins/inputs/rethinkdb/rethinkdb_server_test.go b/plugins/inputs/rethinkdb/rethinkdb_server_test.go index 82ff292804a8c..0119131900b61 100644 --- a/plugins/inputs/rethinkdb/rethinkdb_server_test.go +++ b/plugins/inputs/rethinkdb/rethinkdb_server_test.go @@ -1,3 +1,4 @@ +//go:build integration // +build integration package rethinkdb diff --git a/plugins/inputs/rethinkdb/rethinkdb_test.go b/plugins/inputs/rethinkdb/rethinkdb_test.go index 9a09864cad91a..651042ab13783 100644 --- a/plugins/inputs/rethinkdb/rethinkdb_test.go +++ b/plugins/inputs/rethinkdb/rethinkdb_test.go @@ -1,3 +1,4 @@ +//go:build integration // +build integration package rethinkdb diff --git a/plugins/inputs/riemann_listener/riemann_listener.go b/plugins/inputs/riemann_listener/riemann_listener.go index 24bdd11540e1b..a38d5989cb5d0 100644 --- a/plugins/inputs/riemann_listener/riemann_listener.go +++ b/plugins/inputs/riemann_listener/riemann_listener.go @@ -368,7 +368,7 @@ func (rsl *RiemannSocketListener) Start(acc telegraf.Accumulator) error { // Handle cancellations from the process func processOsSignals(cancelFunc context.CancelFunc) { - signalChan := make(chan os.Signal) + signalChan := make(chan os.Signal, 1) signal.Notify(signalChan, os.Interrupt) for { sig := <-signalChan diff --git a/plugins/inputs/sensors/sensors.go b/plugins/inputs/sensors/sensors.go index d3a8ba762f379..f2590c105272a 100644 --- a/plugins/inputs/sensors/sensors.go +++ b/plugins/inputs/sensors/sensors.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package sensors diff --git a/plugins/inputs/sensors/sensors_notlinux.go b/plugins/inputs/sensors/sensors_notlinux.go index 62a6211598f4e..424e96181b46b 100644 --- a/plugins/inputs/sensors/sensors_notlinux.go +++ b/plugins/inputs/sensors/sensors_notlinux.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package sensors diff --git a/plugins/inputs/sensors/sensors_test.go b/plugins/inputs/sensors/sensors_test.go index 6bf1b616cb985..be4cace6eab79 100644 --- a/plugins/inputs/sensors/sensors_test.go +++ b/plugins/inputs/sensors/sensors_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package sensors diff --git a/plugins/inputs/snmp/snmp_mocks_generate.go b/plugins/inputs/snmp/snmp_mocks_generate.go index 7227771a7e4fa..f87f9029b0d06 100644 --- a/plugins/inputs/snmp/snmp_mocks_generate.go +++ b/plugins/inputs/snmp/snmp_mocks_generate.go @@ -1,3 +1,4 @@ +//go:build generate // +build generate package main diff --git a/plugins/inputs/sql/drivers_sqlite.go b/plugins/inputs/sql/drivers_sqlite.go index 26cf7e08b5170..945e2b8425a3b 100644 --- a/plugins/inputs/sql/drivers_sqlite.go +++ b/plugins/inputs/sql/drivers_sqlite.go @@ -1,4 +1,7 @@ -// +build linux,freebsd,darwin +//go:build linux && freebsd && darwin && (!mips || !mips64) +// +build linux +// +build freebsd +// +build darwin // +build !mips !mips64 package sql diff --git a/plugins/inputs/synproxy/synproxy_linux.go b/plugins/inputs/synproxy/synproxy_linux.go index bcc9729384282..93cd26e3343f3 100644 --- a/plugins/inputs/synproxy/synproxy_linux.go +++ b/plugins/inputs/synproxy/synproxy_linux.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package synproxy diff --git a/plugins/inputs/synproxy/synproxy_notlinux.go b/plugins/inputs/synproxy/synproxy_notlinux.go index 71a223644d8ed..f12fc70656eba 100644 --- a/plugins/inputs/synproxy/synproxy_notlinux.go +++ b/plugins/inputs/synproxy/synproxy_notlinux.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package synproxy diff --git a/plugins/inputs/synproxy/synproxy_test.go b/plugins/inputs/synproxy/synproxy_test.go index fc5d67d6a064a..dd733253635b8 100644 --- a/plugins/inputs/synproxy/synproxy_test.go +++ b/plugins/inputs/synproxy/synproxy_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package synproxy diff --git a/plugins/inputs/sysstat/sysstat.go b/plugins/inputs/sysstat/sysstat.go index 01b4db9fa4af9..7e69ff41ccdf2 100644 --- a/plugins/inputs/sysstat/sysstat.go +++ b/plugins/inputs/sysstat/sysstat.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package sysstat diff --git a/plugins/inputs/sysstat/sysstat_interval_test.go b/plugins/inputs/sysstat/sysstat_interval_test.go index 972eb9af936de..f714ec10b1c36 100644 --- a/plugins/inputs/sysstat/sysstat_interval_test.go +++ b/plugins/inputs/sysstat/sysstat_interval_test.go @@ -1,5 +1,5 @@ -// +build !race -// +build linux +//go:build !race && linux +// +build !race,linux package sysstat diff --git a/plugins/inputs/sysstat/sysstat_notlinux.go b/plugins/inputs/sysstat/sysstat_notlinux.go index e97e71e78280c..6b5dd6fcf18cb 100644 --- a/plugins/inputs/sysstat/sysstat_notlinux.go +++ b/plugins/inputs/sysstat/sysstat_notlinux.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package sysstat diff --git a/plugins/inputs/sysstat/sysstat_test.go b/plugins/inputs/sysstat/sysstat_test.go index 1766130391bbb..64b596bb329ba 100644 --- a/plugins/inputs/sysstat/sysstat_test.go +++ b/plugins/inputs/sysstat/sysstat_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package sysstat diff --git a/plugins/inputs/systemd_units/systemd_units_notlinux.go b/plugins/inputs/systemd_units/systemd_units_notlinux.go index f53cea3de6eba..32f5b97cc37ec 100644 --- a/plugins/inputs/systemd_units/systemd_units_notlinux.go +++ b/plugins/inputs/systemd_units/systemd_units_notlinux.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package systemd_units diff --git a/plugins/inputs/tail/tail.go b/plugins/inputs/tail/tail.go index d84c09ff8d3c2..d5bda84732ad8 100644 --- a/plugins/inputs/tail/tail.go +++ b/plugins/inputs/tail/tail.go @@ -1,3 +1,4 @@ +//go:build !solaris // +build !solaris package tail diff --git a/plugins/inputs/tail/tail_solaris.go b/plugins/inputs/tail/tail_solaris.go index 802088da28248..093dd16a06c23 100644 --- a/plugins/inputs/tail/tail_solaris.go +++ b/plugins/inputs/tail/tail_solaris.go @@ -1,5 +1,6 @@ // Skipping plugin on Solaris due to fsnotify support // +//go:build solaris // +build solaris package tail diff --git a/plugins/inputs/varnish/varnish.go b/plugins/inputs/varnish/varnish.go index e4f18bee42ed3..d9872b9d81af7 100644 --- a/plugins/inputs/varnish/varnish.go +++ b/plugins/inputs/varnish/varnish.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package varnish diff --git a/plugins/inputs/varnish/varnish_test.go b/plugins/inputs/varnish/varnish_test.go index 4ba9e941a52ee..088c08378c1ef 100644 --- a/plugins/inputs/varnish/varnish_test.go +++ b/plugins/inputs/varnish/varnish_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package varnish diff --git a/plugins/inputs/varnish/varnish_windows.go b/plugins/inputs/varnish/varnish_windows.go index 0c85c106f2b4f..9fed7dfc2a3c8 100644 --- a/plugins/inputs/varnish/varnish_windows.go +++ b/plugins/inputs/varnish/varnish_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package varnish diff --git a/plugins/inputs/win_eventlog/event.go b/plugins/inputs/win_eventlog/event.go index 2169ce8b490b3..86ddefdcb95e0 100644 --- a/plugins/inputs/win_eventlog/event.go +++ b/plugins/inputs/win_eventlog/event.go @@ -1,4 +1,5 @@ -//+build windows +//go:build windows +// +build windows //revive:disable-next-line:var-naming // Package win_eventlog Input plugin to collect Windows Event Log messages diff --git a/plugins/inputs/win_eventlog/syscall_windows.go b/plugins/inputs/win_eventlog/syscall_windows.go index df02913eee2af..d7bc07d0a5d42 100644 --- a/plugins/inputs/win_eventlog/syscall_windows.go +++ b/plugins/inputs/win_eventlog/syscall_windows.go @@ -1,4 +1,5 @@ -//+build windows +//go:build windows +// +build windows //revive:disable-next-line:var-naming // Package win_eventlog Input plugin to collect Windows Event Log messages diff --git a/plugins/inputs/win_eventlog/util.go b/plugins/inputs/win_eventlog/util.go index 7435cdb09ceaf..276e7514228e0 100644 --- a/plugins/inputs/win_eventlog/util.go +++ b/plugins/inputs/win_eventlog/util.go @@ -1,4 +1,5 @@ -//+build windows +//go:build windows +// +build windows //revive:disable-next-line:var-naming // Package win_eventlog Input plugin to collect Windows Event Log messages diff --git a/plugins/inputs/win_eventlog/util_test.go b/plugins/inputs/win_eventlog/util_test.go index ce7428dd391d2..1dc90cc2326d3 100644 --- a/plugins/inputs/win_eventlog/util_test.go +++ b/plugins/inputs/win_eventlog/util_test.go @@ -1,4 +1,5 @@ -//+build windows +//go:build windows +// +build windows //revive:disable-next-line:var-naming // Package win_eventlog Input plugin to collect Windows Event Log messages diff --git a/plugins/inputs/win_eventlog/win_eventlog.go b/plugins/inputs/win_eventlog/win_eventlog.go index 8d0efe3119d97..2ee303d483530 100644 --- a/plugins/inputs/win_eventlog/win_eventlog.go +++ b/plugins/inputs/win_eventlog/win_eventlog.go @@ -1,4 +1,5 @@ -//+build windows +//go:build windows +// +build windows //revive:disable-next-line:var-naming // Package win_eventlog Input plugin to collect Windows Event Log messages diff --git a/plugins/inputs/win_eventlog/win_eventlog_notwindows.go b/plugins/inputs/win_eventlog/win_eventlog_notwindows.go index 005077aa64c7d..e78ad6133b367 100644 --- a/plugins/inputs/win_eventlog/win_eventlog_notwindows.go +++ b/plugins/inputs/win_eventlog/win_eventlog_notwindows.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows //revive:disable-next-line:var-naming diff --git a/plugins/inputs/win_eventlog/win_eventlog_test.go b/plugins/inputs/win_eventlog/win_eventlog_test.go index 9f922431ed776..bd6a434f40088 100644 --- a/plugins/inputs/win_eventlog/win_eventlog_test.go +++ b/plugins/inputs/win_eventlog/win_eventlog_test.go @@ -1,4 +1,5 @@ -//+build windows +//go:build windows +// +build windows //revive:disable-next-line:var-naming // Package win_eventlog Input plugin to collect Windows Event Log messages diff --git a/plugins/inputs/win_eventlog/zsyscall_windows.go b/plugins/inputs/win_eventlog/zsyscall_windows.go index 5c7b0a504b0bf..34c17471691e8 100644 --- a/plugins/inputs/win_eventlog/zsyscall_windows.go +++ b/plugins/inputs/win_eventlog/zsyscall_windows.go @@ -1,4 +1,5 @@ -//+build windows +//go:build windows +// +build windows //revive:disable-next-line:var-naming // Package win_eventlog Input plugin to collect Windows Event Log messages diff --git a/plugins/inputs/win_perf_counters/kernel32.go b/plugins/inputs/win_perf_counters/kernel32.go index 9cdadedc873bd..09cbd4be5f182 100644 --- a/plugins/inputs/win_perf_counters/kernel32.go +++ b/plugins/inputs/win_perf_counters/kernel32.go @@ -28,6 +28,7 @@ // Joseph Watson // Kevin Pors +//go:build windows // +build windows package win_perf_counters diff --git a/plugins/inputs/win_perf_counters/pdh.go b/plugins/inputs/win_perf_counters/pdh.go index 3a24761b9d593..d4e5f14a1c267 100644 --- a/plugins/inputs/win_perf_counters/pdh.go +++ b/plugins/inputs/win_perf_counters/pdh.go @@ -28,6 +28,7 @@ // Joseph Watson // Kevin Pors +//go:build windows // +build windows package win_perf_counters diff --git a/plugins/inputs/win_perf_counters/pdh_386.go b/plugins/inputs/win_perf_counters/pdh_386.go index 134d15c8d1461..ec572db72447e 100644 --- a/plugins/inputs/win_perf_counters/pdh_386.go +++ b/plugins/inputs/win_perf_counters/pdh_386.go @@ -28,6 +28,7 @@ // Joseph Watson // Kevin Pors +//go:build windows // +build windows package win_perf_counters diff --git a/plugins/inputs/win_perf_counters/pdh_amd64.go b/plugins/inputs/win_perf_counters/pdh_amd64.go index ff3b39335bcd4..1afedc317260e 100644 --- a/plugins/inputs/win_perf_counters/pdh_amd64.go +++ b/plugins/inputs/win_perf_counters/pdh_amd64.go @@ -28,6 +28,7 @@ // Joseph Watson // Kevin Pors +//go:build windows // +build windows package win_perf_counters diff --git a/plugins/inputs/win_perf_counters/performance_query.go b/plugins/inputs/win_perf_counters/performance_query.go index a59f96b84dc43..ab130a41dec3f 100644 --- a/plugins/inputs/win_perf_counters/performance_query.go +++ b/plugins/inputs/win_perf_counters/performance_query.go @@ -1,4 +1,5 @@ // Go API over pdh syscalls +//go:build windows // +build windows package win_perf_counters diff --git a/plugins/inputs/win_perf_counters/win_perf_counters.go b/plugins/inputs/win_perf_counters/win_perf_counters.go index 4bcbbfb1b2318..3a74e34a5228a 100644 --- a/plugins/inputs/win_perf_counters/win_perf_counters.go +++ b/plugins/inputs/win_perf_counters/win_perf_counters.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package win_perf_counters diff --git a/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go b/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go index 43b20eb611577..a5ae58370ab4a 100644 --- a/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go +++ b/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package win_perf_counters diff --git a/plugins/inputs/win_perf_counters/win_perf_counters_notwindows.go b/plugins/inputs/win_perf_counters/win_perf_counters_notwindows.go index 427f5d5461ff3..00af92b722552 100644 --- a/plugins/inputs/win_perf_counters/win_perf_counters_notwindows.go +++ b/plugins/inputs/win_perf_counters/win_perf_counters_notwindows.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package win_perf_counters diff --git a/plugins/inputs/win_perf_counters/win_perf_counters_test.go b/plugins/inputs/win_perf_counters/win_perf_counters_test.go index 930e923754ac8..969b518d0f2b0 100644 --- a/plugins/inputs/win_perf_counters/win_perf_counters_test.go +++ b/plugins/inputs/win_perf_counters/win_perf_counters_test.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package win_perf_counters diff --git a/plugins/inputs/win_services/win_services.go b/plugins/inputs/win_services/win_services.go index 185e9b6b67de4..38f873a99284d 100644 --- a/plugins/inputs/win_services/win_services.go +++ b/plugins/inputs/win_services/win_services.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package win_services diff --git a/plugins/inputs/win_services/win_services_integration_test.go b/plugins/inputs/win_services/win_services_integration_test.go index 998aa1ed5eb2f..3c831642a01cf 100644 --- a/plugins/inputs/win_services/win_services_integration_test.go +++ b/plugins/inputs/win_services/win_services_integration_test.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows //these tests must be run under administrator account diff --git a/plugins/inputs/win_services/win_services_notwindows.go b/plugins/inputs/win_services/win_services_notwindows.go index 062c11cfc8eed..aa2f3534ca74d 100644 --- a/plugins/inputs/win_services/win_services_notwindows.go +++ b/plugins/inputs/win_services/win_services_notwindows.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package win_services diff --git a/plugins/inputs/win_services/win_services_test.go b/plugins/inputs/win_services/win_services_test.go index 7d1672e8f6515..69a75372dd086 100644 --- a/plugins/inputs/win_services/win_services_test.go +++ b/plugins/inputs/win_services/win_services_test.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package win_services diff --git a/plugins/inputs/wireless/wireless_linux.go b/plugins/inputs/wireless/wireless_linux.go index 75890a7901074..706f9700d12c9 100644 --- a/plugins/inputs/wireless/wireless_linux.go +++ b/plugins/inputs/wireless/wireless_linux.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package wireless diff --git a/plugins/inputs/wireless/wireless_notlinux.go b/plugins/inputs/wireless/wireless_notlinux.go index 4769acc970e42..435559ca58529 100644 --- a/plugins/inputs/wireless/wireless_notlinux.go +++ b/plugins/inputs/wireless/wireless_notlinux.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package wireless diff --git a/plugins/inputs/wireless/wireless_test.go b/plugins/inputs/wireless/wireless_test.go index 6c562887e54db..20c10de88a347 100644 --- a/plugins/inputs/wireless/wireless_test.go +++ b/plugins/inputs/wireless/wireless_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package wireless diff --git a/plugins/inputs/zfs/zfs_freebsd.go b/plugins/inputs/zfs/zfs_freebsd.go index 491388147d93c..24f6a50997612 100644 --- a/plugins/inputs/zfs/zfs_freebsd.go +++ b/plugins/inputs/zfs/zfs_freebsd.go @@ -1,3 +1,4 @@ +//go:build freebsd // +build freebsd package zfs diff --git a/plugins/inputs/zfs/zfs_freebsd_test.go b/plugins/inputs/zfs/zfs_freebsd_test.go index 4d1fea0ae483a..816f82b6dbf5b 100644 --- a/plugins/inputs/zfs/zfs_freebsd_test.go +++ b/plugins/inputs/zfs/zfs_freebsd_test.go @@ -1,3 +1,4 @@ +//go:build freebsd // +build freebsd package zfs diff --git a/plugins/inputs/zfs/zfs_linux.go b/plugins/inputs/zfs/zfs_linux.go index 276880d7dea97..ac3ca6ee81d23 100644 --- a/plugins/inputs/zfs/zfs_linux.go +++ b/plugins/inputs/zfs/zfs_linux.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package zfs diff --git a/plugins/inputs/zfs/zfs_linux_test.go b/plugins/inputs/zfs/zfs_linux_test.go index 7d8aff81c689c..52622582029a5 100644 --- a/plugins/inputs/zfs/zfs_linux_test.go +++ b/plugins/inputs/zfs/zfs_linux_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package zfs diff --git a/plugins/inputs/zfs/zfs_other.go b/plugins/inputs/zfs/zfs_other.go index 98de02be917dd..963afd3580ff8 100644 --- a/plugins/inputs/zfs/zfs_other.go +++ b/plugins/inputs/zfs/zfs_other.go @@ -1,3 +1,4 @@ +//go:build !linux && !freebsd // +build !linux,!freebsd package zfs diff --git a/plugins/outputs/sql/sqlite.go b/plugins/outputs/sql/sqlite.go index 3703f42923ac1..15666101a957d 100644 --- a/plugins/outputs/sql/sqlite.go +++ b/plugins/outputs/sql/sqlite.go @@ -1,4 +1,7 @@ -// +build linux,freebsd,darwin +//go:build linux && freebsd && darwin && (!mips || !mips64) +// +build linux +// +build freebsd +// +build darwin // +build !mips !mips64 package sql diff --git a/plugins/outputs/sql/sqlite_test.go b/plugins/outputs/sql/sqlite_test.go index 6ed08a2570662..d54ffe877a80f 100644 --- a/plugins/outputs/sql/sqlite_test.go +++ b/plugins/outputs/sql/sqlite_test.go @@ -1,4 +1,6 @@ -// +build linux,freebsd +//go:build linux && freebsd && (!mips || !mips64) +// +build linux +// +build freebsd // +build !mips !mips64 package sql diff --git a/plugins/parsers/influx/machine.go b/plugins/parsers/influx/machine.go index 5d715af1c4aaf..2649cdb42bc37 100644 --- a/plugins/parsers/influx/machine.go +++ b/plugins/parsers/influx/machine.go @@ -1,4 +1,3 @@ - //line plugins/parsers/influx/machine.go.rl:1 package influx @@ -16,19 +15,16 @@ func (e *readErr) Error() string { } var ( - ErrNameParse = errors.New("expected measurement name") - ErrFieldParse = errors.New("expected field") - ErrTagParse = errors.New("expected tag") + ErrNameParse = errors.New("expected measurement name") + ErrFieldParse = errors.New("expected field") + ErrTagParse = errors.New("expected tag") ErrTimestampParse = errors.New("expected timestamp") - ErrParse = errors.New("parse error") - EOF = errors.New("EOF") + ErrParse = errors.New("parse error") + EOF = errors.New("EOF") ) - //line plugins/parsers/influx/machine.go.rl:318 - - //line plugins/parsers/influx/machine.go:33 const LineProtocol_start int = 46 const LineProtocol_first_final int = 46 @@ -39,7 +35,6 @@ const LineProtocol_en_discard_line int = 34 const LineProtocol_en_align int = 85 const LineProtocol_en_series int = 37 - //line plugins/parsers/influx/machine.go.rl:321 type Handler interface { @@ -69,26 +64,25 @@ type machine struct { func NewMachine(handler Handler) *machine { m := &machine{ - handler: handler, + handler: handler, initState: LineProtocol_en_align, } - //line plugins/parsers/influx/machine.go.rl:354 - + //line plugins/parsers/influx/machine.go.rl:355 - + //line plugins/parsers/influx/machine.go.rl:356 - + //line plugins/parsers/influx/machine.go.rl:357 - + //line plugins/parsers/influx/machine.go.rl:358 - + //line plugins/parsers/influx/machine.go.rl:359 - + //line plugins/parsers/influx/machine.go:90 { - ( m.cs) = LineProtocol_start + (m.cs) = LineProtocol_start } //line plugins/parsers/influx/machine.go.rl:360 @@ -98,24 +92,23 @@ func NewMachine(handler Handler) *machine { func NewSeriesMachine(handler Handler) *machine { m := &machine{ - handler: handler, + handler: handler, initState: LineProtocol_en_series, } - //line plugins/parsers/influx/machine.go.rl:371 - + //line plugins/parsers/influx/machine.go.rl:372 - + //line plugins/parsers/influx/machine.go.rl:373 - + //line plugins/parsers/influx/machine.go.rl:374 - + //line plugins/parsers/influx/machine.go.rl:375 - + //line plugins/parsers/influx/machine.go:117 { - ( m.cs) = LineProtocol_start + (m.cs) = LineProtocol_start } //line plugins/parsers/influx/machine.go.rl:376 @@ -135,10 +128,9 @@ func (m *machine) SetData(data []byte) { m.beginMetric = false m.finishMetric = false - //line plugins/parsers/influx/machine.go:140 { - ( m.cs) = LineProtocol_start + (m.cs) = LineProtocol_start } //line plugins/parsers/influx/machine.go.rl:393 @@ -163,391 +155,391 @@ func (m *machine) Next() error { func (m *machine) exec() error { var err error - + //line plugins/parsers/influx/machine.go:168 { - if ( m.p) == ( m.pe) { - goto _test_eof - } - goto _resume + if (m.p) == (m.pe) { + goto _test_eof + } + goto _resume -_again: - switch ( m.cs) { - case 46: - goto st46 - case 1: - goto st1 - case 2: - goto st2 - case 3: - goto st3 - case 0: - goto st0 - case 4: - goto st4 - case 5: - goto st5 - case 6: - goto st6 - case 47: - goto st47 - case 48: - goto st48 - case 49: - goto st49 - case 7: - goto st7 - case 8: - goto st8 - case 9: - goto st9 - case 10: - goto st10 - case 50: - goto st50 - case 51: - goto st51 - case 52: - goto st52 - case 53: - goto st53 - case 54: - goto st54 - case 55: - goto st55 - case 56: - goto st56 - case 57: - goto st57 - case 58: - goto st58 - case 59: - goto st59 - case 60: - goto st60 - case 61: - goto st61 - case 62: - goto st62 - case 63: - goto st63 - case 64: - goto st64 - case 65: - goto st65 - case 66: - goto st66 - case 67: - goto st67 - case 68: - goto st68 - case 69: - goto st69 - case 11: - goto st11 - case 12: - goto st12 - case 13: - goto st13 - case 14: - goto st14 - case 15: - goto st15 - case 70: - goto st70 - case 16: - goto st16 - case 17: - goto st17 - case 71: - goto st71 - case 72: - goto st72 - case 73: - goto st73 - case 74: - goto st74 - case 75: - goto st75 - case 76: - goto st76 - case 77: - goto st77 - case 78: - goto st78 - case 79: - goto st79 - case 18: - goto st18 - case 19: - goto st19 - case 20: - goto st20 - case 80: - goto st80 - case 21: - goto st21 - case 22: - goto st22 - case 23: - goto st23 - case 81: - goto st81 - case 24: - goto st24 - case 25: - goto st25 - case 82: - goto st82 - case 83: - goto st83 - case 26: - goto st26 - case 27: - goto st27 - case 28: - goto st28 - case 29: - goto st29 - case 30: - goto st30 - case 31: - goto st31 - case 32: - goto st32 - case 33: - goto st33 - case 34: - goto st34 - case 84: - goto st84 - case 37: - goto st37 - case 86: - goto st86 - case 87: - goto st87 - case 38: - goto st38 - case 39: - goto st39 - case 40: - goto st40 - case 41: - goto st41 - case 88: - goto st88 - case 42: - goto st42 - case 89: - goto st89 - case 43: - goto st43 - case 44: - goto st44 - case 45: - goto st45 - case 85: - goto st85 - case 35: - goto st35 - case 36: - goto st36 - } + _again: + switch m.cs { + case 46: + goto st46 + case 1: + goto st1 + case 2: + goto st2 + case 3: + goto st3 + case 0: + goto st0 + case 4: + goto st4 + case 5: + goto st5 + case 6: + goto st6 + case 47: + goto st47 + case 48: + goto st48 + case 49: + goto st49 + case 7: + goto st7 + case 8: + goto st8 + case 9: + goto st9 + case 10: + goto st10 + case 50: + goto st50 + case 51: + goto st51 + case 52: + goto st52 + case 53: + goto st53 + case 54: + goto st54 + case 55: + goto st55 + case 56: + goto st56 + case 57: + goto st57 + case 58: + goto st58 + case 59: + goto st59 + case 60: + goto st60 + case 61: + goto st61 + case 62: + goto st62 + case 63: + goto st63 + case 64: + goto st64 + case 65: + goto st65 + case 66: + goto st66 + case 67: + goto st67 + case 68: + goto st68 + case 69: + goto st69 + case 11: + goto st11 + case 12: + goto st12 + case 13: + goto st13 + case 14: + goto st14 + case 15: + goto st15 + case 70: + goto st70 + case 16: + goto st16 + case 17: + goto st17 + case 71: + goto st71 + case 72: + goto st72 + case 73: + goto st73 + case 74: + goto st74 + case 75: + goto st75 + case 76: + goto st76 + case 77: + goto st77 + case 78: + goto st78 + case 79: + goto st79 + case 18: + goto st18 + case 19: + goto st19 + case 20: + goto st20 + case 80: + goto st80 + case 21: + goto st21 + case 22: + goto st22 + case 23: + goto st23 + case 81: + goto st81 + case 24: + goto st24 + case 25: + goto st25 + case 82: + goto st82 + case 83: + goto st83 + case 26: + goto st26 + case 27: + goto st27 + case 28: + goto st28 + case 29: + goto st29 + case 30: + goto st30 + case 31: + goto st31 + case 32: + goto st32 + case 33: + goto st33 + case 34: + goto st34 + case 84: + goto st84 + case 37: + goto st37 + case 86: + goto st86 + case 87: + goto st87 + case 38: + goto st38 + case 39: + goto st39 + case 40: + goto st40 + case 41: + goto st41 + case 88: + goto st88 + case 42: + goto st42 + case 89: + goto st89 + case 43: + goto st43 + case 44: + goto st44 + case 45: + goto st45 + case 85: + goto st85 + case 35: + goto st35 + case 36: + goto st36 + } - if ( m.p)++; ( m.p) == ( m.pe) { - goto _test_eof - } -_resume: - switch ( m.cs) { - case 46: - goto st_case_46 - case 1: - goto st_case_1 - case 2: - goto st_case_2 - case 3: - goto st_case_3 - case 0: - goto st_case_0 - case 4: - goto st_case_4 - case 5: - goto st_case_5 - case 6: - goto st_case_6 - case 47: - goto st_case_47 - case 48: - goto st_case_48 - case 49: - goto st_case_49 - case 7: - goto st_case_7 - case 8: - goto st_case_8 - case 9: - goto st_case_9 - case 10: - goto st_case_10 - case 50: - goto st_case_50 - case 51: - goto st_case_51 - case 52: - goto st_case_52 - case 53: - goto st_case_53 - case 54: - goto st_case_54 - case 55: - goto st_case_55 - case 56: - goto st_case_56 - case 57: - goto st_case_57 - case 58: - goto st_case_58 - case 59: - goto st_case_59 - case 60: - goto st_case_60 - case 61: - goto st_case_61 - case 62: - goto st_case_62 - case 63: - goto st_case_63 - case 64: - goto st_case_64 - case 65: - goto st_case_65 - case 66: - goto st_case_66 - case 67: - goto st_case_67 - case 68: - goto st_case_68 - case 69: - goto st_case_69 - case 11: - goto st_case_11 - case 12: - goto st_case_12 - case 13: - goto st_case_13 - case 14: - goto st_case_14 - case 15: - goto st_case_15 - case 70: - goto st_case_70 - case 16: - goto st_case_16 - case 17: - goto st_case_17 - case 71: - goto st_case_71 - case 72: - goto st_case_72 - case 73: - goto st_case_73 - case 74: - goto st_case_74 - case 75: - goto st_case_75 - case 76: - goto st_case_76 - case 77: - goto st_case_77 - case 78: - goto st_case_78 - case 79: - goto st_case_79 - case 18: - goto st_case_18 - case 19: - goto st_case_19 - case 20: - goto st_case_20 - case 80: - goto st_case_80 - case 21: - goto st_case_21 - case 22: - goto st_case_22 - case 23: - goto st_case_23 - case 81: - goto st_case_81 - case 24: - goto st_case_24 - case 25: - goto st_case_25 - case 82: - goto st_case_82 - case 83: - goto st_case_83 - case 26: - goto st_case_26 - case 27: - goto st_case_27 - case 28: - goto st_case_28 - case 29: - goto st_case_29 - case 30: - goto st_case_30 - case 31: - goto st_case_31 - case 32: - goto st_case_32 - case 33: - goto st_case_33 - case 34: - goto st_case_34 - case 84: - goto st_case_84 - case 37: - goto st_case_37 - case 86: - goto st_case_86 - case 87: - goto st_case_87 - case 38: - goto st_case_38 - case 39: - goto st_case_39 - case 40: - goto st_case_40 - case 41: - goto st_case_41 - case 88: - goto st_case_88 - case 42: - goto st_case_42 - case 89: - goto st_case_89 - case 43: - goto st_case_43 - case 44: - goto st_case_44 - case 45: - goto st_case_45 - case 85: - goto st_case_85 - case 35: - goto st_case_35 - case 36: - goto st_case_36 - } - goto st_out + if (m.p)++; (m.p) == (m.pe) { + goto _test_eof + } + _resume: + switch m.cs { + case 46: + goto st_case_46 + case 1: + goto st_case_1 + case 2: + goto st_case_2 + case 3: + goto st_case_3 + case 0: + goto st_case_0 + case 4: + goto st_case_4 + case 5: + goto st_case_5 + case 6: + goto st_case_6 + case 47: + goto st_case_47 + case 48: + goto st_case_48 + case 49: + goto st_case_49 + case 7: + goto st_case_7 + case 8: + goto st_case_8 + case 9: + goto st_case_9 + case 10: + goto st_case_10 + case 50: + goto st_case_50 + case 51: + goto st_case_51 + case 52: + goto st_case_52 + case 53: + goto st_case_53 + case 54: + goto st_case_54 + case 55: + goto st_case_55 + case 56: + goto st_case_56 + case 57: + goto st_case_57 + case 58: + goto st_case_58 + case 59: + goto st_case_59 + case 60: + goto st_case_60 + case 61: + goto st_case_61 + case 62: + goto st_case_62 + case 63: + goto st_case_63 + case 64: + goto st_case_64 + case 65: + goto st_case_65 + case 66: + goto st_case_66 + case 67: + goto st_case_67 + case 68: + goto st_case_68 + case 69: + goto st_case_69 + case 11: + goto st_case_11 + case 12: + goto st_case_12 + case 13: + goto st_case_13 + case 14: + goto st_case_14 + case 15: + goto st_case_15 + case 70: + goto st_case_70 + case 16: + goto st_case_16 + case 17: + goto st_case_17 + case 71: + goto st_case_71 + case 72: + goto st_case_72 + case 73: + goto st_case_73 + case 74: + goto st_case_74 + case 75: + goto st_case_75 + case 76: + goto st_case_76 + case 77: + goto st_case_77 + case 78: + goto st_case_78 + case 79: + goto st_case_79 + case 18: + goto st_case_18 + case 19: + goto st_case_19 + case 20: + goto st_case_20 + case 80: + goto st_case_80 + case 21: + goto st_case_21 + case 22: + goto st_case_22 + case 23: + goto st_case_23 + case 81: + goto st_case_81 + case 24: + goto st_case_24 + case 25: + goto st_case_25 + case 82: + goto st_case_82 + case 83: + goto st_case_83 + case 26: + goto st_case_26 + case 27: + goto st_case_27 + case 28: + goto st_case_28 + case 29: + goto st_case_29 + case 30: + goto st_case_30 + case 31: + goto st_case_31 + case 32: + goto st_case_32 + case 33: + goto st_case_33 + case 34: + goto st_case_34 + case 84: + goto st_case_84 + case 37: + goto st_case_37 + case 86: + goto st_case_86 + case 87: + goto st_case_87 + case 38: + goto st_case_38 + case 39: + goto st_case_39 + case 40: + goto st_case_40 + case 41: + goto st_case_41 + case 88: + goto st_case_88 + case 42: + goto st_case_42 + case 89: + goto st_case_89 + case 43: + goto st_case_43 + case 44: + goto st_case_44 + case 45: + goto st_case_45 + case 85: + goto st_case_85 + case 35: + goto st_case_35 + case 36: + goto st_case_36 + } + goto st_out st46: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof46 } st_case_46: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr31 case 13: @@ -561,33 +553,33 @@ _resume: case 92: goto tr81 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 12 { goto tr80 } goto tr79 -tr29: + tr29: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st1 -tr79: + goto st1 + tr79: //line plugins/parsers/influx/machine.go.rl:82 - m.beginMetric = true + m.beginMetric = true //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st1 + goto st1 st1: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof1 } st_case_1: //line plugins/parsers/influx/machine.go:590 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr2 case 13: @@ -599,43 +591,49 @@ tr79: case 92: goto st8 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 12 { goto tr1 } goto st1 -tr1: - ( m.cs) = 2 + tr1: + (m.cs) = 2 //line plugins/parsers/influx/machine.go.rl:86 - err = m.handler.SetMeasurement(m.text()) - if err != nil { - ( m.p)-- + err = m.handler.SetMeasurement(m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again -tr56: - ( m.cs) = 2 + goto _again + tr56: + (m.cs) = 2 //line plugins/parsers/influx/machine.go.rl:99 - err = m.handler.AddTag(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddTag(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again + goto _again st2: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof2 } st_case_2: //line plugins/parsers/influx/machine.go:638 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr7 case 13: @@ -649,23 +647,23 @@ tr56: case 92: goto tr8 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 12 { goto st2 } goto tr5 -tr5: + tr5: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st3 + goto st3 st3: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof3 } st_case_3: //line plugins/parsers/influx/machine.go:668 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 32: goto tr7 case 44: @@ -675,99 +673,119 @@ tr5: case 92: goto st12 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 13 { goto tr7 } goto st3 -tr2: - ( m.cs) = 0 + tr2: + (m.cs) = 0 //line plugins/parsers/influx/machine.go.rl:46 - err = ErrTagParse - ( m.p)-- + err = ErrTagParse + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } + (m.cs) = 34 + { + (m.p)++ + goto _out + } - goto _again -tr7: - ( m.cs) = 0 + goto _again + tr7: + (m.cs) = 0 //line plugins/parsers/influx/machine.go.rl:39 - err = ErrFieldParse - ( m.p)-- + err = ErrFieldParse + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } + (m.cs) = 34 + { + (m.p)++ + goto _out + } - goto _again -tr31: - ( m.cs) = 0 + goto _again + tr31: + (m.cs) = 0 //line plugins/parsers/influx/machine.go.rl:32 - err = ErrNameParse - ( m.p)-- + err = ErrNameParse + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } + (m.cs) = 34 + { + (m.p)++ + goto _out + } - goto _again -tr35: - ( m.cs) = 0 + goto _again + tr35: + (m.cs) = 0 //line plugins/parsers/influx/machine.go.rl:53 - err = ErrTimestampParse - ( m.p)-- + err = ErrTimestampParse + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } + (m.cs) = 34 + { + (m.p)++ + goto _out + } - goto _again -tr82: - ( m.cs) = 0 + goto _again + tr82: + (m.cs) = 0 //line plugins/parsers/influx/machine.go.rl:39 - err = ErrFieldParse - ( m.p)-- + err = ErrFieldParse + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } + (m.cs) = 34 + { + (m.p)++ + goto _out + } //line plugins/parsers/influx/machine.go.rl:53 - err = ErrTimestampParse - ( m.p)-- + err = ErrTimestampParse + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } + (m.cs) = 34 + { + (m.p)++ + goto _out + } - goto _again -tr135: + goto _again + tr135: //line plugins/parsers/influx/machine.go.rl:73 - ( m.p)-- + (m.p)-- - {goto st46 } + { + goto st46 + } - goto st0 + goto st0 //line plugins/parsers/influx/machine.go:754 -st_case_0: + st_case_0: st0: - ( m.cs) = 0 + (m.cs) = 0 goto _out -tr10: + tr10: //line plugins/parsers/influx/machine.go.rl:108 - m.key = m.text() + m.key = m.text() - goto st4 + goto st4 st4: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof4 } st_case_4: //line plugins/parsers/influx/machine.go:770 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 34: goto st5 case 45: @@ -785,16 +803,16 @@ tr10: case 116: goto tr20 } - if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + if 49 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto tr16 } goto tr7 st5: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof5 } st_case_5: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr22 case 34: @@ -803,39 +821,39 @@ tr10: goto tr24 } goto tr21 -tr21: + tr21: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st6 -tr22: + goto st6 + tr22: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p //line plugins/parsers/influx/machine.go.rl:166 - m.lineno++ - m.sol = m.p - m.sol++ // next char will be the first column in the line + m.lineno++ + m.sol = m.p + m.sol++ // next char will be the first column in the line - goto st6 -tr26: + goto st6 + tr26: //line plugins/parsers/influx/machine.go.rl:166 - m.lineno++ - m.sol = m.p - m.sol++ // next char will be the first column in the line + m.lineno++ + m.sol = m.p + m.sol++ // next char will be the first column in the line - goto st6 + goto st6 st6: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof6 } st_case_6: //line plugins/parsers/influx/machine.go:838 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr26 case 34: @@ -844,43 +862,49 @@ tr26: goto st13 } goto st6 -tr23: - ( m.cs) = 47 + tr23: + (m.cs) = 47 //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p //line plugins/parsers/influx/machine.go.rl:148 - err = m.handler.AddString(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddString(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again -tr27: - ( m.cs) = 47 + goto _again + tr27: + (m.cs) = 47 //line plugins/parsers/influx/machine.go.rl:148 - err = m.handler.AddString(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddString(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again + goto _again st47: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof47 } st_case_47: //line plugins/parsers/influx/machine.go:883 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr34 case 13: @@ -890,69 +914,81 @@ tr27: case 44: goto st11 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 12 { goto st48 } goto tr82 -tr110: - ( m.cs) = 48 + tr110: + (m.cs) = 48 //line plugins/parsers/influx/machine.go.rl:130 - err = m.handler.AddFloat(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddFloat(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again -tr117: - ( m.cs) = 48 + goto _again + tr117: + (m.cs) = 48 //line plugins/parsers/influx/machine.go.rl:112 - err = m.handler.AddInt(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddInt(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again -tr122: - ( m.cs) = 48 + goto _again + tr122: + (m.cs) = 48 //line plugins/parsers/influx/machine.go.rl:121 - err = m.handler.AddUint(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddUint(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again -tr127: - ( m.cs) = 48 + goto _again + tr127: + (m.cs) = 48 //line plugins/parsers/influx/machine.go.rl:139 - err = m.handler.AddBool(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddBool(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again + goto _again st48: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof48 } st_case_48: //line plugins/parsers/influx/machine.go:955 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr34 case 13: @@ -963,130 +999,148 @@ tr127: goto tr86 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto tr87 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto st48 } goto tr35 -tr34: + tr34: //line plugins/parsers/influx/machine.go.rl:166 - m.lineno++ - m.sol = m.p - m.sol++ // next char will be the first column in the line + m.lineno++ + m.sol = m.p + m.sol++ // next char will be the first column in the line - goto st49 -tr89: - ( m.cs) = 49 + goto st49 + tr89: + (m.cs) = 49 //line plugins/parsers/influx/machine.go.rl:157 - err = m.handler.SetTimestamp(m.text()) - if err != nil { - ( m.p)-- + err = m.handler.SetTimestamp(m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } //line plugins/parsers/influx/machine.go.rl:166 - m.lineno++ - m.sol = m.p - m.sol++ // next char will be the first column in the line + m.lineno++ + m.sol = m.p + m.sol++ // next char will be the first column in the line - goto _again -tr111: - ( m.cs) = 49 + goto _again + tr111: + (m.cs) = 49 //line plugins/parsers/influx/machine.go.rl:130 - err = m.handler.AddFloat(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddFloat(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } //line plugins/parsers/influx/machine.go.rl:166 - m.lineno++ - m.sol = m.p - m.sol++ // next char will be the first column in the line + m.lineno++ + m.sol = m.p + m.sol++ // next char will be the first column in the line - goto _again -tr118: - ( m.cs) = 49 + goto _again + tr118: + (m.cs) = 49 //line plugins/parsers/influx/machine.go.rl:112 - err = m.handler.AddInt(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddInt(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } //line plugins/parsers/influx/machine.go.rl:166 - m.lineno++ - m.sol = m.p - m.sol++ // next char will be the first column in the line + m.lineno++ + m.sol = m.p + m.sol++ // next char will be the first column in the line - goto _again -tr123: - ( m.cs) = 49 + goto _again + tr123: + (m.cs) = 49 //line plugins/parsers/influx/machine.go.rl:121 - err = m.handler.AddUint(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddUint(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } //line plugins/parsers/influx/machine.go.rl:166 - m.lineno++ - m.sol = m.p - m.sol++ // next char will be the first column in the line + m.lineno++ + m.sol = m.p + m.sol++ // next char will be the first column in the line - goto _again -tr128: - ( m.cs) = 49 + goto _again + tr128: + (m.cs) = 49 //line plugins/parsers/influx/machine.go.rl:139 - err = m.handler.AddBool(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddBool(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } //line plugins/parsers/influx/machine.go.rl:166 - m.lineno++ - m.sol = m.p - m.sol++ // next char will be the first column in the line + m.lineno++ + m.sol = m.p + m.sol++ // next char will be the first column in the line - goto _again + goto _again st49: //line plugins/parsers/influx/machine.go.rl:172 - m.finishMetric = true - ( m.cs) = 85; - {( m.p)++; goto _out } + m.finishMetric = true + (m.cs) = 85 + { + (m.p)++ + goto _out + } - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof49 } st_case_49: //line plugins/parsers/influx/machine.go:1089 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr31 case 13: @@ -1100,23 +1154,23 @@ tr128: case 92: goto tr32 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 12 { goto st7 } goto tr29 -tr80: + tr80: //line plugins/parsers/influx/machine.go.rl:82 - m.beginMetric = true + m.beginMetric = true - goto st7 + goto st7 st7: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof7 } st_case_7: //line plugins/parsers/influx/machine.go:1119 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr31 case 13: @@ -1130,140 +1184,155 @@ tr80: case 92: goto tr32 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 12 { goto st7 } goto tr29 -tr32: + tr32: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st8 -tr81: + goto st8 + tr81: //line plugins/parsers/influx/machine.go.rl:82 - m.beginMetric = true + m.beginMetric = true //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st8 + goto st8 st8: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof8 } st_case_8: //line plugins/parsers/influx/machine.go:1159 - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 13 { goto st0 } goto st1 -tr90: - ( m.cs) = 9 + tr90: + (m.cs) = 9 //line plugins/parsers/influx/machine.go.rl:157 - err = m.handler.SetTimestamp(m.text()) - if err != nil { - ( m.p)-- + err = m.handler.SetTimestamp(m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again -tr112: - ( m.cs) = 9 + goto _again + tr112: + (m.cs) = 9 //line plugins/parsers/influx/machine.go.rl:130 - err = m.handler.AddFloat(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddFloat(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again -tr119: - ( m.cs) = 9 + goto _again + tr119: + (m.cs) = 9 //line plugins/parsers/influx/machine.go.rl:112 - err = m.handler.AddInt(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddInt(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again -tr124: - ( m.cs) = 9 + goto _again + tr124: + (m.cs) = 9 //line plugins/parsers/influx/machine.go.rl:121 - err = m.handler.AddUint(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddUint(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again -tr129: - ( m.cs) = 9 + goto _again + tr129: + (m.cs) = 9 //line plugins/parsers/influx/machine.go.rl:139 - err = m.handler.AddBool(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddBool(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again + goto _again st9: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof9 } st_case_9: //line plugins/parsers/influx/machine.go:1234 - if ( m.data)[( m.p)] == 10 { + if (m.data)[(m.p)] == 10 { goto tr34 } goto st0 -tr86: + tr86: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st10 + goto st10 st10: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof10 } st_case_10: //line plugins/parsers/influx/machine.go:1250 - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st50 } goto tr35 -tr87: + tr87: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st50 + goto st50 st50: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof50 } st_case_50: //line plugins/parsers/influx/machine.go:1266 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr89 case 13: @@ -1272,34 +1341,37 @@ tr87: goto tr88 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st52 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr88 } goto tr35 -tr88: - ( m.cs) = 51 + tr88: + (m.cs) = 51 //line plugins/parsers/influx/machine.go.rl:157 - err = m.handler.SetTimestamp(m.text()) - if err != nil { - ( m.p)-- + err = m.handler.SetTimestamp(m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again + goto _again st51: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof51 } st_case_51: //line plugins/parsers/influx/machine.go:1302 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr34 case 13: @@ -1307,16 +1379,16 @@ tr88: case 32: goto st51 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 12 { goto st51 } goto st0 st52: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof52 } st_case_52: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr89 case 13: @@ -1325,20 +1397,20 @@ tr88: goto tr88 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st53 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr88 } goto tr35 st53: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof53 } st_case_53: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr89 case 13: @@ -1347,20 +1419,20 @@ tr88: goto tr88 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st54 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr88 } goto tr35 st54: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof54 } st_case_54: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr89 case 13: @@ -1369,20 +1441,20 @@ tr88: goto tr88 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st55 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr88 } goto tr35 st55: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof55 } st_case_55: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr89 case 13: @@ -1391,20 +1463,20 @@ tr88: goto tr88 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st56 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr88 } goto tr35 st56: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof56 } st_case_56: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr89 case 13: @@ -1413,20 +1485,20 @@ tr88: goto tr88 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st57 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr88 } goto tr35 st57: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof57 } st_case_57: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr89 case 13: @@ -1435,20 +1507,20 @@ tr88: goto tr88 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st58 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr88 } goto tr35 st58: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof58 } st_case_58: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr89 case 13: @@ -1457,20 +1529,20 @@ tr88: goto tr88 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st59 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr88 } goto tr35 st59: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof59 } st_case_59: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr89 case 13: @@ -1479,20 +1551,20 @@ tr88: goto tr88 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st60 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr88 } goto tr35 st60: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof60 } st_case_60: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr89 case 13: @@ -1501,20 +1573,20 @@ tr88: goto tr88 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st61 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr88 } goto tr35 st61: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof61 } st_case_61: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr89 case 13: @@ -1523,20 +1595,20 @@ tr88: goto tr88 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st62 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr88 } goto tr35 st62: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof62 } st_case_62: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr89 case 13: @@ -1545,20 +1617,20 @@ tr88: goto tr88 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st63 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr88 } goto tr35 st63: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof63 } st_case_63: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr89 case 13: @@ -1567,20 +1639,20 @@ tr88: goto tr88 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st64 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr88 } goto tr35 st64: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof64 } st_case_64: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr89 case 13: @@ -1589,20 +1661,20 @@ tr88: goto tr88 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st65 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr88 } goto tr35 st65: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof65 } st_case_65: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr89 case 13: @@ -1611,20 +1683,20 @@ tr88: goto tr88 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st66 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr88 } goto tr35 st66: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof66 } st_case_66: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr89 case 13: @@ -1633,20 +1705,20 @@ tr88: goto tr88 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st67 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr88 } goto tr35 st67: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof67 } st_case_67: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr89 case 13: @@ -1655,20 +1727,20 @@ tr88: goto tr88 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st68 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr88 } goto tr35 st68: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof68 } st_case_68: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr89 case 13: @@ -1677,20 +1749,20 @@ tr88: goto tr88 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st69 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr88 } goto tr35 st69: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof69 } st_case_69: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr89 case 13: @@ -1698,69 +1770,81 @@ tr88: case 32: goto tr88 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 12 { goto tr88 } goto tr35 -tr113: - ( m.cs) = 11 + tr113: + (m.cs) = 11 //line plugins/parsers/influx/machine.go.rl:130 - err = m.handler.AddFloat(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddFloat(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again -tr120: - ( m.cs) = 11 + goto _again + tr120: + (m.cs) = 11 //line plugins/parsers/influx/machine.go.rl:112 - err = m.handler.AddInt(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddInt(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again -tr125: - ( m.cs) = 11 + goto _again + tr125: + (m.cs) = 11 //line plugins/parsers/influx/machine.go.rl:121 - err = m.handler.AddUint(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddUint(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again -tr130: - ( m.cs) = 11 + goto _again + tr130: + (m.cs) = 11 //line plugins/parsers/influx/machine.go.rl:139 - err = m.handler.AddBool(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddBool(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again + goto _again st11: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof11 } st_case_11: //line plugins/parsers/influx/machine.go:1763 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 32: goto tr7 case 44: @@ -1770,89 +1854,89 @@ tr130: case 92: goto tr8 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 13 { goto tr7 } goto tr5 -tr8: + tr8: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st12 + goto st12 st12: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof12 } st_case_12: //line plugins/parsers/influx/machine.go:1789 - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 13 { goto tr7 } goto st3 -tr24: + tr24: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st13 + goto st13 st13: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof13 } st_case_13: //line plugins/parsers/influx/machine.go:1805 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 34: goto st6 case 92: goto st6 } goto tr7 -tr13: + tr13: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st14 + goto st14 st14: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof14 } st_case_14: //line plugins/parsers/influx/machine.go:1824 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 46: goto st15 case 48: goto st72 } - if 49 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + if 49 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st75 } goto tr7 -tr14: + tr14: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st15 + goto st15 st15: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof15 } st_case_15: //line plugins/parsers/influx/machine.go:1846 - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st70 } goto tr7 st70: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof70 } st_case_70: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr111 case 13: @@ -1867,20 +1951,20 @@ tr14: goto st16 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st70 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr110 } goto tr82 st16: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof16 } st_case_16: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 34: goto st17 case 43: @@ -1888,25 +1972,25 @@ tr14: case 45: goto st17 } - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st71 } goto tr7 st17: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof17 } st_case_17: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st71 } goto tr7 st71: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof71 } st_case_71: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr111 case 13: @@ -1917,20 +2001,20 @@ tr14: goto tr113 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st71 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr110 } goto tr82 st72: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof72 } st_case_72: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr111 case 13: @@ -1949,20 +2033,20 @@ tr14: goto st74 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st73 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr110 } goto tr82 st73: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof73 } st_case_73: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr111 case 13: @@ -1979,20 +2063,20 @@ tr14: goto st16 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st73 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr110 } goto tr82 st74: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof74 } st_case_74: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr118 case 13: @@ -2002,16 +2086,16 @@ tr14: case 44: goto tr120 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 12 { goto tr117 } goto tr82 st75: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof75 } st_case_75: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr111 case 13: @@ -2030,27 +2114,27 @@ tr14: goto st74 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st75 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr110 } goto tr82 -tr15: + tr15: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st76 + goto st76 st76: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof76 } st_case_76: //line plugins/parsers/influx/machine.go:2053 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr111 case 13: @@ -2071,20 +2155,20 @@ tr15: goto st77 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st73 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr110 } goto tr82 st77: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof77 } st_case_77: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr123 case 13: @@ -2094,23 +2178,23 @@ tr15: case 44: goto tr125 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 12 { goto tr122 } goto tr82 -tr16: + tr16: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st78 + goto st78 st78: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof78 } st_case_78: //line plugins/parsers/influx/machine.go:2113 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr111 case 13: @@ -2131,27 +2215,27 @@ tr16: goto st77 } switch { - case ( m.data)[( m.p)] > 12: - if 48 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 57 { + case (m.data)[(m.p)] > 12: + if 48 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 57 { goto st78 } - case ( m.data)[( m.p)] >= 9: + case (m.data)[(m.p)] >= 9: goto tr110 } goto tr82 -tr17: + tr17: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st79 + goto st79 st79: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof79 } st_case_79: //line plugins/parsers/influx/machine.go:2154 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr128 case 13: @@ -2165,43 +2249,43 @@ tr17: case 97: goto st21 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 12 { goto tr127 } goto tr82 st18: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof18 } st_case_18: - if ( m.data)[( m.p)] == 76 { + if (m.data)[(m.p)] == 76 { goto st19 } goto tr7 st19: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof19 } st_case_19: - if ( m.data)[( m.p)] == 83 { + if (m.data)[(m.p)] == 83 { goto st20 } goto tr7 st20: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof20 } st_case_20: - if ( m.data)[( m.p)] == 69 { + if (m.data)[(m.p)] == 69 { goto st80 } goto tr7 st80: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof80 } st_case_80: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr128 case 13: @@ -2211,50 +2295,50 @@ tr17: case 44: goto tr130 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 12 { goto tr127 } goto tr82 st21: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof21 } st_case_21: - if ( m.data)[( m.p)] == 108 { + if (m.data)[(m.p)] == 108 { goto st22 } goto tr7 st22: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof22 } st_case_22: - if ( m.data)[( m.p)] == 115 { + if (m.data)[(m.p)] == 115 { goto st23 } goto tr7 st23: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof23 } st_case_23: - if ( m.data)[( m.p)] == 101 { + if (m.data)[(m.p)] == 101 { goto st80 } goto tr7 -tr18: + tr18: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st81 + goto st81 st81: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof81 } st_case_81: //line plugins/parsers/influx/machine.go:2257 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr128 case 13: @@ -2268,41 +2352,41 @@ tr18: case 114: goto st25 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 12 { goto tr127 } goto tr82 st24: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof24 } st_case_24: - if ( m.data)[( m.p)] == 85 { + if (m.data)[(m.p)] == 85 { goto st20 } goto tr7 st25: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof25 } st_case_25: - if ( m.data)[( m.p)] == 117 { + if (m.data)[(m.p)] == 117 { goto st23 } goto tr7 -tr19: + tr19: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st82 + goto st82 st82: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof82 } st_case_82: //line plugins/parsers/influx/machine.go:2305 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr128 case 13: @@ -2314,23 +2398,23 @@ tr19: case 97: goto st21 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 12 { goto tr127 } goto tr82 -tr20: + tr20: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st83 + goto st83 st83: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof83 } st_case_83: //line plugins/parsers/influx/machine.go:2333 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr128 case 13: @@ -2342,43 +2426,49 @@ tr20: case 114: goto st25 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 12 { goto tr127 } goto tr82 -tr3: - ( m.cs) = 26 + tr3: + (m.cs) = 26 //line plugins/parsers/influx/machine.go.rl:86 - err = m.handler.SetMeasurement(m.text()) - if err != nil { - ( m.p)-- + err = m.handler.SetMeasurement(m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again -tr57: - ( m.cs) = 26 + goto _again + tr57: + (m.cs) = 26 //line plugins/parsers/influx/machine.go.rl:99 - err = m.handler.AddTag(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddTag(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again + goto _again st26: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof26 } st_case_26: //line plugins/parsers/influx/machine.go:2381 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 32: goto tr2 case 44: @@ -2388,23 +2478,23 @@ tr57: case 92: goto tr49 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 13 { goto tr2 } goto tr48 -tr48: + tr48: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st27 + goto st27 st27: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof27 } st_case_27: //line plugins/parsers/influx/machine.go:2407 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 32: goto tr2 case 44: @@ -2414,23 +2504,23 @@ tr48: case 92: goto st32 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 13 { goto tr2 } goto st27 -tr51: + tr51: //line plugins/parsers/influx/machine.go.rl:95 - m.key = m.text() + m.key = m.text() - goto st28 + goto st28 st28: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof28 } st_case_28: //line plugins/parsers/influx/machine.go:2433 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 32: goto tr2 case 44: @@ -2440,23 +2530,23 @@ tr51: case 92: goto tr54 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 13 { goto tr2 } goto tr53 -tr53: + tr53: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st29 + goto st29 st29: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof29 } st_case_29: //line plugins/parsers/influx/machine.go:2459 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr2 case 13: @@ -2470,39 +2560,39 @@ tr53: case 92: goto st30 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 12 { goto tr56 } goto st29 -tr54: + tr54: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st30 + goto st30 st30: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof30 } st_case_30: //line plugins/parsers/influx/machine.go:2489 - if ( m.data)[( m.p)] == 92 { + if (m.data)[(m.p)] == 92 { goto st31 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 13 { goto tr2 } goto st29 st31: //line plugins/parsers/influx/machine.go.rl:248 - ( m.p)-- - - if ( m.p)++; ( m.p) == ( m.pe) { + (m.p)-- + + if (m.p)++; (m.p) == (m.pe) { goto _test_eof31 } st_case_31: //line plugins/parsers/influx/machine.go:2505 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr2 case 13: @@ -2516,39 +2606,39 @@ tr54: case 92: goto st30 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 12 { goto tr56 } goto st29 -tr49: + tr49: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st32 + goto st32 st32: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof32 } st_case_32: //line plugins/parsers/influx/machine.go:2535 - if ( m.data)[( m.p)] == 92 { + if (m.data)[(m.p)] == 92 { goto st33 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 13 { goto tr2 } goto st27 st33: //line plugins/parsers/influx/machine.go.rl:248 - ( m.p)-- - - if ( m.p)++; ( m.p) == ( m.pe) { + (m.p)-- + + if (m.p)++; (m.p) == (m.pe) { goto _test_eof33 } st_case_33: //line plugins/parsers/influx/machine.go:2551 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 32: goto tr2 case 44: @@ -2558,44 +2648,46 @@ tr49: case 92: goto st32 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 13 { goto tr2 } goto st27 st34: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof34 } st_case_34: - if ( m.data)[( m.p)] == 10 { + if (m.data)[(m.p)] == 10 { goto tr62 } goto st34 -tr62: + tr62: //line plugins/parsers/influx/machine.go.rl:166 - m.lineno++ - m.sol = m.p - m.sol++ // next char will be the first column in the line + m.lineno++ + m.sol = m.p + m.sol++ // next char will be the first column in the line //line plugins/parsers/influx/machine.go.rl:78 - {goto st85 } + { + goto st85 + } - goto st84 + goto st84 st84: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof84 } st_case_84: //line plugins/parsers/influx/machine.go:2592 goto st0 st37: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof37 } st_case_37: - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 32: goto tr31 case 35: @@ -2605,27 +2697,27 @@ tr62: case 92: goto tr66 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 13 { goto tr31 } goto tr65 -tr65: + tr65: //line plugins/parsers/influx/machine.go.rl:82 - m.beginMetric = true + m.beginMetric = true //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st86 + goto st86 st86: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof86 } st_case_86: //line plugins/parsers/influx/machine.go:2628 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr138 case 13: @@ -2637,138 +2729,159 @@ tr65: case 92: goto st45 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 12 { goto tr2 } goto st86 -tr67: + tr67: //line plugins/parsers/influx/machine.go.rl:166 - m.lineno++ - m.sol = m.p - m.sol++ // next char will be the first column in the line + m.lineno++ + m.sol = m.p + m.sol++ // next char will be the first column in the line - goto st87 -tr138: - ( m.cs) = 87 + goto st87 + tr138: + (m.cs) = 87 //line plugins/parsers/influx/machine.go.rl:86 - err = m.handler.SetMeasurement(m.text()) - if err != nil { - ( m.p)-- + err = m.handler.SetMeasurement(m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } //line plugins/parsers/influx/machine.go.rl:166 - m.lineno++ - m.sol = m.p - m.sol++ // next char will be the first column in the line + m.lineno++ + m.sol = m.p + m.sol++ // next char will be the first column in the line - goto _again -tr142: - ( m.cs) = 87 + goto _again + tr142: + (m.cs) = 87 //line plugins/parsers/influx/machine.go.rl:99 - err = m.handler.AddTag(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddTag(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } //line plugins/parsers/influx/machine.go.rl:166 - m.lineno++ - m.sol = m.p - m.sol++ // next char will be the first column in the line + m.lineno++ + m.sol = m.p + m.sol++ // next char will be the first column in the line - goto _again + goto _again st87: //line plugins/parsers/influx/machine.go.rl:172 - m.finishMetric = true - ( m.cs) = 85; - {( m.p)++; goto _out } + m.finishMetric = true + (m.cs) = 85 + { + (m.p)++ + goto _out + } - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof87 } st_case_87: //line plugins/parsers/influx/machine.go:2702 goto st0 -tr139: - ( m.cs) = 38 + tr139: + (m.cs) = 38 //line plugins/parsers/influx/machine.go.rl:86 - err = m.handler.SetMeasurement(m.text()) - if err != nil { - ( m.p)-- + err = m.handler.SetMeasurement(m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again -tr143: - ( m.cs) = 38 + goto _again + tr143: + (m.cs) = 38 //line plugins/parsers/influx/machine.go.rl:99 - err = m.handler.AddTag(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddTag(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again + goto _again st38: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof38 } st_case_38: //line plugins/parsers/influx/machine.go:2735 - if ( m.data)[( m.p)] == 10 { + if (m.data)[(m.p)] == 10 { goto tr67 } goto st0 -tr140: - ( m.cs) = 39 + tr140: + (m.cs) = 39 //line plugins/parsers/influx/machine.go.rl:86 - err = m.handler.SetMeasurement(m.text()) - if err != nil { - ( m.p)-- + err = m.handler.SetMeasurement(m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again -tr144: - ( m.cs) = 39 + goto _again + tr144: + (m.cs) = 39 //line plugins/parsers/influx/machine.go.rl:99 - err = m.handler.AddTag(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddTag(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + goto _out + } + } - goto _again + goto _again st39: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof39 } st_case_39: //line plugins/parsers/influx/machine.go:2771 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 32: goto tr2 case 44: @@ -2778,23 +2891,23 @@ tr144: case 92: goto tr69 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 13 { goto tr2 } goto tr68 -tr68: + tr68: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st40 + goto st40 st40: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof40 } st_case_40: //line plugins/parsers/influx/machine.go:2797 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 32: goto tr2 case 44: @@ -2804,23 +2917,23 @@ tr68: case 92: goto st43 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 13 { goto tr2 } goto st40 -tr71: + tr71: //line plugins/parsers/influx/machine.go.rl:95 - m.key = m.text() + m.key = m.text() - goto st41 + goto st41 st41: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof41 } st_case_41: //line plugins/parsers/influx/machine.go:2823 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 32: goto tr2 case 44: @@ -2830,23 +2943,23 @@ tr71: case 92: goto tr74 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 13 { goto tr2 } goto tr73 -tr73: + tr73: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st88 + goto st88 st88: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof88 } st_case_88: //line plugins/parsers/influx/machine.go:2849 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr142 case 13: @@ -2860,39 +2973,39 @@ tr73: case 92: goto st42 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 12 { goto tr2 } goto st88 -tr74: + tr74: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st42 + goto st42 st42: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof42 } st_case_42: //line plugins/parsers/influx/machine.go:2879 - if ( m.data)[( m.p)] == 92 { + if (m.data)[(m.p)] == 92 { goto st89 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 13 { goto tr2 } goto st88 st89: //line plugins/parsers/influx/machine.go.rl:248 - ( m.p)-- - - if ( m.p)++; ( m.p) == ( m.pe) { + (m.p)-- + + if (m.p)++; (m.p) == (m.pe) { goto _test_eof89 } st_case_89: //line plugins/parsers/influx/machine.go:2895 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr142 case 13: @@ -2906,39 +3019,39 @@ tr74: case 92: goto st42 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 12 { goto tr2 } goto st88 -tr69: + tr69: //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st43 + goto st43 st43: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof43 } st_case_43: //line plugins/parsers/influx/machine.go:2925 - if ( m.data)[( m.p)] == 92 { + if (m.data)[(m.p)] == 92 { goto st44 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 13 { goto tr2 } goto st40 st44: //line plugins/parsers/influx/machine.go.rl:248 - ( m.p)-- - - if ( m.p)++; ( m.p) == ( m.pe) { + (m.p)-- + + if (m.p)++; (m.p) == (m.pe) { goto _test_eof44 } st_case_44: //line plugins/parsers/influx/machine.go:2941 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 32: goto tr2 case 44: @@ -2948,45 +3061,45 @@ tr69: case 92: goto st43 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 13 { goto tr2 } goto st40 -tr66: + tr66: //line plugins/parsers/influx/machine.go.rl:82 - m.beginMetric = true + m.beginMetric = true //line plugins/parsers/influx/machine.go.rl:28 - m.pb = m.p + m.pb = m.p - goto st45 + goto st45 st45: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof45 } st_case_45: //line plugins/parsers/influx/machine.go:2971 - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 13 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 13 { goto st0 } goto st86 -tr63: + tr63: //line plugins/parsers/influx/machine.go.rl:166 - m.lineno++ - m.sol = m.p - m.sol++ // next char will be the first column in the line + m.lineno++ + m.sol = m.p + m.sol++ // next char will be the first column in the line - goto st85 + goto st85 st85: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof85 } st_case_85: //line plugins/parsers/influx/machine.go:2989 - switch ( m.data)[( m.p)] { + switch (m.data)[(m.p)] { case 10: goto tr63 case 13: @@ -2996,312 +3109,554 @@ tr63: case 35: goto st36 } - if 9 <= ( m.data)[( m.p)] && ( m.data)[( m.p)] <= 12 { + if 9 <= (m.data)[(m.p)] && (m.data)[(m.p)] <= 12 { goto st85 } goto tr135 st35: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof35 } st_case_35: - if ( m.data)[( m.p)] == 10 { + if (m.data)[(m.p)] == 10 { goto tr63 } goto st0 st36: - if ( m.p)++; ( m.p) == ( m.pe) { + if (m.p)++; (m.p) == (m.pe) { goto _test_eof36 } st_case_36: - if ( m.data)[( m.p)] == 10 { + if (m.data)[(m.p)] == 10 { goto tr63 } goto st36 st_out: - _test_eof46: ( m.cs) = 46; goto _test_eof - _test_eof1: ( m.cs) = 1; goto _test_eof - _test_eof2: ( m.cs) = 2; goto _test_eof - _test_eof3: ( m.cs) = 3; goto _test_eof - _test_eof4: ( m.cs) = 4; goto _test_eof - _test_eof5: ( m.cs) = 5; goto _test_eof - _test_eof6: ( m.cs) = 6; goto _test_eof - _test_eof47: ( m.cs) = 47; goto _test_eof - _test_eof48: ( m.cs) = 48; goto _test_eof - _test_eof49: ( m.cs) = 49; goto _test_eof - _test_eof7: ( m.cs) = 7; goto _test_eof - _test_eof8: ( m.cs) = 8; goto _test_eof - _test_eof9: ( m.cs) = 9; goto _test_eof - _test_eof10: ( m.cs) = 10; goto _test_eof - _test_eof50: ( m.cs) = 50; goto _test_eof - _test_eof51: ( m.cs) = 51; goto _test_eof - _test_eof52: ( m.cs) = 52; goto _test_eof - _test_eof53: ( m.cs) = 53; goto _test_eof - _test_eof54: ( m.cs) = 54; goto _test_eof - _test_eof55: ( m.cs) = 55; goto _test_eof - _test_eof56: ( m.cs) = 56; goto _test_eof - _test_eof57: ( m.cs) = 57; goto _test_eof - _test_eof58: ( m.cs) = 58; goto _test_eof - _test_eof59: ( m.cs) = 59; goto _test_eof - _test_eof60: ( m.cs) = 60; goto _test_eof - _test_eof61: ( m.cs) = 61; goto _test_eof - _test_eof62: ( m.cs) = 62; goto _test_eof - _test_eof63: ( m.cs) = 63; goto _test_eof - _test_eof64: ( m.cs) = 64; goto _test_eof - _test_eof65: ( m.cs) = 65; goto _test_eof - _test_eof66: ( m.cs) = 66; goto _test_eof - _test_eof67: ( m.cs) = 67; goto _test_eof - _test_eof68: ( m.cs) = 68; goto _test_eof - _test_eof69: ( m.cs) = 69; goto _test_eof - _test_eof11: ( m.cs) = 11; goto _test_eof - _test_eof12: ( m.cs) = 12; goto _test_eof - _test_eof13: ( m.cs) = 13; goto _test_eof - _test_eof14: ( m.cs) = 14; goto _test_eof - _test_eof15: ( m.cs) = 15; goto _test_eof - _test_eof70: ( m.cs) = 70; goto _test_eof - _test_eof16: ( m.cs) = 16; goto _test_eof - _test_eof17: ( m.cs) = 17; goto _test_eof - _test_eof71: ( m.cs) = 71; goto _test_eof - _test_eof72: ( m.cs) = 72; goto _test_eof - _test_eof73: ( m.cs) = 73; goto _test_eof - _test_eof74: ( m.cs) = 74; goto _test_eof - _test_eof75: ( m.cs) = 75; goto _test_eof - _test_eof76: ( m.cs) = 76; goto _test_eof - _test_eof77: ( m.cs) = 77; goto _test_eof - _test_eof78: ( m.cs) = 78; goto _test_eof - _test_eof79: ( m.cs) = 79; goto _test_eof - _test_eof18: ( m.cs) = 18; goto _test_eof - _test_eof19: ( m.cs) = 19; goto _test_eof - _test_eof20: ( m.cs) = 20; goto _test_eof - _test_eof80: ( m.cs) = 80; goto _test_eof - _test_eof21: ( m.cs) = 21; goto _test_eof - _test_eof22: ( m.cs) = 22; goto _test_eof - _test_eof23: ( m.cs) = 23; goto _test_eof - _test_eof81: ( m.cs) = 81; goto _test_eof - _test_eof24: ( m.cs) = 24; goto _test_eof - _test_eof25: ( m.cs) = 25; goto _test_eof - _test_eof82: ( m.cs) = 82; goto _test_eof - _test_eof83: ( m.cs) = 83; goto _test_eof - _test_eof26: ( m.cs) = 26; goto _test_eof - _test_eof27: ( m.cs) = 27; goto _test_eof - _test_eof28: ( m.cs) = 28; goto _test_eof - _test_eof29: ( m.cs) = 29; goto _test_eof - _test_eof30: ( m.cs) = 30; goto _test_eof - _test_eof31: ( m.cs) = 31; goto _test_eof - _test_eof32: ( m.cs) = 32; goto _test_eof - _test_eof33: ( m.cs) = 33; goto _test_eof - _test_eof34: ( m.cs) = 34; goto _test_eof - _test_eof84: ( m.cs) = 84; goto _test_eof - _test_eof37: ( m.cs) = 37; goto _test_eof - _test_eof86: ( m.cs) = 86; goto _test_eof - _test_eof87: ( m.cs) = 87; goto _test_eof - _test_eof38: ( m.cs) = 38; goto _test_eof - _test_eof39: ( m.cs) = 39; goto _test_eof - _test_eof40: ( m.cs) = 40; goto _test_eof - _test_eof41: ( m.cs) = 41; goto _test_eof - _test_eof88: ( m.cs) = 88; goto _test_eof - _test_eof42: ( m.cs) = 42; goto _test_eof - _test_eof89: ( m.cs) = 89; goto _test_eof - _test_eof43: ( m.cs) = 43; goto _test_eof - _test_eof44: ( m.cs) = 44; goto _test_eof - _test_eof45: ( m.cs) = 45; goto _test_eof - _test_eof85: ( m.cs) = 85; goto _test_eof - _test_eof35: ( m.cs) = 35; goto _test_eof - _test_eof36: ( m.cs) = 36; goto _test_eof - - _test_eof: {} - if ( m.p) == ( m.eof) { - switch ( m.cs) { - case 7, 37: + _test_eof46: + (m.cs) = 46 + goto _test_eof + _test_eof1: + (m.cs) = 1 + goto _test_eof + _test_eof2: + (m.cs) = 2 + goto _test_eof + _test_eof3: + (m.cs) = 3 + goto _test_eof + _test_eof4: + (m.cs) = 4 + goto _test_eof + _test_eof5: + (m.cs) = 5 + goto _test_eof + _test_eof6: + (m.cs) = 6 + goto _test_eof + _test_eof47: + (m.cs) = 47 + goto _test_eof + _test_eof48: + (m.cs) = 48 + goto _test_eof + _test_eof49: + (m.cs) = 49 + goto _test_eof + _test_eof7: + (m.cs) = 7 + goto _test_eof + _test_eof8: + (m.cs) = 8 + goto _test_eof + _test_eof9: + (m.cs) = 9 + goto _test_eof + _test_eof10: + (m.cs) = 10 + goto _test_eof + _test_eof50: + (m.cs) = 50 + goto _test_eof + _test_eof51: + (m.cs) = 51 + goto _test_eof + _test_eof52: + (m.cs) = 52 + goto _test_eof + _test_eof53: + (m.cs) = 53 + goto _test_eof + _test_eof54: + (m.cs) = 54 + goto _test_eof + _test_eof55: + (m.cs) = 55 + goto _test_eof + _test_eof56: + (m.cs) = 56 + goto _test_eof + _test_eof57: + (m.cs) = 57 + goto _test_eof + _test_eof58: + (m.cs) = 58 + goto _test_eof + _test_eof59: + (m.cs) = 59 + goto _test_eof + _test_eof60: + (m.cs) = 60 + goto _test_eof + _test_eof61: + (m.cs) = 61 + goto _test_eof + _test_eof62: + (m.cs) = 62 + goto _test_eof + _test_eof63: + (m.cs) = 63 + goto _test_eof + _test_eof64: + (m.cs) = 64 + goto _test_eof + _test_eof65: + (m.cs) = 65 + goto _test_eof + _test_eof66: + (m.cs) = 66 + goto _test_eof + _test_eof67: + (m.cs) = 67 + goto _test_eof + _test_eof68: + (m.cs) = 68 + goto _test_eof + _test_eof69: + (m.cs) = 69 + goto _test_eof + _test_eof11: + (m.cs) = 11 + goto _test_eof + _test_eof12: + (m.cs) = 12 + goto _test_eof + _test_eof13: + (m.cs) = 13 + goto _test_eof + _test_eof14: + (m.cs) = 14 + goto _test_eof + _test_eof15: + (m.cs) = 15 + goto _test_eof + _test_eof70: + (m.cs) = 70 + goto _test_eof + _test_eof16: + (m.cs) = 16 + goto _test_eof + _test_eof17: + (m.cs) = 17 + goto _test_eof + _test_eof71: + (m.cs) = 71 + goto _test_eof + _test_eof72: + (m.cs) = 72 + goto _test_eof + _test_eof73: + (m.cs) = 73 + goto _test_eof + _test_eof74: + (m.cs) = 74 + goto _test_eof + _test_eof75: + (m.cs) = 75 + goto _test_eof + _test_eof76: + (m.cs) = 76 + goto _test_eof + _test_eof77: + (m.cs) = 77 + goto _test_eof + _test_eof78: + (m.cs) = 78 + goto _test_eof + _test_eof79: + (m.cs) = 79 + goto _test_eof + _test_eof18: + (m.cs) = 18 + goto _test_eof + _test_eof19: + (m.cs) = 19 + goto _test_eof + _test_eof20: + (m.cs) = 20 + goto _test_eof + _test_eof80: + (m.cs) = 80 + goto _test_eof + _test_eof21: + (m.cs) = 21 + goto _test_eof + _test_eof22: + (m.cs) = 22 + goto _test_eof + _test_eof23: + (m.cs) = 23 + goto _test_eof + _test_eof81: + (m.cs) = 81 + goto _test_eof + _test_eof24: + (m.cs) = 24 + goto _test_eof + _test_eof25: + (m.cs) = 25 + goto _test_eof + _test_eof82: + (m.cs) = 82 + goto _test_eof + _test_eof83: + (m.cs) = 83 + goto _test_eof + _test_eof26: + (m.cs) = 26 + goto _test_eof + _test_eof27: + (m.cs) = 27 + goto _test_eof + _test_eof28: + (m.cs) = 28 + goto _test_eof + _test_eof29: + (m.cs) = 29 + goto _test_eof + _test_eof30: + (m.cs) = 30 + goto _test_eof + _test_eof31: + (m.cs) = 31 + goto _test_eof + _test_eof32: + (m.cs) = 32 + goto _test_eof + _test_eof33: + (m.cs) = 33 + goto _test_eof + _test_eof34: + (m.cs) = 34 + goto _test_eof + _test_eof84: + (m.cs) = 84 + goto _test_eof + _test_eof37: + (m.cs) = 37 + goto _test_eof + _test_eof86: + (m.cs) = 86 + goto _test_eof + _test_eof87: + (m.cs) = 87 + goto _test_eof + _test_eof38: + (m.cs) = 38 + goto _test_eof + _test_eof39: + (m.cs) = 39 + goto _test_eof + _test_eof40: + (m.cs) = 40 + goto _test_eof + _test_eof41: + (m.cs) = 41 + goto _test_eof + _test_eof88: + (m.cs) = 88 + goto _test_eof + _test_eof42: + (m.cs) = 42 + goto _test_eof + _test_eof89: + (m.cs) = 89 + goto _test_eof + _test_eof43: + (m.cs) = 43 + goto _test_eof + _test_eof44: + (m.cs) = 44 + goto _test_eof + _test_eof45: + (m.cs) = 45 + goto _test_eof + _test_eof85: + (m.cs) = 85 + goto _test_eof + _test_eof35: + (m.cs) = 35 + goto _test_eof + _test_eof36: + (m.cs) = 36 + goto _test_eof + + _test_eof: + { + } + if (m.p) == (m.eof) { + switch m.cs { + case 7, 37: //line plugins/parsers/influx/machine.go.rl:32 - err = ErrNameParse - ( m.p)-- + err = ErrNameParse + (m.p)-- - ( m.cs) = 34; - {( m.p)++; ( m.cs) = 0; goto _out } + (m.cs) = 34 + { + (m.p)++ + (m.cs) = 0 + goto _out + } - case 2, 3, 4, 5, 6, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25: + case 2, 3, 4, 5, 6, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25: //line plugins/parsers/influx/machine.go.rl:39 - err = ErrFieldParse - ( m.p)-- + err = ErrFieldParse + (m.p)-- - ( m.cs) = 34; - {( m.p)++; ( m.cs) = 0; goto _out } + (m.cs) = 34 + { + (m.p)++ + (m.cs) = 0 + goto _out + } - case 26, 27, 28, 30, 32, 33, 39, 40, 41, 42, 43, 44: + case 26, 27, 28, 30, 32, 33, 39, 40, 41, 42, 43, 44: //line plugins/parsers/influx/machine.go.rl:46 - err = ErrTagParse - ( m.p)-- + err = ErrTagParse + (m.p)-- - ( m.cs) = 34; - {( m.p)++; ( m.cs) = 0; goto _out } + (m.cs) = 34 + { + (m.p)++ + (m.cs) = 0 + goto _out + } - case 10: + case 10: //line plugins/parsers/influx/machine.go.rl:53 - err = ErrTimestampParse - ( m.p)-- + err = ErrTimestampParse + (m.p)-- - ( m.cs) = 34; - {( m.p)++; ( m.cs) = 0; goto _out } + (m.cs) = 34 + { + (m.p)++ + (m.cs) = 0 + goto _out + } - case 86: + case 86: //line plugins/parsers/influx/machine.go.rl:86 - err = m.handler.SetMeasurement(m.text()) - if err != nil { - ( m.p)-- + err = m.handler.SetMeasurement(m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; ( m.cs) = 0; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + (m.cs) = 0 + goto _out + } + } - case 88, 89: + case 88, 89: //line plugins/parsers/influx/machine.go.rl:99 - err = m.handler.AddTag(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddTag(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; ( m.cs) = 0; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + (m.cs) = 0 + goto _out + } + } - case 47, 48, 49, 51: + case 47, 48, 49, 51: //line plugins/parsers/influx/machine.go.rl:178 - m.finishMetric = true + m.finishMetric = true - case 46: + case 46: //line plugins/parsers/influx/machine.go.rl:82 - m.beginMetric = true + m.beginMetric = true //line plugins/parsers/influx/machine.go.rl:178 - m.finishMetric = true + m.finishMetric = true - case 1: + case 1: //line plugins/parsers/influx/machine.go.rl:86 - err = m.handler.SetMeasurement(m.text()) - if err != nil { - ( m.p)-- + err = m.handler.SetMeasurement(m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; ( m.cs) = 0; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + (m.cs) = 0 + goto _out + } + } //line plugins/parsers/influx/machine.go.rl:46 - err = ErrTagParse - ( m.p)-- + err = ErrTagParse + (m.p)-- - ( m.cs) = 34; - {( m.p)++; ( m.cs) = 0; goto _out } + (m.cs) = 34 + { + (m.p)++ + (m.cs) = 0 + goto _out + } - case 29, 31: + case 29, 31: //line plugins/parsers/influx/machine.go.rl:99 - err = m.handler.AddTag(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddTag(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; ( m.cs) = 0; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + (m.cs) = 0 + goto _out + } + } //line plugins/parsers/influx/machine.go.rl:46 - err = ErrTagParse - ( m.p)-- + err = ErrTagParse + (m.p)-- - ( m.cs) = 34; - {( m.p)++; ( m.cs) = 0; goto _out } + (m.cs) = 34 + { + (m.p)++ + (m.cs) = 0 + goto _out + } - case 74: + case 74: //line plugins/parsers/influx/machine.go.rl:112 - err = m.handler.AddInt(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddInt(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; ( m.cs) = 0; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + (m.cs) = 0 + goto _out + } + } //line plugins/parsers/influx/machine.go.rl:178 - m.finishMetric = true + m.finishMetric = true - case 77: + case 77: //line plugins/parsers/influx/machine.go.rl:121 - err = m.handler.AddUint(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddUint(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; ( m.cs) = 0; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + (m.cs) = 0 + goto _out + } + } //line plugins/parsers/influx/machine.go.rl:178 - m.finishMetric = true + m.finishMetric = true - case 70, 71, 72, 73, 75, 76, 78: + case 70, 71, 72, 73, 75, 76, 78: //line plugins/parsers/influx/machine.go.rl:130 - err = m.handler.AddFloat(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddFloat(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; ( m.cs) = 0; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + (m.cs) = 0 + goto _out + } + } //line plugins/parsers/influx/machine.go.rl:178 - m.finishMetric = true + m.finishMetric = true - case 79, 80, 81, 82, 83: + case 79, 80, 81, 82, 83: //line plugins/parsers/influx/machine.go.rl:139 - err = m.handler.AddBool(m.key, m.text()) - if err != nil { - ( m.p)-- + err = m.handler.AddBool(m.key, m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; ( m.cs) = 0; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + (m.cs) = 0 + goto _out + } + } //line plugins/parsers/influx/machine.go.rl:178 - m.finishMetric = true + m.finishMetric = true - case 50, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69: + case 50, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69: //line plugins/parsers/influx/machine.go.rl:157 - err = m.handler.SetTimestamp(m.text()) - if err != nil { - ( m.p)-- + err = m.handler.SetTimestamp(m.text()) + if err != nil { + (m.p)-- - ( m.cs) = 34; - {( m.p)++; ( m.cs) = 0; goto _out } - } + (m.cs) = 34 + { + (m.p)++ + (m.cs) = 0 + goto _out + } + } //line plugins/parsers/influx/machine.go.rl:178 - m.finishMetric = true + m.finishMetric = true //line plugins/parsers/influx/machine.go:3301 + } } - } - _out: {} + _out: + { + } } //line plugins/parsers/influx/machine.go.rl:415 @@ -3364,7 +3719,7 @@ type streamMachine struct { func NewStreamMachine(r io.Reader, handler Handler) *streamMachine { m := &streamMachine{ machine: NewMachine(handler), - reader: r, + reader: r, } m.machine.SetData(make([]byte, 1024)) @@ -3394,7 +3749,7 @@ func (m *streamMachine) Next() error { for { // Expand the buffer if it is full if m.machine.pe == len(m.machine.data) { - expanded := make([]byte, 2 * len(m.machine.data)) + expanded := make([]byte, 2*len(m.machine.data)) copy(expanded, m.machine.data) m.machine.data = expanded } diff --git a/plugins/processors/filepath/filepath_test.go b/plugins/processors/filepath/filepath_test.go index a305c4c5c2f29..c6a3262921407 100644 --- a/plugins/processors/filepath/filepath_test.go +++ b/plugins/processors/filepath/filepath_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package filepath diff --git a/plugins/processors/port_name/services_path.go b/plugins/processors/port_name/services_path.go index c8cf73d14157c..3b9a4ce579c9a 100644 --- a/plugins/processors/port_name/services_path.go +++ b/plugins/processors/port_name/services_path.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package portname diff --git a/plugins/processors/port_name/services_path_notwindows.go b/plugins/processors/port_name/services_path_notwindows.go index 5097bfa9c6140..5fd30eb59671d 100644 --- a/plugins/processors/port_name/services_path_notwindows.go +++ b/plugins/processors/port_name/services_path_notwindows.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package portname diff --git a/scripts/alpine.docker b/scripts/alpine.docker index d5b8b85f6abb7..8c2418083ef8c 100644 --- a/scripts/alpine.docker +++ b/scripts/alpine.docker @@ -1,4 +1,4 @@ -FROM golang:1.16.6 as builder +FROM golang:1.17.0 as builder WORKDIR /go/src/github.com/influxdata/telegraf COPY . /go/src/github.com/influxdata/telegraf diff --git a/scripts/buster.docker b/scripts/buster.docker index 685d30067e0ef..fbb18eee24f17 100644 --- a/scripts/buster.docker +++ b/scripts/buster.docker @@ -1,4 +1,4 @@ -FROM golang:1.16.6-buster as builder +FROM golang:1.17.0-buster as builder WORKDIR /go/src/github.com/influxdata/telegraf COPY . /go/src/github.com/influxdata/telegraf diff --git a/scripts/ci-1.16.docker b/scripts/ci-1.16.docker index f0b2badafd521..ab1683329e633 100644 --- a/scripts/ci-1.16.docker +++ b/scripts/ci-1.16.docker @@ -1,4 +1,4 @@ -FROM golang:1.16.6 +FROM golang:1.16.7 RUN chmod -R 755 "$GOPATH" diff --git a/scripts/ci-1.15.docker b/scripts/ci-1.17.docker similarity index 95% rename from scripts/ci-1.15.docker rename to scripts/ci-1.17.docker index 2b87f29be4e3e..574ab7be7a896 100644 --- a/scripts/ci-1.15.docker +++ b/scripts/ci-1.17.docker @@ -1,4 +1,4 @@ -FROM golang:1.15.8 +FROM golang:1.17.0 RUN chmod -R 755 "$GOPATH" diff --git a/scripts/mac_installgo.sh b/scripts/mac_installgo.sh index aab4731c22f30..cb41ee5f666cd 100644 --- a/scripts/mac_installgo.sh +++ b/scripts/mac_installgo.sh @@ -3,8 +3,8 @@ set -eux GO_ARCH="darwin-amd64" -GO_VERSION="1.16.6" -GO_VERSION_SHA="e4e83e7c6891baa00062ed37273ce95835f0be77ad8203a29ec56dbf3d87508a" # from https://golang.org/dl +GO_VERSION="1.17" +GO_VERSION_SHA="355bd544ce08d7d484d9d7de05a71b5c6f5bc10aa4b316688c2192aeb3dacfd1" # from https://golang.org/dl # This path is cachable. (Saving in /usr/local/ would cause issues restoring the cache.) path="/usr/local/Cellar"