Try to add OTeL

juncevich · Sep 20, 2023 · fcbe4aa · fcbe4aa
1 parent 83edb14
commit fcbe4aa
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 4 deletions.
diff --git a/k8s/data-service/data-service-deployment.yaml b/k8s/data-service/data-service-deployment.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
     app.kubernetes.io/name: relay-store-service
     app.kubernetes.io/version: 0.0.2-SNAPSHOT
+    sidecar.opentelemetry.io/inject: "true"
   name: relay-store-service-srv
 spec:
   ports:
@@ -39,6 +40,8 @@ spec:
         app: relay-store-service
         app.kubernetes.io/name: relay-store-service
         app.kubernetes.io/version: 0.0.2-SNAPSHOT
+        sidecar.opentelemetry.io/inject: "true"
+        instrumentation.opentelemetry.io/inject-java: "true"
     spec:
       containers:
         - env:

diff --git a/relay-store-service/Tiltfile b/relay-store-service/Tiltfile
@@ -26,9 +26,21 @@ helm_remote('postgresql',
             repo_url='https://charts.bitnami.com/bitnami',
             values=['k8s_pg/pg_values.yaml'])
 
+helm_remote('opentelemetry-operator',
+            repo_name='opentelemetry-operator',
+            repo_url='https://open-telemetry.github.io/opentelemetry-helm-charts'
+#           values=['k8s_pg/pg_values.yaml']
+            )
+
+helm_remote('opentelemetry-collector',
+            repo_name='opentelemetry-collector',
+            repo_url='https://open-telemetry.github.io/opentelemetry-helm-charts'
+            )
+
 #helm_remote('kong',
 #            repo_name='kong',
 #            repo_url='https://charts.konghq.com')
 
 k8s_resource('relay-store-service', port_forwards='8082:8082', resource_deps=['relay-store-compile'], labels=['Backend'])
-k8s_resource('postgresql', port_forwards=[5432], labels=['Database'])
+k8s_resource('postgresql', port_forwards=[5432], labels=['Database'])
+k8s_resource('opentelemetry-operator', port_forwards='8443:8443', labels=['Observability'])
diff --git a/relay-store-service/k8s/deployment.yaml b/relay-store-service/k8s/deployment.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
     app.kubernetes.io/name: data-service
     app.kubernetes.io/version: 0.0.2-SNAPSHOT
+    sidecar.opentelemetry.io/inject: "true"
   name: data-service-srv
 spec:
   ports:

diff --git a/relay-store-service/k8s_pg/pg_values.yaml b/relay-store-service/k8s_pg/pg_values.yaml
@@ -16,4 +16,10 @@ global:
       postgresPassword: Qwerty12345
       username: sample_user
       password: example
-      database: postgresql
+      database: postgresql
+
+    initdb:
+      scripts:
+        init.sql: |
+          CREATE USER sample_user;
+          GRANT SELECT ON TABLE relay TO sample_user;
diff --git a/relay-store-service/src/main/resources/application-dev.yml b/relay-store-service/src/main/resources/application-dev.yml
@@ -4,7 +4,7 @@ spring:
   application:
     name: relay-service
   datasource:
-    url: jdbc:postgresql://postgresql:5432/postgres
+    url: jdbc:postgresql://postgresql:5432/postgresql
     username: sample_user
     password: example
   jpa:
@@ -22,7 +22,7 @@ spring:
     enabled: true
     user: postgres
     password: Qwerty12345
-    url: jdbc:postgresql://postgresql:5432/postgres
+    url: jdbc:postgresql://postgresql:5432/postgresql
     baseline-on-migrate: true
 
 

diff --git a/relay-store-service/src/main/resources/db/migration/V1__init.sql b/relay-store-service/src/main/resources/db/migration/V1__init.sql
@@ -13,6 +13,8 @@ create table relay
     primary key (id)
 );
 
+CREATE USER sample_user;
+ALTER ROLE sample_user WITH PASSWORD 'example';
 GRANT SELECT ON TABLE relay TO sample_user;
 
 INSERT INTO relay (id, creation_date, last_check_date, relay_type, serial_number, update_date, version, container_id)