Wip tracing ks

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

@@ -160,7 +160,7 @@ class ControlPlane private constructor(
             val envoySnapshotFactory = EnvoySnapshotFactory(
                 ingressRoutesFactory = EnvoyIngressRoutesFactory(snapshotProperties, envoyHttpFilters),
                 egressRoutesFactory = EnvoyEgressRoutesFactory(snapshotProperties),
-                clustersFactory = EnvoyClustersFactory(snapshotProperties),
+                clustersFactory = EnvoyClustersFactory(snapshotProperties, properties.tracing),
                 endpointsFactory = EnvoyEndpointsFactory(
                     snapshotProperties, ServiceTagMetadataGenerator(snapshotProperties.routing.serviceTags)
                 ),

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

@@ -149,7 +149,6 @@ class EnvoySnapshotFactory(
 
     fun getSnapshotForGroup(group: Group, globalSnapshot: GlobalSnapshot): Snapshot {
         val groupSample = Timer.start(meterRegistry)
-
         val newSnapshotForGroup = newSnapshotForGroup(group, globalSnapshot)
         groupSample.stop(meterRegistry.timer("snapshot-factory.get-snapshot-for-group.time"))
         return newSnapshotForGroup

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

@@ -32,6 +32,7 @@ import io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.CommonTlsContext
 import io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.SdsSecretConfig
 import io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.TlsParameters
 import io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext
+import pl.allegro.tech.servicemesh.envoycontrol.TracingProperties
 import pl.allegro.tech.servicemesh.envoycontrol.groups.AllServicesGroup
 import pl.allegro.tech.servicemesh.envoycontrol.groups.CommunicationMode
 import pl.allegro.tech.servicemesh.envoycontrol.groups.CommunicationMode.ADS
@@ -50,7 +51,8 @@ import pl.allegro.tech.servicemesh.envoycontrol.snapshot.Threshold
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.resource.listeners.filters.SanUriMatcherFactory
 
 class EnvoyClustersFactory(
-    private val properties: SnapshotProperties
+    private val properties: SnapshotProperties,
+    private val tracingProperties: TracingProperties
 ) {
     private val httpProtocolOptions: HttpProtocolOptions = HttpProtocolOptions.newBuilder().setIdleTimeout(
         Durations.fromMillis(properties.egress.commonHttp.connectionIdleTimeout.toMillis())
@@ -75,7 +77,7 @@ class EnvoyClustersFactory(
     private val clustersForJWT: List<Cluster> =
         properties.jwt.providers.values.mapNotNull(this::clusterForOAuthProvider)
 
-    private val clustersForTracing: List<Cluster> = listOf(clusterForTracing())
+    // private val clustersForTracing: List<Cluster> = listOf(clusterForTracing())
 
     companion object {
         private val logger by logger()
@@ -112,10 +114,8 @@ class EnvoyClustersFactory(
         val edsCluster = getEdsClustersForGroup(group, globalSnapshot)
         val strictDnsClusters = getStrictDnsClustersForGroup(group)
         val jwtClusters = clustersForJWT
-        val rateLimitCluster =    getRateLimitClusterForGroup(group, globalSnapshot)
-        val jaegerCluster = listOf(globalSnapshot.clusters.resources()["jaeger"]!!)
-
-        return edsCluster + strictDnsClusters + jwtClusters + rateLimitCluster + jaegerCluster
+        val rateLimitCluster = getRateLimitClusterForGroup(group, globalSnapshot)
+        return edsCluster + strictDnsClusters + jwtClusters + rateLimitCluster
     }
 
     private fun clusterForOAuthProvider(provider: OAuthProvider): Cluster? {
@@ -170,9 +170,9 @@ class EnvoyClustersFactory(
         }
     }
 
-    private fun clusterForTracing(): Cluster {
-        return edsCluster(ClusterConfiguration("jaeger", false), ADS)
-    }
+    // private fun clusterForTracing(): Cluster {
+    //     return edsCluster(ClusterConfiguration("jaeger", false), ADS)
+    // }
 
     private fun getRateLimitClusterForGroup(group: Group, globalSnapshot: GlobalSnapshot): List<Cluster> {
         if (group.proxySettings.incoming.rateLimitEndpoints.containsGlobalRateLimits()) {

envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/resource/listeners/filters/EnvoyDefaultFilters.kt

@@ -2,7 +2,6 @@ package pl.allegro.tech.servicemesh.envoycontrol.snapshot.resource.listeners.fil
 
 import com.google.protobuf.Any
 import io.envoyproxy.envoy.extensions.filters.http.header_to_metadata.v3.Config
-import io.envoyproxy.envoy.extensions.filters.http.router.v3.Router
 import io.envoyproxy.envoy.extensions.filters.network.http_connection_manager.v3.HttpFilter
 import pl.allegro.tech.servicemesh.envoycontrol.groups.Group
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.GlobalSnapshot
@@ -141,7 +140,6 @@ class EnvoyDefaultFilters(
     private fun envoyRouterHttpFilter(): HttpFilter = HttpFilter
         .newBuilder()
         .setName("envoy.filters.http.router")
-        .setTypedConfig(Any.pack(Router.newBuilder().build()))
         .build()
 
     private fun headerToMetadataHttpFilter(headerToMetadataConfig: Config.Builder): HttpFilter {

envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/resource/listeners/filters/HttpConnectionManagerFactory.kt

@@ -22,6 +22,7 @@ import pl.allegro.tech.servicemesh.envoycontrol.snapshot.SnapshotProperties
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.resource.listeners.HttpFilterFactory
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.resource.listeners.config.LocalReplyConfigFactory
 import com.google.protobuf.Any
+import pl.allegro.tech.servicemesh.envoycontrol.logger
 
 class HttpConnectionManagerFactory(
     val snapshotProperties: SnapshotProperties,
@@ -62,9 +63,8 @@ class HttpConnectionManagerFactory(
             .setRds(setupRds(group.communicationMode, initialFetchTimeout, routeConfigName))
             .setGenerateRequestId(BoolValue.newBuilder().setValue(listenersConfig.generateRequestId).build())
             .setPreserveExternalRequestId(listenersConfig.preserveExternalRequestId)
-
         if (tracingEnabled) {
-            connectionManagerBuilder.setTracing(prepareTracing())
+            connectionManagerBuilder.setTracing(tracingConfig)
         }
 
         when (direction) {
@@ -171,7 +171,9 @@ class HttpConnectionManagerFactory(
         }
     }
 
-    private fun prepareTracing(): HttpConnectionManager.Tracing.Builder {
+    private val tracingConfig = prepareTracing()
+
+    private fun prepareTracing(): HttpConnectionManager.Tracing {
         val jaegerConfig = ZipkinConfig.newBuilder()
             .setCollectorCluster("jaeger")
             .setCollectorEndpoint("/api/v2/spans")
@@ -185,7 +187,8 @@ class HttpConnectionManagerFactory(
         val provider = Tracing.Http.newBuilder()
             .setName("envoy.tracers.zipkin")
             .setTypedConfig(Any.pack(jaegerConfig))
+            .build()
 
-        return HttpConnectionManager.Tracing.newBuilder().setProvider(provider)
+        return HttpConnectionManager.Tracing.newBuilder().setProvider(provider).build()
     }
 }

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

@@ -1,6 +1,5 @@
 package pl.allegro.tech.servicemesh.envoycontrol.snapshot.resource.routes
 
-import com.google.protobuf.Any
 import com.google.protobuf.BoolValue
 import com.google.protobuf.UInt32Value
 import com.google.protobuf.util.Durations
@@ -17,7 +16,6 @@ import io.envoyproxy.envoy.config.route.v3.RouteAction
 import io.envoyproxy.envoy.config.route.v3.RouteConfiguration
 import io.envoyproxy.envoy.config.route.v3.RouteMatch
 import io.envoyproxy.envoy.config.route.v3.VirtualHost
-import io.envoyproxy.envoy.extensions.retry.host.previous_hosts.v3.PreviousHostsPredicate
 import io.envoyproxy.envoy.type.matcher.v3.RegexMatcher
 import pl.allegro.tech.servicemesh.envoycontrol.groups.RateLimitedRetryBackOff
 import pl.allegro.tech.servicemesh.envoycontrol.groups.RetryBackOff
@@ -331,7 +329,7 @@ class RequestPolicyMapper private constructor() {
             retryPolicyBuilder: RetryPolicy.Builder
         ) {
             hostPredicates.map {
-                RetryPolicy.RetryHostPredicate.newBuilder().setName(it.name).setTypedConfig(Any.pack(PreviousHostsPredicate.newBuilder().build())).build()
+                RetryPolicy.RetryHostPredicate.newBuilder().setName(it.name).build()
             }.also {
                 retryPolicyBuilder.addAllRetryHostPredicate(it)
             }

envoy-control-core/src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/EnvoySnapshotFactoryTest.kt

@@ -324,10 +324,10 @@ class EnvoySnapshotFactoryTest {
             ) { Metadata.getDefaultInstance() }
         )
         val egressRoutesFactory = EnvoyEgressRoutesFactory(properties)
-        val clustersFactory = EnvoyClustersFactory(properties)
+        val clustersFactory = EnvoyClustersFactory(properties, TracingProperties())
         val endpointsFactory = EnvoyEndpointsFactory(properties, ServiceTagMetadataGenerator())
         val envoyHttpFilters = EnvoyHttpFilters.defaultFilters(properties)
-        val listenersFactory = EnvoyListenersFactory(properties, envoyHttpFilters)
+        val listenersFactory = EnvoyListenersFactory(properties, envoyHttpFilters, TracingProperties())
         val snapshotsVersions = SnapshotsVersions()
         val meterRegistry: MeterRegistry = SimpleMeterRegistry()
 

envoy-control-core/src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/SnapshotUpdaterTest.kt

@@ -19,6 +19,7 @@ import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.Arguments
 import org.junit.jupiter.params.provider.MethodSource
 import org.mockito.Mockito
+import pl.allegro.tech.servicemesh.envoycontrol.TracingProperties
 import pl.allegro.tech.servicemesh.envoycontrol.groups.AccessLogFilterSettings
 import pl.allegro.tech.servicemesh.envoycontrol.groups.AllServicesGroup
 import pl.allegro.tech.servicemesh.envoycontrol.groups.CommunicationMode
@@ -1227,13 +1228,14 @@ class SnapshotUpdaterTest {
         EnvoySnapshotFactory(
             ingressRoutesFactory = EnvoyIngressRoutesFactory(snapshotProperties),
             egressRoutesFactory = EnvoyEgressRoutesFactory(snapshotProperties),
-            clustersFactory = EnvoyClustersFactory(snapshotProperties),
+            clustersFactory = EnvoyClustersFactory(snapshotProperties, TracingProperties()),
             endpointsFactory = EnvoyEndpointsFactory(
                 snapshotProperties, ServiceTagMetadataGenerator(snapshotProperties.routing.serviceTags)
             ),
             listenersFactory = EnvoyListenersFactory(
                 snapshotProperties,
-                EnvoyHttpFilters.emptyFilters
+                EnvoyHttpFilters.emptyFilters,
+                TracingProperties()
             ),
             // Remember when LDS change we have to send RDS again
             snapshotsVersions = SnapshotsVersions(),

envoy-control-runner/src/main/resources/application-docker.yaml

@@ -3,7 +3,21 @@ envoy-control:
     consul:
       host: consul
       port: 8500
+  tracing:
+    services:
+      - s1
+      - s2
+      - s3
+  envoy:
+    snapshot:
+      tracing: true
+      outgoing-permissions:
+        enabled: true
+        services-allowed-to-use-wildcard:
+          - s1
+          - s2
+          - s3
 
 chaos:
   username: "user"
-  password: "pass"
+  password: "pass"

envoy-control-runner/src/main/resources/application-local.yaml

@@ -1,9 +1,23 @@
 envoy-control:
   source:
     consul:
-      host: localhost
-      port: 18500
+      host: consul
+      port: 8500
+  tracing:
+    services:
+      - s1
+      - s2
+      - s3
+  envoy:
+    snapshot:
+      tracing: true
+      outgoing-permissions:
+        enabled: true
+        services-allowed-to-use-wildcard:
+          - s1
+          - s2
+          - s3
 
 chaos:
   username: "user"
-  password: "pass"
+  password: "pass"

envoy-control-runner/src/main/resources/application.yaml

@@ -6,17 +6,22 @@ application:
 envoy-control:
   tracing:
     services:
-      - front-proxy
-      - service1
-      - service2
-      - service3
+      - s1
+      - s2
+      - s3
   source:
     consul:
       host: localhost
   envoy:
     snapshot:
+      tracing: true
       outgoing-permissions:
         enabled: true
+        services-allowed-to-use-wildcard:
+          - s1
+          - s2
+          - s3
+
 
 chaos:
   username: "user"