allegro-internal/flex-roadmap#819 Migrated metrics to prometheus | removed some metrics

nastassia-dailidava · nastassia-dailidava · commit fa2745021f8a · 2024-10-18T15:29:34.000+02:00
diff --git a/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/server/callbacks/MetricsDiscoveryServerCallbacks.kt b/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/server/callbacks/MetricsDiscoveryServerCallbacks.kt
@@ -2,16 +2,14 @@ package pl.allegro.tech.servicemesh.envoycontrol.server.callbacks
 
 import io.envoyproxy.controlplane.cache.Resources
 import io.envoyproxy.controlplane.server.DiscoveryServerCallbacks
-import io.envoyproxy.envoy.service.discovery.v3.DiscoveryRequest as V3DiscoveryRequest
-import io.envoyproxy.envoy.service.discovery.v3.DeltaDiscoveryRequest as V3DeltaDiscoveryRequest
 import io.micrometer.core.instrument.MeterRegistry
 import io.micrometer.core.instrument.Tags
-import pl.allegro.tech.servicemesh.envoycontrol.utils.CONNECTION_TYPE_TAG
 import pl.allegro.tech.servicemesh.envoycontrol.utils.CONNECTIONS_METRIC
-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.CONNECTION_TYPE_TAG
 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
+import io.envoyproxy.envoy.service.discovery.v3.DiscoveryRequest as V3DiscoveryRequest
 
 class MetricsDiscoveryServerCallbacks(private val meterRegistry: MeterRegistry) : DiscoveryServerCallbacks {
 
@@ -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/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/SnapshotUpdater.kt b/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/SnapshotUpdater.kt
@@ -4,7 +4,6 @@ import io.envoyproxy.controlplane.cache.SnapshotCache
 import io.envoyproxy.controlplane.cache.v3.Snapshot
 import io.micrometer.core.instrument.MeterRegistry
 import io.micrometer.core.instrument.Tags
-import io.micrometer.core.instrument.Timer
 import pl.allegro.tech.servicemesh.envoycontrol.groups.CommunicationMode.ADS
 import pl.allegro.tech.servicemesh.envoycontrol.groups.CommunicationMode.XDS
 import pl.allegro.tech.servicemesh.envoycontrol.groups.Group
@@ -22,7 +21,6 @@ import pl.allegro.tech.servicemesh.envoycontrol.utils.SNAPSHOT_ERROR_METRIC
 import pl.allegro.tech.servicemesh.envoycontrol.utils.SNAPSHOT_GROUP_ERROR_METRIC
 import pl.allegro.tech.servicemesh.envoycontrol.utils.SNAPSHOT_METRIC
 import pl.allegro.tech.servicemesh.envoycontrol.utils.SNAPSHOT_STATUS_TAG
-import pl.allegro.tech.servicemesh.envoycontrol.utils.SNAPSHOT_UPDATE_DURATION_METRIC
 import pl.allegro.tech.servicemesh.envoycontrol.utils.UPDATE_TRIGGER_TAG
 import pl.allegro.tech.servicemesh.envoycontrol.utils.doOnNextScheduledOn
 import pl.allegro.tech.servicemesh.envoycontrol.utils.measureBuffer
@@ -201,13 +199,10 @@ class SnapshotUpdater(
         }
     }
 
-    private val updateSnapshotForGroupsTimer = meterRegistry.timer(SNAPSHOT_UPDATE_DURATION_METRIC)
-
     private fun updateSnapshotForGroups(
         groups: Collection<Group>,
         result: UpdateResult
     ): Mono<UpdateResult> {
-        val sample = Timer.start()
         versions.retainGroups(cache.groups())
         val results = Flux.fromIterable(groups)
             .doOnNextScheduledOn(groupSnapshotScheduler) { group ->
@@ -225,7 +220,6 @@ class SnapshotUpdater(
                 }
             }
         return results.then(Mono.fromCallable {
-            sample.stop(updateSnapshotForGroupsTimer)
             result
         })
     }
diff --git a/envoy-control-runner/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/infrastructure/ControlPlaneConfig.kt b/envoy-control-runner/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/infrastructure/ControlPlaneConfig.kt
@@ -3,7 +3,6 @@ package pl.allegro.tech.servicemesh.envoycontrol.infrastructure
 import com.ecwid.consul.v1.ConsulClient
 import com.fasterxml.jackson.databind.ObjectMapper
 import io.micrometer.core.instrument.MeterRegistry
-import io.micrometer.core.instrument.Tags
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.boot.context.properties.ConfigurationProperties
@@ -41,12 +40,6 @@ import pl.allegro.tech.servicemesh.envoycontrol.services.transformers.RegexServi
 import pl.allegro.tech.servicemesh.envoycontrol.services.transformers.ServiceInstancesTransformer
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.resource.listeners.filters.EnvoyHttpFilters
 import pl.allegro.tech.servicemesh.envoycontrol.synchronization.GlobalStateChanges
-import pl.allegro.tech.servicemesh.envoycontrol.utils.CACHE_GROUP_COUNT_METRIC
-import pl.allegro.tech.servicemesh.envoycontrol.utils.WATCH_ERRORS_METRIC
-import pl.allegro.tech.servicemesh.envoycontrol.utils.METRIC_EMITTER_TAG
-import pl.allegro.tech.servicemesh.envoycontrol.utils.STATUS_TAG
-import pl.allegro.tech.servicemesh.envoycontrol.utils.WATCH_METRIC
-import pl.allegro.tech.servicemesh.envoycontrol.utils.WATCH_TYPE_TAG
 import reactor.core.scheduler.Schedulers
 import java.net.URI
 
