fix: jaeger datastore (#3149)

* fix: jaeger datastore * rollback jaeger version pin * fix go version
kubeshop · Sep 12, 2023 · 87c20b3 · 87c20b3
1 parent 57a9ef2
commit 87c20b3
Show file tree

Hide file tree

Showing 20 changed files with 20 additions and 20 deletions.
diff --git a/...servability-driven-development-go-tracetest/bookstore/part1/tracetest/docker-compose.yaml b/...servability-driven-development-go-tracetest/bookstore/part1/tracetest/docker-compose.yaml
@@ -9,7 +9,7 @@ services:
             timeout: 3s
             interval: 1s
             retries: 60
-        image: jaegertracing/all-in-one:1.48.0
+        image: jaegertracing/all-in-one:latest
         networks:
             default: null
         restart: unless-stopped

diff --git a/...rvability-driven-development-go-tracetest/bookstore/part2.1/tracetest/docker-compose.yaml b/...rvability-driven-development-go-tracetest/bookstore/part2.1/tracetest/docker-compose.yaml
@@ -9,7 +9,7 @@ services:
             timeout: 3s
             interval: 1s
             retries: 60
-        image: jaegertracing/all-in-one:1.48.0
+        image: jaegertracing/all-in-one:latest
         networks:
             default: null
         restart: unless-stopped

diff --git a/...rvability-driven-development-go-tracetest/bookstore/part2.2/tracetest/docker-compose.yaml b/...rvability-driven-development-go-tracetest/bookstore/part2.2/tracetest/docker-compose.yaml
@@ -9,7 +9,7 @@ services:
             timeout: 3s
             interval: 1s
             retries: 60
-        image: jaegertracing/all-in-one:1.48.0
+        image: jaegertracing/all-in-one:latest
         networks:
             default: null
         restart: unless-stopped

diff --git a/...rvability-driven-development-go-tracetest/bookstore/part3.1/tracetest/docker-compose.yaml b/...rvability-driven-development-go-tracetest/bookstore/part3.1/tracetest/docker-compose.yaml
@@ -9,7 +9,7 @@ services:
             timeout: 3s
             interval: 1s
             retries: 60
-        image: jaegertracing/all-in-one:1.48.0
+        image: jaegertracing/all-in-one:latest
         ports:
             - 16686:16686
         networks:

diff --git a/...rvability-driven-development-go-tracetest/bookstore/part3.2/tracetest/docker-compose.yaml b/...rvability-driven-development-go-tracetest/bookstore/part3.2/tracetest/docker-compose.yaml
@@ -9,7 +9,7 @@ services:
             timeout: 3s
             interval: 1s
             retries: 60
-        image: jaegertracing/all-in-one:1.48.0
+        image: jaegertracing/all-in-one:latest
         ports:
             - 16686:16686
         networks:

diff --git a/examples/observability-to-the-rescue/docker-compose.yaml b/examples/observability-to-the-rescue/docker-compose.yaml
@@ -109,7 +109,7 @@ services:
       - jaeger
 
   jaeger:
-    image: jaegertracing/all-in-one:1.48.0
+    image: jaegertracing/all-in-one:latest
     restart: unless-stopped
     ports:
       - 16686:16686

diff --git a/examples/quick-start-go-and-kafka/docker-compose.yaml b/examples/quick-start-go-and-kafka/docker-compose.yaml
@@ -116,7 +116,7 @@ services:
         condition: service_started
 
   jaeger:
-    image: jaegertracing/all-in-one:1.48.0
+    image: jaegertracing/all-in-one:latest
     restart: unless-stopped
     ports:
       - 16686:16686

diff --git a/examples/quick-start-jaeger-nodejs/tracetest/docker-compose.yaml b/examples/quick-start-jaeger-nodejs/tracetest/docker-compose.yaml
@@ -50,7 +50,7 @@ services:
       - ./tracetest/collector.config.yaml:/otel-local-config.yaml
 
   jaeger:
-    image: jaegertracing/all-in-one:1.48.0
+    image: jaegertracing/all-in-one:latest
     restart: unless-stopped
     ports:
       - "16686:16686"

diff --git a/examples/quick-start-net-core/docker-compose.yaml b/examples/quick-start-net-core/docker-compose.yaml
@@ -61,7 +61,7 @@ services:
       - 4318:4318
 
   jaeger:
-    image: jaegertracing/all-in-one:1.48.0
+    image: jaegertracing/all-in-one:latest
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "wget", "--spider", "localhost:16686"]

