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.

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

ui: ensures resources loaded by relative URL when ZIPKIN_UI_BASEPATH set #3746

Merged
merged 1 commit into from
Mar 5, 2024

Conversation

codefromthecrypt
Copy link
Member

per #3742 (comment) we aren't there, yet

@@ -1,7 +1,7 @@
<!-- simplified version of /zipkin-lens/index.html -->
<html>
<head>
<base href="/zipkin/">
Copy link
Member Author

Choose a reason for hiding this comment

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

the actual source has no trailing slash

@codefromthecrypt
Copy link
Member Author

locally seems to match old behavior. also the UI functions fine without this property

$ curl -s localhost:9411/zipkin/index.html |tidy -q -i --tidy-mark no --wrap 1024
line 18 column 3 - Warning: inserting missing 'title' element
<!--

    Copyright 2015-2024 The OpenZipkin Authors

    Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
    in compliance with the License. You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

    Unless required by applicable law or agreed to in writing, software distributed under the License
    is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
    or implied. See the License for the specific language governing permissions and limitations under
    the License.

-->
<!DOCTYPE html>
<html>
<head>
  <base href="/admin/zipkin">
  <meta charset="utf-8">
  <link rel="icon" href="./favicon.ico">
  <script type="module" crossorigin="" src="./static/js/index.6af42604.js"></script>
  <link rel="stylesheet" href="./static/css/index.a7aa86b4.css">
  <title></title>
</head>
<body>
  <noscript>You need to enable JavaScript to run this app.</noscript>
  <div id="root"></div>
</body>
</html>

@codefromthecrypt codefromthecrypt changed the title ui: ensures resources loaded by relative URL when baseUrl property set ui: ensures resources loaded by relative URL when ZIPKIN_UI_BASEPATH set Mar 5, 2024
@codefromthecrypt codefromthecrypt merged commit 7352fb1 into master Mar 5, 2024
11 of 12 checks passed
@codefromthecrypt codefromthecrypt deleted the lens-relative branch March 5, 2024 08:09
@codefromthecrypt
Copy link
Member Author

thanks for the look @anuraaga!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants