Remove agent from distributions

Signed-off-by: Yuri Shkuro <github@ysh.us>

cmd/agent/app/builder.go

@@ -22,7 +22,6 @@ import (
 	"github.com/jaegertracing/jaeger/cmd/agent/app/servers/thriftudp"
 	"github.com/jaegertracing/jaeger/internal/safeexpvar"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
-	"github.com/jaegertracing/jaeger/ports"
 	agentThrift "github.com/jaegertracing/jaeger/thrift-gen/agent"
 )
 
@@ -38,7 +37,7 @@ const (
 	binaryProtocol  Protocol = "binary"
 )
 
-var defaultHTTPServerHostPort = ":" + strconv.Itoa(ports.AgentConfigServerHTTP)
+var defaultHTTPServerHostPort = ":" + strconv.Itoa(AgentConfigServerHTTP)
 
 // Model used to distinguish the data transfer model
 type Model string

cmd/agent/app/flags.go

@@ -10,8 +10,6 @@ import (
 	"strconv"
 
 	"github.com/spf13/viper"
-
-	"github.com/jaegertracing/jaeger/ports"
 )
 
 const (
@@ -30,9 +28,9 @@ var defaultProcessors = []struct {
 	protocol Protocol
 	port     int
 }{
-	{model: "zipkin", protocol: "compact", port: ports.AgentZipkinThriftCompactUDP},
-	{model: "jaeger", protocol: "compact", port: ports.AgentJaegerThriftCompactUDP},
-	{model: "jaeger", protocol: "binary", port: ports.AgentJaegerThriftBinaryUDP},
+	{model: "zipkin", protocol: "compact", port: AgentZipkinThriftCompactUDP},
+	{model: "jaeger", protocol: "compact", port: AgentJaegerThriftCompactUDP},
+	{model: "jaeger", protocol: "binary", port: AgentJaegerThriftBinaryUDP},
 }
 
 // AddFlags adds flags for Builder.

cmd/agent/app/ports.go

@@ -0,0 +1,17 @@
+// Copyright (c) 2019 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package app
+
+const (
+	// AgentJaegerThriftCompactUDP is the default port for receiving Jaeger Thrift over UDP in compact encoding
+	AgentJaegerThriftCompactUDP = 6831
+	// AgentJaegerThriftBinaryUDP is the default port for receiving Jaeger Thrift over UDP in binary encoding
+	AgentJaegerThriftBinaryUDP = 6832
+	// AgentZipkinThriftCompactUDP is the default port for receiving Zipkin Thrift over UDP in binary encoding
+	AgentZipkinThriftCompactUDP = 5775
+	// AgentConfigServerHTTP is the default port for the agent's HTTP config server (e.g. /sampling endpoint)
+	AgentConfigServerHTTP = 5778
+	// AgentAdminHTTP is the default admin HTTP port (health check, metrics, etc.)
+	AgentAdminHTTP = 14271
+)

cmd/agent/main.go

@@ -23,15 +23,14 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/pkg/version"
-	"github.com/jaegertracing/jaeger/ports"
 )
 
 func main() {
 	println("***************************************************************************************************")
 	println("*** WARNING jaeger-agent is deprecated. See https://github.com/jaegertracing/jaeger/issues/4739 ***")
 	println("***************************************************************************************************")
 
-	svc := flags.NewService(ports.AgentAdminHTTP)
+	svc := flags.NewService(app.AgentAdminHTTP)
 	svc.NoStorage = true
 
 	v := viper.New()
@@ -92,7 +91,7 @@ func main() {
 
 	command.AddCommand(version.Command())
 	command.AddCommand(docs.Command(v))
-	command.AddCommand(status.Command(v, ports.AgentAdminHTTP))
+	command.AddCommand(status.Command(v, app.AgentAdminHTTP))
 
 	config.AddFlags(
 		v,

cmd/all-in-one/Dockerfile

@@ -8,18 +8,6 @@ FROM $base_image AS release
 ARG TARGETARCH
 ARG USER_UID=10001
 
-# Agent zipkin.thrift compact
-EXPOSE 5775/udp
-
-# Agent jaeger.thrift compact
-EXPOSE 6831/udp
-
-# Agent jaeger.thrift binary
-EXPOSE 6832/udp
-
-# Agent config HTTP
-EXPOSE 5778
-
 # Collector OTLP gRPC
 EXPOSE 4317
 
@@ -52,18 +40,6 @@ FROM $debug_image AS debug
 ARG TARGETARCH=amd64
 ARG USER_UID=10001
 
-# Agent zipkin.thrift compact
-EXPOSE 5775/udp
-
-# Agent jaeger.thrift compact
-EXPOSE 6831/udp
-
-# Agent jaeger.thrift binary
-EXPOSE 6832/udp
-
-# Agent config HTTP
-EXPOSE 5778
-
 # Collector OTLP gRPC
 EXPOSE 4317
 

cmd/all-in-one/all_in_one_test.go

@@ -7,6 +7,7 @@ package main
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
 	"os"
@@ -20,26 +21,30 @@ import (
 	"github.com/stretchr/testify/require"
 
 	ui "github.com/jaegertracing/jaeger/model/json"
+	"github.com/jaegertracing/jaeger/ports"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
 )
 
 // These tests are only run when the environment variable TEST_MODE=integration is set.
 
 const (
-	host       = "0.0.0.0"
-	queryPort  = "16686"
-	agentPort  = "5778"
-	healthPort = "13133"
-	queryAddr  = "http://" + host + ":" + queryPort
-	agentAddr  = "http://" + host + ":" + agentPort
-	healthAddr = "http://" + host + ":" + healthPort + "/status"
+	host         = "0.0.0.0"
+	queryPort    = ports.QueryHTTP
+	samplingPort = ports.CollectorHTTP
+	healthPort   = "13133"
 
 	getServicesURL         = "/api/services"
 	getTraceURL            = "/api/traces/"
 	getServicesAPIV3URL    = "/api/v3/services"
 	getSamplingStrategyURL = "/sampling?service=whatever"
 )
 
+var (
+	queryAddr    = fmt.Sprintf("http://%s:%d", host, queryPort)
+	samplingAddr = fmt.Sprintf("http://%s:%d", host, samplingPort)
+	healthAddr   = fmt.Sprintf("http://%s:%d/status", host, healthPort)
+)
+
 var traceID string // stores state exchanged between createTrace and getAPITrace
 
 var httpClient = &http.Client{
@@ -170,7 +175,7 @@ func getAPITrace(t *testing.T) {
 func getSamplingStrategy(t *testing.T) {
 	// TODO should we test refreshing the strategy file?
 
-	r, body := httpGet(t, agentAddr+getSamplingStrategyURL)
+	r, body := httpGet(t, samplingAddr+getSamplingStrategyURL)
 	t.Logf("Sampling strategy response: %s", string(body))
 	require.EqualValues(t, http.StatusOK, r.StatusCode)
 

cmd/all-in-one/main.go

@@ -6,6 +6,7 @@ package main
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"log"
@@ -16,9 +17,6 @@ import (
 	_ "go.uber.org/automaxprocs"
 	"go.uber.org/zap"
 
-	agentApp "github.com/jaegertracing/jaeger/cmd/agent/app"
-	agentRep "github.com/jaegertracing/jaeger/cmd/agent/app/reporter"
-	agentGrpcRep "github.com/jaegertracing/jaeger/cmd/agent/app/reporter/grpc"
 	"github.com/jaegertracing/jaeger/cmd/all-in-one/setupcontext"
 	collectorApp "github.com/jaegertracing/jaeger/cmd/collector/app"
 	collectorFlags "github.com/jaegertracing/jaeger/cmd/collector/app/flags"
@@ -86,7 +84,6 @@ by default uses only in-memory database.`,
 			logger := svc.Logger // shortcut
 			baseFactory := svc.MetricsFactory.Namespace(metrics.NSOptions{Name: "jaeger"})
 			version.NewInfoMetrics(baseFactory)
-			agentMetricsFactory := baseFactory.Namespace(metrics.NSOptions{Name: "agent"})
 			collectorMetricsFactory := baseFactory.Namespace(metrics.NSOptions{Name: "collector"})
 			queryMetricsFactory := baseFactory.Namespace(metrics.NSOptions{Name: "query"})
 
@@ -132,12 +129,6 @@ by default uses only in-memory database.`,
 				logger.Fatal("Failed to create sampling strategy provider", zap.Error(err))
 			}
 
-			aOpts := new(agentApp.Builder).InitFromViper(v)
-			repOpts := new(agentRep.Options).InitFromViper(v, logger)
-			grpcBuilder, err := agentGrpcRep.NewConnBuilder().InitFromViper(v)
-			if err != nil {
-				logger.Fatal("Failed to configure connection for grpc", zap.Error(err))
-			}
 			cOpts, err := new(collectorFlags.CollectorOptions).InitFromViper(v, logger)
 			if err != nil {
 				logger.Fatal("Failed to initialize collector", zap.Error(err))
@@ -164,25 +155,6 @@ by default uses only in-memory database.`,
 				log.Fatal(err)
 			}
 
-			// agent
-			// if the agent reporter grpc host:port was not explicitly set then use whatever the collector is listening on
-			if len(grpcBuilder.CollectorHostPorts) == 0 {
-				grpcBuilder.CollectorHostPorts = append(grpcBuilder.CollectorHostPorts, cOpts.GRPC.HostPort)
-			}
-			ctx, cancel := context.WithCancel(context.Background())
-			defer cancel()
-			builders := map[agentRep.Type]agentApp.CollectorProxyBuilder{
-				agentRep.GRPC: agentApp.GRPCCollectorProxyBuilder(grpcBuilder),
-			}
-			cp, err := agentApp.CreateCollectorProxy(ctx, agentApp.ProxyBuilderOptions{
-				Options: *repOpts,
-				Logger:  logger,
-				Metrics: agentMetricsFactory,
-			}, builders)
-			if err != nil {
-				logger.Fatal("Could not create collector proxy", zap.Error(err))
-			}
-			agent := startAgent(cp, aOpts, logger, agentMetricsFactory)
 			telset := telemetery.Setting{
 				Logger:         svc.Logger,
 				TracerProvider: tracer.OTEL,
@@ -197,20 +169,16 @@ by default uses only in-memory database.`,
 			)
 
 			svc.RunAndThen(func() {
-				agent.Stop()
-				_ = cp.Close()
-				_ = c.Close()
-				_ = querySrv.Close()
+				var errs []error
+				errs = append(errs, c.Close())
+				errs = append(errs, querySrv.Close())
 				if closer, ok := spanWriter.(io.Closer); ok {
-					if err := closer.Close(); err != nil {
-						logger.Error("Failed to close span writer", zap.Error(err))
-					}
+					errs = append(errs, closer.Close())
 				}
-				if err := storageFactory.Close(); err != nil {
-					logger.Error("Failed to close storage factory", zap.Error(err))
-				}
-				if err := tracer.Close(context.Background()); err != nil {
-					logger.Error("Error shutting down tracer provider", zap.Error(err))
+				errs = append(errs, storageFactory.Close())
+				errs = append(errs, tracer.Close(context.Background()))
+				if err := errors.Join(errs...); err != nil {
+					logger.Error("Failed to close services", zap.Error(err))
 				}
 			})
 			return nil
@@ -228,9 +196,6 @@ by default uses only in-memory database.`,
 		command,
 		svc.AddFlags,
 		storageFactory.AddPipelineFlags,
-		agentApp.AddFlags,
-		agentRep.AddFlags,
-		agentGrpcRep.AddFlags,
 		collectorFlags.AddFlags,
 		queryApp.AddFlags,
 		samplingStrategyFactory.AddFlags,
@@ -242,25 +207,6 @@ by default uses only in-memory database.`,
 	}
 }
 
-func startAgent(
-	cp agentApp.CollectorProxy,
-	b *agentApp.Builder,
-	logger *zap.Logger,
-	baseFactory metrics.Factory,
-) *agentApp.Agent {
-	agent, err := b.CreateAgent(cp, logger, baseFactory)
-	if err != nil {
-		logger.Fatal("Unable to initialize Jaeger Agent", zap.Error(err))
-	}
-
-	logger.Info("Starting agent")
-	if err := agent.Run(); err != nil {
-		logger.Fatal("Failed to run the agent", zap.Error(err))
-	}
-
-	return agent
-}
-
 func startQuery(
 	svc *flags.Service,
 	qOpts *queryApp.QueryOptions,

cmd/jaeger/Dockerfile

@@ -10,21 +10,6 @@ FROM $base_image AS release
 ARG TARGETARCH
 ARG USER_UID=10001
 
-# Agent zipkin.thrift compact
-EXPOSE 5775/udp
-
-# Agent jaeger.thrift compact
-EXPOSE 6831/udp
-
-# Agent jaeger.thrift binary
-EXPOSE 6832/udp
-
-# Sampling config HTTP
-EXPOSE 5778
-
-# Sampling config gRPC
-EXPOSE 5779
-
 # Collector OTLP gRPC
 EXPOSE 4317
 
@@ -62,21 +47,6 @@ FROM $debug_image AS debug
 ARG TARGETARCH=amd64
 ARG USER_UID=10001
 
-# Agent zipkin.thrift compact
-EXPOSE 5775/udp
-
-# Agent jaeger.thrift compact
-EXPOSE 6831/udp
-
-# Agent jaeger.thrift binary
-EXPOSE 6832/udp
-
-# Sampling config HTTP
-EXPOSE 5778
-
-# Sampling config gRPC
-EXPOSE 5779
-
 # Collector OTLP gRPC
 EXPOSE 4317
 

cmd/jaeger/internal/extension/remotesampling/extension.go

@@ -231,8 +231,7 @@ func (ext *rsExtension) startHTTPServer(ctx context.Context, host component.Host
 
 		// In v1 the sampling endpoint in the collector was at /api/sampling, because
 		// the collector reused the same port for multiple services. In v2, the extension
-		// always uses a separate port, making /api prefix unnecessary. So we mimic the behavior
-		// of jaeger-agent port 5778 which serves sampling strategies at /sampling endpoint.
+		// always uses a separate port, making /api prefix unnecessary.
 		BasePath: "",
 	})
 	httpMux := http.NewServeMux()

crossdock/jaeger-docker-compose.yml

@@ -39,17 +39,3 @@ services:
       restart: on-failure
       depends_on:
         - jaeger-remote-storage
-
-    jaeger-agent:
-      image: jaegertracing/jaeger-agent
-      command: ["--reporter.grpc.host-port=jaeger-collector:14250", "--reporter.grpc.retry.max=1000"]
-      ports:
-        - "5775:5775/udp"
-        - "6831:6831/udp"
-        - "6832:6832/udp"
-        - "5778:5778"
-      environment:
-        - LOG_LEVEL=debug
-      restart: on-failure
-      depends_on:
-        - jaeger-collector