demo 1.5 release

Signed-off-by: Pierre Tessier <[email protected]>
open-telemetry · Sep 19, 2023 · 6b1b635 · 6b1b635
1 parent 70583f7
commit 6b1b635
Show file tree

Hide file tree

Showing 13 changed files with 67 additions and 33 deletions.
diff --git a/...s/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml b/...s/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml
@@ -49,7 +49,7 @@ spec:
           name: jaeger
           args:
             - "--memory.max-traces"
-            - "10000"
+            - "8000"
             - "--query.base-path"
             - "/jaeger/ui"
             - "--prometheus.server-url"

diff --git a/...emo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml b/...emo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml
@@ -22,7 +22,7 @@ data:
           insecure: true
       prometheus:
         enable_open_metrics: true
-        endpoint: 0.0.0.0:9464
+        endpoint: ${env.MY_POD_IP}:9464
         resource_to_telemetry_conversion:
           enabled: true
     extensions:
@@ -31,6 +31,11 @@ data:
         size_in_percentage: 40
     processors:
       batch: {}
+      filter/ottl:
+        error_mode: ignore
+        metrics:
+          metric:
+          - name == "rpc.server.duration"
       k8sattributes:
         extract:
           metadata:
@@ -71,6 +76,7 @@ data:
           statements:
           - set(description, "") where name == "queueSize"
           - set(description, "") where name == "rpc.server.duration"
+          - set(description, "") where name == "http.client.duration"
     receivers:
       jaeger:
         protocols:
@@ -89,7 +95,7 @@ data:
               allowed_origins:
               - http://*
               - https://*
-            endpoint: 0.0.0.0:4318
+            endpoint: ${env:MY_POD_IP}:4318
       prometheus:
         config:
           scrape_configs:
@@ -121,8 +127,9 @@ data:
           processors:
           - k8sattributes
           - memory_limiter
-          - resource
+          - filter/ottl
           - transform
+          - resource
           - batch
           receivers:
           - otlp

diff --git a/...etry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml b/...etry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml
@@ -21,7 +21,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: b0d2c52070e8cff6b070a8dd217673be88d078bb7d794dae71f928c17c010213
+        checksum/config: 078e8c22fbb93a32d12180256c540e5112524117b2cb0bddfadc9f4741a40b93
         opentelemetry_community_demo: "true"
         prometheus.io/port: "9464"
         prometheus.io/scrape: "true"
@@ -95,7 +95,7 @@ spec:
               port: 13133
           resources:
             limits:
-              memory: 180Mi
+              memory: 200Mi
           volumeMounts:
             - mountPath: /conf
               name: opentelemetry-collector-configmap

diff --git a/...telemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml b/...telemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml
@@ -49,7 +49,7 @@ spec:
           name: jaeger
           args:
             - "--memory.max-traces"
-            - "10000"
+            - "8000"
             - "--query.base-path"
             - "/jaeger/ui"
             - "--prometheus.server-url"

diff --git a/...emo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml b/...emo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml
@@ -22,7 +22,7 @@ data:
           insecure: true
       prometheus:
         enable_open_metrics: true
-        endpoint: 0.0.0.0:9464
+        endpoint: ${env.MY_POD_IP}:9464
         resource_to_telemetry_conversion:
           enabled: true
     extensions:
@@ -40,6 +40,11 @@ data:
           services:
           - frontend-proxy
       batch: {}
+      filter/ottl:
+        error_mode: ignore
+        metrics:
+          metric:
+          - name == "rpc.server.duration"
       k8sattributes:
         extract:
           metadata:
@@ -78,6 +83,7 @@ data:
           statements:
           - set(description, "") where name == "queueSize"
           - set(description, "") where name == "rpc.server.duration"
+          - set(description, "") where name == "http.client.duration"
     receivers:
       jaeger:
         protocols:
@@ -96,7 +102,7 @@ data:
               allowed_origins:
               - http://*
               - https://*
-            endpoint: 0.0.0.0:4318
+            endpoint: ${env:MY_POD_IP}:4318
       prometheus:
         config:
           scrape_configs:
@@ -128,8 +134,9 @@ data:
           processors:
           - k8sattributes
           - memory_limiter
-          - resource
+          - filter/ottl
           - transform
+          - resource
           - batch
           receivers:
           - otlp

diff --git a/...mo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml b/...mo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml
@@ -23,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: db0e93d20a0305525f27fef9ca29f3a255c7e5558958aa61e84c34acd9decd06
+        checksum/config: 087d42dff41bace242e1acef4881a69f566f04a40267d5ec1c6e84d53c3e071e
         opentelemetry_community_demo: "true"
         prometheus.io/port: "9464"
         prometheus.io/scrape: "true"
@@ -87,7 +87,7 @@ spec:
               port: 13133
           resources:
             limits:
-              memory: 180Mi
+              memory: 200Mi
           volumeMounts:
             - mountPath: /conf
               name: opentelemetry-collector-configmap

diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml
@@ -49,7 +49,7 @@ spec:
           name: jaeger
           args:
             - "--memory.max-traces"
-            - "10000"
+            - "8000"
             - "--query.base-path"
             - "/jaeger/ui"
             - "--prometheus.server-url"

diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml
@@ -22,7 +22,7 @@ data:
           insecure: true
       prometheus:
         enable_open_metrics: true
-        endpoint: 0.0.0.0:9464
+        endpoint: ${env.MY_POD_IP}:9464
         resource_to_telemetry_conversion:
           enabled: true
     extensions:
@@ -31,6 +31,11 @@ data:
         size_in_percentage: 40
     processors:
       batch: {}
+      filter/ottl:
+        error_mode: ignore
+        metrics:
+          metric:
+          - name == "rpc.server.duration"
       k8sattributes:
         extract:
           metadata:
@@ -69,6 +74,7 @@ data:
           statements:
           - set(description, "") where name == "queueSize"
           - set(description, "") where name == "rpc.server.duration"
+          - set(description, "") where name == "http.client.duration"
     receivers:
       jaeger:
         protocols:
@@ -87,7 +93,7 @@ data:
               allowed_origins:
               - http://*
               - https://*
-            endpoint: 0.0.0.0:4318
+            endpoint: ${env:MY_POD_IP}:4318
       prometheus:
         config:
           scrape_configs:
@@ -119,8 +125,9 @@ data:
           processors:
           - k8sattributes
           - memory_limiter
-          - resource
+          - filter/ottl
           - transform
+          - resource
           - batch
           receivers:
           - otlp

diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml
@@ -23,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 55d3b8b801c52d8ece946630bf88f5056ca47ca17458a76ec968dc15e90b7bb3
+        checksum/config: 65697fdda2bc5b2836ec1e38cbdf3148c0d242f8ff77a457a5967dec922788bd
         opentelemetry_community_demo: "true"
         prometheus.io/port: "9464"
         prometheus.io/scrape: "true"
@@ -87,7 +87,7 @@ spec:
               port: 13133
           resources:
             limits:
-              memory: 180Mi
+              memory: 200Mi
           volumeMounts:
             - mountPath: /conf
               name: opentelemetry-collector-configmap

diff --git a/...ts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml b/...ts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml
@@ -49,7 +49,7 @@ spec:
           name: jaeger
           args:
             - "--memory.max-traces"
-            - "10000"
+            - "8000"
             - "--query.base-path"
             - "/jaeger/ui"
             - "--prometheus.server-url"

diff --git a/...metry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml b/...metry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml
@@ -22,7 +22,7 @@ data:
           insecure: true
       prometheus:
         enable_open_metrics: true
-        endpoint: 0.0.0.0:9464
+        endpoint: ${env.MY_POD_IP}:9464
         resource_to_telemetry_conversion:
           enabled: true
     extensions:
@@ -31,6 +31,11 @@ data:
         size_in_percentage: 40
     processors:
       batch: {}
+      filter/ottl:
+        error_mode: ignore
+        metrics:
+          metric:
+          - name == "rpc.server.duration"
       k8sattributes:
         extract:
           metadata:
@@ -69,6 +74,7 @@ data:
           statements:
           - set(description, "") where name == "queueSize"
           - set(description, "") where name == "rpc.server.duration"
+          - set(description, "") where name == "http.client.duration"
     receivers:
       jaeger:
         protocols:
