Merge branch 'main' of https://github.com/pmuls99/jaeger into enableC…

…ORSSettings
jaegertracing · Jul 13, 2023 · e27c5fe · e27c5fe
2 parents 6baee5c + e40a3e5
commit e27c5fe
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/cmd/tracegen/main.go b/cmd/tracegen/main.go
@@ -81,7 +81,7 @@ func createTracers(cfg *tracegen.Config, logger *zap.Logger) ([]trace.Tracer, fu
 		logger.Sugar().Infof("using %s trace exporter for service %s", cfg.TraceExporter, svc)
 
 		tp := sdktrace.NewTracerProvider(
-			sdktrace.WithBatcher(exp),
+			sdktrace.WithBatcher(exp, sdktrace.WithBlocking()),
 			sdktrace.WithResource(resource.NewWithAttributes(
 				semconv.SchemaURL,
 				semconv.ServiceNameKey.String(svc),

diff --git a/examples/hotrod/services/frontend/web_assets/code.jquery.com_jquery-3.7.0.min.js b/examples/hotrod/services/frontend/web_assets/code.jquery.com_jquery-3.7.0.min.js
diff --git a/examples/hotrod/services/frontend/web_assets/index.html b/examples/hotrod/services/frontend/web_assets/index.html
@@ -3,7 +3,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
   <head>
     <title>HotROD - Rides On Demand</title>
-    <script src="./jquery-3.1.1.min.js"></script>
+    <script src="./code.jquery.com_jquery-3.7.0.min.js"></script>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 

diff --git a/examples/hotrod/services/frontend/web_assets/jquery-3.1.1.min.js b/examples/hotrod/services/frontend/web_assets/jquery-3.1.1.min.js
diff --git a/scripts/rebuild-ui.sh b/scripts/rebuild-ui.sh
@@ -4,6 +4,9 @@ set -euxf -o pipefail
 
 cd jaeger-ui
 
+git fetch --all --tags
+git log --oneline --decorate=full -n 10 | cat
+
 LAST_TAG=$(git describe --tags --dirty 2>/dev/null)
 
 if [[ "$LAST_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]];  then