@@ -179,30 +172,7 @@ class ControlPlaneConfig {
         ConsulClient(properties.host, properties.port).agentSelf.value?.config?.datacenter ?: "local"
 
     fun controlPlaneMetrics(meterRegistry: MeterRegistry): DefaultEnvoyControlMetrics {
-        return DefaultEnvoyControlMetrics(meterRegistry = meterRegistry).also {
-            meterRegistry.gauge(WATCH_METRIC, Tags.of(STATUS_TAG, "added", WATCH_TYPE_TAG, "service"), it.servicesAdded)
-            meterRegistry.gauge(
-                WATCH_METRIC,
-                Tags.of(STATUS_TAG, "removed", WATCH_TYPE_TAG, "service"),
-                it.servicesRemoved
-            )
-            meterRegistry.gauge(
-                WATCH_METRIC,
-                Tags.of(STATUS_TAG, "instance-changed", WATCH_TYPE_TAG, "service"),
-                it.instanceChanges
-            )
-            meterRegistry.gauge(
-                WATCH_METRIC,
-                Tags.of(STATUS_TAG, "snapshot-changed", WATCH_TYPE_TAG, "service"),
-                it.snapshotChanges
-            )
-            meterRegistry.gauge(CACHE_GROUP_COUNT_METRIC, it.cacheGroupsCount)
-            it.meterRegistry.more().counter(
-                WATCH_ERRORS_METRIC,
-                Tags.of(METRIC_EMITTER_TAG, "watch-services"),
-                it.errorWatchingServices
-            )
-        }
+        return DefaultEnvoyControlMetrics(meterRegistry = meterRegistry)
     }
 
     @Bean
diff --git a/envoy-control-tests/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/MetricsDiscoveryServerCallbacksTest.kt b/envoy-control-tests/src/main/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
@@ -28,6 +29,7 @@ import pl.allegro.tech.servicemesh.envoycontrol.utils.STREAM_TYPE_TAG
 import java.util.function.Consumer
 import java.util.function.Predicate
 
+@Disabled
 class XdsMetricsDiscoveryServerCallbacksTest : MetricsDiscoveryServerCallbacksTest {
     companion object {
 
@@ -87,6 +89,7 @@ class XdsMetricsDiscoveryServerCallbacksTest : MetricsDiscoveryServerCallbacksTe
     )
 }
 
+@Disabled
 class AdsMetricsDiscoveryServerCallbackTest : MetricsDiscoveryServerCallbacksTest {
     companion object {
 
@@ -146,6 +149,7 @@ class AdsMetricsDiscoveryServerCallbackTest : MetricsDiscoveryServerCallbacksTes
     )
 }
 
+@Disabled
 class DeltaAdsMetricsDiscoveryServerCallbackTest : MetricsDiscoveryServerCallbacksTest {
     companion object {
 
@@ -205,6 +209,7 @@ class DeltaAdsMetricsDiscoveryServerCallbackTest : MetricsDiscoveryServerCallbac
     )
 }
 
+@Disabled
 interface MetricsDiscoveryServerCallbacksTest {
     companion object {
         private val logger by logger()

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package pl.allegro.tech.servicemesh.envoycontrol`
`2`	`2`
`3`	`3`	`import io.micrometer.core.instrument.Tags`
`4`	`4`	`import org.assertj.core.api.Assertions.assertThat`
	`5`	`+import org.junit.jupiter.api.Disabled`
`5`	`6`	`import org.junit.jupiter.api.Test`
`6`	`7`	`import org.junit.jupiter.api.extension.RegisterExtension`
`7`	`8`	`import pl.allegro.tech.servicemesh.envoycontrol.assertions.untilAsserted`
`@@ -28,6 +29,7 @@ import pl.allegro.tech.servicemesh.envoycontrol.utils.STREAM_TYPE_TAG`
`28`	`29`	`import java.util.function.Consumer`
`29`	`30`	`import java.util.function.Predicate`
`30`	`31`
	`32`	`+@Disabled`
`31`	`33`	`class XdsMetricsDiscoveryServerCallbacksTest : MetricsDiscoveryServerCallbacksTest {`
`32`	`34`	`companion object {`
`33`	`35`
`@@ -87,6 +89,7 @@ class XdsMetricsDiscoveryServerCallbacksTest : MetricsDiscoveryServerCallbacksTe`
`87`	`89`	`)`
`88`	`90`	`}`
`89`	`91`
	`92`	`+@Disabled`
`90`	`93`	`class AdsMetricsDiscoveryServerCallbackTest : MetricsDiscoveryServerCallbacksTest {`
`91`	`94`	`companion object {`
`92`	`95`
`@@ -146,6 +149,7 @@ class AdsMetricsDiscoveryServerCallbackTest : MetricsDiscoveryServerCallbacksTes`
`146`	`149`	`)`
`147`	`150`	`}`
`148`	`151`
	`152`	`+@Disabled`
`149`	`153`	`class DeltaAdsMetricsDiscoveryServerCallbackTest : MetricsDiscoveryServerCallbacksTest {`
`150`	`154`	`companion object {`
`151`	`155`
`@@ -205,6 +209,7 @@ class DeltaAdsMetricsDiscoveryServerCallbackTest : MetricsDiscoveryServerCallbac`
`205`	`209`	`)`
`206`	`210`	`}`
`207`	`211`
	`212`	`+@Disabled`
`208`	`213`	`interface MetricsDiscoveryServerCallbacksTest {`
`209`	`214`	`companion object {`
`210`	`215`	`private val logger by logger()`