Revert "PI-2876 Log OpenSearch query JSON to app insights (#821)"

This reverts commit 76908c2.

Author: marcus-bcl

src/main/kotlin/uk/gov/justice/hmpps/probationsearch/contactsearch/ContactSearchController.kt

@@ -11,15 +11,31 @@ import java.time.temporal.ChronoUnit
 
 @RestController
 @RequestMapping("/search/contacts")
-class ContactSearchController(val contactSearchService: ContactSearchService) {
+class ContactSearchController(
+  val contactSearchService: ContactSearchService,
+  val telemetryClient: TelemetryClient
+) {
   @PreAuthorize("hasAnyRole('ROLE_PROBATION_CONTACT_SEARCH', 'ROLE_PROBATION_INTEGRATION_ADMIN')")
   @RequestMapping(method = [RequestMethod.GET, RequestMethod.POST])
   fun searchContact(
     @RequestBody request: ContactSearchRequest,
     @ParameterObject @PageableDefault pageable: Pageable,
     @RequestParam(defaultValue = "false") semantic: Boolean = false,
   ): ContactSearchResponse = if (semantic) {
-    contactSearchService.semanticSearch(request, pageable)
+    val started = Instant.now()
+    val response = contactSearchService.semanticSearch(request, pageable)
+    telemetryClient.trackEvent(
+      "SemanticSearchCompleted",
+      mapOf(
+        "crn" to request.crn,
+        "query" to request.query.length.toString(),
+        "resultCount" to response.totalResults.toString(),
+      ),
+      mapOf(
+        "duration" to started.until(Instant.now(), ChronoUnit.MILLIS).toDouble(),
+      ),
+    )
+    response
   } else {
     contactSearchService.keywordSearch(request, pageable)
   }

src/main/kotlin/uk/gov/justice/hmpps/probationsearch/contactsearch/ContactSearchService.kt

@@ -1,7 +1,6 @@
 package uk.gov.justice.hmpps.probationsearch.contactsearch
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import com.microsoft.applicationinsights.TelemetryClient
 import io.opentelemetry.api.trace.Span
 import io.opentelemetry.context.Context
 import io.opentelemetry.extension.kotlin.asContextElement
@@ -39,7 +38,6 @@ import uk.gov.justice.hmpps.probationsearch.contactsearch.ContactSearchService.S
 import uk.gov.justice.hmpps.probationsearch.services.DeliusService
 import uk.gov.justice.hmpps.sqs.audit.HmppsAuditService
 import java.time.Instant
-import java.time.temporal.ChronoUnit
 import org.opensearch.client.opensearch._types.SortOrder as JavaClientSortOrder
 import org.opensearch.client.opensearch._types.query_dsl.Operator as JavaClientOperator
 
@@ -50,7 +48,6 @@ class ContactSearchService(
   private val objectMapper: ObjectMapper,
   private val deliusService: DeliusService,
   private val openSearchClient: OpenSearchClient,
-  private val telemetryClient: TelemetryClient
 ) {
 
   private val scope = CoroutineScope(Context.current().asContextElement())
@@ -81,7 +78,6 @@ class ContactSearchService(
   }
 
   fun semanticSearch(request: ContactSearchRequest, pageable: Pageable): ContactSearchResponse {
-    val started = Instant.now()
     audit(request, pageable)
 
     val indexName = "contact-semantic-search-${request.crn.lowercase()}"
@@ -111,7 +107,6 @@ class ContactSearchService(
     val searchRequest = SearchRequest.of { searchRequest ->
       searchRequest
         .index(indexName)
-        .source { source -> source.filter { it.excludes("textEmbedding", "textChunks") } }
         .query { query -> query.hybrid { hybrid -> hybrid.queries(keywordQuery, semanticQuery) } }
         .trackTotalHits(TrackHits.of { it.count(5000) })
         .size(pageable.pageSize)
@@ -143,19 +138,6 @@ class ContactSearchService(
     }
     val response = PageImpl(results, pageable, searchResponse.hits().total().value())
 
-    telemetryClient.trackEvent(
-      "SemanticSearchCompleted",
-      mapOf(
-        "crn" to request.crn,
-        "query" to request.query.length.toString(),
-        "jsonQuery" to searchRequest.toJsonString(),
-        "resultCount" to response.totalElements.toString(),
-      ),
-      mapOf(
-        "duration" to started.until(Instant.now(), ChronoUnit.MILLIS).toDouble(),
-      ),
-    )
-
     return ContactSearchResponse(
       response.numberOfElements,
       response.pageable.pageNumber,