Revert "Support new instrumentation config and tracer from Libbeat (e…

…lastic#3836)" This reverts commit 6ba318f.
jalvz · Jul 2, 2020 · 1ba1007 · 1ba1007
1 parent b7a6b6e
commit 1ba1007
Show file tree

Hide file tree

Showing 15 changed files with 313 additions and 251 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -534,7 +534,7 @@ Contents of "LICENSE":
 --------------------------------------------------------------------
 Dependency: github.com/elastic/beats/v7
 Version: v7.0.0
-Revision: 1498938e22f3
+Revision: 0dcb3dfebef7
 License type (autodetected): Apache-2.0
 
 --------------------------------------------------------------------

diff --git a/_meta/beat.yml b/_meta/beat.yml
@@ -38,6 +38,39 @@ apm-server:
     # Url to expose expvar.
     #url: "/debug/vars"
 
+  # Instrumentation support for the server's HTTP endpoints and event publisher.
+  #instrumentation:
+    # Set to true to enable instrumentation of the APM Server itself.
+    #enabled: false
+
+    # Environment in which the APM Server is running on (eg: staging, production, etc.)
+    #environment: ""
+
+    # Remote hosts to report instrumentation results to.
+    #hosts:
+    #  - http://remote-apm-server:8200
+
+    # API Key for the remote APM Server(s).
+    # If api_key is set then secret_token will be ignored.
+    #api_key:
+
+    # Secret token for the remote APM Server(s).
+    #secret_token:
+
+    # Enable profiling of the server, recording profile samples as events.
+    #
+    # This feature is experimental.
+    #profiling:
+      #cpu:
+        # Set to true to enable CPU profiling.
+        #enabled: false
+        #interval: 60s
+        #duration: 10s
+      #heap:
+        # Set to true to enable heap profiling.
+        #enabled: false
+        #interval: 60s
+
   # A pipeline is a definition of processors applied to documents when ingesting them to Elasticsearch.
   # Using pipelines involves two steps:
   # (1) registering a pipeline
@@ -950,43 +983,6 @@ output.elasticsearch:
   # Kerberos realm.
   #kerberos.realm: ELASTIC
 
-#============================= Instrumentation =============================
-
-# Instrumentation support for the server's HTTP endpoints and event publisher.
-#instrumentation:
-
-  # Set to true to enable instrumentation of the APM Server itself.
-  #enabled: false
-
-  # Environment in which the APM Server is running on (eg: staging, production, etc.)
-  #environment: ""
-
-  # Hosts to report instrumentation results to.
-  # For reporting to itself, leave this field commented
-  #hosts:
-  #  - http://remote-apm-server:8200
-
-  # API Key for the remote APM Server(s).
-  # If api_key is set then secret_token will be ignored.
-  #api_key:
-
-  # Secret token for the remote APM Server(s).
-  #secret_token:
-
-  # Enable profiling of the server, recording profile samples as events.
-  #
-  # This feature is experimental.
-  #profiling:
-    #cpu:
-      # Set to true to enable CPU profiling.
-      #enabled: false
-      #interval: 60s
-      #duration: 10s
-  #heap:
-    # Set to true to enable heap profiling.
-    #enabled: false
-    #interval: 60s
-
 #================================= Paths ==================================
 
 # The home path for the apm-server installation. This is the default base path

diff --git a/apm-server.docker.yml b/apm-server.docker.yml
@@ -38,6 +38,39 @@ apm-server:
     # Url to expose expvar.
     #url: "/debug/vars"
 
+  # Instrumentation support for the server's HTTP endpoints and event publisher.
+  #instrumentation:
+    # Set to true to enable instrumentation of the APM Server itself.
+    #enabled: false
+
+    # Environment in which the APM Server is running on (eg: staging, production, etc.)
+    #environment: ""
+
+    # Remote hosts to report instrumentation results to.
+    #hosts:
+    #  - http://remote-apm-server:8200
+
+    # API Key for the remote APM Server(s).
+    # If api_key is set then secret_token will be ignored.
+    #api_key:
+
+    # Secret token for the remote APM Server(s).
+    #secret_token:
+
+    # Enable profiling of the server, recording profile samples as events.
+    #
+    # This feature is experimental.
+    #profiling:
+      #cpu:
+        # Set to true to enable CPU profiling.
+        #enabled: false
+        #interval: 60s
+        #duration: 10s
+      #heap:
+        # Set to true to enable heap profiling.
+        #enabled: false
+        #interval: 60s
+
   # A pipeline is a definition of processors applied to documents when ingesting them to Elasticsearch.
   # Using pipelines involves two steps:
   # (1) registering a pipeline
@@ -950,43 +983,6 @@ output.elasticsearch:
   # Kerberos realm.
   #kerberos.realm: ELASTIC
 
-#============================= Instrumentation =============================
-
-# Instrumentation support for the server's HTTP endpoints and event publisher.
-#instrumentation:
-
-  # Set to true to enable instrumentation of the APM Server itself.
-  #enabled: false
-
-  # Environment in which the APM Server is running on (eg: staging, production, etc.)
-  #environment: ""
-
-  # Hosts to report instrumentation results to.
-  # For reporting to itself, leave this field commented
-  #hosts:
-  #  - http://remote-apm-server:8200
-
-  # API Key for the remote APM Server(s).
-  # If api_key is set then secret_token will be ignored.
-  #api_key:
-
-  # Secret token for the remote APM Server(s).
-  #secret_token:
-
-  # Enable profiling of the server, recording profile samples as events.
-  #
-  # This feature is experimental.
-  #profiling:
-    #cpu:
-      # Set to true to enable CPU profiling.
-      #enabled: false
-      #interval: 60s
-      #duration: 10s
-  #heap:
-    # Set to true to enable heap profiling.
-    #enabled: false
-    #interval: 60s
-
 #================================= Paths ==================================
 
 # The home path for the apm-server installation. This is the default base path

diff --git a/apm-server.yml b/apm-server.yml
@@ -38,6 +38,39 @@ apm-server:
     # Url to expose expvar.
     #url: "/debug/vars"
 
+  # Instrumentation support for the server's HTTP endpoints and event publisher.
+  #instrumentation:
+    # Set to true to enable instrumentation of the APM Server itself.
+    #enabled: false
+
+    # Environment in which the APM Server is running on (eg: staging, production, etc.)
+    #environment: ""
+
+    # Remote hosts to report instrumentation results to.
+    #hosts:
+    #  - http://remote-apm-server:8200
+
+    # API Key for the remote APM Server(s).
+    # If api_key is set then secret_token will be ignored.
+    #api_key:
+
+    # Secret token for the remote APM Server(s).
+    #secret_token:
+
+    # Enable profiling of the server, recording profile samples as events.
+    #
+    # This feature is experimental.
+    #profiling:
+      #cpu:
+        # Set to true to enable CPU profiling.
+        #enabled: false
+        #interval: 60s
+        #duration: 10s
+      #heap:
+        # Set to true to enable heap profiling.
+        #enabled: false
+        #interval: 60s
+
   # A pipeline is a definition of processors applied to documents when ingesting them to Elasticsearch.
   # Using pipelines involves two steps:
   # (1) registering a pipeline
@@ -950,43 +983,6 @@ output.elasticsearch:
   # Kerberos realm.
   #kerberos.realm: ELASTIC
 
-#============================= Instrumentation =============================
-
-# Instrumentation support for the server's HTTP endpoints and event publisher.
-#instrumentation:
-
-  # Set to true to enable instrumentation of the APM Server itself.
-  #enabled: false
-
-  # Environment in which the APM Server is running on (eg: staging, production, etc.)
-  #environment: ""
-
-  # Hosts to report instrumentation results to.
-  # For reporting to itself, leave this field commented
-  #hosts:
-  #  - http://remote-apm-server:8200
-
-  # API Key for the remote APM Server(s).
-  # If api_key is set then secret_token will be ignored.
-  #api_key:
-
-  # Secret token for the remote APM Server(s).
-  #secret_token:
-
-  # Enable profiling of the server, recording profile samples as events.
-  #
-  # This feature is experimental.
-  #profiling:
-    #cpu:
-      # Set to true to enable CPU profiling.
-      #enabled: false
-      #interval: 60s
-      #duration: 10s
-  #heap:
-    # Set to true to enable heap profiling.
-    #enabled: false
-    #interval: 60s
-
 #================================= Paths ==================================
 
 # The home path for the apm-server installation. This is the default base path

diff --git a/beater/beater.go b/beater/beater.go
@@ -130,14 +130,12 @@ type beater struct {
 // Run runs the APM Server, blocking until the beater's Stop method is called,
 // or a fatal error occurs.
 func (bt *beater) Run(b *beat.Beat) error {
-
-	var tracerServer *tracerServer
-	var err error
-	if listener := b.Instrumentation.Listener(); listener != nil {
-		tracerServer = newTracerServer(bt.config, listener)
+	tracer, tracerServer, err := initTracer(b.Info, bt.config, bt.logger)
+	if err != nil {
+		return err
 	}
+	defer tracer.Close()
 
-	tracer := b.Instrumentation.Tracer()
 	runServer := runServer
 	if tracerServer != nil {
 		runServer = runServerWithTracerServer(runServer, tracerServer, tracer)

diff --git a/beater/server_test.go b/beater/server_test.go
@@ -35,7 +35,6 @@ import (
 
 	"github.com/elastic/beats/v7/libbeat/beat"
 	"github.com/elastic/beats/v7/libbeat/common"
-	"github.com/elastic/beats/v7/libbeat/instrumentation"
 	"github.com/elastic/beats/v7/libbeat/logp"
 	"github.com/elastic/beats/v7/libbeat/outputs"
 	pubs "github.com/elastic/beats/v7/libbeat/publisher"
@@ -515,15 +514,11 @@ func setupServer(t *testing.T, cfg *common.Config, beatConfig *beat.BeatConfig,
 		pub = dummyPipeline(cfg, info)
 	}
 
-	instrumentation, err := instrumentation.New(baseConfig, info.Beat, info.Version)
-	require.NoError(t, err)
-
 	// create a beat
 	apmBeat := &beat.Beat{
-		Publisher:       pub,
-		Info:            info,
-		Config:          beatConfig,
-		Instrumentation: instrumentation,
+		Publisher: pub,
+		Info:      info,
+		Config:    beatConfig,
 	}
 	return setupBeater(t, apmBeat, baseConfig, beatConfig)
 }