Process review comments

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>

diff --git a/contrib/ProtobufLogger.py b/contrib/ProtobufLogger.py
index 1b035e0e9869608030c9492ba291e49aa259c84e..e9fbcd4403c40003321e7a45ccd1b9e15ab67dc0 100644 (file)
--- a/contrib/ProtobufLogger.py
+++ b/contrib/ProtobufLogger.py
@@ -311,16 +311,16 @@ class PDNSPBConnHandler(object):
         if msg.HasField('edeText'):
             edeText = msg.edeText
 
-        openTelemetryData = "N/A"
+        openTelemetryDataLen = "N/A"
         if opentelemetryAvailable and msg.HasField('openTelemetryData'):
-            openTelemetryData = str(len(msg.openTelemetryData))
+            openTelemetryDataLen = str(len(msg.openTelemetryData))
 
         openTelemetryTraceID = "N/A"
         if msg.HasField('openTelemetryTraceID'):
             openTelemetryTraceID = binascii.hexlify(msg.openTelemetryTraceID)
 
         print('[%s] %s of size %d: %s%s%s -> %s%s(%s) id: %d uuid: %s%s '
-                  'requestorid: %s deviceid: %s devicename: %s serverid: %s nod: %s workerId: %s pcCacheHit: %s outgoingQueries: %s headerFlags: %s ednsVersion: %s ede: %s edeText: %s openTelemetryData: len %s otTraceID: %s' %
+                  'requestorid: %s deviceid: %s devicename: %s serverid: %s nod: %s workerId: %s pcCacheHit: %s outgoingQueries: %s headerFlags: %s ednsVersion: %s ede: %s edeText: %s otTraceID: %s openTelemetryData: len %s' %
               (datestr,
                typestr,
                msg.inBytes,
@@ -345,8 +345,8 @@ class PDNSPBConnHandler(object):
                ednsVersion,
                ede,
                edeText,
-               openTelemetryData,
-               openTelemetryTraceID))
+               openTelemetryTraceID,
+               openTelemetryDataLen))
 
         for mt in msg.meta:
             values = ''

diff --git a/pdns/recursordist/pdns_recursor.cc b/pdns/recursordist/pdns_recursor.cc
index fd3ceb01caf5c0cfb49010f5758f0f7087e3bc2c..dab277280ee5e960a965c07bd1887ba5e5a8752b 100644 (file)
--- a/pdns/recursordist/pdns_recursor.cc
+++ b/pdns/recursordist/pdns_recursor.cc
@@ -1684,7 +1684,7 @@ void startDoResolve(void* arg) // NOLINT(readability-function-cognitive-complexi
         }
         eee.emplace(EDNSExtendedError{static_cast<uint16_t>(code), std::move(extra)});
 
-        if (packetWriter.size() < maxanswersize && (maxanswersize - packetWriter.size()) >= (EDNSOptionCodeSize + EDNSOptionLengthSize + sizeof(eee->infoCode) + eee->extraText.size())) {
+        if (packetWriter.size() < maxanswersize && (maxanswersize - packetWriter.size()) >= (EDNSOptionCodeSize + EDNSOptionLengthSize + sizeof(EDNSExtendedError::code) + eee->extraText.size())) {
           returnedEdnsOptions.emplace_back(EDNSOptionCode::EXTENDEDERROR, makeEDNSExtendedErrorOptString(*eee));
         }
       }