kafarest changes

.ci/check-packages.groovy

@@ -36,7 +36,7 @@ pipeline {
       steps {
         pipelineManager([ cancelPreviousRunningBuilds: [ when: 'PR' ] ])
         deleteDir()
-        gitCheckout(basedir: "${BASE_DIR}", repo: '[email protected]:elastic/beats-tester.git', branch: 'master', credentialsId: 'f6c7695a-671e-4f4f-a331-acdce44ff9ba')
+        gitCheckout(basedir: "${BASE_DIR}", repo: '[email protected]:snappyflow/beats-tester.git', branch: 'master', credentialsId: 'f6c7695a-671e-4f4f-a331-acdce44ff9ba')
         stash allowEmpty: true, name: 'source', useDefaultExcludes: false
       }
     }

.gitignore

@@ -21,7 +21,7 @@
 /_meta/kibana.generated/*
 /fields.yml
 /apm-server.template-es.json
-/vendor/github.com/elastic/beats/libbeat/fields.yml
+/vendor/github.com/snappyflow/beats/libbeat/fields.yml
 /docs/elastic/
 html_docs
 /x-pack/apm-server/apm-server

Jenkinsfile

@@ -73,7 +73,7 @@ pipeline {
               "^ingest.*",
               "^packaging.*",
               "^tests/packaging.*",
-              "^vendor/github.com/elastic/beats.*"
+              "^vendor/github.com/snappyflow/beats.*"
             ]
             env.BEATS_UPDATED = isGitRegionMatch(patterns: regexps)
 

Makefile

@@ -127,7 +127,7 @@ go-generate:
 
 notice: NOTICE.txt
 NOTICE.txt: $(PYTHON) go.mod
-	@$(PYTHON) script/generate_notice.py -b "Elastic APM Server" -s "github.com/elastic/beats*" . ./x-pack/apm-server
+	@$(PYTHON) script/generate_notice.py -b "Elastic APM Server" -s "github.com/snappyflow/beats*" . ./x-pack/apm-server
 
 .PHONY: add-headers
 add-headers: $(GOLICENSER)
@@ -166,11 +166,11 @@ copy-docs:
 ##############################################################################
 
 BEATS_VERSION?=master
-BEATS_MODULE=$(shell go list -m -f {{.Path}} all | grep github.com/elastic/beats)
+BEATS_MODULE=$(shell go list -m -f {{.Path}} all | grep github.com/snappyflow/beats)
 
 .PHONY: update-beats
 update-beats: update-beats-module update
-	@echo --- Use this commit message: Update to elastic/beats@$(shell go list -m -f {{.Version}} $(BEATS_MODULE) | cut -d- -f3)
+	@echo --- Use this commit message: Update to snappyflow/beats@$(shell go list -m -f {{.Version}} $(BEATS_MODULE) | cut -d- -f3)
 
 .PHONY: update-beats-module
 update-beats-module:

NOTICE.txt

@@ -533,7 +533,7 @@ Contents of "LICENSE":
     SOFTWARE.
 
 --------------------------------------------------------------------
-Dependency: github.com/elastic/beats/v7
+Dependency: github.com/snappyflow/beats/v7
 Version: v7.0.0
 Revision: 38fc1ed06525
 License type (autodetected): Apache-2.0

README.md

@@ -109,7 +109,7 @@ below.
 
 ### Updating libbeat
 
-By running `make update-beats` the `github.com/elastic/beats/vN` module will be updated to the most recent
+By running `make update-beats` the `github.com/snappyflow/beats/vN` module will be updated to the most recent
 commit from the master branch, and a minimal set of files will be copied into the apm-server tree.
 
 You can specify an alternative branch or commit by specifying the `BEATS_VERSION` variable, such as:

RELEASES.md

@@ -32,7 +32,7 @@
   * update versions in release branch, e.g. [#2803](https://github.com/elastic/apm-server/pull/2803/files)
   * update versions in `major.x` branch to next minor version, e.g. [#2804](https://github.com/elastic/apm-server/pull/2804)
 
-* Update to latest changes of [beats](https://github.com/elastic/beats/pulls/)
+* Update to latest changes of [beats](https://github.com/snappyflow/beats/pulls/)
 
   When beats has merged all PRs and for minor releases created the new branch, update beats again.
 

TESTING.md

@@ -1,7 +1,7 @@
 # APM Server-Testing
 
 ## Automated Testing
-The tests are built on top of the [Beats Test Framework](https://github.com/elastic/beats/blob/master/docs/devguide/testing.asciidoc), where you can find a detailed description on how to run the test suite.
+The tests are built on top of the [Beats Test Framework](https://github.com/snappyflow/beats/blob/master/docs/devguide/testing.asciidoc), where you can find a detailed description on how to run the test suite.
 
 ### Quick Overview
 

agentcfg/cache.go

@@ -22,7 +22,7 @@ import (
 
 	gocache "github.com/patrickmn/go-cache"
 
-	"github.com/elastic/beats/v7/libbeat/logp"
+	"github.com/snappyflow/beats/v7/libbeat/logp"
 )
 
 const (

agentcfg/cache_test.go

@@ -26,7 +26,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/elastic/beats/v7/libbeat/logp"
+	"github.com/snappyflow/beats/v7/libbeat/logp"
 )
 
 var (

agentcfg/fetch.go

@@ -27,8 +27,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/elastic/beats/v7/libbeat/common"
-	"github.com/elastic/beats/v7/libbeat/logp"
+	"github.com/snappyflow/beats/v7/libbeat/common"
+	"github.com/snappyflow/beats/v7/libbeat/logp"
 
 	"github.com/elastic/apm-server/convert"
 	"github.com/elastic/apm-server/kibana"

agentcfg/fetch_test.go

@@ -27,7 +27,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/elastic/beats/v7/libbeat/common"
+	"github.com/snappyflow/beats/v7/libbeat/common"
 
 	"github.com/elastic/apm-server/kibana"
 	"github.com/elastic/apm-server/tests"

beater/api/asset/sourcemap/handler.go

@@ -25,7 +25,7 @@ import (
 
 	"go.elastic.co/apm"
 
-	"github.com/elastic/beats/v7/libbeat/monitoring"
+	"github.com/snappyflow/beats/v7/libbeat/monitoring"
 
 	"github.com/elastic/apm-server/beater/request"
 	"github.com/elastic/apm-server/processor/asset"

beater/api/config/agent/handler.go

@@ -27,7 +27,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/elastic/beats/v7/libbeat/monitoring"
+	"github.com/snappyflow/beats/v7/libbeat/monitoring"
 
 	"github.com/elastic/apm-server/agentcfg"
 	"github.com/elastic/apm-server/beater/config"

beater/api/config/agent/handler_test.go

@@ -33,8 +33,8 @@ import (
 	"go.elastic.co/apm/apmtest"
 	"golang.org/x/time/rate"
 
-	"github.com/elastic/beats/v7/libbeat/common"
-	libkibana "github.com/elastic/beats/v7/libbeat/kibana"
+	"github.com/snappyflow/beats/v7/libbeat/common"
+	libkibana "github.com/snappyflow/beats/v7/libbeat/kibana"
 
 	"github.com/elastic/apm-server/agentcfg"
 	"github.com/elastic/apm-server/beater/authorization"

beater/api/expvar.go

@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/elastic/beats/v7/libbeat/monitoring"
+	"github.com/snappyflow/beats/v7/libbeat/monitoring"
 )
 
 // debugVarsHandler reports expvar and all libbeat/monitoring metrics.

beater/api/intake/handler.go

@@ -25,7 +25,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/elastic/beats/v7/libbeat/monitoring"
+	"github.com/snappyflow/beats/v7/libbeat/monitoring"
 
 	"github.com/elastic/apm-server/beater/headers"
 	"github.com/elastic/apm-server/beater/request"

beater/api/mux.go

@@ -20,9 +20,9 @@ package api
 import (
 	"net/http"
 
-	"github.com/elastic/beats/v7/libbeat/monitoring"
+	"github.com/snappyflow/beats/v7/libbeat/monitoring"
 
-	"github.com/elastic/beats/v7/libbeat/logp"
+	"github.com/snappyflow/beats/v7/libbeat/logp"
 
 	"github.com/elastic/apm-server/beater/api/asset/sourcemap"
 	"github.com/elastic/apm-server/beater/api/config/agent"

beater/api/profile/handler.go

@@ -26,7 +26,7 @@ import (
 	pprof_profile "github.com/google/pprof/profile"
 	"github.com/pkg/errors"
 
-	"github.com/elastic/beats/v7/libbeat/monitoring"
+	"github.com/snappyflow/beats/v7/libbeat/monitoring"
 
 	"github.com/elastic/apm-server/beater/headers"
 	"github.com/elastic/apm-server/beater/request"

beater/api/root/handler.go

@@ -22,9 +22,9 @@ import (
 
 	"github.com/elastic/apm-server/beater/authorization"
 
-	"github.com/elastic/beats/v7/libbeat/common"
-	"github.com/elastic/beats/v7/libbeat/monitoring"
-	"github.com/elastic/beats/v7/libbeat/version"
+	"github.com/snappyflow/beats/v7/libbeat/common"
+	"github.com/snappyflow/beats/v7/libbeat/monitoring"
+	"github.com/snappyflow/beats/v7/libbeat/version"
 
 	"github.com/elastic/apm-server/beater/request"
 )

beater/api/root/handler_test.go

@@ -26,7 +26,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/elastic/beats/v7/libbeat/version"
+	"github.com/snappyflow/beats/v7/libbeat/version"
 
 	"github.com/elastic/apm-server/beater/authorization"
 	"github.com/elastic/apm-server/beater/beatertest"

beater/beater.go

@@ -28,13 +28,13 @@ import (
 	"go.elastic.co/apm"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/elastic/beats/v7/libbeat/beat"
-	"github.com/elastic/beats/v7/libbeat/cfgfile"
-	"github.com/elastic/beats/v7/libbeat/common"
-	"github.com/elastic/beats/v7/libbeat/esleg/eslegclient"
-	"github.com/elastic/beats/v7/libbeat/instrumentation"
-	"github.com/elastic/beats/v7/libbeat/logp"
-	esoutput "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch"
+	"github.com/snappyflow/beats/v7/libbeat/beat"
+	"github.com/snappyflow/beats/v7/libbeat/cfgfile"
+	"github.com/snappyflow/beats/v7/libbeat/common"
+	"github.com/snappyflow/beats/v7/libbeat/esleg/eslegclient"
+	"github.com/snappyflow/beats/v7/libbeat/instrumentation"
+	"github.com/snappyflow/beats/v7/libbeat/logp"
+	esoutput "github.com/snappyflow/beats/v7/libbeat/outputs/elasticsearch"
 
 	"github.com/elastic/apm-server/beater/config"
 	"github.com/elastic/apm-server/elasticsearch"

beater/beater_test.go

@@ -34,8 +34,8 @@ import (
 	"github.com/elastic/apm-server/beater/config"
 	"github.com/elastic/apm-server/model"
 	"github.com/elastic/apm-server/publish"
-	"github.com/elastic/beats/v7/libbeat/beat"
-	"github.com/elastic/beats/v7/libbeat/common"
+	"github.com/snappyflow/beats/v7/libbeat/beat"
+	"github.com/snappyflow/beats/v7/libbeat/common"
 )
 
 type testBeater struct {

beater/beatertest/monitoring.go

@@ -20,7 +20,7 @@ package beatertest
 import (
 	"fmt"
 
-	"github.com/elastic/beats/v7/libbeat/monitoring"
+	"github.com/snappyflow/beats/v7/libbeat/monitoring"
 
 	"github.com/elastic/apm-server/beater/request"
 )

beater/config/aggregation_test.go

@@ -23,7 +23,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/elastic/beats/v7/libbeat/common"
+	"github.com/snappyflow/beats/v7/libbeat/common"
 )
 
 func TestAggregationConfigInvalid(t *testing.T) {

beater/config/api_key.go

@@ -20,9 +20,9 @@ package config
 import (
 	"github.com/pkg/errors"
 
-	"github.com/elastic/beats/v7/libbeat/logp"
+	"github.com/snappyflow/beats/v7/libbeat/logp"
 
-	"github.com/elastic/beats/v7/libbeat/common"
+	"github.com/snappyflow/beats/v7/libbeat/common"
 
 	"github.com/elastic/apm-server/elasticsearch"
 )

beater/config/api_key_test.go

@@ -24,8 +24,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/elastic/beats/v7/libbeat/common"
-	"github.com/elastic/beats/v7/libbeat/logp"
+	"github.com/snappyflow/beats/v7/libbeat/common"
+	"github.com/snappyflow/beats/v7/libbeat/logp"
 
 	"github.com/elastic/apm-server/elasticsearch"
 )

beater/config/config.go

@@ -24,10 +24,10 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/elastic/beats/v7/libbeat/common"
-	"github.com/elastic/beats/v7/libbeat/common/transport/tlscommon"
-	"github.com/elastic/beats/v7/libbeat/kibana"
-	"github.com/elastic/beats/v7/libbeat/logp"
+	"github.com/snappyflow/beats/v7/libbeat/common"
+	"github.com/snappyflow/beats/v7/libbeat/common/transport/tlscommon"
+	"github.com/snappyflow/beats/v7/libbeat/kibana"
+	"github.com/snappyflow/beats/v7/libbeat/logp"
 
 	logs "github.com/elastic/apm-server/log"
 )

beater/config/config_test.go

@@ -27,8 +27,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/elastic/beats/v7/libbeat/common"
-	"github.com/elastic/beats/v7/libbeat/common/transport/tlscommon"
+	"github.com/snappyflow/beats/v7/libbeat/common"
+	"github.com/snappyflow/beats/v7/libbeat/common/transport/tlscommon"
 
 	"github.com/elastic/apm-server/elasticsearch"
 )

beater/config/instrumentation.go

@@ -20,7 +20,7 @@ package config
 import (
 	"time"
 
-	"github.com/elastic/beats/v7/libbeat/logp"
+	"github.com/snappyflow/beats/v7/libbeat/logp"
 	"github.com/elastic/go-ucfg"
 )
 

beater/config/instrumentation_test.go

@@ -25,7 +25,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/elastic/beats/v7/libbeat/common"
+	"github.com/snappyflow/beats/v7/libbeat/common"
 )
 
 func TestNonzeroHosts(t *testing.T) {

beater/config/jaeger.go

@@ -20,7 +20,7 @@ package config
 import (
 	"crypto/tls"
 
-	"github.com/elastic/beats/v7/libbeat/common/transport/tlscommon"
+	"github.com/snappyflow/beats/v7/libbeat/common/transport/tlscommon"
 )
 
 const (

beater/config/register.go

@@ -20,7 +20,7 @@ package config
 import (
 	"path/filepath"
 
-	"github.com/elastic/beats/v7/libbeat/paths"
+	"github.com/snappyflow/beats/v7/libbeat/paths"
 )
 
 const (

beater/config/rum.go

@@ -23,8 +23,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/elastic/beats/v7/libbeat/common"
-	"github.com/elastic/beats/v7/libbeat/logp"
+	"github.com/snappyflow/beats/v7/libbeat/common"
+	"github.com/snappyflow/beats/v7/libbeat/logp"
 
 	"github.com/elastic/apm-server/elasticsearch"
 )

beater/http.go

@@ -27,8 +27,8 @@ import (
 	"go.elastic.co/apm/module/apmhttp"
 	"golang.org/x/net/netutil"
 
-	"github.com/elastic/beats/v7/libbeat/common/transport/tlscommon"
-	"github.com/elastic/beats/v7/libbeat/logp"
+	"github.com/snappyflow/beats/v7/libbeat/common/transport/tlscommon"
+	"github.com/snappyflow/beats/v7/libbeat/logp"
 
 	"github.com/elastic/apm-server/beater/api"
 	"github.com/elastic/apm-server/beater/config"

beater/integration_test.go

@@ -32,10 +32,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/elastic/beats/v7/libbeat/beat"
-	"github.com/elastic/beats/v7/libbeat/common"
-	jsonoutput "github.com/elastic/beats/v7/libbeat/outputs/codec/json"
-	"github.com/elastic/beats/v7/libbeat/version"
+	"github.com/snappyflow/beats/v7/libbeat/beat"
+	"github.com/snappyflow/beats/v7/libbeat/common"
+	jsonoutput "github.com/snappyflow/beats/v7/libbeat/outputs/codec/json"
+	"github.com/snappyflow/beats/v7/libbeat/version"
 
 	"github.com/elastic/apm-server/beater/api"
 	"github.com/elastic/apm-server/tests/approvals"

beater/jaeger/common.go

@@ -25,7 +25,7 @@ import (
 	trjaeger "github.com/open-telemetry/opentelemetry-collector/translator/trace/jaeger"
 	"github.com/pkg/errors"
 
-	"github.com/elastic/beats/v7/libbeat/monitoring"
+	"github.com/snappyflow/beats/v7/libbeat/monitoring"
 
 	"github.com/elastic/apm-server/beater/authorization"
 	"github.com/elastic/apm-server/beater/request"