Payment error Aproving as I need this for next revision

* payment error rebuild. with otel

* added Buttercup to payment

* Profiing on Payment is working again

Author: hagen-p

kubernetes/opentelemetry-demo.yaml

@@ -1853,14 +1853,16 @@ spec:
             runAsUser: 1000
           volumeMounts:
       volumes:
----
+---      
 # Source: opentelemetry-demo/templates/component.yaml
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: payment
-  labels:    
-    opentelemetry.io/name: payment   
+  labels:
+    
+    opentelemetry.io/name: payment
+    
     app.kubernetes.io/component: payment
     app.kubernetes.io/name: payment
     app.kubernetes.io/version: "2.1.3"
@@ -1869,22 +1871,23 @@ spec:
   replicas: 1
   revisionHistoryLimit: 10
   selector:
-    matchLabels:      
+    matchLabels:
+      
       opentelemetry.io/name: payment
   template:
     metadata:
-      labels:        
-        opentelemetry.io/name: payment        
+      labels:
+        opentelemetry.io/name: payment
         app.kubernetes.io/component: payment
         app.kubernetes.io/name: payment
     spec:
       serviceAccountName: opentelemetry-demo
       containers:
         - name: payment
-          image: 'ghcr.io/open-telemetry/demo:2.1.3-payment'
-          #image: ghcr.io/splunk/opentelemetry-demo/otel-payment:2.1.3-splunk
+          #image: 'ghcr.io/open-telemetry/demo:2.1.3-payment'
+          image: 'ghcr.io/splunk/opentelemetry-demo/otel-payment:2.1.3-profiling'
           imagePullPolicy: Always
-          ports:        
+          ports:
             - containerPort: 8080
               name: service
           env:
@@ -1918,30 +1921,28 @@ spec:
             - name: FLAGD_PORT
               value: "8013"
             - name: OTEL_EXPORTER_OTLP_ENDPOINT
-              value: http://$(NODE_IP):4317
-            # - name: OTEL_EXPORTER_OTLP_METRICS_ENDPOINT
-            #   value: http://$(NODE_IP):4317
-            # - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
-            #   value: http://$(NODE_IP):4317
+              value: http://$(OTEL_COLLECTOR_NAME):4318
             - name: OTEL_RESOURCE_ATTRIBUTES
               value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=2.1.3,service.kafka=no
-            - name: OTEL_PROFILER_LOGS_ENDPOINT
-              value: http://$(OTEL_COLLECTOR_NAME):4318
-            - name: SPLUNK_PROFILER_CALL_STACK_INTERVAL
-              value: "750"
-            - name: SPLUNK_PROFILER_ENABLED
-              value: "false"
-            - name: SPLUNK_PROFILER_MEMORY_ENABLED
-              value: "false"   
+            - name: SPLUNK_INSTRUMENTATION_METRICS_ENABLED
+              value: "true"
+            - name: SPLUNK_METRICS_ENABLED
+              value: "true"
+            - name: SPLUNK_PROFILER_ENABLED 
+              value: "true"                            
+            - name: SPLUNK_PROFILER_MEMORY_ENABLED  
+              value: "true"                            
+            - name: SPLUNK_PROFILER_CALL_STACK_INTERVAL  
+              value: "500"                                                        
             - name: OTEL_LOG_LEVEL
-              value: "info"  
+              value: "none"
           resources:
             limits:
               memory: 520Mi
           securityContext:
-            runAsGroup: 1000
+            runAsGroup: 1001
             runAsNonRoot: true
-            runAsUser: 1000
+            runAsUser: 1001
           volumeMounts:
       volumes:
 ---

kubernetes/otel-col-base.yaml

@@ -7,6 +7,91 @@ clusterReceiver:
     - name: pods
       mode: watch
       namespaces: [default, splunk]
