Add Bigtable app profile ID to metrics and analytics modules (#698)

heroic-dist/src/main/java/com/spotify/heroic/profile/BigtableProfile.java

@@ -48,6 +48,7 @@ public HeroicConfig.Builder build(final ExtraParameters params) throws Exception
 
         params.get("project").map(module::project);
         params.get("instance").map(module::instance);
+        params.get("profile").map(module::profile);
 
         final String credentials = params.get("credential").orElse(DEFAULT_CREDENTIALS);
 
@@ -101,6 +102,7 @@ public List<ParameterSpecification> options() {
                     "configured"),
             parameter("project", "Bigtable project to use", "<project>"),
             parameter("instance", "Bigtable instance to use", "<instance>"),
+            parameter("profile", "Bigtable profile to use", "<profile>"),
             parameter("credentials", "Credentials implementation to use, must be one of:" +
                     " default, compute-engine, json, service-account", "<credentials>"),
             parameter("json", "Json file to use when using json credentials", "<file>"),

metric/bigtable/src/main/java/com/spotify/heroic/analytics/bigtable/BigtableAnalyticsModule.java

@@ -46,7 +46,7 @@
 
 @Module
 public class BigtableAnalyticsModule implements AnalyticsModule {
-    private static final String DEFAULT_CLUSTER = "heroic";
+    private static final String DEFAULT_INSTANCE = "heroic";
     private static final CredentialsBuilder DEFAULT_CREDENTIALS =
         new ComputeEngineCredentialsBuilder();
     private static final String HITS_TABLE = "hits";
@@ -56,20 +56,23 @@ public class BigtableAnalyticsModule implements AnalyticsModule {
     private static final int DEFAULT_FLUSH_INTERVAL_SECONDS = 2;
 
     private final String project;
-    private final String cluster;
+    private final String instance;
+    private final String profile;
     private final CredentialsBuilder credentials;
     private final String emulatorEndpoint;
     private final int maxPendingReports;
 
     public BigtableAnalyticsModule(
         final String project,
-        final String cluster,
+        final String instance,
+        final String profile,
         final CredentialsBuilder credentials,
         @Nullable final String emulatorEndpoint,
         final int maxPendingReports
     ) {
         this.project = project;
-        this.cluster = cluster;
+        this.instance = instance;
+        this.profile = profile;
         this.credentials = credentials;
         this.emulatorEndpoint = emulatorEndpoint;
         this.maxPendingReports = maxPendingReports;
@@ -97,9 +100,9 @@ public Managed<BigtableConnection> connection(final AsyncFramework async) {
             @Override
             public AsyncFuture<BigtableConnection> construct() {
                 return async.call(
-                    new BigtableConnectionBuilder(project, cluster, credentials, emulatorEndpoint,
-                        async, DEFAULT_DISABLE_BULK_MUTATIONS, DEFAULT_FLUSH_INTERVAL_SECONDS,
-                        Optional.empty()));
+                    new BigtableConnectionBuilder(project, instance, profile, credentials,
+                        emulatorEndpoint, async, DEFAULT_DISABLE_BULK_MUTATIONS,
+                        DEFAULT_FLUSH_INTERVAL_SECONDS, Optional.empty()));
             }
 
             @Override
@@ -145,14 +148,15 @@ public static Builder builder() {
     }
 
     public String toString() {
-      return "BigtableAnalyticsModule(project=" + this.project + ", cluster=" + this.cluster
-             + ", credentials=" + this.credentials + ", maxPendingReports=" + this.maxPendingReports
-             + ")";
+      return "BigtableAnalyticsModule(project=" + this.project + ", cluster=" + this.instance
+          + ", profile=" + this.profile + ", credentials=" + this.credentials
+          + ", maxPendingReports=" + this.maxPendingReports + ")";
     }
 
   public static class Builder implements AnalyticsModule.Builder {
         private Optional<String> project = Optional.empty();
         private Optional<String> instance = Optional.empty();
+        private Optional<String> profile = Optional.empty();
         private Optional<CredentialsBuilder> credentials = Optional.empty();
         private Optional<String> emulatorEndpoint = Optional.empty();
         private Optional<Integer> maxPendingReports = Optional.empty();
@@ -161,12 +165,14 @@ public static class Builder implements AnalyticsModule.Builder {
         public Builder(
             @JsonProperty("project") Optional<String> project,
             @JsonProperty("instance") Optional<String> instance,
+            @JsonProperty("profile") Optional<String> profile,
             @JsonProperty("credentials") Optional<CredentialsBuilder> credentials,
             @JsonProperty("emulatorEndpoint") Optional<String> emulatorEndpoint,
             @JsonProperty("maxPendingReports") Optional<Integer> maxPendingReports
         ) {
             this.project = project;
             this.instance = instance;
+            this.profile = profile;
             this.credentials = credentials;
             this.emulatorEndpoint = emulatorEndpoint;
             this.maxPendingReports = maxPendingReports;
@@ -185,6 +191,11 @@ public Builder instance(String instance) {
             return this;
         }
 
+        public Builder profile(String profile) {
+            this.profile = Optional.of(profile);
+            return this;
+        }
+
         public Builder credentials(CredentialsBuilder credentials) {
             this.credentials = Optional.of(credentials);
             return this;
@@ -206,7 +217,8 @@ public BigtableAnalyticsModule build() {
 
             return new BigtableAnalyticsModule(
                 project,
-                instance.orElse(DEFAULT_CLUSTER),
+                instance.orElse(DEFAULT_INSTANCE),
+                profile.orElse(null),
                 credentials.orElse(DEFAULT_CREDENTIALS),
                 emulatorEndpoint.orElse(null),
                 maxPendingReports.orElse(DEFAULT_MAX_PENDING_REPORTS)

metric/bigtable/src/main/java/com/spotify/heroic/metric/bigtable/BigtableConnection.java

@@ -76,6 +76,7 @@ public AsyncFuture<Void> close() {
 
     public String toString() {
         return "BigtableConnectionBuilder.GrpcBigtableConnection(project=" + this.project
-               + ", instance=" + this.instance + ")";
+               + ", instance=" + this.instance
+               + ", profile=" + this.session.getOptions().getAppProfileId() + ")";
     }
 }

metric/bigtable/src/main/java/com/spotify/heroic/metric/bigtable/BigtableConnectionBuilder.java

@@ -43,6 +43,7 @@ public class BigtableConnectionBuilder implements Callable<BigtableConnection> {
 
     private final String project;
     private final String instance;
+    private final String profile;
 
     private final CredentialsBuilder credentials;
 
@@ -56,6 +57,7 @@ public class BigtableConnectionBuilder implements Callable<BigtableConnection> {
     public BigtableConnectionBuilder(
         final String project,
         final String instance,
+        final String profile,
         final CredentialsBuilder credentials,
         @Nullable final String emulatorEndpoint,
         final AsyncFramework async,
@@ -65,6 +67,7 @@ public BigtableConnectionBuilder(
     ) {
         this.project = project;
         this.instance = instance;
+        this.profile = profile;
         this.credentials = credentials;
         this.emulatorEndpoint = emulatorEndpoint;
         this.async = async;
@@ -96,6 +99,10 @@ public BigtableConnection call() throws Exception {
             .setRetryOptions(retryOptions)
             .setBulkOptions(bulkOptions);
 
+        if (profile != null) {
+            builder.setAppProfileId(profile);
+        }
+
         if (emulatorEndpoint != null) {
             builder.enableEmulator(emulatorEndpoint);
         }
@@ -117,6 +124,6 @@ public BigtableConnection call() throws Exception {
 
     public String toString() {
         return "BigtableConnectionBuilder(project=" + this.project + ", instance=" + this.instance
-               + ", credentials=" + this.credentials + ")";
+            + ", profile=" + this.profile + ", credentials=" + this.credentials + ")";
     }
 }

metric/bigtable/src/main/java/com/spotify/heroic/metric/bigtable/BigtableMetricModule.java

@@ -61,6 +61,7 @@ public final class BigtableMetricModule implements MetricModule, DynamicModuleId
     private final Groups groups;
     private final String project;
     private final String instance;
+    private final String profile;
     private final String table;
     private final CredentialsBuilder credentials;
     private final boolean configure;
@@ -75,6 +76,7 @@ public BigtableMetricModule(
         @JsonProperty("groups") Optional<Groups> groups,
         @JsonProperty("project") Optional<String> project,
         @JsonProperty("instance") Optional<String> instance,
+        @JsonProperty("profile") Optional<String> profile,
         @JsonProperty("table") Optional<String> table,
         @JsonProperty("credentials") Optional<CredentialsBuilder> credentials,
         @JsonProperty("configure") Optional<Boolean> configure,
@@ -87,6 +89,7 @@ public BigtableMetricModule(
         this.groups = groups.orElseGet(Groups::empty).or(DEFAULT_GROUP);
         this.project = project.orElseThrow(() -> new NullPointerException("project"));
         this.instance = instance.orElse(DEFAULT_INSTANCE);
+        this.profile = profile.orElse(null);
         this.table = table.orElse(DEFAULT_TABLE);
         this.credentials = credentials.orElse(DEFAULT_CREDENTIALS);
         this.configure = configure.orElse(DEFAULT_CONFIGURE);
@@ -126,7 +129,7 @@ public Managed<BigtableConnection> connection(final AsyncFramework async) {
                 public AsyncFuture<BigtableConnection> construct() {
                     return async.call(
                         new BigtableConnectionBuilder(
-                            project, instance, credentials, emulatorEndpoint,
+                            project, instance, profile, credentials, emulatorEndpoint,
                             async, disableBulkMutations, flushIntervalSeconds, batchSize));
                 }
 
@@ -188,6 +191,7 @@ public static class Builder {
         private Optional<Groups> groups = empty();
         private Optional<String> project = empty();
         private Optional<String> instance = empty();
+        private Optional<String> profile = empty();
         private Optional<String> table = empty();
         private Optional<CredentialsBuilder> credentials = empty();
         private Optional<Boolean> configure = empty();
@@ -216,6 +220,11 @@ public Builder instance(String instance) {
             return this;
         }
 
+        public Builder profile(String profile) {
+            this.profile = of(profile);
+            return this;
+        }
+
         public Builder credentials(CredentialsBuilder credentials) {
             this.credentials = of(credentials);
             return this;
@@ -252,8 +261,9 @@ public Builder emulatorEndpoint(final String emulatorEndpoint) {
         }
 
         public BigtableMetricModule build() {
-            return new BigtableMetricModule(id, groups, project, instance, table, credentials,
-                configure, disableBulkMutations, flushIntervalSeconds, batchSize, emulatorEndpoint);
+            return new BigtableMetricModule(id, groups, project, instance, profile,
+                table, credentials, configure, disableBulkMutations, flushIntervalSeconds,
+                batchSize, emulatorEndpoint);
         }
     }
 }