Bump jaeger v2

- Switch to jaeger v2 container within NWO
- Remove unused docker-compose and configuration
- Remove unused jaeger reporting client code

Signed-off-by: Marcus Brandenburger <bur@zurich.ibm.com>

Author: mbrandenburger

Makefile

@@ -94,7 +94,7 @@ monitoring-docker-images: ## Pull images for monitoring
 	docker pull ghcr.io/hyperledger-labs/explorer:latest
 	docker pull prom/prometheus:latest
 	docker pull grafana/grafana:latest
-	docker pull jaegertracing/all-in-one:latest
+	docker pull cr.jaegertracing.io/jaegertracing/jaeger:2.12.0
 
 .PHONY: testing-docker-images
 testing-docker-images: ## Pull images for system testing

go.mod

@@ -284,7 +284,7 @@ require (
 	go.opentelemetry.io/otel/metric v1.37.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.37.0
 	go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.3.1
+	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
 	go.uber.org/automaxprocs v1.6.0 // indirect
 	go.uber.org/fx v1.23.0 // indirect
 	go.uber.org/mock v0.5.0 // indirect

integration/nwo/monitoring/otlp/docker-compose.yaml

@@ -10,15 +10,14 @@ import (
 	"context"
 
 	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/client"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/common/docker"
 	"github.com/onsi/gomega"
 )
 
 const (
-	JaegerTracing       = "jaegertracing/all-in-one:latest"
+	JaegerTracing       = "cr.jaegertracing.io/jaegertracing/jaeger:2.12.0"
 	JaegerQueryPort     = 16685
 	JaegerCollectorPort = 4317
 	JaegerUIPort        = 16686
@@ -64,14 +63,6 @@ func (n *Extension) startJaeger() {
 		},
 		&container.HostConfig{
 			PortBindings: docker.PortBindings([]int{JaegerCollectorPort, JaegerQueryPort, JaegerUIPort, JaegerAdminPort}...),
-			Mounts: []mount.Mount{
-				// To avoid error: "error reading server preface: EOF"
-				{
-					Type:   mount.TypeBind,
-					Source: n.jaegerHostsPath(),
-					Target: "/etc/hosts",
-				},
-			},
 		},
 		&network.NetworkingConfig{
 			EndpointsConfig: map[string]*network.EndpointSettings{

integration/nwo/monitoring/otlp/docker.go

@@ -47,8 +47,6 @@ func (n *Extension) GenerateArtifacts() {
 	}
 
 	gomega.Expect(os.MkdirAll(n.configFileDir(), 0o777)).NotTo(gomega.HaveOccurred())
-	gomega.Expect(os.WriteFile(n.configFilePath(), []byte(ConfigTemplate), 0o644)).NotTo(gomega.HaveOccurred())
-	gomega.Expect(os.WriteFile(n.jaegerHostsPath(), []byte(JaegerHosts), 0o644)).NotTo(gomega.HaveOccurred())
 }
 
 func (n *Extension) PostRun(bool) {
@@ -66,11 +64,3 @@ func (n *Extension) configFileDir() string {
 		"otlp",
 	)
 }
-
-func (n *Extension) configFilePath() string {
-	return filepath.Join(n.configFileDir(), "otlp-collector-config.yaml")
-}
-
-func (n *Extension) jaegerHostsPath() string {
-	return filepath.Join(n.configFileDir(), "jaeger_hosts")
-}

integration/nwo/monitoring/otlp/optl.go

@@ -18,6 +18,8 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 )
 
+const defaultSearchDepth = 20
+
 type Reporter interface {
 	FindTraces(nodeName, operationName string) (iterators.Iterator[*api_v2.SpansResponseChunk], error)
 	GetServices() ([]string, error)
@@ -64,7 +66,7 @@ func (c *reporter) FindTraces(nodeName, operationName string) (iterators.Iterato
 	if len(nodeName) == 0 {
 		return nil, errors.New("no node name passed")
 	}
-	params := &api_v2.TraceQueryParameters{ServiceName: nodeName, RawTraces: true}
+	params := &api_v2.TraceQueryParameters{ServiceName: nodeName, RawTraces: true, SearchDepth: defaultSearchDepth}
 	if len(operationName) > 0 {
 		params.OperationName = operationName
 	}