Java attacher runs only in non-cloud environments

.gitignore

@@ -40,3 +40,4 @@ docker-compose.yml.bck
 Dockerfile.bck
 version.asciidoc.bck
 .imported-java-agent-pubkey
+/agent

beater/beater.go

@@ -50,6 +50,7 @@ import (
 	"github.com/elastic/beats/v7/libbeat/publisher/pipetool"
 
 	"github.com/elastic/apm-server/beater/config"
+	javaattacher "github.com/elastic/apm-server/beater/java_attacher"
 	"github.com/elastic/apm-server/elasticsearch"
 	"github.com/elastic/apm-server/kibana"
 	logs "github.com/elastic/apm-server/log"
@@ -416,7 +417,8 @@ func (s *serverRunner) run(listener net.Listener) error {
 	cfg := ucfg.Config(*s.rawConfig)
 	parentCfg := cfg.Parent()
 	// Check for an environment variable set when running in a cloud environment
-	if eac := os.Getenv("ELASTIC_AGENT_CLOUD"); eac != "" && s.config.Kibana.Enabled {
+	eac := os.Getenv("ELASTIC_AGENT_CLOUD")
+	if eac != "" && s.config.Kibana.Enabled {
 		// Don't block server startup sending the config.
 		go func() {
 			if err := kibana.SendConfig(s.runServerContext, kibanaClient, parentCfg); err != nil {
@@ -425,6 +427,24 @@ func (s *serverRunner) run(listener net.Listener) error {
 		}()
 	}
 
+	if s.config.JavaAttacherConfig.Enabled {
+		if eac == "" {
+			// We aren't running in a cloud environment
+			go func() {
+				attacher, err := javaattacher.New(s.config.JavaAttacherConfig)
+				if err != nil {
+					s.logger.Errorf("failed to start java attacher: %v", err)
+					return
+				}
+				if err := attacher.Run(s.runServerContext); err != nil {
+					s.logger.Errorf("failed to run java attacher: %v", err)
+				}
+			}()
+		} else {
+			s.logger.Error("java attacher not supported in cloud environments")
+		}
+	}
+
 	g, ctx := errgroup.WithContext(s.runServerContext)
 
 	// Ensure the libbeat output and go-elasticsearch clients do not index

beater/java_attacher/java_attacher.go

@@ -62,8 +62,7 @@ func New(cfg config.JavaAttacherConfig) (JavaAttacher, error) {
 }
 
 // javaAttacher is bundled by the server
-// TODO: Figure out the real path
-var javaAttacher = filepath.FromSlash("/bin/apm-agent-attach-cli-1.24.0-slim.jar")
+var javaAttacher = filepath.FromSlash("./java-attacher.jar")
 
 func (j JavaAttacher) Run(ctx context.Context) error {
 	cmd := j.build(ctx)

beater/java_attacher/java_attacher_test.go

@@ -76,7 +76,7 @@ func TestBuild(t *testing.T) {
 
 	cmd := attacher.build(context.Background())
 
-	want := filepath.FromSlash("/usr/bin/java -jar /bin/apm-agent-attach-cli-1.24.0-slim.jar") +
+	want := filepath.FromSlash("/usr/bin/java -jar ./java-attacher.jar") +
 		" --continuous --log-level debug --download-agent-version 1.25.0 --exclude-user root --include-main MyApplication " +
 		"--include-main my-application.jar --include-vmarg elastic.apm.agent.attach=true " +
 		"--config server_url=http://localhost:8200 --config service_name=my-cool-service"

changelogs/head.asciidoc

@@ -68,6 +68,7 @@ https://github.com/elastic/apm-server/compare/7.15\...master[View commits]
 - Changed RUM traces to use a dedicated data stream (`traces-apm.rum`). RUM traces are kept for 90 days {pull}6480[6480]
 - `apm-server` artifacts now have the apm java-attacher.jar packaged alongside them {pull}6593[6593]
 - When `auth.anonymous.enabled` isn't specified and RUM is enabled (`rum.enabled:true`), `auth.anonymous.enabled` will be set to `true` {pull}6607[6607]
+- Run the java attacher jar when configured and not in a cloud environment {pull}6617[6617]
 
 [float]
 ==== Deprecated