Enable SPM in Jaeger v2

.github/workflows/ci-build-spm.yml

@@ -18,6 +18,14 @@ permissions:
 jobs:
   spm:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        mode:
+        - name: v1
+          binary: all-in-one
+        - name: v2
+          binary: jaeger
+
     steps:
     - name: Harden Runner
       uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
@@ -40,9 +48,15 @@ jobs:
       uses: ./.github/actions/setup-node.js
 
     - name: Temporary - only run the build
-      run:
-        cd docker-compose/monitor && make build
+      run: |
+        case ${{ matrix.mode.name }} in
+          v1)
+            cd docker-compose/monitor && make build
+            ;;
+          v2)
+            cd docker-compose/monitor && make build-v2
+            ;;
+        esac
 
     - name: Run SPM Test
-      run: ./scripts/spm-integration-test.sh
-
+      run:  bash scripts/spm-integration-test.sh  -b ${{ matrix.mode.binary }}

Makefile

@@ -257,6 +257,10 @@ rebuild-ui:
 build-all-in-one-linux:
 	GOOS=linux $(MAKE) build-all-in-one
 
+.PHONY: build-jaeger-linux
+build-jaeger-linux:
+	GOOS=linux $(MAKE) build-jaeger
+
 # Requires variables: $(BIN_NAME) $(BIN_PATH) $(GO_TAGS) $(DISABLE_OPTIMIZATIONS) $(SUFFIX) $(GOOS) $(GOARCH) $(BUILD_INFO)
 # Other targets can depend on this one but with a unique suffix to ensure it is always executed.
 BIN_PATH = ./cmd/$(BIN_NAME)

docker-compose/monitor/Makefile

@@ -14,9 +14,14 @@ build: clean-jaeger
 # Note: the jaeger "dev" image can be built with "make build".
 .PHONY: dev
 dev: export JAEGER_IMAGE_TAG = dev
-dev:
+dev: 
 	docker compose -f docker-compose.yml up $(DOCKER_COMPOSE_ARGS)
 
+.PHONY: dev-v2
+dev-v2: export JAEGER_IMAGE_TAG = dev
+dev-v2: build-v2
+	docker compose -f docker-compose-v2.yml up $(DOCKER_COMPOSE_ARGS)
+
 .PHONY: clean-jaeger
 clean-jaeger:
 	# Also cleans up intermediate cached containers.
@@ -29,3 +34,15 @@ clean-all: clean-jaeger
 	docker rmi -f otel/opentelemetry-collector-contrib:latest ; \
 	docker rmi -f prom/prometheus:latest ; \
 	docker rmi -f grafana/grafana:latest
+
+.PHONY: build-v2
+build-v2: clean-jaeger
+	cd ../../ && make build-jaeger-linux
+	cd ../../ && make create-baseimg PLATFORMS=linux/$(shell go env GOARCH)
+	cd ../../ && docker buildx build --target release \
+		--tag jaegertracing/jaeger:dev \
+		--build-arg base_image=localhost:5000/baseimg_alpine:latest \
+		--build-arg debug_image=not-used \
+		--build-arg TARGETARCH=$(shell go env GOARCH) \
+		--load \
+		cmd/jaeger

docker-compose/monitor/docker-compose-v2.yml

