Merge branch 'main' into dotnetUpdateBuilder

open-telemetry · Jul 18, 2023 · ab364c1 · ab364c1
2 parents e2eccde + 1296ae1
commit ab364c1
Show file tree

Hide file tree

Showing 5 changed files with 2,621 additions and 1,886 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -49,6 +49,8 @@ release.
   ([#872](https://github.com/open-telemetry/opentelemetry-demo/pull/872))
 * [frontendproxy]Envoy expose a route for the collector to route frontend spans
   ([#938](https://github.com/open-telemetry/opentelemetry-demo/pull/938))
+* [frontend] update JS SDKs to 1.15.0/0.41.0
+  ([#853](https://github.com/open-telemetry/opentelemetry-demo/pull/853))
 * [shippingservice] Update Rust dependencies and add TelemetryResourceDetector
   ([#972](https://github.com/open-telemetry/opentelemetry-demo/pull/972))
 * Update frontendproxy's env for minimal