grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gcp-csm-o11y: Add resource attributes from environment 

This fixes csm_remote_workload_namespace_name being unknown when running
the interop test.
This commit is contained in:
Eric Anderson 2024-06-04 17:59:03 -07:00
parent 9e2cca08fa
commit 22642465d3
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gcp-csm-observability/src/main/java/io/grpc/gcp/csm/observability/MetadataExchanger.java
View File

@ -39,6 +39,7 @@ import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.common.AttributesBuilder;
import io.opentelemetry.contrib.gcp.resource.GCPResourceProvider;
import io.opentelemetry.sdk.autoconfigure.ResourceConfiguration;
import java.net.URI;
import java.util.Map;
import java.util.function.Consumer;
@ -87,7 +88,7 @@ final class MetadataExchanger implements InternalOpenTelemetryPlugin {
public MetadataExchanger() {
this(
new GCPResourceProvider().getAttributes(),
addOtelResourceAttributes(new GCPResourceProvider().getAttributes()),
System::getenv,
InternalGrpcBootstrapperImpl::getJsonContent);
}
@ -148,6 +149,19 @@ final class MetadataExchanger implements InternalOpenTelemetryPlugin {
return value.getStringValue();
}
private static Attributes addOtelResourceAttributes(Attributes platformAttributes) {
// Can't inject env variables as ResourceConfiguration requires the large ConfigProperties API
// to inject our own values and a default implementation isn't provided. So this reads directly
// from System.getenv().
Attributes envAttributes = ResourceConfiguration
.createEnvironmentResource()
.getAttributes();
AttributesBuilder builder = platformAttributes.toBuilder();
builder.putAll(envAttributes);
return builder.build();
}
@VisibleForTesting
static String getMeshId(Supplier<String> xdsBootstrap) {
try {