diff --git a/examples/quick-start-tail-sampling/docker-compose.yaml b/examples/quick-start-tail-sampling/docker-compose.yaml
@@ -75,7 +75,7 @@ services:
         condition: service_started
 
   jaeger:
-    image: jaegertracing/all-in-one:1.48.0
+    image: jaegertracing/all-in-one:latest
     restart: unless-stopped
     ports:
       - 16686:16686

diff --git a/examples/tracetest-jaeger/docker-compose.yml b/examples/tracetest-jaeger/docker-compose.yml
@@ -55,7 +55,7 @@ services:
             - 4317:4317
 
     jaeger:
-        image: jaegertracing/all-in-one:1.48.0
+        image: jaegertracing/all-in-one:latest
         restart: unless-stopped
         healthcheck:
             test: ["CMD", "wget", "--spider", "localhost:16686"]

diff --git a/examples/tracetest-k6/docker-compose.yml b/examples/tracetest-k6/docker-compose.yml
@@ -54,7 +54,7 @@ services:
       - 4317:4317
 
   jaeger:
-    image: jaegertracing/all-in-one:1.48.0
+    image: jaegertracing/all-in-one:latest
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "wget", "--spider", "localhost:16686"]

diff --git a/examples/tracetest-otel-demo/docker-compose.yaml b/examples/tracetest-otel-demo/docker-compose.yaml
@@ -68,7 +68,7 @@ services:
         condition: service_healthy
 
   jaeger:
-    image: jaegertracing/all-in-one:1.48.0
+    image: jaegertracing/all-in-one:latest
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "wget", "--spider", "localhost:16686"]

diff --git a/examples/tracetest-provisioning-env/docker-compose.yml b/examples/tracetest-provisioning-env/docker-compose.yml
@@ -53,7 +53,7 @@ services:
             - 4317:4317
 
     jaeger:
-        image: jaegertracing/all-in-one:1.48.0
+        image: jaegertracing/all-in-one:latest
         restart: unless-stopped
         healthcheck:
             test: ["CMD", "wget", "--spider", "localhost:16686"]

diff --git a/examples/tracetesting-kubernetes/kubetracing/docker-compose.yaml b/examples/tracetesting-kubernetes/kubetracing/docker-compose.yaml
@@ -9,7 +9,7 @@ services:
       timeout: 3s
       interval: 1s
       retries: 60
-    image: jaegertracing/all-in-one:1.48.0
+    image: jaegertracing/all-in-one:latest
     restart: unless-stopped
     environment:
       - COLLECTOR_OTLP_ENABLED=true

diff --git a/local-config/jaeger/docker-compose.yml b/local-config/jaeger/docker-compose.yml
@@ -15,7 +15,7 @@ services:
             - 5432:5432
 
     jaeger:
-        image: jaegertracing/all-in-one:1.48.0
+        image: jaegertracing/all-in-one:latest
         restart: unless-stopped
         healthcheck:
             test: ["CMD", "wget", "--spider", "localhost:16686"]

diff --git a/server/go.mod b/server/go.mod
@@ -1,6 +1,6 @@
 module github.com/kubeshop/tracetest/server
 
-go 1.20
+go 1.21
 
 require (
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0

diff --git a/server/tracedb/jaegerdb.go b/server/tracedb/jaegerdb.go
@@ -104,7 +104,7 @@ func jaegerGrpcGetTraceByID(ctx context.Context, traceID string, conn *grpc.Clie
 			if !ok {
 				return traces.Trace{}, fmt.Errorf("jaeger stream recv: %w", err)
 			}
-			if st.Message() == "trace not found" {
+			if strings.Contains(st.Message(), "trace not found") {
 				return traces.Trace{}, connection.ErrTraceNotFound
 			}
 			return traces.Trace{}, fmt.Errorf("jaeger stream recv err: %w", err)

diff --git a/testing/cli-e2etest/environment/jaeger/server-setup/docker-compose-no-api.yaml b/testing/cli-e2etest/environment/jaeger/server-setup/docker-compose-no-api.yaml
@@ -53,7 +53,7 @@ services:
       - 4317
 
   jaeger:
-    image: jaegertracing/all-in-one:1.48.0
+    image: jaegertracing/all-in-one:latest
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "wget", "--spider", "localhost:16686"]

diff --git a/testing/load/infra/docker-compose.yaml b/testing/load/infra/docker-compose.yaml
@@ -58,7 +58,7 @@ services:
       - 4318:4318
 
   jaeger:
-    # image: jaegertracing/all-in-one:1.48.0
+    # image: jaegertracing/all-in-one:latest
     image: jaegertracing/all-in-one:1.46.0
     restart: unless-stopped
     healthcheck: