diff --git a/beater/http.go b/beater/http.go index 9c18d43c696..ae0a7773458 100644 --- a/beater/http.go +++ b/beater/http.go @@ -23,9 +23,6 @@ import ( "net/http" "net/url" - "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/gmux" "go.elastic.co/apm" "go.elastic.co/apm/module/apmhttp" "golang.org/x/net/netutil" @@ -33,6 +30,9 @@ import ( "github.com/elastic/apm-server/beater/api" "github.com/elastic/apm-server/beater/config" "github.com/elastic/apm-server/publish" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/gmux" ) type httpServer struct { diff --git a/systemtest/fleet_test.go b/systemtest/fleet_test.go index b438c06148e..a42bb708e65 100644 --- a/systemtest/fleet_test.go +++ b/systemtest/fleet_test.go @@ -28,13 +28,14 @@ import ( "runtime" "testing" - "github.com/elastic/apm-server/systemtest" - "github.com/elastic/apm-server/systemtest/apmservertest" - "github.com/elastic/apm-server/systemtest/fleettest" "github.com/stretchr/testify/require" "github.com/testcontainers/testcontainers-go/wait" "go.elastic.co/apm" "go.elastic.co/apm/transport" + + "github.com/elastic/apm-server/systemtest" + "github.com/elastic/apm-server/systemtest/apmservertest" + "github.com/elastic/apm-server/systemtest/fleettest" ) func TestFleetIntegration(t *testing.T) { diff --git a/systemtest/fleettest/client.go b/systemtest/fleettest/client.go index ae7f7fd7874..f7552b12c6c 100644 --- a/systemtest/fleettest/client.go +++ b/systemtest/fleettest/client.go @@ -1,3 +1,20 @@ +// Licensed to Elasticsearch B.V. under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. Elasticsearch B.V. licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + package fleettest import ( diff --git a/systemtest/fleettest/types.go b/systemtest/fleettest/types.go index 0c0872d9d84..c228db8d9e1 100644 --- a/systemtest/fleettest/types.go +++ b/systemtest/fleettest/types.go @@ -1,3 +1,20 @@ +// Licensed to Elasticsearch B.V. under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. Elasticsearch B.V. licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + package fleettest import "time"