Skip to content

Commit d3a121b

Browse files
Ian-NaraIan-Nara
committed
update logging
1 parent 24b0d69 commit d3a121b

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

‎src/main/java/com/uid2/optout/Main.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.uid2.optout;
22

33
import com.uid2.optout.vertx.*;
4-
import com.uid2.optout.vertx.OptOutTrafficFilter.MalformedTrafficFilterConfigException;
5-
import com.uid2.optout.vertx.OptOutTrafficCalculator.MalformedTrafficCalcConfigException;
4+
import com.uid2.optout.traffic.OptOutTrafficFilter.MalformedTrafficFilterConfigException;
5+
import com.uid2.optout.traffic.OptOutTrafficCalculator.MalformedTrafficCalcConfigException;
66
import com.uid2.shared.ApplicationVersion;
77
import com.uid2.shared.Utils;
88
import com.uid2.shared.attest.AttestationResponseHandler;

‎src/main/java/com/uid2/optout/delta/DeltaProductionOrchestrator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import com.uid2.optout.sqs.SqsMessageOperations;
44
import com.uid2.optout.sqs.SqsParsedMessage;
55
import com.uid2.optout.sqs.SqsWindowReader;
6-
import com.uid2.optout.vertx.OptOutTrafficCalculator;
7-
import com.uid2.optout.vertx.OptOutTrafficFilter;
6+
import com.uid2.optout.traffic.OptOutTrafficCalculator;
7+
import com.uid2.optout.traffic.OptOutTrafficFilter;
88
import com.uid2.shared.optout.OptOutCloudSync;
99
import com.uid2.shared.optout.OptOutUtils;
1010
import io.vertx.core.json.JsonArray;

src/main/java/com/uid2/optout/circuit-breaker/OptOutTrafficCalculator.java renamed to src/main/java/com/uid2/optout/traffic/OptOutTrafficCalculator.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.uid2.optout.vertx;
1+
package com.uid2.optout.traffic;
22

