Add OpenTelemetry-Web to site (#205)

* update registry * fix search elements not taking full width * update colors/tagging * add collector note * initial work * add sourcemap * add opentelemetry tracing * change url for collector
open-telemetry · Jun 18, 2020 · 8072e04 · 8072e04
1 parent 479cf6f
commit 8072e04
Show file tree

Hide file tree

Showing 15 changed files with 18,274 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,5 @@ data/progress_generated.yaml
 # Link checker
 bin/
 tmp/
+
+scripts/collector.yaml
diff --git a/Makefile b/Makefile
@@ -3,11 +3,10 @@ clean:
 
 setup:
 	npm install
+	npm run-script build
 
 serve: setup
-	hugo server \
-		--buildDrafts \
-		--buildFuture
+	hugo server -p 30000 --buildDrafts --buildFuture && npm start
 
 preview-build: get-milestones
 	hugo \

diff --git a/assets/js/app.js b/assets/js/app.js
diff --git a/assets/js/app.js.map b/assets/js/app.js.map
diff --git a/assets/js/search.js b/assets/js/search.js
diff --git a/assets/js/search.js.map b/assets/js/search.js.map
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -3,6 +3,7 @@
   <head>
     {{ partial "meta.html" . }}
     {{ partial "css.html" . }}
+    {{ partial "javascript.html" . }}
     <title>
       {{ block "title" . }}{{ site.Title }} | {{ site.Params.tagline }}{{ end }}
     </title>
@@ -16,6 +17,5 @@
     </main>
 
     {{ partial "footer.html" . }}
-    {{ partial "javascript.html" . }}
   </body>
 </html>
diff --git a/layouts/registry/list.html b/layouts/registry/list.html
@@ -1,5 +1,6 @@
 {{ define "main" }}
 {{ $registryItems := where .Data.Pages "Params.layout" "!=" "search" }}
+{{ $search := resources.Get "js/search.js" | fingerprint }}
 <div class="container">
   <section class="section">
     <div class="columns">
@@ -121,6 +122,6 @@ <h1 class="title">OpenTelemetry Registry</h1>
   </script>
   <script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/fuse.js/3.2.0/fuse.min.js"></script>
-  <script src="{{ "/js/search.js" | absURL }}"></script>
+  <script src="{{ $search.RelPermalink }}" integrity="{{ $search.Data.Integrity }}" type="application/javascript"></script>
 </div>
 {{ end }}
diff --git a/layouts/registry/search.html b/layouts/registry/search.html
@@ -1,4 +1,5 @@
 {{ define "main" }}
+{{ $search := resources.Get "js/search.js" | fingerprint }}
 <div class="registry__search container">
   <div class="row">
     <div class="col">
@@ -28,5 +29,5 @@ <h4><a href="${link}">${title}</a></h4>
 </script>
 <script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/fuse.js/3.2.0/fuse.min.js"></script>
-<script src="{{ "/js/search.js" | absURL }}"></script>
+<script src="{{ $search.RelPermalink }}" integrity="{{ $search.Data.Integrity }}" type="application/javascript"></script>
 {{ end }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,3 +14,5 @@ data/progress_generated.yaml @@
     # Link checker
     bin/
     tmp/
+    scripts/collector.yaml