Upgrade : versions.reformLogging to 6.0.1 (#489)

* Upgrade : versions.reformLogging to 6.0.1

* Removed lib/applicationinsights-agent-3.4.9.jar

* UPDATE applicationinsights-agent-3.4.9.jar

* added net.logstash.logback in build.gradle

* reverted version of app insight

* added net.logstash.logback

* added net.logstash.logback

* APP_INSIGHTS_AGENT_VERSION=3.2.9

* Added app-insights-connection-string config

* Added app-insights-connection-string config

* removed commented part

Author: vilasshelke-hmcts

Dockerfile

@@ -10,7 +10,7 @@ ENV APPLICATION_SIZE_ON_DISK_IN_MB 48
 # Optional
 ENV JAVA_OPTS ""
 
-COPY lib/applicationinsights-agent-3.4.9.jar lib/AI-Agent.xml /opt/app/
+COPY lib/applicationinsights.json /opt/app/
 COPY build/libs/$APP /opt/app/
 
 WORKDIR /opt/app

build.gradle

@@ -28,7 +28,7 @@ apply plugin: 'idea'
 def versions = [
         lombok             : '1.18.22',
         pitest             : '1.7.3',
-        reformLogging      : '5.1.9',
+        reformLogging      : '6.0.1',
         serenity           : '2.0.76',
         springBoot         : '2.7.7',
         restAssured        : '4.3.3',
@@ -353,8 +353,8 @@ dependencies {
     implementation group: 'org.springframework', name: 'spring-webmvc', version: versions.springVersion
 
     implementation "com.github.hmcts.java-logging:logging:${versions.reformLogging}"
-    implementation "com.github.hmcts.java-logging:logging-appinsights:${versions.reformLogging}"
-
+    implementation "com.github.hmcts.java-logging:logging-appinsights:5.1.9"
+    implementation group: 'net.logstash.logback', name: 'logstash-logback-encoder', version: '7.0.1'
     implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
     //Fix for CVE-2021-29425
     implementation 'commons-io:commons-io:2.8.0'
@@ -364,9 +364,7 @@ dependencies {
     implementation group: 'io.github.openfeign.form', name: 'feign-form-spring', version: '3.8.0'
     implementation "io.github.openfeign:feign-httpclient:11.0"
     implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: versions.log4j
-    implementation "com.github.hmcts.java-logging:logging:${versions.reformLogging}"
-    implementation "com.github.hmcts.java-logging:logging-appinsights:${versions.reformLogging}"
-    
+
 
 
     testImplementation ('com.github.hmcts:rd-commons-lib:v0.0.13'){

charts/rd-judicial-api/values.yaml

@@ -25,7 +25,7 @@ java:
           alias: spring.datasource.password
         - name: judicial-api-s2s-secret
           alias: JUDICIAL_API_S2S_SECRET
-        - name: ApplicationInsightsInstrumentationKey
-          alias: azure.application-insights.instrumentation-key
+        - name: app-insights-connection-string
+          alias: app-insights-connection-string
         - name: LD-SDK-KEY
           alias: LD_SDK_KEY

lib/applicationinsights.json

@@ -0,0 +1,6 @@
+{
+  "connectionString": "${file:/mnt/secrets/rd/app-insights-connection-string}",
+  "role": {
+    "name": "Professional Reference Data API"
+  }
+}

web.config

@@ -9,7 +9,7 @@
     <httpPlatform processPath="%JAVA_HOME%\bin\java.exe"
                   stdoutLogEnabled="true"
                   stdoutLogFile="%HOME%\LogFiles\stdout"
-                  arguments="-javaagent:&quot;%HOME%\site\wwwroot\applicationinsights-agent-2.3.1.jar&quot; -Dfile.encoding=UTF-8 -Djava.net.preferIPv4Stack=true -Dserver.port=%HTTP_PLATFORM_PORT% -jar &quot;%HOME%\site\wwwroot\rd-judicial-api.jar&quot;">
+                  arguments="-javaagent:&quot;%HOME%\site\wwwroot\applicationinsights-agent-3.4.9.jar&quot; -Dfile.encoding=UTF-8 -Djava.net.preferIPv4Stack=true -Dserver.port=%HTTP_PLATFORM_PORT% -jar &quot;%HOME%\site\wwwroot\rd-judicial-api.jar&quot;">
     </httpPlatform>
   </system.webServer>
 </configuration>