Skip to content

chore(RpcSemanticConventionUtils): getter for grpc path #428

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
merged 4 commits into from
Oct 5, 2023
Merged

chore(RpcSemanticConventionUtils): getter for grpc path #428

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f9cdd59
chore(RpcSemanticConventionUtils): getter for grpc path
skjindal93 Oct 5, 2023
bb16a3f
Merge branch 'main' into grpc+path+util
skjindal93 Oct 5, 2023
6530cb9
spotless
skjindal93 Oct 5, 2023
53d42dd
Merge branch 'grpc+path+util' of github.com:hypertrace/hypertrace-ing…
skjindal93 Oct 5, 2023
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
24 changes: 16 additions & 8 deletions ...rc/main/java/org/hypertrace/semantic/convention/utils/rpc/RpcSemanticConventionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.hypertrace.semantic.convention.utils.rpc;

import static org.hypertrace.core.datamodel.shared.AvroBuilderCache.fastNewBuilder;
import static org.hypertrace.core.datamodel.shared.SpanAttributeUtils.getStringAttribute;
import static org.hypertrace.core.span.constants.v1.CensusResponse.CENSUS_RESPONSE_STATUS_MESSAGE;
import static org.hypertrace.core.span.constants.v1.Envoy.ENVOY_GRPC_STATUS_MESSAGE;
import static org.hypertrace.core.span.constants.v1.Envoy.ENVOY_REQUEST_SIZE;
Expand Down Expand Up @@ -131,7 +132,7 @@ public class RpcSemanticConventionUtils {
*/
public static Optional<String> getGrpcURL(Event event) {
if (SpanAttributeUtils.containsAttributeKey(event, OTHER_GRPC_HOST_PORT)) {
return Optional.of(SpanAttributeUtils.getStringAttribute(event, OTHER_GRPC_HOST_PORT));
return Optional.of(getStringAttribute(event, OTHER_GRPC_HOST_PORT));
}
// look for grpc authority
Optional<String> grpcAuthority = getSanitizedGrpcAuthority(event);
Expand Down Expand Up @@ -218,7 +219,7 @@ public static boolean isRpcTypeGrpcForOTelFormat(Map<String, AttributeValue> val
*/
public static Optional<String> getGrpcURI(Event event) {
if (SpanAttributeUtils.containsAttributeKey(event, OTHER_GRPC_HOST_PORT)) {
return Optional.of(SpanAttributeUtils.getStringAttribute(event, OTHER_GRPC_HOST_PORT));
return Optional.of(getStringAttribute(event, OTHER_GRPC_HOST_PORT));
} else if (isRpcTypeGrpcForOTelFormat(event)) {
return SpanSemanticConventionUtils.getURIForOtelFormat(event);
}
Expand Down Expand Up @@ -530,10 +531,9 @@ public static Optional<String> getGrpcRequestEndpoint(Event event) {
return sanitizePath(attributeValue.get().getValue());
}

attributeValue =
Optional.ofNullable(attributeValueMap.get(RawSpanConstants.getValue(GRPC_PATH)));
if (attributeValue.isPresent() && StringUtils.isNotBlank(attributeValue.get().getValue())) {
return sanitizePath(attributeValue.get().getValue());
Optional<String> maybeGrpcPath = getGrpcPath(event);
if (maybeGrpcPath.isPresent()) {
return sanitizePath(maybeGrpcPath.get());
}

return Optional.ofNullable(event.getEventName());
Expand Down Expand Up @@ -573,6 +573,15 @@ public static Optional<String> getRpcPath(Event event) {
return Optional.empty();
}

public static Optional<String> getGrpcPath(Event event) {
String grpcPath = getStringAttribute(event, RawSpanConstants.getValue(GRPC_PATH));
if (grpcPath != null && !grpcPath.isBlank()) {
return Optional.of(grpcPath);
}

return Optional.empty();
}

static Optional<String> getSanitizedGrpcAuthority(Event event) {

Optional<String> grpcAuthority = getGrpcAuthority(event);
Expand All @@ -581,8 +590,7 @@ static Optional<String> getSanitizedGrpcAuthority(Event event) {
} else if (SpanAttributeUtils.containsAttributeKey(
event, RawSpanConstants.getValue(Envoy.ENVOY_GRPC_AUTHORITY))) {
return getSanitizedAuthorityValue(
SpanAttributeUtils.getStringAttribute(
event, RawSpanConstants.getValue(Envoy.ENVOY_GRPC_AUTHORITY)));
getStringAttribute(event, RawSpanConstants.getValue(Envoy.ENVOY_GRPC_AUTHORITY)));
}
return Optional.empty();
}
Expand Down