2 files changed, 22 insertions, 6 deletions

diff --git a/kubernetes/aai/components/aai-resources/resources/config/application.properties b/kubernetes/aai/components/aai-resources/resources/config/application.properties
index 40b89eabb4..805f3cd505 100644
--- a/kubernetes/aai/components/aai-resources/resources/config/application.properties
+++ b/kubernetes/aai/components/aai-resources/resources/config/application.properties
@@ -1,7 +1,7 @@
 {{/*
 # Copyright © 2018 Amdocs, Bell Canada, AT&T
 # Modifications Copyright © 2020 Orange
-# Modifications Copyright © 2023 Nordix Foundation
+# Modifications Copyright © 2023 Nordix Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -28,6 +28,14 @@ spring.jersey.type=filter
 spring.main.allow-bean-definition-overriding=true
 server.servlet.context-path=/
 
+spring.zipkin.baseUrl={{ .Values.tracing.collector.baseUrl }}
+spring.sleuth.messaging.jms.enabled = false
+spring.sleuth.trace-id128=true
+spring.sleuth.sampler.probability={{ .Values.tracing.sampling.probability }}
+spring.sleuth.propagation.type=w3c, b3
+spring.sleuth.supports-join=false
+spring.sleuth.web.skip-pattern={{ join "," .Values.tracing.ignorePatterns }}
+
 spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,org.keycloak.adapters.springboot.KeycloakAutoConfiguration,org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration,org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration
 
 spring.profiles.active={{ .Values.global.config.profiles.active }}
diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml
index 7615f4b1d3..3a4d568799 100644
--- a/kubernetes/aai/components/aai-resources/values.yaml
+++ b/kubernetes/aai/components/aai-resources/values.yaml
@@ -75,11 +75,11 @@ global: # global defaults
       version:
         # Current version of the REST API
         api:
-          default: v27
+          default: v28
         # Specifies which version the depth parameter is configurable
         depth: v11
         # List of all the supported versions of the API
-        list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27
+        list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28
         # Specifies from which version related link should appear
         related:
           link: v11
@@ -123,7 +123,7 @@ aai_enpoints:
     url: external-system
 
 # application image
-image: onap/aai-resources:1.11.0
+image: onap/aai-resources:1.12.3
 pullPolicy: Always
 restartPolicy: Always
 flavor: small
@@ -251,6 +251,14 @@ resources:
       memory: 6Gi
   unlimited: {}
 
+tracing:
+  collector:
+    baseUrl: http://jaeger-collector.istio-system:9411
+  sampling:
+    probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%)
+  ignorePatterns:
+    - /aai/util.*
+
 metrics:
   serviceMonitor:
     enabled: false
@@ -316,12 +324,12 @@ logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 
 # To make logback capping values configurable
 logback:
-  logToFileEnabled: true
+  logToFileEnabled: false
   maxHistory: 7
   totalSizeCap: 1GB
   queueSize: 1000
 
 accessLogback:
-  logToFileEnabled: true
+  logToFileEnabled: false
   maxHistory: 7
   totalSizeCap: 1GB