Skip to content

Clarify log messages (cherry-pick #2066) #2067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mandarjog merged 1 commit into from
Dec 15, 2018
Merged

Clarify log messages (cherry-pick #2066) #2067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/envoy/http/mixer/control.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ Control::Control(const Config& config, Upstream::ClusterManager& cm,
auto& logger = Logger::Registry::getLog(Logger::Id::config);
LocalNode local_node;
if (!Utils::ExtractNodeInfo(local_info.node(), &local_node)) {
ENVOY_LOG_TO_LOGGER(logger, warn, "Unable to get node metadata");
ENVOY_LOG_TO_LOGGER(
logger, warn,
"Missing required node metadata: NODE_UID, NODE_NAMESPACE");
}
::istio::utils::SerializeForwardedAttributes(local_node,
&serialized_forward_attributes_);
Expand Down
4 changes: 3 additions & 1 deletion src/envoy/tcp/mixer/control.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ Control::Control(const Config& config, Upstream::ClusterManager& cm,
auto& logger = Logger::Registry::getLog(Logger::Id::config);
LocalNode local_node;
if (!Utils::ExtractNodeInfo(local_info.node(), &local_node)) {
ENVOY_LOG_TO_LOGGER(logger, warn, "Unable to get node metadata");
ENVOY_LOG_TO_LOGGER(
logger, warn,
"Missing required node metadata: NODE_UID, NODE_NAMESPACE");
}
::istio::utils::SerializeForwardedAttributes(local_node,
&serialized_forward_attributes_);
Expand Down
26 changes: 14 additions & 12 deletions src/envoy/utils/mixer_control.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,17 +131,19 @@ bool ExtractInfoCompat(const std::string &nodeid, LocalNode *args) {
auto parts = StringUtil::splitToken(nodeid, "~");
if (parts.size() < 3) {
ENVOY_LOG_TO_LOGGER(
logger, warn,
"ExtractInfoCompat node id did not have the correct format:",
"{proxy_type}~{ip}~{node_name}.{node_ns}~{node_domain} ", nodeid);
logger, debug,
"ExtractInfoCompat node id {} did not have the correct format:{} ",
nodeid, "{proxy_type}~{ip}~{node_name}.{node_ns}~{node_domain} ");
return false;
}

auto longname = std::string(parts[2].begin(), parts[2].end());
auto names = StringUtil::splitToken(longname, ".");
if (names.size() < 2) {
ENVOY_LOG_TO_LOGGER(logger, warn,
"error len(split(longname, '.')) < 3: ", longname);
ENVOY_LOG_TO_LOGGER(logger, debug,
"ExtractInfoCompat node_name {} must have two parts: "
"node_name.namespace",
longname);
return false;
}
auto ns = std::string(names[1].begin(), names[1].end());
Expand All @@ -159,24 +161,24 @@ bool ExtractInfo(const envoy::api::v2::core::Node &node, LocalNode *args) {
const auto meta = node.metadata().fields();

if (meta.empty()) {
ENVOY_LOG_TO_LOGGER(logger, warn,
"ExtractInfo metadata empty:", node.DebugString());
ENVOY_LOG_TO_LOGGER(logger, debug, "ExtractInfo node metadata empty: {}",
node.DebugString());
return false;
}

std::string uid;
if (!ReadProtoMap(meta, kNodeUID, &uid)) {
ENVOY_LOG_TO_LOGGER(logger, warn,
"ExtractInfo metadata missing:", kNodeUID,
ENVOY_LOG_TO_LOGGER(logger, debug,
"ExtractInfo node metadata missing:{} {}", kNodeUID,
node.metadata().DebugString());
return false;
}

std::string ns;
if (!ReadProtoMap(meta, kNodeNamespace, &ns)) {
ENVOY_LOG_TO_LOGGER(logger, warn,
"ExtractInfo metadata missing:", kNodeNamespace,
node.metadata().DebugString());
ENVOY_LOG_TO_LOGGER(logger, debug,
"ExtractInfo node metadata missing:{} {}",
kNodeNamespace, node.metadata().DebugString());
return false;
}

Expand Down