allegro-internal/flex-roadmap#819 removed MetricsDiscoveryServerCallb…

…acks, RemoteServices
allegro · Oct 20, 2024 · ae04885 · ae04885
1 parent 025872c
commit ae04885
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 35 deletions.
diff --git a/...allegro/tech/servicemesh/envoycontrol/server/callbacks/MetricsDiscoveryServerCallbacks.kt b/...allegro/tech/servicemesh/envoycontrol/server/callbacks/MetricsDiscoveryServerCallbacks.kt
@@ -6,8 +6,6 @@ import io.micrometer.core.instrument.MeterRegistry
 import io.micrometer.core.instrument.Tags
 import pl.allegro.tech.servicemesh.envoycontrol.utils.CONNECTIONS_METRIC
 import pl.allegro.tech.servicemesh.envoycontrol.utils.CONNECTION_TYPE_TAG
-import pl.allegro.tech.servicemesh.envoycontrol.utils.DISCOVERY_REQ_TYPE_TAG
-import pl.allegro.tech.servicemesh.envoycontrol.utils.REQUESTS_METRIC
 import pl.allegro.tech.servicemesh.envoycontrol.utils.STREAM_TYPE_TAG
 import java.util.concurrent.atomic.AtomicInteger
 import io.envoyproxy.envoy.service.discovery.v3.DeltaDiscoveryRequest as V3DeltaDiscoveryRequest
@@ -60,30 +58,14 @@ class MetricsDiscoveryServerCallbacks(private val meterRegistry: MeterRegistry)
     }
 
     override fun onV3StreamRequest(streamId: Long, request: V3DiscoveryRequest) {
-        meterRegistry.counter(
-            REQUESTS_METRIC,
-            Tags.of(
-                CONNECTION_TYPE_TAG, "grpc",
-                STREAM_TYPE_TAG, StreamType.fromTypeUrl(request.typeUrl).name.lowercase(),
-                DISCOVERY_REQ_TYPE_TAG, "total"
-            )
-        )
-            .increment()
+        // noop
     }
 
     override fun onV3StreamDeltaRequest(
         streamId: Long,
         request: V3DeltaDiscoveryRequest
     ) {
-        meterRegistry.counter(
-            REQUESTS_METRIC,
-            Tags.of(
-                CONNECTION_TYPE_TAG, "grpc",
-                STREAM_TYPE_TAG, StreamType.fromTypeUrl(request.typeUrl).name.lowercase(),
-                DISCOVERY_REQ_TYPE_TAG, "delta"
-            )
-        )
-            .increment()
+        // noop
     }
 
     override fun onStreamCloseWithError(streamId: Long, typeUrl: String, error: Throwable) {

diff --git a/...rc/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/synchronization/RemoteServices.kt b/...rc/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/synchronization/RemoteServices.kt
@@ -13,7 +13,6 @@ import pl.allegro.tech.servicemesh.envoycontrol.utils.CROSS_DC_SYNC_CANCELLED_ME
 import pl.allegro.tech.servicemesh.envoycontrol.utils.CROSS_DC_SYNC_SECONDS_METRIC
 import pl.allegro.tech.servicemesh.envoycontrol.utils.CROSS_DC_SYNC_TOTAL_METRIC
 import pl.allegro.tech.servicemesh.envoycontrol.utils.OPERATION_TAG
-import pl.allegro.tech.servicemesh.envoycontrol.utils.SERVICES_STATE_ERRORS_METRIC
 import reactor.core.publisher.Flux
 import reactor.core.publisher.FluxSink
 import java.lang.Integer.max
@@ -70,13 +69,6 @@ class RemoteServices(
             .thenApply { servicesStateFromCluster(cluster, it) }
             .orTimeout(interval, TimeUnit.SECONDS)
             .exceptionally {
-                meterRegistry.counter(
-                    SERVICES_STATE_ERRORS_METRIC,
-                    Tags.of(
-                        CLUSTER_TAG, cluster,
-                        OPERATION_TAG, "get-state"
-                    )
-                ).increment()
                 logger.warn("Error synchronizing instances ${it.message}", it)
                 clusterStateCache[cluster]
             }
@@ -87,13 +79,6 @@ class RemoteServices(
             val instances = controlPlaneInstanceFetcher.instances(cluster)
             cluster to instances
         } catch (e: Exception) {
-            meterRegistry.counter(
-                SERVICES_STATE_ERRORS_METRIC,
-                Tags.of(
-                    CLUSTER_TAG, cluster,
-                    OPERATION_TAG, "get-instances"
-                )
-            ).increment()
             logger.warn("Failed fetching instances from $cluster", e)
             cluster to emptyList()
         }

diff --git a/...in/kotlin/pl/allegro/tech/servicemesh/envoycontrol/MetricsDiscoveryServerCallbacksTest.kt b/...in/kotlin/pl/allegro/tech/servicemesh/envoycontrol/MetricsDiscoveryServerCallbacksTest.kt
@@ -2,6 +2,7 @@ package pl.allegro.tech.servicemesh.envoycontrol
 
 import io.micrometer.core.instrument.Tags
 import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.RegisterExtension
 import pl.allegro.tech.servicemesh.envoycontrol.assertions.untilAsserted
@@ -205,6 +206,7 @@ class DeltaAdsMetricsDiscoveryServerCallbackTest : MetricsDiscoveryServerCallbac
     )
 }
 
+@Disabled
 interface MetricsDiscoveryServerCallbacksTest {
     companion object {
         private val logger by logger()