Fix TR logging when cqhv field is absent

CHANGELOG.md

@@ -42,6 +42,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - [#7044](https://github.com/apache/trafficcontrol/issues/7044) *CDN in a Box* [CDN in a Box, the t3c integration tests, and the tc health client integration tests now use Apache Traffic Server 9.1.
 
 ### Fixed
+- [#7340](https://github.com/apache/trafficcontrol/pull/7340) *Traffic Router* Fixed TR logging for the `cqhv` field when absent.
 - [#5557](https://github.com/apache/trafficcontrol/issues/5557) *Traffic Portal* Moved `Fair Queueing Pacing Rate Bps` DS field to `Cache Configuration Settings` section.
 - [#7252](https://github.com/apache/trafficcontrol/issues/7252) *Traffic Router* Fixed integer overflow for `czCount`, by resetting the count to max value when it overflows.
 - [#7221](https://github.com/apache/trafficcontrol/issues/7221) *Docs* Fixed request structure spec in cdn locks description in APIv4.

traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/http/HTTPAccessEventBuilder.java

@@ -74,6 +74,14 @@ private static String formatRequestHeaders(final Map<String, String> requestHead
         return stringBuilder.toString();
     }
 
+    private static boolean validProtocol(final String protocol) {
+        if (protocol != null &&
+        !protocol.equals("")) {
+            return true;
+        }
+        return false;
+    }
+
     @SuppressWarnings({"PMD.UseStringBufferForStringAppends", "PMD.NPathComplexity"})
     public static String create(final HTTPAccessRecord httpAccessRecord) {
         final long start = httpAccessRecord.getRequestDate().getTime();
@@ -84,7 +92,11 @@ public static String create(final HTTPAccessRecord httpAccessRecord) {
         String chi = formatObject(httpServletRequest.getRemoteAddr());
         final String url = formatRequest(httpServletRequest);
         final String cqhm = formatObject(httpServletRequest.getMethod());
-        final String cqhv = formatObject(httpServletRequest.getProtocol());
+        String cqhv = "-";
+        final String protocol = formatObject(httpServletRequest.getProtocol());
+        if (validProtocol(protocol)) {
+            cqhv = protocol;
+        }
 
         final String resultType = formatObject(httpAccessRecord.getResultType());
         final String rerr = formatObject(httpAccessRecord.getRerr());

traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/http/HTTPAccessEventBuilderTest.java

@@ -79,10 +79,21 @@ public void itGeneratesAccessEvents() throws Exception {
         HTTPAccessRecord httpAccessRecord = builder.build();
 
         String httpAccessEvent = HTTPAccessEventBuilder.create(httpAccessRecord);
-
         assertThat(httpAccessEvent, equalTo("144140678.000 qtype=HTTP chi=192.168.7.6 rhi=- url=\"http://example.com/index.html?foo=bar\" cqhm=GET cqhv=HTTP/1.1 rtype=- rloc=\"-\" rdtl=- rerr=\"-\" rgb=\"-\" rurl=\"-\" rurls=\"-\" uas=\"null\" svc=\"-\" rh=\"-\""));
     }
 
+    @Test
+    public void itGeneratesAccessEventsWithCorrectCqhvDefaultValues() throws Exception {
+        HTTPAccessRecord.Builder builder = new HTTPAccessRecord.Builder(new Date(144140678000L), request);
+        HTTPAccessRecord httpAccessRecord = builder.build();
+        when(request.getProtocol()).thenReturn(null);
+        String httpAccessEvent = HTTPAccessEventBuilder.create(httpAccessRecord);
+        assertThat(httpAccessEvent, equalTo("144140678.000 qtype=HTTP chi=192.168.7.6 rhi=- url=\"http://example.com/index.html?foo=bar\" cqhm=GET cqhv=- rtype=- rloc=\"-\" rdtl=- rerr=\"-\" rgb=\"-\" rurl=\"-\" rurls=\"-\" uas=\"null\" svc=\"-\" rh=\"-\""));
+        when(request.getProtocol()).thenReturn("");
+        httpAccessEvent = HTTPAccessEventBuilder.create(httpAccessRecord);
+        assertThat(httpAccessEvent, equalTo("144140678.000 qtype=HTTP chi=192.168.7.6 rhi=- url=\"http://example.com/index.html?foo=bar\" cqhm=GET cqhv=- rtype=- rloc=\"-\" rdtl=- rerr=\"-\" rgb=\"-\" rurl=\"-\" rurls=\"-\" uas=\"null\" svc=\"-\" rh=\"-\""));
+    }
+
     @Test
     public void itAddsResponseData() throws Exception {
         Answer<Long> nanoTimeAnswer = new Answer<Long>() {