From 464c55267f7dca648739a684c09b695e1c249d94 Mon Sep 17 00:00:00 2001 From: Matheus Nogueira Date: Tue, 12 Sep 2023 13:21:23 -0300 Subject: [PATCH 1/3] fix: jaeger datastore --- server/tracedb/jaegerdb.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/tracedb/jaegerdb.go b/server/tracedb/jaegerdb.go index d6dd9db976..581dc34ba1 100644 --- 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) From c72f9bba6474fb495cd2c24d32138fbc97fa4703 Mon Sep 17 00:00:00 2001 From: Matheus Nogueira Date: Tue, 12 Sep 2023 13:24:31 -0300 Subject: [PATCH 2/3] rollback jaeger version pin --- .../bookstore/part1/tracetest/docker-compose.yaml | 2 +- .../bookstore/part2.1/tracetest/docker-compose.yaml | 2 +- .../bookstore/part2.2/tracetest/docker-compose.yaml | 2 +- .../bookstore/part3.1/tracetest/docker-compose.yaml | 2 +- .../bookstore/part3.2/tracetest/docker-compose.yaml | 2 +- examples/observability-to-the-rescue/docker-compose.yaml | 2 +- examples/quick-start-go-and-kafka/docker-compose.yaml | 2 +- .../quick-start-jaeger-nodejs/tracetest/docker-compose.yaml | 2 +- examples/quick-start-net-core/docker-compose.yaml | 2 +- examples/quick-start-tail-sampling/docker-compose.yaml | 2 +- examples/tracetest-jaeger/docker-compose.yml | 2 +- examples/tracetest-k6/docker-compose.yml | 2 +- examples/tracetest-otel-demo/docker-compose.yaml | 2 +- examples/tracetest-provisioning-env/docker-compose.yml | 2 +- .../tracetesting-kubernetes/kubetracing/docker-compose.yaml | 2 +- local-config/jaeger/docker-compose.yml | 2 +- .../environment/jaeger/server-setup/docker-compose-no-api.yaml | 2 +- testing/load/infra/docker-compose.yaml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/observability-driven-development-go-tracetest/bookstore/part1/tracetest/docker-compose.yaml b/examples/observability-driven-development-go-tracetest/bookstore/part1/tracetest/docker-compose.yaml index 0cbf640ab7..a45f2679bb 100644 --- a/examples/observability-driven-development-go-tracetest/bookstore/part1/tracetest/docker-compose.yaml +++ b/examples/observability-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/examples/observability-driven-development-go-tracetest/bookstore/part2.1/tracetest/docker-compose.yaml b/examples/observability-driven-development-go-tracetest/bookstore/part2.1/tracetest/docker-compose.yaml index 0cbf640ab7..a45f2679bb 100644 --- a/examples/observability-driven-development-go-tracetest/bookstore/part2.1/tracetest/docker-compose.yaml +++ b/examples/observability-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/examples/observability-driven-development-go-tracetest/bookstore/part2.2/tracetest/docker-compose.yaml b/examples/observability-driven-development-go-tracetest/bookstore/part2.2/tracetest/docker-compose.yaml index 0cbf640ab7..a45f2679bb 100644 --- a/examples/observability-driven-development-go-tracetest/bookstore/part2.2/tracetest/docker-compose.yaml +++ b/examples/observability-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/examples/observability-driven-development-go-tracetest/bookstore/part3.1/tracetest/docker-compose.yaml b/examples/observability-driven-development-go-tracetest/bookstore/part3.1/tracetest/docker-compose.yaml index 291e47d56e..9026688cc6 100644 --- a/examples/observability-driven-development-go-tracetest/bookstore/part3.1/tracetest/docker-compose.yaml +++ b/examples/observability-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/examples/observability-driven-development-go-tracetest/bookstore/part3.2/tracetest/docker-compose.yaml b/examples/observability-driven-development-go-tracetest/bookstore/part3.2/tracetest/docker-compose.yaml index 291e47d56e..9026688cc6 100644 --- a/examples/observability-driven-development-go-tracetest/bookstore/part3.2/tracetest/docker-compose.yaml +++ b/examples/observability-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 index c9fcbb722b..24ce5475f1 100644 --- 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 index eb2e135124..1a4ed88fc9 100644 --- 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 index 26636687b7..22dfdf71cc 100644 --- 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 index d48a1682c0..c35393fc0a 100644 --- 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 index d6eeef91c8..296a4ff880 100644 --- 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 index 043c5aad1c..8020fcdf03 100644 --- 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 index 543c807e2f..3e3d43e021 100644 --- 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 index c19572064f..ea2ec70af9 100644 --- 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 index e1543347cf..0150bd8944 100644 --- 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 index 1a85919a64..bf6b1c77f3 100644 --- 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 index 7755c04e05..618d443078 100644 --- 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/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 index 4baf7cff30..4b068a1e44 100644 --- 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 index 553aece7fc..69910c0c01 100644 --- 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: From 58e6740a0002e2b5b8727ccf7cf927dc87e04ffd Mon Sep 17 00:00:00 2001 From: Matheus Nogueira Date: Tue, 12 Sep 2023 13:28:55 -0300 Subject: [PATCH 3/3] fix go version --- server/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/go.mod b/server/go.mod index 9d560b0393..c85d76d646 100644 --- 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