Ccd 7765 remove shady import appinsights

Jenkinsfile_CNP

@@ -1,6 +1,7 @@
 #!groovy
 import uk.gov.hmcts.contino.AppPipelineDsl
 import uk.gov.hmcts.contino.GithubAPI
+import groovy.transform.Field
 properties(
     [
         [
@@ -84,10 +85,11 @@ static LinkedHashMap<String, Object> secret(String secretName, String envVar) {
     ]
 }
 
-def vaultOverrides = [
+@Field Map<String, String> vaultOverrides = [
     'preview' : 'aat',
     'spreview': 'saat'
 ]
+
 // vars needed for functional tests
 // Other env variables needed for BEFTA.
 env.DM_STORE_BASE_URL = "http://dm-store-aat.service.core-compute-aat.internal"
@@ -100,6 +102,9 @@ env.PACT_BROKER_FULL_URL = "https://pact-broker.platform.hmcts.net"
 env.PACT_BROKER_URL = "pact-broker.platform.hmcts.net"
 env.PACT_BROKER_PORT = "443"
 env.PACT_BROKER_SCHEME = "https"
+env.APP_INSIGHTS_TELEMETRY_SMOKE_ENABLED = "true"
+env.APP_INSIGHTS_TELEMETRY_REQUIRED = "true"
+env.APP_INSIGHTS_TRACE_MARKER = "CLA-CCD"
 env.DEFAULT_COLLECTION_ASSERTION_MODE="UNORDERED"
 env.MAX_NUM_PARALLEL_THREADS=6
 env.BEFTA_S2S_CLIENT_ID = "ccd_gw"
@@ -221,6 +226,10 @@ withPipeline(type, product, component) {
       ]
     }
 
+    afterSuccess('functionalTest:preview') {
+        runTelemetrySmokeCheckAfterFunctional('preview')
+    }
+
     afterAlways('functionalTest:aat') {
         steps.archiveArtifacts allowEmptyArchive: true, artifacts: '**/BEFTA Report for Functional Tests/**/*'
         publishHTML target: [
@@ -233,6 +242,10 @@ withPipeline(type, product, component) {
       ]
     }
 
+    afterSuccess('functionalTest:aat') {
+        runTelemetrySmokeCheckAfterFunctional('aat')
+    }
+
     afterAlways('pact-provider-verification') {
         steps.archiveArtifacts allowEmptyArchive: true, artifacts: 'build/reports/tests/**/*'
          publishHTML target: [
@@ -252,3 +265,53 @@ withPipeline(type, product, component) {
 def copyIgnore(filePath, destinationDir) {
   steps.sh("cp -R '${filePath}' '${destinationDir}' || :")
 }
+
+def runTelemetrySmokeCheckAfterFunctional(environment) {
+  steps.stage("Application Insights telemetry - ${environment}") {
+    steps.catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+      runTelemetrySmokeCheck(environment)
+    }
+  }
+}
+
+def runTelemetrySmokeCheck(environment) {
+  if (!env.APP_INSIGHTS_TELEMETRY_SMOKE_ENABLED?.toBoolean()) {
+    echo "Skipping App Insights telemetry smoke check for ${environment}; set APP_INSIGHTS_TELEMETRY_SMOKE_ENABLED=true to enable."
+    return
+  }
+
+  def azureConfigDir = env.AZURE_CONFIG_DIR?.trim() ?: '/opt/jenkins/.azure-nonprod'
+  def appInsightsEnvironment = vaultOverrides[environment] ?: environment
+
+  steps.echo("Running Application Insights telemetry smoke check for ${environment}")
+  steps.echo("Using Azure CLI config ${azureConfigDir} for Application Insights telemetry check")
+  steps.echo("Using ${appInsightsEnvironment} Application Insights for ${environment} telemetry check")
+  steps.echo("Functional TEST_URL for ${environment}: ${env.TEST_URL ?: '<not set>'}")
+  def requestUrlContains = environment == 'preview' ? (env.TEST_URL?.trim() ?: '') : ''
+  if (!requestUrlContains && environment == 'aat') {
+    requestUrlContains = "http://ccd-data-store-api-aat.service.core-compute-aat.internal"
+  }
+  requestUrlContains = requestUrlContains.replaceFirst('^https?://', '').replaceFirst('/.*$', '').toLowerCase()
+  def status = steps.sh(
+      script: """
+        AZURE_CONFIG_DIR='${azureConfigDir}' \\
+        APP_INSIGHTS_SOURCE_ENV='${environment}' \\
+        APP_INSIGHTS_ENV='${appInsightsEnvironment}' \\
+        APP_INSIGHTS_REQUEST_URL_CONTAINS='${requestUrlContains}' \\
+        APP_INSIGHTS_TRACE_MARKER='${env.APP_INSIGHTS_TRACE_MARKER}' \\
+        ./scripts/check-app-insights-telemetry.sh
+      """,
+      returnStatus: true
+  )
+
+  if (status == 0) {
+    return
+  }
+
+  def message = "Application Insights telemetry check did not pass for ${environment} (exit code ${status})."
+  def telemetryRequired = env.APP_INSIGHTS_TELEMETRY_REQUIRED?.toBoolean() && environment != 'preview'
+  if (telemetryRequired) {
+    steps.error(message)
+  }
+  steps.echo("${message} Continuing because telemetry smoke check is non-blocking for ${environment}.")
+}

build.gradle

@@ -34,7 +34,7 @@ ext {
     junit = '5.14.4'
     junitPlatform = '1.14.4'
     jjwt = '0.13.0'
-    appInsightsVersion = '2.6.4'
+    appInsightsVersion = '3.7.8'
     pactProviderVersion = '4.7.1'
     lombokVersion = '1.18.46'
     lombokBindingVersion = '0.2.0'
@@ -307,8 +307,7 @@ dependencies {
     implementation group: 'com.auth0', name: 'java-jwt', version: '4.5.2'
     implementation group: 'com.google.guava', name: 'guava', version: '33.6.0-jre'
     implementation group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '3.2.4'
-    implementation group: 'com.microsoft.azure', name: 'applicationinsights-logging-logback', version: appInsightsVersion
-    implementation group: 'com.microsoft.azure', name: 'applicationinsights-spring-boot-starter', version: appInsightsVersion
+    implementation group: 'com.microsoft.azure', name: 'applicationinsights-core', version: appInsightsVersion
     implementation group: 'com.sun.mail', name: 'mailapi', version: '2.0.2'
     implementation group: 'com.vladmihalcea', name: 'hibernate-types-60', version: '2.21.1'
     implementation group: 'commons-validator', name: 'commons-validator', version: '1.10.1'
@@ -477,6 +476,20 @@ task projectVersion {
     }
 }
 
+task printAuditLogFormatterTag {
+    dependsOn classes
+
+    doLast {
+        def urls = sourceSets.main.runtimeClasspath.files.collect { it.toURI().toURL() } as URL[]
+        def loader = new URLClassLoader(urls, Thread.currentThread().contextClassLoader)
+        try {
+            println loader.loadClass('uk.gov.hmcts.ccd.auditlog.AuditLogFormatter').getField('TAG').get(null)
+        } finally {
+            loader.close()
+        }
+    }
+}
+
 // copied from https://github.com/joelittlejohn/jsonschema2pojo/tree/master/jsonschema2pojo-gradle-plugin
 // Note A problem was found with the configuration of task ':generateJsonSchema2Pojo'.
 // Registering invalid inputs and outputs via TaskInputs and TaskOutputs methods has been deprecated

charts/ccd-data-store-api/values.preview.template.yaml

@@ -21,8 +21,9 @@ java:
           alias: IDAM_DATA_STORE_SYSTEM_USER_PASSWORD
         - name: data-store-api-TOKEN-SECRET
           alias: DATA_STORE_TOKEN_SECRET
+        - name: app-insights-connection-string
+          alias: app-insights-connection-string
   environment:
-    AZURE_APPLICATIONINSIGHTS_INSTRUMENTATIONKEY: "2dcb834e-768e-4429-9050-ab15af959995"
     DATA_STORE_DB_HOST: "{{ .Release.Name }}-postgresql"
     DATA_STORE_DB_NAME: data-store
     DATA_STORE_DB_USERNAME: "{{ .Values.postgresql.auth.username}}"