upstream updates (#17)

* Regenerate kubernetes manifest and add autogenerate comment (open-telemetry#909) Co-authored-by: Pierre Tessier <pierre@pierretessier.com> * [loadgenerator] run load through frontend proxy (Envoy) (open-telemetry#914) * Run load through frontendProxy Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * Run load through frontendProxy Signed-off-by: Pierre Tessier <pierre@pierretessier.com> --------- Signed-off-by: Pierre Tessier <pierre@pierretessier.com> Co-authored-by: Austin Parker <austin@ap2.io> * Fix error sh in README.md (open-telemetry#926) --------- Signed-off-by: Pierre Tessier <pierre@pierretessier.com> Co-authored-by: isabel <isaschm@users.noreply.github.com> Co-authored-by: Pierre Tessier <pierre@pierretessier.com> Co-authored-by: Austin Parker <austin@ap2.io> Co-authored-by: Lancelot <lancel.huang.cs@gmail.com>
opensearch-project · Jun 9, 2023 · f6c32ed · f6c32ed
1 parent ddc5b46
commit f6c32ed
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 37 deletions.
diff --git a/.env b/.env
@@ -60,11 +60,12 @@ NGINX_ADDR=nginx:${FRONTEND_PORT}
 # Frontend Proxy (Envoy)
 FRONTEND_HOST=frontend
 ENVOY_PORT=8080
+FRONTEND_PROXY_ADDR=frontend-proxy:${ENVOY_PORT}
 
 # Load Generator
 LOCUST_WEB_PORT=8089
 LOCUST_USERS=10
-LOCUST_HOST=http://${FRONTEND_ADDR}
+LOCUST_HOST=http://${FRONTEND_PROXY_ADDR}
 LOCUST_WEB_HOST=loadgenerator
 LOCUST_AUTOSTART=true
 LOCUST_HEADLESS=false

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -35,8 +35,12 @@ release.
   ([#904](https://github.com/open-telemetry/opentelemetry-demo/pull/904))
 * [featureflagservice] Bump OTP version to 26.0
   ([#903](https://github.com/open-telemetry/opentelemetry-demo/pull/903))
+* Regenerate kubernetes manifest and add auto-generate comment
+  ([#909](https://github.com/open-telemetry/opentelemetry-demo/pull/909))
 * [loadgenerator] fix redirect on recommendations load
   ([#913](https://github.com/open-telemetry/opentelemetry-demo/pull/913))
+* [loadgenerator] run load through frontend proxy (Envoy)
+  ([#914](https://github.com/open-telemetry/opentelemetry-demo/pull/914))
 
 ## 1.4.0
 

diff --git a/Makefile b/Makefile
@@ -105,4 +105,5 @@ generate-kubernetes-manifests:
 	helm repo update
 	echo "# Copyright The OpenTelemetry Authors" > kubernetes/opentelemetry-demo.yaml
 	echo "# SPDX-License-Identifier: Apache-2.0" >> kubernetes/opentelemetry-demo.yaml
+	echo "# This file is generated by 'make generate-kubernetes-manifests'" >> kubernetes/opentelemetry-demo.yaml
 	helm template opentelemetry-demo open-telemetry/opentelemetry-demo --namespace otel-demo | sed '/helm.sh\/chart\:/d' | sed '/helm.sh\/hook/d' | sed '/managed-by\: Helm/d' >> kubernetes/opentelemetry-demo.yaml
diff --git a/kubernetes/opentelemetry-demo.yaml b/kubernetes/opentelemetry-demo.yaml
@@ -1,5 +1,6 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
+# This file is generated by 'make generate-kubernetes-manifests'
 ---
 # Source: opentelemetry-demo/charts/grafana/templates/serviceaccount.yaml
 apiVersion: v1
@@ -31,7 +32,7 @@ metadata:
   labels:
     app.kubernetes.io/name: otelcol
     app.kubernetes.io/instance: opentelemetry-demo
-    app.kubernetes.io/version: "0.75.0"
+    app.kubernetes.io/version: "0.76.1"
 ---
 # Source: opentelemetry-demo/charts/prometheus/templates/serviceaccount.yaml
 apiVersion: v1
@@ -152,7 +153,7 @@ metadata:
   labels:
     app.kubernetes.io/name: otelcol
     app.kubernetes.io/instance: opentelemetry-demo
-    app.kubernetes.io/version: "0.75.0"
+    app.kubernetes.io/version: "0.76.1"
 data:
   relay: |
     connectors:
@@ -193,31 +194,31 @@ data:
       jaeger:
         protocols:
           grpc:
-            endpoint: ${MY_POD_IP}:14250
+            endpoint: ${env:MY_POD_IP}:14250
           thrift_compact:
-            endpoint: ${MY_POD_IP}:6831
+            endpoint: ${env:MY_POD_IP}:6831
           thrift_http:
-            endpoint: ${MY_POD_IP}:14268
+            endpoint: ${env:MY_POD_IP}:14268
       otlp:
         protocols:
           grpc:
-            endpoint: ${MY_POD_IP}:4317
+            endpoint: ${env:MY_POD_IP}:4317
           http:
             cors:
               allowed_origins:
               - http://*
               - https://*
-            endpoint: 127.0.0.1:4318
+            endpoint: 0.0.0.0:4318
       prometheus:
         config:
           scrape_configs:
           - job_name: opentelemetry-collector
             scrape_interval: 10s
             static_configs:
             - targets:
-              - ${MY_POD_IP}:8888
+              - ${env:MY_POD_IP}:8888
       zipkin:
-        endpoint: ${MY_POD_IP}:9411
+        endpoint: ${env:MY_POD_IP}:9411
     service:
       extensions:
       - health_check
@@ -257,7 +258,7 @@ data:
           - zipkin
       telemetry:
         metrics:
-          address: ${MY_POD_IP}:8888
+          address: ${env:MY_POD_IP}:8888
 ---
 # Source: opentelemetry-demo/charts/prometheus/templates/cm.yaml
 apiVersion: v1
@@ -4912,7 +4913,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "topk(7,histogram_quantile(0.50, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))",
+              "expr": "topk(7,histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))",
               "format": "time_series",
               "hide": true,
               "instant": false,
@@ -4928,7 +4929,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,service_name)))",
+              "expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,service_name)))",
               "hide": false,
               "instant": true,
               "interval": "",
@@ -4943,7 +4944,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "histogram_quantile(0.99, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
+              "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
               "hide": true,
               "interval": "",
               "legendFormat": "quantile99",
@@ -4957,7 +4958,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "histogram_quantile(0.999, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
+              "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
               "hide": true,
               "interval": "",
               "legendFormat": "quantile999",
@@ -5037,7 +5038,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "topk(7,sum by (service_name) (rate(calls{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])))",
+              "expr": "topk(7,sum by (service_name) (rate(calls_total{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])))",
               "format": "time_series",
               "instant": true,
               "interval": "",
@@ -5115,7 +5116,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "topk(7,sum(rate(calls{status_code=\"STATUS_CODE_ERROR\",service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (service_name))",
+              "expr": "topk(7,sum(rate(calls_total{status_code=\"STATUS_CODE_ERROR\",service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (service_name))",
               "instant": true,
               "interval": "",
               "legendFormat": "{{service_name}}",
@@ -5288,7 +5289,7 @@ data:
                 "uid": "webstore-metrics"
               },
               "exemplar": false,
-              "expr": "topk(7, sum(rate(calls{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,service_name)) ",
+              "expr": "topk(7, sum(rate(calls_total{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,service_name)) ",
               "format": "table",
               "instant": true,
               "interval": "",
@@ -5301,7 +5302,7 @@ data:
                 "uid": "webstore-metrics"
               },
               "exemplar": false,
-              "expr": "topk(7, sum(rate(calls{status_code=\"STATUS_CODE_ERROR\",service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,service_name))",
+              "expr": "topk(7, sum(rate(calls_total{status_code=\"STATUS_CODE_ERROR\",service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,service_name))",
               "format": "table",
               "hide": false,
               "instant": true,
@@ -5495,7 +5496,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "topk(7,histogram_quantile(0.50, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))",
+              "expr": "topk(7,histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))",
               "format": "time_series",
               "hide": true,
               "instant": false,
@@ -5511,7 +5512,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,span_name)))",
+              "expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,span_name)))",
               "hide": false,
               "instant": true,
               "interval": "",
@@ -5526,7 +5527,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "histogram_quantile(0.99, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
+              "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
               "hide": true,
               "interval": "",
               "legendFormat": "quantile99",
@@ -5540,7 +5541,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "histogram_quantile(0.999, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
+              "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
               "hide": true,
               "interval": "",
               "legendFormat": "quantile999",
@@ -5611,7 +5612,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "topk(7, sum by (span_name,service_name)(increase(duration_sum{service_name=~\"${service}\", span_name=~\"$span_name\"}[5m]) / increase(duration_count{service_name=~\"${service}\",span_name=~\"$span_name\"}[5m\n])))",
+              "expr": "topk(7, sum by (span_name,service_name)(increase(duration_milliseconds_sum{service_name=~\"${service}\", span_name=~\"$span_name\"}[5m]) / increase(duration_milliseconds_count{service_name=~\"${service}\",span_name=~\"$span_name\"}[5m\n])))",
               "instant": true,
               "interval": "",
               "legendFormat": "{{span_name}} [{{service_name}}]",
@@ -5715,7 +5716,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": true,
-              "expr": "topk(7,sum by (span_name,service_name)(increase(duration_sum{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval]) / increase(duration_count{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])))",
+              "expr": "topk(7,sum by (span_name,service_name)(increase(duration_milliseconds_sum{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval]) / increase(duration_milliseconds_count{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])))",
               "instant": false,
               "interval": "",
               "legendFormat": "[{{service_name}}]  {{span_name}}",
@@ -5744,14 +5745,14 @@ data:
               "type": "prometheus",
               "uid": "webstore-metrics"
             },
-            "definition": "query_result(count by (service_name)(count_over_time(calls[$__range])))",
+            "definition": "query_result(count by (service_name)(count_over_time(calls_total[$__range])))",
             "hide": 0,
             "includeAll": true,
             "multi": true,
             "name": "service",
             "options": [],
             "query": {
-              "query": "query_result(count by (service_name)(count_over_time(calls[$__range])))",
+              "query": "query_result(count by (service_name)(count_over_time(calls_total[$__range])))",
               "refId": "StandardVariableQuery"
             },
             "refresh": 2,
@@ -5771,14 +5772,14 @@ data:
               "type": "prometheus",
               "uid": "webstore-metrics"
             },
-            "definition": "query_result(sum ({__name__=~\".*calls\",service_name=~\"$service\"})  by (span_name))",
+            "definition": "query_result(sum ({__name__=~\".*calls_total\",service_name=~\"$service\"})  by (span_name))",
             "hide": 0,
             "includeAll": true,
             "multi": true,
             "name": "span_name",
             "options": [],
             "query": {
-              "query": "query_result(sum ({__name__=~\".*calls\",service_name=~\"$service\"})  by (span_name))",
+              "query": "query_result(sum ({__name__=~\".*calls_total\",service_name=~\"$service\"})  by (span_name))",
               "refId": "StandardVariableQuery"
             },
             "refresh": 2,
@@ -6045,7 +6046,7 @@ metadata:
   labels:
     app.kubernetes.io/name: otelcol
     app.kubernetes.io/instance: opentelemetry-demo
-    app.kubernetes.io/version: "0.75.0"
+    app.kubernetes.io/version: "0.76.1"
     component: standalone-collector
 spec:
   type: ClusterIP
@@ -6729,7 +6730,7 @@ metadata:
   labels:
     app.kubernetes.io/name: otelcol
     app.kubernetes.io/instance: opentelemetry-demo
-    app.kubernetes.io/version: "0.75.0"
+    app.kubernetes.io/version: "0.76.1"
 spec:
   replicas: 1
   revisionHistoryLimit: 10
@@ -6743,7 +6744,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: f656fcfa8e308a9922ba2be0799513a217a25722c2abc9855ea3e09d534fa89c
+        checksum/config: 43d3318bb84ce994167ce160b46e0e06eb17a17b8de61b578bf4a3e97f4dcdd1
         opentelemetry_community_demo: "true"
         prometheus.io/port: "9464"
         prometheus.io/scrape: "true"
@@ -6762,10 +6763,9 @@ spec:
           command:
             - /otelcol-contrib
             - --config=/conf/relay.yaml
-            - --feature-gates=service.connectors
           securityContext:
             {}
-          image: "otel/opentelemetry-collector-contrib:0.75.0"
+          image: "otel/opentelemetry-collector-contrib:0.76.1"
           imagePullPolicy: IfNotPresent
           ports:
             - name: jaeger-compact
@@ -6808,7 +6808,6 @@ spec:
               port: 13133
           resources:
             limits:
-              cpu: 256m
               memory: 125Mi
           volumeMounts:
             - mountPath: /conf

diff --git a/src/checkoutservice/README.md b/src/checkoutservice/README.md
@@ -7,7 +7,7 @@ This service provides checkout services for the application.
 To build the protos and the service binary, run:
 
 ```sh
-protoc -I ../pb/ ../pb/demo.proto --go_out=./ --go-grpc_out=./
+protoc -I ../../pb/ ../../pb/demo.proto --go_out=./ --go-grpc_out=./
 go build -o /go/bin/checkoutservice/ ./
 ```
 

diff --git a/src/productcatalogservice/README.md b/src/productcatalogservice/README.md
@@ -12,7 +12,7 @@ When this service is run the output should be similar to the following
 To build the protos and the service binary, run:
 
 ```sh
-protoc -I ../pb/ ../pb/demo.proto --go_out=./ --go-grpc_out=./
+protoc -I ../../pb/ ../../pb/demo.proto --go_out=./ --go-grpc_out=./
 go build -o /go/bin/productcatalogservice/ ./
 ```