Remove JMX exporter container from span-normalizer and raw-spans-grouper pods

hypertrace-ingester/build.gradle.kts

@@ -25,7 +25,7 @@ hypertraceDocker {
 }
 
 dependencies {
-  implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.15")
+  implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.16")
   implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.18")
   implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.18")
   implementation("org.hypertrace.core.datamodel:data-model:0.1.12")

hypertrace-trace-enricher/hypertrace-trace-enricher/build.gradle.kts

@@ -40,7 +40,7 @@ dependencies {
   implementation("org.hypertrace.entity.service:entity-service-client:0.1.23")
 
   implementation("com.typesafe:config:1.4.1")
-  implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.15")
+  implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.16")
   constraints {
     implementation("com.google.guava:guava:30.1-jre") {
       because("Information Disclosure [Medium Severity][https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-1015415] in com.google.guava:guava@29.0-android")

raw-spans-grouper/helm/templates/headless-service.yaml

@@ -2,9 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Values.name }}
-  annotations:
-    prometheus.io/scrape: "true"
-    prometheus.io/port: {{ .Values.containerAdminPort | quote }}
   labels:
     release: {{ .Release.Name }}
   {{- with .Values.deploymentLabels }}

raw-spans-grouper/helm/templates/statefulset.yaml

@@ -36,10 +36,8 @@ spec:
       {{- end }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/raw-spans-grouper-config.yaml") . | sha256sum }}
-      {{- if .Values.prometheus.jmx.enabled }}
         prometheus.io/scrape: "true"
-        prometheus.io/port: {{ .Values.prometheus.jmx.port | quote }}
-      {{- end }}
+        prometheus.io/port: {{ .Values.containerAdminPort | quote }}
       {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
@@ -68,11 +66,6 @@ spec:
         - name: log4j-config
           configMap:
             name: {{ .Values.logConfig.name }}
-        {{- if .Values.prometheus.jmx.enabled }}
-        - name: jmx-config
-          configMap:
-            name: {{ .Values.name }}-jmx-config
-        {{- end }}
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
@@ -91,11 +84,6 @@ spec:
             - name: admin-port
               containerPort: {{ .Values.containerAdminPort }}
               protocol: TCP
-            {{- if .Values.jmx.enabled }}
-            - name: jmx
-              containerPort: {{ .Values.jmx.port }}
-              protocol: TCP
-            {{- end }}
           env:
             - name: SERVICE_NAME
               value: "{{ .Values.name }}"
@@ -111,7 +99,7 @@ spec:
               value: "/var/{{ .Values.name }}/log/log4j2.properties"
             {{- if .Values.javaOpts }}
             - name: JAVA_TOOL_OPTIONS
-              value: {{ .Values.javaOpts }} {{ if .Values.jmx.enabled }}{{ .Values.jmx.opts }}{{ end }}
+              value: {{ .Values.javaOpts | quote }}
             {{- end }}
           volumeMounts:
             - name: service-config
@@ -134,26 +122,3 @@ spec:
               port: {{ .Values.containerAdminPort }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-        {{- if .Values.prometheus.jmx.enabled }}
-        - name: prometheus-jmx-exporter
-          image: "{{ .Values.prometheus.jmx.image.repository }}:{{ .Values.prometheus.jmx.image.tag }}"
-          imagePullPolicy: "{{ .Values.prometheus.jmx.image.pullPolicy }}"
-          command:
-            - java
-            - -XX:+UnlockExperimentalVMOptions
-            - -XX:+UseCGroupMemoryLimitForHeap
-            - -XX:MaxRAMFraction=1
-            - -XshowSettings:vm
-            - -jar
-            - jmx_prometheus_httpserver.jar
-            - {{ .Values.prometheus.jmx.port | quote }}
-            - /etc/jmx-config/prometheus-raw-spans-grouper.yaml
-          ports:
-            - name: prometheus-jmx
-              containerPort: {{ .Values.prometheus.jmx.port }}
-          resources:
-            {{- toYaml .Values.prometheus.jmx.resources | nindent 12 }}
-          volumeMounts:
-            - name: jmx-config
-              mountPath: /etc/jmx-config
-        {{- end }}

raw-spans-grouper/helm/values.yaml

@@ -80,26 +80,6 @@ volumeClaimTemplates:
   storageClassName: kafka-streams-rocksdb
   storageRequestSize: 50Gi
 
-jmx:
-  enabled: true
-  port: 7022
-  opts: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.port=7022 -Dcom.sun.management.jmxremote.rmi.port=7022 -Djava.rmi.server.hostname=127.0.0.1"
-
-prometheus:
-  jmx:
-    enabled: true
-    port: 7071
-    image:
-      repository: solsson/kafka-prometheus-jmx-exporter@sha256
-      tag: 6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143
-      pullPolicy: IfNotPresent
-    resources:
-      requests:
-        cpu: "0.25"
-        memory: "256Mi"
-
-
-
 ###########
 # Config Maps
 ###########
@@ -138,6 +118,9 @@ rawSpansGrouperConfig:
     ignoreProductionExceptionClasses: "org.apache.kafka.common.errors.RecordTooLargeException"
     # Others
     metricsRecordingLevel: INFO # default = INFO
+  # All other streams config goes here.
+  # Remove the flower braces and add key: value pair here.
+  extraKafkaStreamsConfig: {}
 
   span:
     groupby:

raw-spans-grouper/raw-spans-grouper/build.gradle.kts

@@ -39,7 +39,7 @@ dependencies {
     implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.18")
     implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.18")
 
-    implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.15")
+    implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.16")
     implementation("com.typesafe:config:1.4.1")
     implementation("de.javakaffee:kryo-serializers:0.45")
     implementation("io.confluent:kafka-avro-serializer:5.5.0")

span-normalizer/helm/templates/deployment.yaml

@@ -25,10 +25,8 @@ spec:
       {{- end }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/span-normalizer-config.yaml") . | sha256sum }}
-        {{- if .Values.prometheus.jmx.enabled }}
         prometheus.io/scrape: "true"
-        prometheus.io/port: {{ .Values.prometheus.jmx.port | quote }}
-        {{- end }}
+        prometheus.io/port: {{ .Values.containerAdminPort | quote }}
       {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
@@ -44,11 +42,6 @@ spec:
         - name: log4j-config
           configMap:
             name: {{ .Values.logConfig.name }}
-        {{- if .Values.prometheus.jmx.enabled }}
-        - name: jmx-config
-          configMap:
-            name: {{ .Chart.Name }}-jmx-config
-        {{- end }}
     {{- with .Values.nodeLabels }}
       nodeSelector:
       {{- toYaml . | nindent 8}}
@@ -69,7 +62,7 @@ spec:
             - name: LOG4J_CONFIGURATION_FILE
               value: "/var/{{ .Chart.Name }}/log/log4j2.properties"
             - name: JAVA_TOOL_OPTIONS
-              value: {{ .Values.javaOpts }} {{ if .Values.jmx.enabled }}{{ .Values.jmx.opts }}{{ end }}
+              value: {{ .Values.javaOpts | quote }}
           volumeMounts:
             - name: service-config
               mountPath: /app/resources/configs/{{ .Chart.Name }}/application.conf
@@ -89,26 +82,3 @@ spec:
               port: {{ .Values.containerAdminPort }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-        {{- if .Values.prometheus.jmx.enabled }}
-        - name: prometheus-jmx-exporter
-          image: "{{ .Values.prometheus.jmx.image.repository }}:{{ .Values.prometheus.jmx.image.tag }}"
-          imagePullPolicy: "{{ .Values.prometheus.jmx.image.pullPolicy }}"
-          command:
-            - java
-            - -XX:+UnlockExperimentalVMOptions
-            - -XX:+UseCGroupMemoryLimitForHeap
-            - -XX:MaxRAMFraction=1
-            - -XshowSettings:vm
-            - -jar
-            - jmx_prometheus_httpserver.jar
-            - {{ .Values.prometheus.jmx.port | quote }}
-            - /etc/jmx-config/prometheus-span-normalizer.yaml
-          ports:
-            - name: prometheus-jmx
-              containerPort: {{ .Values.prometheus.jmx.port }}
-          resources:
-            {{- toYaml .Values.prometheus.jmx.resources | nindent 12 }}
-          volumeMounts:
-            - name: jmx-config
-              mountPath: /etc/jmx-config
-        {{- end }}

span-normalizer/helm/values.yaml

@@ -107,24 +107,6 @@ logConfig:
     rolling:
       enabled: false
 
-jmx:
-  enabled: true
-  port: 7022
-  opts: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.port=7022 -Dcom.sun.management.jmxremote.rmi.port=7022 -Djava.rmi.server.hostname=127.0.0.1"
-
-prometheus:
-  jmx:
-    enabled: true
-    port: 7071
-    image:
-      repository: solsson/kafka-prometheus-jmx-exporter@sha256
-      tag: 6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143
-      pullPolicy: IfNotPresent
-    resources:
-      requests:
-        cpu: "0.25"
-        memory: "256Mi"
-
 kafka-topic-creator:
   enabled: true
   jobName: raw-spans-topic-creator

span-normalizer/span-normalizer/build.gradle.kts

@@ -43,7 +43,7 @@ dependencies {
   implementation("org.hypertrace.core.datamodel:data-model:0.1.12")
   implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.18")
   implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.18")
-  implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.15")
+  implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.16")
 
 
   // Required for the GRPC clients.