@@ -87,7 +93,7 @@ data:
               allowed_origins:
               - http://*
               - https://*
-            endpoint: 0.0.0.0:4318
+            endpoint: ${env:MY_POD_IP}:4318
       prometheus:
         config:
           scrape_configs:
@@ -119,8 +125,9 @@ data:
           processors:
           - k8sattributes
           - memory_limiter
-          - resource
+          - filter/ottl
           - transform
+          - resource
           - batch
           receivers:
           - otlp

diff --git a/...etry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml b/...etry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml
@@ -23,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 55d3b8b801c52d8ece946630bf88f5056ca47ca17458a76ec968dc15e90b7bb3
+        checksum/config: 65697fdda2bc5b2836ec1e38cbdf3148c0d242f8ff77a457a5967dec922788bd
         opentelemetry_community_demo: "true"
         prometheus.io/port: "9464"
         prometheus.io/scrape: "true"
@@ -87,7 +87,7 @@ spec:
               port: 13133
           resources:
             limits:
-              memory: 180Mi
+              memory: 200Mi
           volumeMounts:
             - mountPath: /conf
               name: opentelemetry-collector-configmap

diff --git a/charts/opentelemetry-demo/values.yaml b/charts/opentelemetry-demo/values.yaml
@@ -585,7 +585,7 @@ opentelemetry-collector:
       enabled: true
   resources:
     limits:
-      memory: 180Mi
+      memory: 200Mi
   service:
     type: ClusterIP
   ports:
@@ -605,9 +605,6 @@ opentelemetry-collector:
       otlp:
         protocols:
           http:
-            # Bind to 0.0.0.0 to allow for `kubectl port-forward` to work
-            # This may be susceptible to denial of service attacks - CWE-1327 https://cwe.mitre.org/data/definitions/1327.html
-            endpoint: 0.0.0.0:4318
             # Since this collector needs to receive data from the web, enable cors for all origins
             # `allowed_origins` can be refined for your deployment domain
             cors:
@@ -623,7 +620,7 @@ opentelemetry-collector:
           insecure: true
       # Create an exporter to Prometheus (metrics)
       prometheus:
-        endpoint: '0.0.0.0:9464'
+        endpoint: "${env.MY_POD_IP}:9464"
         resource_to_telemetry_conversion:
           enabled: true
         enable_open_metrics: true
@@ -634,16 +631,25 @@ opentelemetry-collector:
         - key: service.instance.id
           from_attribute: k8s.pod.uid
           action: insert
+      filter/ottl:
+        error_mode: ignore
+        metrics:
+          metric:
+            # FIXME: remove when a Metrics View is implemented in the checkout and productcatalog components
+            # or when this issue is resolved: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/3071
+            - 'name == "rpc.server.duration"'
       transform:
         metric_statements:
           - context: metric
             statements:
-              # FIXME: remove this when this is issue is resolved: https://github.com/open-telemetry/opentelemetry-java/issues/4834
+              # FIXME: remove when this issue is resolved: https://github.com/open-telemetry/opentelemetry-java/issues/4834
               - set(description, "") where name == "queueSize"
-              # FIXME: remove this when the following 2 issues are resolved
+              # FIXME: remove when these 2 issues are resolved:
               # Java: https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/9478
               # Go: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/4301
               - set(description, "") where name == "rpc.server.duration"
+              # FIXME: remove when this issue is resolved: https://github.com/open-telemetry/opentelemetry-python-contrib/issues/1958
+              - set(description, "") where name == "http.client.duration"
 
     connectors:
       spanmetrics:
@@ -655,7 +661,7 @@ opentelemetry-collector:
           exporters: [otlp, logging, spanmetrics]
         metrics:
           receivers: [otlp, spanmetrics]
-          processors: [memory_limiter, resource, transform, batch]
+          processors: [memory_limiter, filter/ottl, transform, resource, batch]
           exporters: [prometheus, logging]
 
 jaeger:
@@ -666,7 +672,7 @@ jaeger:
     enabled: true
     args:
       - "--memory.max-traces"
-      - "10000"
+      - "8000"
       - "--query.base-path"
       - "/jaeger/ui"
       - "--prometheus.server-url"