Merge remote-tracking branch 'origin/master'

Romanow · Nov 26, 2023 · 5c65507 · 5c65507
2 parents 4205d38 + 71aa8b9
commit 5c65507
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 156 deletions.
diff --git a/charts/java-service/Chart.yaml b/charts/java-service/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: java-service
 type: application
 description: Helm chart for Spring Boot application with logging and tracing
-version: 1.5.0
+version: 1.5.1
 appVersion: "v1.0"
 home: https://github.com/Romanow/helm-charts/tree/master/charts/java-service
 icon: https://raw.githubusercontent.com/Romanow/helm-charts/master/icons/spring-boot.png

diff --git a/charts/java-service/README.md b/charts/java-service/README.md
@@ -1,6 +1,6 @@
 # Helm Chart for java-service
 
-![Version: 1.5.0](https://img.shields.io/badge/Version-1.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0](https://img.shields.io/badge/AppVersion-v1.0-informational?style=flat-square)
+![Version: 1.5.1](https://img.shields.io/badge/Version-1.5.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0](https://img.shields.io/badge/AppVersion-v1.0-informational?style=flat-square)
 
 Helm chart for Spring Boot application with logging and tracing
 
@@ -202,95 +202,6 @@ false
 </td>
 			<td>Init containers full declaration</td>
 		</tr>
-		<tr>
-			<td>jaeger.application.host</td>
-			<td>string</td>
-			<td><pre lang="json">
-"localhost"
-</pre>
-</td>
-			<td>Jaeger agent host for application (set `JAEGER_HOST` env)</td>
-		</tr>
-		<tr>
-			<td>jaeger.application.port</td>
-			<td>int</td>
-			<td><pre lang="json">
-6831
-</pre>
-</td>
-			<td>Jaeger agent port for application (set `JAEGER_PORT` env)</td>
-		</tr>
-		<tr>
-			<td>jaeger.collector</td>
-			<td>object</td>
-			<td><pre lang="json">
-{
-  "host": "jaeger-collector",
-  "port": 14250
-}
-</pre>
-</td>
-			<td>Jaeger collector address</td>
-		</tr>
-		<tr>
-			<td>jaeger.enabled</td>
-			<td>bool</td>
-			<td><pre lang="json">
-false
-</pre>
-</td>
-			<td>Enable jaeger distributed tracing</td>
-		</tr>
-		<tr>
-			<td>jaeger.image</td>
-			<td>object</td>
-			<td><pre lang="json">
-{
-  "pullPolicy": "IfNotPresent",
-  "repository": "jaegertracing/jaeger-agent",
-  "tag": "1.41.0"
-}
-</pre>
-</td>
-			<td>Jaeger agent image</td>
-		</tr>
-		<tr>
-			<td>jaeger.ports</td>
-			<td>object</td>
-			<td><pre lang="json">
-{
-  "admin": 14271,
-  "binaryThrift": 6832,
-  "compactThrift": 6831
-}
-</pre>
-</td>
-			<td>Jaeger agent ports</td>
-		</tr>
-		<tr>
-			<td>jaeger.resources.limits</td>
-			<td>object</td>
-			<td><pre lang="json">
-{
-  "cpu": "500m",
-  "memory": "1024Mi"
-}
-</pre>
-</td>
-			<td>Limited resources</td>
-		</tr>
-		<tr>
-			<td>jaeger.resources.requests</td>
-			<td>object</td>
-			<td><pre lang="json">
-{
-  "cpu": "500m",
-  "memory": "1024Mi"
-}
-</pre>
-</td>
-			<td>Requested resources</td>
-		</tr>
 		<tr>
 			<td>javaOptions</td>
 			<td>string</td>
@@ -495,6 +406,24 @@ null
 </td>
 			<td>Custom service name</td>
 		</tr>
+		<tr>
+			<td>tracing.enabled</td>
+			<td>bool</td>
+			<td><pre lang="json">
+false
+</pre>
+</td>
+			<td>Enable tracing (set `TRACING_ENABLED` env)</td>
+		</tr>
+		<tr>
+			<td>tracing.endpoint</td>
+			<td>string</td>
+			<td><pre lang="json">
+"jaeger-collector:4318"
+</pre>
+</td>
+			<td>OpenTelemetry collector endpoint</td>
+		</tr>
 	</tbody>
 </table>
 

diff --git a/charts/java-service/templates/deployment.yaml b/charts/java-service/templates/deployment.yaml
@@ -61,16 +61,12 @@ spec:
               value: "{{ .Values.database.password }}"
             - name: CIRCUIT_BREAKER_ENABLED
               value: "{{ .Values.circuitBreaker.enabled }}"
-            - name: JAEGER_ENABLED
-              value: "{{ .Values.jaeger.enabled }}"
-            {{- if .Values.jaeger.enabled }}
-            {{- if .Values.jaeger.application.host }}
-            - name: JAEGER_HOST
-              value: "{{ .Values.jaeger.application.host }}"
-            {{- end }}
-            {{- if .Values.jaeger.application.port }}
-            - name: JAEGER_PORT
-              value: "{{ .Values.jaeger.application.port }}"
+            {{- if .Values.tracing.enabled }}
+            - name: TRACING_ENABLED
+              value: "{{ .Values.tracing.enabled }}"
+            {{- if .Values.tracing.endpoint }}
+            - name: TRACING_COLLECTOR_ENDPOINT
+              value: "{{ .Values.tracing.endpoint }}"
             {{- end }}
             {{- end }}
             {{- range $env := .Values.environments }}
@@ -124,31 +120,6 @@ spec:
               mountPath: /usr/share/filebeat/filebeat.yml
               subPath: filebeat.yml
         {{- end }}
-        {{- if .Values.jaeger.enabled }}
-        - name: {{ .Release.Name }}-jaeger-agent
-          image: "{{ .Values.jaeger.image.repository }}:{{ .Values.jaeger.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          env:
-            - name: REPORTER_GRPC_HOST_PORT
-              value: "{{ .Values.jaeger.collector.host }}:{{ .Values.jaeger.collector.port }}"
-          ports:
-            - name: thrift-compact
-              containerPort: {{ .Values.jaeger.ports.compactThrift }}
-              protocol: UDP
-            - name: trift-binary
-              containerPort: {{ .Values.jaeger.ports.binaryThrift }}
-              protocol: UDP
-            - name: admin
-              containerPort: {{ .Values.jaeger.ports.admin }}
-              protocol: TCP
-          resources:
-            requests:
-              memory: "{{ .Values.filebeat.resources.requests.memory }}"
-              cpu: "{{ .Values.filebeat.resources.requests.cpu }}"
-            limits:
-              memory: "{{ .Values.filebeat.resources.limits.memory }}"
-              cpu: "{{ .Values.filebeat.resources.limits.cpu }}"
-      {{- end }}
       volumes:
         - name: {{ .Chart.Name }}-logs-volume
         - name: {{ .Chart.Name }}-config-volume

diff --git a/charts/java-service/values.yaml b/charts/java-service/values.yaml
@@ -84,37 +84,11 @@ circuitBreaker:
   # -- Enable circuit breaker (set `CIRCUIT_BREAKER_ENABLED` env)
   enabled: false
 
-jaeger:
-  # -- Enable jaeger distributed tracing
+tracing:
+  # -- Enable tracing (set `TRACING_ENABLED` env)
   enabled: false
-  # -- Jaeger agent image
-  image:
-    pullPolicy: IfNotPresent
-    repository: jaegertracing/jaeger-agent
-    tag: 1.41.0
-  application:
-    # -- Jaeger agent host for application (set `JAEGER_HOST` env)
-    host: localhost
-    # -- Jaeger agent port for application (set `JAEGER_PORT` env)
-    port: 6831
-  # -- Jaeger collector address
-  collector:
-    host: jaeger-collector
-    port: 14250
-  # -- Jaeger agent ports
-  ports:
-    compactThrift: 6831
-    binaryThrift: 6832
-    admin: 14271
-  resources:
-    # -- Requested resources
-    requests:
-      cpu: 500m
-      memory: 1024Mi
-    # -- Limited resources
-    limits:
-      cpu: 500m
-      memory: 1024Mi
+  # -- OpenTelemetry collector endpoint
+  endpoint: jaeger-collector:4318
 
 filebeat:
   # -- Enable send logs to ELK