Add lights_out_delta (#132)

* Add lights_out_delta * Lower caching value on staging
hello · Dec 21, 2016 · 9cf11bf · 9cf11bf
1 parent 09c8ab9
commit 9cf11bf
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 17 deletions.
diff --git a/configs/suripu-service.staging.yml b/configs/suripu-service.staging.yml
@@ -137,6 +137,7 @@ aws_access_key_s3: AKIAJVQV7XJU23UWILSQ
 aws_access_secret_s3: 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
 
 ring_duration_sec: 240
+calibration_cache_duration_seconds: 10
 
 audio_features_firehose:
   endpoint: firehose.us-east-1.amazonaws.com

diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
         <librato.reporter.version>2.2.0.5</librato.reporter.version>
         <metrics.version>3.1.2</metrics.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <suripu.version>0.8.5789</suripu.version>
+        <suripu.version>0.8.5852</suripu.version>
     </properties>
 
     <distributionManagement>

diff --git a/src/main/java/com/hello/suripu/service/SuripuService.java b/src/main/java/com/hello/suripu/service/SuripuService.java
@@ -315,7 +315,11 @@ protected void configure() {
 
         // 300 sec = 5 minutes, which should maximize cache hitrate
         // TODO: add cache hitrate to metrics
-        final CalibrationDAO calibrationDAO = CalibrationDynamoDB.createWithCacheConfig(calibrationDynamoDBClient, tableNames.get(DynamoDBTableName.CALIBRATION), 300);
+        final CalibrationDAO calibrationDAO = CalibrationDynamoDB.createWithCacheConfig(
+                calibrationDynamoDBClient,
+                tableNames.get(DynamoDBTableName.CALIBRATION),
+                configuration.calibrationCacheDurationSeconds()
+        );
 
         final ReceiveResource receiveResource = new ReceiveResource(
                 senseKeyStore,

diff --git a/src/main/java/com/hello/suripu/service/configuration/SuripuConfiguration.java b/src/main/java/com/hello/suripu/service/configuration/SuripuConfiguration.java
@@ -96,6 +96,12 @@ public Integer getRingDuration(){
         return this.ringDuration;
     }
 
+    @JsonProperty("calibration_cache_duration_seconds")
+    private Integer calibrationCacheDurationSeconds = 300;
+    public Integer calibrationCacheDurationSeconds() {
+        return calibrationCacheDurationSeconds;
+    }
+
     @Valid
     @NotNull
     @JsonProperty("dynamodb")

diff --git a/src/main/java/com/hello/suripu/service/resources/ReceiveResource.java b/src/main/java/com/hello/suripu/service/resources/ReceiveResource.java
@@ -1,16 +1,15 @@
 package com.hello.suripu.service.resources;
 
+import com.codahale.metrics.Histogram;
+import com.codahale.metrics.Meter;
+import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.annotation.Timed;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.protobuf.TextFormat;
-
-import com.codahale.metrics.Histogram;
-import com.codahale.metrics.Meter;
-import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.annotation.Timed;
 import com.hello.dropwizard.mikkusu.helpers.AdditionalMediaTypes;
 import com.hello.suripu.api.audio.AudioControlProtos;
 import com.hello.suripu.api.audio.AudioFeaturesControlProtos;
@@ -61,7 +60,6 @@
 import com.hello.suripu.service.models.UploadSettings;
 import com.hello.suripu.service.utils.ServiceFeatureFlipper;
 import com.librato.rollout.RolloutClient;
-
 import org.apache.commons.codec.binary.Hex;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeConstants;
@@ -70,14 +68,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
@@ -87,6 +77,13 @@
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import static com.codahale.metrics.MetricRegistry.name;
 
@@ -595,7 +592,10 @@ private byte[] generateSyncResponse(final String deviceName,
 
             if (i == batch.getDataCount() - 1) {
                 final Optional<Calibration> calibrationOptional = this.hasCalibrationEnabled(deviceName) ? calibrationDAO.get(deviceName) : Optional.<Calibration>absent();
-
+                if(calibrationOptional.isPresent()) {
+                    responseBuilder.setLightsOffThreshold(calibrationOptional.get().lightsOutDelta());
+                    LOGGER.trace("sense_id={} lights_out_delta={}", deviceName, calibrationOptional.get().lightsOutDelta());
+                }
                 final CurrentRoomState currentRoomState = CurrentRoomState.fromRawData(data.getTemperature(), data.getHumidity(), data.getDustMax(), data.getLight(), data.getAudioPeakBackgroundEnergyDb(), data.getAudioPeakDisturbanceEnergyDb(),
                         roundedDateTime.getMillis(),
                         data.getFirmwareVersion(),
@@ -675,6 +675,8 @@ private byte[] generateSyncResponse(final String deviceName,
                 }
             }
 
+
+
             final AudioControlProtos.AudioControl.Builder audioControl = AudioControlProtos.AudioControl
                     .newBuilder()
                     .setAudioCaptureAction(AudioControlProtos.AudioControl.AudioCaptureAction.ON)