Skip to content

Commit a3ebe14

Browse files
katukotasvc-squareup-copybara
authored andcommitted
Remove unused logging from DynamoClusterWatcherTask
GitOrigin-RevId: cd47d0dccdcb7095d0c4d1505c6460f01110091a
1 parent ea8285f commit a3ebe14

File tree

2 files changed

+28
-37
lines changed

2 files changed

+28
-37
lines changed

misk-clustering-dynamodb/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ plugins {
77
}
88

99
dependencies {
10-
api(libs.loggingApi)
1110
api(project(":misk-inject"))
1211
api(project(":wisp:wisp-config"))
1312

@@ -20,7 +19,6 @@ dependencies {
2019
implementation(project(":misk-backoff"))
2120
implementation(project(":misk-clustering"))
2221
implementation(project(":misk-service"))
23-
implementation(project(":wisp:wisp-logging"))
2422

2523
testImplementation(libs.assertj)
2624
testImplementation(libs.junitApi)

misk-clustering-dynamodb/src/main/kotlin/misk/clustering/dynamo/DynamoClusterWatcherTask.kt

Lines changed: 28 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@ import misk.clustering.DefaultCluster
88
import misk.clustering.weights.ClusterWeightProvider
99
import misk.tasks.RepeatedTaskQueue
1010
import misk.tasks.Status
11-
import misk.time.timed
1211
import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient
1312
import software.amazon.awssdk.enhanced.dynamodb.Expression
1413
import software.amazon.awssdk.enhanced.dynamodb.TableSchema
1514
import software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.numberValue
1615
import software.amazon.awssdk.enhanced.dynamodb.model.ScanEnhancedRequest
1716
import software.amazon.awssdk.services.dynamodb.DynamoDbClient
18-
import wisp.logging.getLogger
1917
import java.time.Clock
2018
import java.time.Duration
2119

@@ -57,49 +55,44 @@ internal class DynamoClusterWatcherTask @Inject constructor(
5755
}
5856

5957
private fun updateOurselfInDynamo() {
60-
val (duration) = timed {
61-
val self = cluster.snapshot.self.name
62-
val member = DyClusterMember()
63-
member.name = self
64-
member.updated_at = clock.instant().toEpochMilli()
65-
// TTL should be in seconds
66-
member.expires_at = clock.instant().plus(Duration.ofDays(1)).toEpochMilli() / 1000
67-
podName?.let { member.pod_name = it }
68-
table.putItem(member)
69-
}
70-
71-
logger.info { "Updated dynamodb with my information in ${duration.toMillis()}ms" }
58+
val self = cluster.snapshot.self.name
59+
val member = DyClusterMember()
60+
member.name = self
61+
member.updated_at = clock.instant().toEpochMilli()
62+
// TTL should be in seconds
63+
member.expires_at = clock.instant().plus(Duration.ofDays(1)).toEpochMilli() / 1000
64+
podName?.let { member.pod_name = it }
65+
table.putItem(member)
7266
}
7367

7468
internal fun recordCurrentDynamoCluster() {
75-
val (duration) = timed {
76-
val members = mutableSetOf<Member>()
77-
val threshold = clock.instant().minusSeconds(dynamoClusterConfig.stale_threshold_seconds).toEpochMilli()
78-
val request = ScanEnhancedRequest.builder()
79-
.consistentRead(true)
80-
.filterExpression(
81-
Expression.builder()
82-
.expression("updated_at >= :threshold")
83-
.expressionValues(mapOf(":threshold" to numberValue(threshold)))
84-
.build()
85-
)
86-
.build()
87-
for (page in table.scan(request).stream()) {
88-
for (item in page.items()) {
89-
members.add(Member(item.name!!, "invalid-ip"))
90-
}
69+
val members = mutableSetOf<Member>()
70+
val threshold =
71+
clock.instant().minusSeconds(dynamoClusterConfig.stale_threshold_seconds).toEpochMilli()
72+
val request = ScanEnhancedRequest.builder()
73+
.consistentRead(true)
74+
.filterExpression(
75+
Expression.builder()
76+
.expression("updated_at >= :threshold")
77+
.expressionValues(mapOf(":threshold" to numberValue(threshold)))
78+
.build()
79+
)
80+
.build()
81+
for (page in table.scan(request).stream()) {
82+
for (item in page.items()) {
83+
members.add(Member(item.name!!, "invalid-ip"))
9184
}
92-
cluster.clusterChanged(membersBecomingReady = members, membersBecomingNotReady = prevMembers - members)
93-
prevMembers = members
9485
}
95-
96-
logger.info { "Updated cluster information from dynamodb in ${duration.toMillis()}ms" }
86+
cluster.clusterChanged(
87+
membersBecomingReady = members,
88+
membersBecomingNotReady = prevMembers - members
89+
)
90+
prevMembers = members
9791
}
9892

9993
override fun shutDown() {}
10094

10195
companion object {
10296
internal val TABLE_SCHEMA = TableSchema.fromClass(DyClusterMember::class.java)
103-
private val logger = getLogger<DynamoClusterWatcherTask>()
10497
}
10598
}

0 commit comments

Comments
 (0)