Merge remote-tracking branch 'upstream/main'

Author: github-actions

CHANGELOG.md

@@ -20,6 +20,9 @@ the release.
   ([#1727](https://github.com/open-telemetry/opentelemetry-demo/pull/1727))
 * [chore] Fix binding for host's volume mount
   ([#1728](https://github.com/open-telemetry/opentelemetry-demo/pull/1728))
+* [frontend] fix imageSlowLoad headers not applied
+  to 1.8.0 together with other dependencies
+  ([#1733](https://github.com/open-telemetry/opentelemetry-demo/pull/1733))
 
 ## 1.11.1
 

src/frontend/components/ProductCard/ProductCard.tsx

@@ -12,8 +12,8 @@ interface IProps {
   product: Product;
 }
 
-async function getImageWithHeaders(url: RequestInfo, headers: Record<string, string>) {
-  const res = await fetch(url, { headers });
+async function getImageWithHeaders(requestInfo: Request) {
+  const res = await fetch(requestInfo);
   return await res.blob();
 }
 
@@ -33,9 +33,16 @@ const ProductCard = ({
   const [imageSrc, setImageSrc] = useState<string>('');
 
   useEffect(() => {
-    const requestInfo = new Request('/images/products/' + picture);
-    const headers = { 'x-envoy-fault-delay-request': imageSlowLoad.toString(), 'Cache-Control': 'no-cache' };
-    getImageWithHeaders(requestInfo, headers).then(blob => {
+    const headers = new Headers();
+    headers.append('x-envoy-fault-delay-request', imageSlowLoad.toString());
+    headers.append('Cache-Control', 'no-cache')
+    const requestInit = {
+      method: "GET",
+      headers: headers
+    };
+    const image_url ='/images/products/' + picture
+    const requestInfo = new Request(image_url, requestInit);
+    getImageWithHeaders(requestInfo).then(blob => {
       setImageSrc(URL.createObjectURL(blob));
     });
   }, [imageSlowLoad, picture]);

src/productcatalogservice/main.go

@@ -128,6 +128,7 @@ func main() {
 		}
 		log.Println("Shutdown meter provider")
 	}()
+	openfeature.AddHooks(otelhooks.NewTracesHook())
 	err := openfeature.SetProvider(flagd.NewProvider())
 	if err != nil {
 		log.Fatal(err)
@@ -300,7 +301,7 @@ func (p *productCatalog) checkProductFailure(ctx context.Context, id string) boo
 	if id != "OLJCESPC7Z" {
 		return false
 	}
-	openfeature.AddHooks(otelhooks.NewTracesHook())
+
 	client := openfeature.NewClient("productCatalog")
 	failureEnabled, _ := client.BooleanValue(
 		ctx, "productCatalogFailure", false, openfeature.EvaluationContext{},