Skip to content

Commit

Permalink
Log trace ID if it exists (#474)
Browse files Browse the repository at this point in the history
  • Loading branch information
@DanG100
DanG100 authored Sep 12, 2024
1 parent 7126f84 commit 70d6b3d
Show file tree
Hide file tree
Showing 50 changed files with 2,670 additions and 446 deletions.
49 changes: 42 additions & 7 deletions dataplane/apigen/ccgen/ccgen.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,12 @@ return msg;
{{ if .EntryVar }} *req.mutable_entry() = {{ .EntryConversionFunc }}({{ .EntryVar }}); {{ end }}
grpc::Status status = {{ .Client }}->{{ .RPCMethod }}(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}
{{ if .OidVar -}}
Expand All @@ -849,7 +854,12 @@ return msg;
grpc::Status status = {{ .Client }}->{{ .RPCMethod }}(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}
if (object_count != resp.resps().size()) {
Expand All @@ -872,7 +882,12 @@ return msg;
}
grpc::Status status = {{ .Client }}->{{ .RPCMethod }}(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}
for(uint32_t i = 0; i < attr_count; i++ ) {
Expand All @@ -889,7 +904,12 @@ return msg;
{{ template "setattr" .AttrSwitch }}
grpc::Status status = {{ .Client }}->{{ .RPCMethod }}(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}
{{ else if eq .Operation "remove" }}
Expand All @@ -900,7 +920,12 @@ return msg;
{{ if .EntryVar }} *req.mutable_entry() = {{ .EntryConversionFunc }}({{ .EntryVar }}); {{ end }}
grpc::Status status = {{ .Client }}->{{ .RPCMethod }}(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}
{{ else if eq .Operation "remove_bulk" }}
Expand All @@ -915,7 +940,12 @@ return msg;
grpc::Status status = {{ .Client }}->{{ .RPCMethod }}(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}
if (object_count != resp.resps().size()) {
Expand All @@ -935,7 +965,12 @@ return msg;
}
grpc::Status status = {{ .Client }}->{{ .RPCMethod }}(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}
for(uint32_t i = 0; i < number_of_counters && i < uint32_t(resp.values_size()); i++ ) {
Expand Down
140 changes: 120 additions & 20 deletions dataplane/standalone/sai/acl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,12 @@ sai_status_t l_create_acl_table(sai_object_id_t *acl_table_id,

grpc::Status status = acl->CreateAclTable(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}
if (acl_table_id) {
Expand All @@ -900,7 +905,12 @@ sai_status_t l_remove_acl_table(sai_object_id_t acl_table_id) {

grpc::Status status = acl->RemoveAclTable(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}

Expand Down Expand Up @@ -930,7 +940,12 @@ sai_status_t l_get_acl_table_attribute(sai_object_id_t acl_table_id,
}
grpc::Status status = acl->GetAclTableAttribute(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}
for (uint32_t i = 0; i < attr_count; i++) {
Expand Down Expand Up @@ -1266,7 +1281,12 @@ sai_status_t l_create_acl_entry(sai_object_id_t *acl_entry_id,

grpc::Status status = acl->CreateAclEntry(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}
if (acl_entry_id) {
Expand All @@ -1286,7 +1306,12 @@ sai_status_t l_remove_acl_entry(sai_object_id_t acl_entry_id) {

grpc::Status status = acl->RemoveAclEntry(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}

Expand Down Expand Up @@ -1689,7 +1714,12 @@ sai_status_t l_set_acl_entry_attribute(sai_object_id_t acl_entry_id,

grpc::Status status = acl->SetAclEntryAttribute(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}

Expand All @@ -1712,7 +1742,12 @@ sai_status_t l_get_acl_entry_attribute(sai_object_id_t acl_entry_id,
}
grpc::Status status = acl->GetAclEntryAttribute(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}
for (uint32_t i = 0; i < attr_count; i++) {
Expand Down Expand Up @@ -2180,7 +2215,12 @@ sai_status_t l_create_acl_counter(sai_object_id_t *acl_counter_id,

grpc::Status status = acl->CreateAclCounter(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}
if (acl_counter_id) {
Expand All @@ -2200,7 +2240,12 @@ sai_status_t l_remove_acl_counter(sai_object_id_t acl_counter_id) {

grpc::Status status = acl->RemoveAclCounter(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}

Expand Down Expand Up @@ -2230,7 +2275,12 @@ sai_status_t l_set_acl_counter_attribute(sai_object_id_t acl_counter_id,

grpc::Status status = acl->SetAclCounterAttribute(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}

Expand All @@ -2253,7 +2303,12 @@ sai_status_t l_get_acl_counter_attribute(sai_object_id_t acl_counter_id,
}
grpc::Status status = acl->GetAclCounterAttribute(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}
for (uint32_t i = 0; i < attr_count; i++) {
Expand Down Expand Up @@ -2295,7 +2350,12 @@ sai_status_t l_create_acl_range(sai_object_id_t *acl_range_id,

grpc::Status status = acl->CreateAclRange(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}
if (acl_range_id) {
Expand All @@ -2315,7 +2375,12 @@ sai_status_t l_remove_acl_range(sai_object_id_t acl_range_id) {

grpc::Status status = acl->RemoveAclRange(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}

Expand Down Expand Up @@ -2345,7 +2410,12 @@ sai_status_t l_get_acl_range_attribute(sai_object_id_t acl_range_id,
}
grpc::Status status = acl->GetAclRangeAttribute(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}
for (uint32_t i = 0; i < attr_count; i++) {
Expand Down Expand Up @@ -2374,7 +2444,12 @@ sai_status_t l_create_acl_table_group(sai_object_id_t *acl_table_group_id,

grpc::Status status = acl->CreateAclTableGroup(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}
if (acl_table_group_id) {
Expand All @@ -2394,7 +2469,12 @@ sai_status_t l_remove_acl_table_group(sai_object_id_t acl_table_group_id) {

grpc::Status status = acl->RemoveAclTableGroup(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}

Expand Down Expand Up @@ -2425,7 +2505,12 @@ sai_status_t l_get_acl_table_group_attribute(sai_object_id_t acl_table_group_id,
}
grpc::Status status = acl->GetAclTableGroupAttribute(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}
for (uint32_t i = 0; i < attr_count; i++) {
Expand Down Expand Up @@ -2467,7 +2552,12 @@ sai_status_t l_create_acl_table_group_member(

grpc::Status status = acl->CreateAclTableGroupMember(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}
if (acl_table_group_member_id) {
Expand All @@ -2488,7 +2578,12 @@ sai_status_t l_remove_acl_table_group_member(

grpc::Status status = acl->RemoveAclTableGroupMember(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}

Expand Down Expand Up @@ -2520,7 +2615,12 @@ sai_status_t l_get_acl_table_group_member_attribute(
grpc::Status status =
acl->GetAclTableGroupMemberAttribute(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
auto it = context.GetServerTrailingMetadata().find("traceparent");
if (it != context.GetServerTrailingMetadata().end()) {
LOG(ERROR) << "Trace ID " << it->second << " " << status.error_message();
} else {
LOG(ERROR) << status.error_message();
}
return SAI_STATUS_FAILURE;
}
for (uint32_t i = 0; i < attr_count; i++) {
Expand Down
Loading

0 comments on commit 70d6b3d

Please sign in to comment.