+  config:
+    receivers:
+      sqlserver:
+        collection_interval: 1s
+        username: sa
+        password: "ChangeMe_SuperStrong123!"
+        server: sql-server-fraud.sql.svc.cluster.local
+        port: 1433
+        resource_attributes:
+          # sqlserver.computer.name:
+          #   enabled: true
+          sqlserver.instance.name:
+            enabled: true
+        # ADD to ENABLE Database Monitoring
+        events:
+          db.server.query_sample:
+            enabled: true
+          db.server.top_query:
+            enabled: true 
+        metrics:
+          sqlserver.batch.request.rate:
+              enabled: true
+          sqlserver.batch.sql_compilation.rate:
+              enabled: true
+          sqlserver.batch.sql_recompilation.rate:
+              enabled: true
+          sqlserver.database.count:
+              enabled: true
+          sqlserver.database.io:
+              enabled: true
+          sqlserver.database.latency:
+              enabled: true
+          sqlserver.database.operations:
+              enabled: true
+          sqlserver.deadlock.rate:
+              enabled: true
+          sqlserver.lock.wait.count:
+              enabled: true
+          sqlserver.lock.wait.rate:
+              enabled: true
+          sqlserver.os.wait.duration:
+              enabled: true
+          sqlserver.page.buffer_cache.hit_ratio:
+              enabled: true
+          sqlserver.processes.blocked:
+              enabled: true
+          sqlserver.resource_pool.disk.operations:
+              enabled: true
+          sqlserver.resource_pool.disk.throttled.read.rate:
+              enabled: true
+          sqlserver.resource_pool.disk.throttled.write.rate:
+              enabled: true
+          sqlserver.user.connection.count:
+              enabled: true
+          sqlserver.database.latency:
+            enabled: true  
+    exporters:
+      # Exports dbmon events as logs
+      otlphttp/dbmon:
+        headers:
+          X-SF-Token: 3QThm3q899dAU8udj-i4tA
+          X-splunk-instrumentation-library: dbmon
+        logs_endpoint: https://ingest.us1.signalfx.com/v3/event
+        sending_queue:
+          batch:
+            flush_timeout: 15s
+            max_size: 10485760 # 10 MiB
+            sizer: bytes    
+    service:
+      pipelines:
+        metrics:
+          exporters: [signalfx]
+          processors: [memory_limiter, batch, resourcedetection, resource]
+          receivers: [sqlserver]
+        logs/dbmon:
+          receivers:
+            - sqlserver
+          processors:
+            - memory_limiter
+            #- resource/tns
+            - batch
+            - resourcedetection
+            - resource
+          exporters:
+            - otlphttp/dbmon                
 agent:
   extraEnvs:
   - name: WORKSHOP_ENVIRONMENT
@@ -35,24 +120,6 @@ agent:
            config:
              endpoint: "redis-cart:6379"
              collection_interval: 10s
-      sqlserver:
-        collection_interval: 10s
-        username: sa
-        password: "ChangeMe_SuperStrong123!"
-        server: sql-server-fraud.sql.svc.cluster.local
-        port: 1433
-        resource_attributes:
-          sqlserver.computer.name:
-            enabled: true
-          sqlserver.instance.name:
-            enabled: true
-        # ADD to ENABLE Database Monitoring
-        events:
-          db.server.query_sample:
-            enabled: true
-          db.server.top_query:
-            enabled: true
-
     processors:
       filter/drop_flagd:
         traces:
@@ -66,41 +133,18 @@ agent:
           - attributes["url.full"] == "http://flagd:8013/flagd.evaluation.v1.Service/ResolveBoolean"
           - attributes["otel.scope.name"] == "flagd.evaluation.v1"
           - attributes["url.full"] == "http://flagd:8013/flagd.evaluation.v1.Service/EventStream"
-    
-    # Exporters define where the telemetry data is sent to
-    exporters:
-      # Exports dbmon events as logs
-      otlphttp/dbmon:
-        headers:
-          X-SF-Token: 3QThm3q899dAU8udj-i4tA
-          X-splunk-instrumentation-library: dbmon
-        logs_endpoint: https://ingest.us1.signalfx.com/v3/event
-        sending_queue:
-          batch:
-            flush_timeout: 15s
-            max_size: 10485760 # 10 MiB
-            sizer: bytes
 
     service:
       pipelines:
         metrics:
           exporters: [signalfx]
           processors: [memory_limiter, k8sattributes, batch, resourcedetection, resource]
-          receivers: [hostmetrics, kubeletstats, otlp, sqlserver, receiver_creator, signalfx]
+          receivers: [hostmetrics, kubeletstats, otlp, receiver_creator, signalfx]
         traces:
           exporters: [signalfx, otlphttp]
           processors: [memory_limiter,  filter/drop_flagd, k8sattributes, batch, resourcedetection, resource, resource/add_environment]
           receivers: [otlp, jaeger, zipkin]
-        logs/dbmon:
-          receivers:
-            - sqlserver
-          processors:
-            - memory_limiter
-            #- resource/tns
-            - batch
-            - resourcedetection
-          exporters:
-            - otlphttp/dbmon 
+
 logsCollection:
   extraFileLogs:
     filelog/syslog: