Fixed traffic splitting for endpoints with tag metadata - Rollback

envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/EnvoySnapshotFactory.kt

@@ -225,9 +225,9 @@ class EnvoySnapshotFactory(
     ): RouteSpecification {
         val trafficSplitting = properties.loadBalancing.trafficSplitting
         val weights = trafficSplitting.serviceByWeightsProperties[serviceName]
-        val enabledForDependency = globalSnapshot.endpoints[clusterName]?.let {
-            endpointsFactory.filterEndpoints(it, settings.routingPolicy)
-        }?.endpointsList?.any { e -> trafficSplitting.zoneName == e.locality.zone && e.lbEndpointsCount > 0 } ?: false
+        val enabledForDependency = globalSnapshot.endpoints[clusterName]?.endpointsList
+            ?.any { e -> trafficSplitting.zoneName == e.locality.zone }
+            ?: false
         return if (weights != null && enabledForDependency) {
             logger.debug(
                 "Building traffic splitting route spec, weights: $weights, " +

envoy-control-tests/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/trafficsplitting/TrafficSplitting.kt

@@ -28,11 +28,6 @@ fun CallStats.verifyCallsCountCloseTo(service: EchoServiceExtension, expectedCou
     return this
 }
 
-fun CallStats.verifyCallsCountEquals(service: EchoServiceExtension, expectedCount: Int): CallStats {
-    Assertions.assertThat(this.hits(service)).isEqualTo(expectedCount)
-    return this
-}
-
 fun CallStats.verifyCallsCountGreaterThan(service: EchoServiceExtension, hits: Int): CallStats {
     Assertions.assertThat(this.hits(service)).isGreaterThan(hits)
     return this

envoy-control-tests/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/trafficsplitting/WeightedClustersRoutingTest.kt

@@ -96,4 +96,19 @@ class WeightedClustersRoutingTest {
             .verifyCallsCountCloseTo(upstreamServiceDC1, 90)
             .verifyCallsCountGreaterThan(upstreamServiceDC2, 1)
     }
+
+    @Test
+    fun `should route traffic according to weights with service tag`() {
+        consul.serverFirst.operations.registerServiceWithEnvoyOnEgress(echoEnvoyDC1, name = serviceName)
+
+        consul.serverFirst.operations.registerService(upstreamServiceDC1, name = upstreamServiceName, tags = listOf("tag"))
+        echoEnvoyDC1.verifyIsReachable(upstreamServiceDC1, upstreamServiceName)
+
+        consul.serverSecond.operations.registerService(upstreamServiceDC2, name = upstreamServiceName, tags = listOf("tag"))
+        echoEnvoyDC1.verifyIsReachable(upstreamServiceDC2, upstreamServiceName)
+
+        echoEnvoyDC1.callUpstreamServiceRepeatedly(upstreamServiceDC1, upstreamServiceDC2, tag = "tag")
+            .verifyCallsCountCloseTo(upstreamServiceDC1, 90)
+            .verifyCallsCountGreaterThan(upstreamServiceDC2, 1)
+    }
 }