Fixes

grafana · May 29, 2024 · 25b1ab8 · 25b1ab8
1 parent b04743b
commit 25b1ab8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -293,7 +293,7 @@ oats-test: oats-test-sql oats-test-sql-statement oats-test-sql-other-langs oats-
 
 .PHONY: oats-test-debug
 oats-test-debug: oats-prereq
- cd test/oats/sql && TESTCASE_BASE_PATH=./yaml TESTCASE_MANUAL_DEBUG=true TESTCASE_TIMEOUT=1h $(GINKGO) -v -r
+ cd test/oats/redis_other_langs && TESTCASE_BASE_PATH=./yaml TESTCASE_MANUAL_DEBUG=true TESTCASE_TIMEOUT=1h $(GINKGO) -v -r
 
 .PHONY: drone
 drone:

diff --git a/pkg/internal/export/otel/traces.go b/pkg/internal/export/otel/traces.go
@@ -619,7 +619,10 @@ func TraceName(span *request.Span) string {
  }
  return operation
  case request.EventTypeRedisClient:
- return fmt.Sprintf("REDIS %s", span.Method)
+ if span.Method == "" {
+ return "REDIS"
+ }
+ return span.Method
  }
  return ""
 }

diff --git a/test/integration/components/pythonredis/Dockerfile b/test/integration/components/pythonredis/Dockerfile
@@ -3,6 +3,6 @@ FROM python:latest
 EXPOSE 8080
 RUN apt update
 RUN apt install libpq-dev
-RUN pip install fastapi uvicorn psycopg2
+RUN pip install fastapi uvicorn redis
 COPY main.py /main.py
 CMD ["uvicorn", "--port", "8080", "--host", "0.0.0.0", "main:app"]