@@ -0,0 +1,53 @@
+version: "3.5"
+services:
+  jaeger:
+    networks:
+      - backend
+    image: jaegertracing/jaeger:${JAEGER_IMAGE_TAG:-latest}
+    volumes:
+      - "./jaeger-ui.json:/etc/jaeger/jaeger-ui.json" # Do we need this for v2 ? Seems to be running without this.
+      - "./jaeger-v2-config.yml:/etc/jaeger/jaeger-v2-config.yml"
+    command: ["--config", "/etc/jaeger/jaeger-v2-config.yml"]
+    environment:
+      - METRICS_STORAGE_TYPE=prometheus
+      - PROMETHEUS_SERVER_URL=http://prometheus:9090
+      # - PROMETHEUS_QUERY_SUPPORT_SPANMETRICS_CONNECTOR=${PROMETHEUS_QUERY_SUPPORT_SPANMETRICS_CONNECTOR:-true}
+      - PROMETHEUS_QUERY_NAMESPACE=${PROMETHEUS_QUERY_NAMESPACE:-}
+      - PROMETHEUS_QUERY_DURATION_UNIT=${PROMETHEUS_QUERY_DURATION_UNIT:-}
+      - PROMETHEUS_QUERY_NORMALIZE_CALLS=true
+      - PROMETHEUS_QUERY_NORMALIZE_DURATION=true
+    ports:
+      - "16686:16686"
+      - "14278:14278"
+  microsim:
+    networks:
+      - backend
+    image: yurishkuro/microsim:0.3.0
+    # TODO: Fix error - dial tcp [::1]:14278: connect: connection refused
+    command: "-j http://localhost:14278/api/traces -d 24h -s 500ms"
+    depends_on:
+      - jaeger
+  prometheus:
+    networks:
+      - backend
+    image: prom/prometheus:latest
+    volumes:
+      - "./prometheus.yml:/etc/prometheus/prometheus.yml"
+    ports:
+      - "9090:9090"
+  grafana:
+    networks:
+      - backend
+    image: grafana/grafana:latest
+    volumes:
+      - ./grafana.ini:/etc/grafana/grafana.ini
+      - ./datasource.yml:/etc/grafana/provisioning/datasources/datasource.yaml
+    environment:
+      - GF_AUTH_ANONYMOUS_ENABLED=true
+      - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
+      - GF_AUTH_DISABLE_LOGIN_FORM=true
+    ports:
+      - 3000:3000
+
+networks:
+  backend:

docker-compose/monitor/jaeger-v2-config.yml

@@ -0,0 +1,47 @@
+service:
+  extensions: [jaeger_storage, jaeger_query]
+  pipelines:
+    traces:
+      receivers: [otlp, jaeger, zipkin]
+      processors: [batch]
+      exporters: [jaeger_storage_exporter, spanmetrics]
+    metrics/spanmetrics:
+      receivers: [spanmetrics] 
+      exporters: [prometheus] 
+
+
+extensions:
+  jaeger_query:
+    trace_storage: memstore
+
+  jaeger_storage:
+    memory:
+      memstore:
+        max_traces: 100000
+
+connectors:
+  spanmetrics:
+
+receivers:
+  otlp:
+    protocols:
+      grpc:
+      http:
+
+  jaeger:
+    protocols:
+      grpc:
+      thrift_binary:
+      thrift_compact:
+      thrift_http:
+
+  zipkin:
+
+processors:
+  batch:
+
+exporters:
+  jaeger_storage_exporter:
+    trace_storage: memstore
+  prometheus: 
+    endpoint: "0.0.0.0:8889"

scripts/spm-integration-test.sh

@@ -2,7 +2,31 @@
 
 set -euf -o pipefail
 
+print_help() {
+  echo "Usage: $0 [-b binary]"
+  echo "-b: Which binary to build: 'all-in-one' (default) or 'jaeger' (v2)"
+  echo "-h: Print help"
+  exit 1
+}
+
+BINARY='all-in-one'
 compose_file=docker-compose/monitor/docker-compose.yml
+
+while getopts "b:h" opt; do
+	case "${opt}" in
+	b)
+		BINARY=${OPTARG}
+		;;
+	?)
+		print_help
+		;;
+	esac
+done
+
+if [ "$BINARY" == "jaeger" ]; then
+  compose_file=docker-compose/monitor/docker-compose-v2.yml
+fi
+
 timeout=300
 end_time=$((SECONDS + timeout))
 success="false"
@@ -115,7 +139,11 @@ teardown_services() {
 }
 
 main() {
-  (cd docker-compose/monitor && make build && make dev DOCKER_COMPOSE_ARGS="-d")
+  if [ "$BINARY" == "jaeger" ]; then
+    (cd docker-compose/monitor && make build-v2 && make dev-v2 DOCKER_COMPOSE_ARGS="-d")
+  else
+    (cd docker-compose/monitor && make build && make dev DOCKER_COMPOSE_ARGS="-d")
+  fi
   wait_for_services
   check_spm
   success="true"