Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: jaeger datastore #3149

Merged
merged 3 commits into from
Sep 12, 2023
Merged

fix: jaeger datastore #3149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
464c552
fix: jaeger datastore
mathnogueira Sep 12, 2023
c72f9bb
rollback jaeger version pin
mathnogueira Sep 12, 2023
58e6740
fix go version
mathnogueira Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...servability-driven-development-go-tracetest/bookstore/part1/tracetest/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...rvability-driven-development-go-tracetest/bookstore/part2.1/tracetest/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...rvability-driven-development-go-tracetest/bookstore/part2.2/tracetest/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...rvability-driven-development-go-tracetest/bookstore/part3.1/tracetest/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...rvability-driven-development-go-tracetest/bookstore/part3.2/tracetest/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion examples/observability-to-the-rescue/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/quick-start-go-and-kafka/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/quick-start-jaeger-nodejs/tracetest/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion examples/quick-start-net-core/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion examples/quick-start-tail-sampling/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/tracetest-jaeger/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion examples/tracetest-k6/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion examples/tracetest-otel-demo/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion examples/tracetest-provisioning-env/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion examples/tracetesting-kubernetes/kubetracing/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion local-config/jaeger/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion server/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion server/tracedb/jaegerdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line owns me peace of mind! 🙃

return traces.Trace{}, connection.ErrTraceNotFound
}
return traces.Trace{}, fmt.Errorf("jaeger stream recv err: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion testing/cli-e2etest/environment/jaeger/server-setup/docker-compose-no-api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion testing/load/infra/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down