33
import com.uid2.shared.cloud.ICloudStorage;
44
import com.uid2.shared.optout.OptOutCollection;
@@ -267,7 +267,6 @@ public TrafficStatus calculateStatus(List<Message> sqsMessages, SqsMessageOperat
267267
for (long ts : timestamps) {
268268
// Stop condition: record is older than our window
269269
if (ts < deltaWindowStart) {
270-
LOGGER.info("stopping delta file processing at timestamp {} (older than window start {})", ts, deltaWindowStart);
271270
break;
272271
}
273272

@@ -314,8 +313,8 @@ public TrafficStatus calculateStatus(List<Message> sqsMessages, SqsMessageOperat
314313
// Determine status
315314
TrafficStatus status = determineStatus(sum, this.baselineTraffic);
316315

317-
LOGGER.info("traffic calculation complete: sum={} (deltaRecords + sqsMessages={} + otherConsumers={}), baselineTraffic={}, thresholdMultiplier={}, status={}",
318-
sum, sqsCount, otherConsumersMessages, this.baselineTraffic, this.thresholdMultiplier, status);
316+
LOGGER.info("traffic calculation complete: sum={} (deltaRecords={} + sqsMessages={} + otherConsumers={}), baselineTraffic={}, thresholdMultiplier={}, status={}",
317+
sum, deltaRecordsCount, sqsCount, otherConsumersMessages, this.baselineTraffic, this.thresholdMultiplier, status);
319318

320319
return status;
321320

@@ -389,17 +388,14 @@ private List<Long> getTimestampsFromFile(String s3Path) throws IOException {
389388
// Check cache first
390389
FileRecordCache cached = deltaFileCache.get(filename);
391390
if (cached != null) {
392-
LOGGER.info("using cached timestamps for file: {}", filename);
393391
return cached.timestamps;
394392
}
395393

396394
// Cache miss - download from S3
397-
LOGGER.info("downloading and reading timestamps from s3: {}", s3Path);
398395
List<Long> timestamps = readTimestampsFromS3(s3Path);
399396

400397
// Store in cache
401398
deltaFileCache.put(filename, new FileRecordCache(timestamps));
402-
LOGGER.info("cached delta file: {} ({} records)", filename, timestamps.size());
403399

404400
return timestamps;
405401
}
@@ -509,7 +505,7 @@ private Long extractTimestampFromMessage(Message msg) {
509505
try {
510506
return Long.parseLong(sentTimestamp) / 1000; // Convert ms to seconds
511507
} catch (NumberFormatException e) {
512-
LOGGER.info("invalid sentTimestamp: {}", sentTimestamp);
508+
LOGGER.warn("invalid sentTimestamp: {}", sentTimestamp);
513509
}
514510
}
515511

@@ -595,7 +591,7 @@ TrafficStatus determineStatus(int sumCurrent, int baselineTraffic) {
595591
}
596592

597593
if (sumCurrent >= thresholdMultiplier * baselineTraffic) {
598-
LOGGER.warn("delayed_processing threshold breached: sumCurrent={} >= {}×baselineTraffic={}",
594+
LOGGER.error("delayed_processing threshold breached: sumCurrent={} >= {}×baselineTraffic={}",
599595
sumCurrent, thresholdMultiplier, baselineTraffic);
600596
return TrafficStatus.DELAYED_PROCESSING;
601597
}

src/main/java/com/uid2/optout/circuit-breaker/OptOutTrafficFilter.java renamed to src/main/java/com/uid2/optout/traffic/OptOutTrafficFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.uid2.optout.vertx;
1+
package com.uid2.optout.traffic;
22

33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;

‎src/main/java/com/uid2/optout/vertx/OptOutSqsLogProducer.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111
import com.uid2.optout.delta.S3UploadService;
1212
import com.uid2.optout.delta.StopReason;
1313
import com.uid2.optout.sqs.SqsWindowReader;
14-
import com.uid2.optout.vertx.OptOutTrafficCalculator.MalformedTrafficCalcConfigException;
15-
import com.uid2.optout.vertx.OptOutTrafficFilter.MalformedTrafficFilterConfigException;
14+
import com.uid2.optout.traffic.OptOutTrafficCalculator;
15+
import com.uid2.optout.traffic.OptOutTrafficCalculator.MalformedTrafficCalcConfigException;
16+
import com.uid2.optout.traffic.OptOutTrafficFilter;
17+
import com.uid2.optout.traffic.OptOutTrafficFilter.MalformedTrafficFilterConfigException;
1618
import com.uid2.shared.Utils;
1719
import com.uid2.shared.cloud.ICloudStorage;
1820
import com.uid2.shared.health.HealthComponent;

src/test/java/com/uid2/optout/vertx/OptOutTrafficCalculatorTest.java renamed to src/test/java/com/uid2/optout/traffic/OptOutTrafficCalculatorTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.uid2.optout.vertx;
1+
package com.uid2.optout.traffic;
22

33
import com.uid2.shared.cloud.CloudStorageException;
44
import com.uid2.shared.cloud.ICloudStorage;
@@ -24,7 +24,8 @@
2424
import software.amazon.awssdk.services.sqs.model.Message;
2525
import software.amazon.awssdk.services.sqs.model.MessageSystemAttributeName;
2626

27-
import com.uid2.optout.vertx.OptOutTrafficCalculator.MalformedTrafficCalcConfigException;
27+
import com.uid2.optout.traffic.OptOutTrafficCalculator;
28+
import com.uid2.optout.traffic.OptOutTrafficCalculator.MalformedTrafficCalcConfigException;
2829
import java.io.ByteArrayInputStream;
2930
import java.util.*;
3031

src/test/java/com/uid2/optout/vertx/OptOutTrafficFilterTest.java renamed to src/test/java/com/uid2/optout/traffic/OptOutTrafficFilterTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
package com.uid2.optout.vertx;
1+
package com.uid2.optout.traffic;
22

33
import org.junit.After;
44
import org.junit.Before;
55
import org.junit.Test;
66

77
import com.uid2.optout.sqs.SqsParsedMessage;
8+
import com.uid2.optout.traffic.OptOutTrafficFilter;
89

910
import software.amazon.awssdk.services.sqs.model.Message;
1011

0 commit comments

Comments
 (0)