]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge pull request #16576 from pieterlexis/dnsdist-ot-send-raii
authorPieter Lexis <pieter.lexis@powerdns.com>
Mon, 5 Jan 2026 09:18:48 +0000 (10:18 +0100)
committerGitHub <noreply@github.com>
Mon, 5 Jan 2026 09:18:48 +0000 (10:18 +0100)
dnsdist: OpenTelemetry additions

1  2 
pdns/dnsdistdist/dnsdist-actions-definitions.yml
pdns/dnsdistdist/dnsdist-actions-factory.cc
pdns/dnsdistdist/dnsdist-idstate.hh
pdns/dnsdistdist/dnsdist-tcp.cc
pdns/dnsdistdist/dnsdist.cc

index c6937af7c356c51d3bd11c68441d6d05627bd328,e3c4afbc7394b394b3c777967bfddae489dc94f9..0bee1016596f9df0fe2b08125eeb7c0cb9ecccf2
@@@ -203,8 -201,9 +202,9 @@@ public
    std::unique_ptr<ProtoBufData> d_protoBufData{nullptr};
  #ifndef DISABLE_PROTOBUF
    std::vector<std::pair<std::string, std::shared_ptr<RemoteLoggerInterface>>> delayedResponseMsgs;
+   std::vector<std::shared_ptr<RemoteLoggerInterface>> ottraceLoggers;
  #endif
 -  std::unique_ptr<EDNSExtendedError> d_extendedError{nullptr};
 +  std::unique_ptr<std::vector<dnsdist::edns::SetExtendedDNSErrorOperation>> d_extendedErrors{nullptr};
    std::optional<uint32_t> tempFailureTTL{std::nullopt}; // 8
    ClientState* cs{nullptr}; // 8
    std::unique_ptr<DOHUnitInterface> du; // 8
Simple merge
Simple merge