Skip to content
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

Added missing fields on MonitoredResource #3887

Merged
merged 2 commits into from
Nov 28, 2018
Merged

Added missing fields on MonitoredResource #3887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79c9e33
added missing fields #3559
Oct 31, 2018
61386fe
Fix indentation
chingor13 Nov 28, 2018
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
8 changes: 8 additions & 0 deletions google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@ public static String getClusterName() {
return getAttribute("instance/attributes/cluster-name");
}

public static String getContainerName(){
return getAttribute("instance/attributes/container-name");
}

public static String getNamespaceId(){
return getAttribute("instance/attributes/namespace-id");
}

public static String getAttribute(String attributeName) {
try {
URL url = new URL(METADATA_URL + attributeName);
Expand Down
10 changes: 10 additions & 0 deletions ...ts/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,11 @@ public class MonitoredResourceUtil {
private enum Label {
AppId("app_id"),
ClusterName("cluster_name"),
ContainerName("container_name"),
InstanceId("instance_id"),
InstanceName("instance_name"),
ModuleId("module_id"),
NamespaceId("namespace_id"),
PodId("pod_id"),
ProjectId("project_id"),
VersionId("version_id"),
Expand Down Expand Up @@ -84,7 +86,9 @@ String getKey() {
.putAll(
Resource.Container.getKey(),
Label.ClusterName,
Label.ContainerName,
Label.InstanceId,
Label.NamespaceId,
Label.PodId,
Label.Zone)
.putAll(Resource.GceInstance.getKey(), Label.InstanceId, Label.Zone)
Expand Down Expand Up @@ -135,6 +139,9 @@ private static String getValue(Label label) {
case ClusterName:
value = MetadataConfig.getClusterName();
break;
case ContainerName:
value = MetadataConfig.getContainerName();
break;
case InstanceId:
value = MetadataConfig.getInstanceId();
break;
Expand All @@ -144,6 +151,9 @@ private static String getValue(Label label) {
case ModuleId:
value = getAppEngineModuleId();
break;
case NamespaceId:
value = MetadataConfig.getNamespaceId();
break;
case PodId:
value = System.getenv("HOSTNAME");
break;
Expand Down