lens: adds zipkin-uiproxy image and fixes ZIPKIN_UI_BASEPATH #3751
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This adds a new test image zipkin-uiproxy which allows us to verify the ZIPKIN_UI_BASEPATH. This allowed me to notice that we rely on the basePath having a trailing slash in the index.html. Signed-off-by: Adrian Cole <[email protected]>
Signed-off-by: Adrian Cole <[email protected]>
|
Here's where I got. diff --git a/docker/examples/docker-compose-uiproxy.yml b/docker/examples/docker-compose-uiproxy.yml
index a01658436..a94ff1634 100644
--- a/docker/examples/docker-compose-uiproxy.yml
+++ b/docker/examples/docker-compose-uiproxy.yml
@@ -13,7 +13,7 @@ version: '2.4'
services:
zipkin-uiproxy:
- image: ghcr.io/openzipkin/zipkin-uiproxy:${TAG:-latest}
+ image: openzipkin/zipkin-uiproxy:test
container_name: zipkin-uiproxy
environment:
# This allows hitting the UI on the host by http://localhost/admin/zipkin
diff --git a/docker/examples/docker-compose.yml b/docker/examples/docker-compose.yml
index 1210bb8d5..b37c6fed0 100644
--- a/docker/examples/docker-compose.yml
+++ b/docker/examples/docker-compose.yml
@@ -17,7 +17,7 @@ services:
# The zipkin process services the UI, and also exposes a POST endpoint that
# instrumentation can send trace data to.
zipkin:
- image: ghcr.io/openzipkin/zipkin-slim:${TAG:-latest}
+ image: openzipkin/zipkin-slim:test
container_name: zipkin
# Environment settings are defined here https://github.com/openzipkin/zipkin/blob/master/zipkin-server/README.md#environment-variables
environment:
diff --git a/zipkin-lens/vite.config.ts b/zipkin-lens/vite.config.ts
index d8b1b994e..2b9b53839 100644
--- a/zipkin-lens/vite.config.ts
+++ b/zipkin-lens/vite.config.ts
@@ -39,6 +39,7 @@ export default defineConfig(():UserConfig => {
outDir: 'build',
// use the same path patterns as the original react-scripts lens build
assetsDir: "static",
+ sourcemap: true,
rollupOptions: {
output: {
assetFileNames({name}):string {
$ ./mvnw -T1C -q --batch-mode -DskipTests --also-make -pl zipkin-server clean install
$ DOCKER_TARGET=zipkin-slim build-bin/docker/docker_build openzipkin/zipkin-slim:test
$ DOCKER_FILE=docker/test-images/zipkin-uiproxy/Dockerfile build-bin/docker/docker_build openzipkin/zipkin-uiproxy:test
$ cd docker/examples
$ docker-compose -f docker-compose.yml -f docker-compose-uiproxy.yml upthen http://localhost/admin/zipkin/ and add a breakpoint in api.tsx you can see at least for API calls the variable is passing through. Maybe some other code is controlling the window location and it isn't aware of the BASE_PATH? 
|
added 2 commits
March 6, 2024 11:58
Signed-off-by: Adrian Cole <[email protected]>
Signed-off-by: Adrian Cole <[email protected]>
|
working except the logo is still served from /zipkin not /admin/zipkin.. |
Signed-off-by: Adrian Cole <[email protected]>
|
ok I have it working and verified in the proxy-pass image (zipkin-uiproxy) |
codefromthecrypt
commented
Mar 6, 2024
|
|
||
| const App: React.FC = () => { | ||
| useTitle('Zipkin'); | ||
| const baseName = useMemo(() => { | ||
| return import.meta.env.DEV | ||
| ? '/zipkin' | ||
| : (import.meta.env.BASE_URL as string); |
There was a problem hiding this comment.
basically this was undefined, so why the main URLs weren't mapping
codefromthecrypt
commented
Mar 6, 2024
| @@ -28,7 +28,6 @@ import TraceIdSearch from './TraceIdSearch'; | |||
| import TraceJsonUploader from './TraceJsonUploader'; | |||
| import { useUiConfig } from '../UiConfig'; | |||
| import { darkTheme } from '../../constants/color'; | |||
| import logoSrc from '../../img/zipkin-logo.png'; | |||
There was a problem hiding this comment.
this doesn't relatlvize, but since the logo will likely never change, I just moved it to public
Signed-off-by: Adrian Cole <[email protected]>
codefromthecrypt
commented
Mar 6, 2024
| @@ -1,7 +1,7 @@ | |||
| <!-- simplified version of /zipkin-lens/index.html --> | |||
| <html> | |||
| <head> | |||
| <base href="/zipkin"> | |||
| <base href="/zipkin/"> | |||
There was a problem hiding this comment.
trailing slash is important
codefromthecrypt
changed the title
codefromthecrypt
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds a new test image zipkin-uiproxy which allows us to verify the ZIPKIN_UI_BASEPATH. This allowed me to notice and fix the following glitches since we migrated to vite: