Clean up old feature flags (#9015)

Author: jdpgrailsdev

airbyte-commons-worker/src/main/java/io/airbyte/workers/sync/LauncherWorker.java

@@ -4,8 +4,6 @@
 
 package io.airbyte.workers.sync;
 
-import static io.airbyte.config.EnvConfigs.SOCAT_KUBE_CPU_LIMIT;
-import static io.airbyte.config.EnvConfigs.SOCAT_KUBE_CPU_REQUEST;
 import static io.airbyte.metrics.lib.ApmTraceConstants.Tags.PROCESS_EXIT_VALUE_KEY;
 import static io.airbyte.metrics.lib.ApmTraceConstants.WORKER_OPERATION_NAME;
 import static io.airbyte.workers.process.Metadata.CONNECTION_ID_LABEL_KEY;
@@ -18,7 +16,6 @@
 import io.airbyte.commons.temporal.sync.OrchestratorConstants;
 import io.airbyte.commons.workers.config.WorkerConfigs;
 import io.airbyte.config.ResourceRequirements;
-import io.airbyte.featureflag.ConcurrentSocatResources;
 import io.airbyte.featureflag.Connection;
 import io.airbyte.featureflag.FeatureFlagClient;
 import io.airbyte.featureflag.UseCustomK8sScheduler;
@@ -36,7 +33,6 @@
 import io.fabric8.kubernetes.api.model.DeletionPropagation;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.client.KubernetesClientException;
-import io.micronaut.core.util.StringUtils;
 import java.nio.file.Path;
 import java.time.Duration;
 import java.util.Collections;
@@ -135,15 +131,6 @@ public OUTPUT run(final INPUT input, final Path jobRoot) throws WorkerException
       // Merge in the env from the ContainerOrchestratorConfig
       containerOrchestratorConfig.environmentVariables().entrySet().stream().forEach(e -> envMap.putIfAbsent(e.getKey(), e.getValue()));
 
-      // Allow for the override of the socat pod CPU resources as part of the concurrent source read
-      // experimentation
-      final String socatResources = featureFlagClient.stringVariation(ConcurrentSocatResources.INSTANCE, new Connection(connectionId));
-      if (StringUtils.isNotEmpty(socatResources)) {
-        LOGGER.info("Overriding Socat CPU limit and request to {}.", socatResources);
-        envMap.put(SOCAT_KUBE_CPU_LIMIT, socatResources);
-        envMap.put(SOCAT_KUBE_CPU_REQUEST, socatResources);
-      }
-
       final Map<String, String> fileMap = new HashMap<>(additionalFileMap);
       fileMap.putAll(Map.of(
           OrchestratorConstants.INIT_FILE_APPLICATION, application,

airbyte-featureflag/src/main/kotlin/FlagDefinitions.kt

@@ -73,8 +73,6 @@ object RefreshSchemaPeriod : Temporary<Int>(key = "refreshSchema.period.hours",
 
 object ConcurrentSourceStreamRead : Temporary<Boolean>(key = "concurrent.source.stream.read", default = false)
 
-object ConcurrentSocatResources : Temporary<String>(key = "concurrent.socat.resources", default = "")
-
 object ReplicationWorkerImpl : Permanent<String>(key = "platform.replication-worker-impl", default = "buffered")
 
 object UseResourceRequirementsVariant : Permanent<String>(key = "platform.resource-requirements-variant", default = "default")

flags.yml

@@ -21,8 +21,6 @@ flags:
     serve: 24
   - name: concurrent.source.stream.read
     serve: false
-  - name: concurrent.socat.resources
-    serve: ""
   - name: platform.add-scheduling-jitter
     serve: false
   - name: platform.use-new-schema-update-notification

tools/bin/acceptance-test-flags.yml

@@ -21,7 +21,5 @@ flags:
     serve: true
   - name: connection.columnSelection
     serve: true
-  - name: handle.stream.status
-    serve: false
   - name: refreshSchema.period.hours
     serve: 0