Merge pull request #1784 from IABTechLab/vse-UID2-5593-add-service-instance-id-operator

vishalegbert-ttd · web-flow · commit f11dac576b2a · 2025-06-09T14:45:45.000+10:00
Add service instance ID and UID trace ID to core and opt out requests
diff --git a/conf/default-config.json b/conf/default-config.json
@@ -38,5 +38,6 @@
   "failure_shutdown_wait_hours": 120,
   "sharing_token_expiry_seconds": 2592000,
   "operator_type": "public",
-  "enable_remote_config": false
+  "enable_remote_config": false,
+  "uid_instance_id_prefix": "local-operator"
 }
diff --git a/conf/docker-config.json b/conf/docker-config.json
@@ -42,5 +42,6 @@
   "salts_expired_shutdown_hours": 12,
   "operator_type": "public",
   "disable_optout_token": true,
-  "enable_remote_config": false
+  "enable_remote_config": false,
+  "uid_instance_id_prefix": "local-operator"
 }
diff --git a/conf/integ-config.json b/conf/integ-config.json
@@ -18,5 +18,6 @@
   "salts_expired_shutdown_hours": 12,
   "operator_type": "public",
   "disable_optout_token": true,
-  "enable_remote_config": false
+  "enable_remote_config": false,
+  "uid_instance_id_prefix": "local-operator"
 }
diff --git a/conf/local-config.json b/conf/local-config.json
@@ -41,5 +41,6 @@
   "operator_type": "public",
   "encrypted_files": false,
   "disable_optout_token": true,
-  "enable_remote_config": false
+  "enable_remote_config": false,
+  "uid_instance_id_prefix": "local-operator"
 }
diff --git a/conf/local-e2e-docker-private-config.json b/conf/local-e2e-docker-private-config.json
@@ -31,5 +31,6 @@
   "cloud_refresh_interval": 30,
   "salts_expired_shutdown_hours": 12,
   "operator_type": "private",
-  "enable_remote_config": false
+  "enable_remote_config": false,
+  "uid_instance_id_prefix": "local-private-operator"
 }
diff --git a/conf/local-e2e-docker-public-config.json b/conf/local-e2e-docker-public-config.json
@@ -38,5 +38,6 @@
   "salts_expired_shutdown_hours": 12,
   "operator_type": "public",
   "disable_optout_token": true,
-  "enable_remote_config": false
+  "enable_remote_config": false,
+  "uid_instance_id_prefix": "local-public-operator"
 }
diff --git a/conf/local-e2e-private-config.json b/conf/local-e2e-private-config.json
@@ -42,5 +42,6 @@
   "client_side_token_generate_log_invalid_http_origins": true,
   "salts_expired_shutdown_hours": 12,
   "operator_type": "private",
-  "enable_remote_config": false
+  "enable_remote_config": false,
+  "uid_instance_id_prefix": "local-private-operator"
 }
diff --git a/conf/local-e2e-public-config.json b/conf/local-e2e-public-config.json
@@ -44,5 +44,6 @@
   "salts_expired_shutdown_hours": 12,
   "operator_type": "public",
   "disable_optout_token": true,
-  "enable_remote_config": false
+  "enable_remote_config": false,
+  "uid_instance_id_prefix": "local-public-operator"
 }
diff --git a/conf/validator-latest-e2e-docker-public-config.json b/conf/validator-latest-e2e-docker-public-config.json
@@ -43,5 +43,6 @@
     "config_scan_period_ms": 300000
   },
   "disable_optout_token": true,
-  "enable_remote_config": false
+  "enable_remote_config": false,
+  "uid_instance_id_prefix": "local-public-operator"
 }
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
         <enclave-aws.version>2.1.0</enclave-aws.version>
         <enclave-azure.version>2.1.13</enclave-azure.version>
         <enclave-gcp.version>2.1.0</enclave-gcp.version>
-        <uid2-shared.version>9.4.14</uid2-shared.version>
+        <uid2-shared.version>10.0.0</uid2-shared.version>
         <image.version>${project.version}</image.version>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
diff --git a/src/main/java/com/uid2/operator/Main.java b/src/main/java/com/uid2/operator/Main.java
@@ -18,6 +18,7 @@
 import com.uid2.shared.ApplicationVersion;
 import com.uid2.shared.Utils;
 import com.uid2.shared.attest.*;
+import com.uid2.shared.audit.UidInstanceIdProvider;
 import com.uid2.shared.cloud.*;
 import com.uid2.shared.jmx.AdminApi;
 import com.uid2.shared.optout.OptOutCloudSync;
@@ -90,6 +91,7 @@ public class Main {
     private RotatingServiceStore serviceProvider;
     private RotatingServiceLinkStore serviceLinkProvider;
     private RotatingCloudEncryptionKeyApiProvider cloudEncryptionKeyProvider;
+    private final UidInstanceIdProvider uidInstanceIdProvider;
 
     public Main(Vertx vertx, JsonObject config) throws Exception {
         this.vertx = vertx;
@@ -111,6 +113,7 @@ public Main(Vertx vertx, JsonObject config) throws Exception {
         this.validateServiceLinks = config.getBoolean(Const.Config.ValidateServiceLinks, false);
         this.encryptedCloudFilesEnabled = config.getBoolean(Const.Config.EncryptedFiles, false);
         this.shutdownHandler = new OperatorShutdownHandler(Duration.ofHours(12), Duration.ofHours(config.getInteger(Const.Config.SaltsExpiredShutdownHours, 12)), Clock.systemUTC(), new ShutdownService());
+        this.uidInstanceIdProvider = new UidInstanceIdProvider(config);
 
         String coreAttestUrl = this.config.getString(Const.Config.CoreAttestUrlProp);
 
@@ -325,7 +328,7 @@ private void run() throws Exception {
         this.createVertxEventLoopsMetric();
 
         Supplier<Verticle> operatorVerticleSupplier = () -> {
-            UIDOperatorVerticle verticle = new UIDOperatorVerticle(configStore, config, this.clientSideTokenGenerate, siteProvider, clientKeyProvider, clientSideKeypairProvider, getKeyManager(), saltProvider, optOutStore, Clock.systemUTC(), _statsCollectorQueue, new SecureLinkValidatorService(this.serviceLinkProvider, this.serviceProvider), this.shutdownHandler::handleSaltRetrievalResponse);
+            UIDOperatorVerticle verticle = new UIDOperatorVerticle(configStore, config, this.clientSideTokenGenerate, siteProvider, clientKeyProvider, clientSideKeypairProvider, getKeyManager(), saltProvider, optOutStore, Clock.systemUTC(), _statsCollectorQueue, new SecureLinkValidatorService(this.serviceLinkProvider, this.serviceProvider), this.shutdownHandler::handleSaltRetrievalResponse, this.uidInstanceIdProvider);
             return verticle;
         };
 
@@ -544,8 +547,8 @@ private void createVertxEventLoopsMetric() {
 
     private Map.Entry<UidCoreClient, UidOptOutClient> createUidClients(Vertx vertx, String attestationUrl, String clientApiToken, Handler<Pair<AttestationResponseCode, String>> responseWatcher) throws Exception {
         AttestationResponseHandler attestationResponseHandler = getAttestationTokenRetriever(vertx, attestationUrl, clientApiToken, responseWatcher);
-        UidCoreClient coreClient = new UidCoreClient(clientApiToken, CloudUtils.defaultProxy, attestationResponseHandler, this.encryptedCloudFilesEnabled);
-        UidOptOutClient optOutClient = new UidOptOutClient(clientApiToken, CloudUtils.defaultProxy, attestationResponseHandler);
+        UidCoreClient coreClient = new UidCoreClient(clientApiToken, CloudUtils.defaultProxy, attestationResponseHandler, this.encryptedCloudFilesEnabled, this.uidInstanceIdProvider);
+        UidOptOutClient optOutClient = new UidOptOutClient(clientApiToken, CloudUtils.defaultProxy, attestationResponseHandler, this.uidInstanceIdProvider);
         return new AbstractMap.SimpleEntry<>(coreClient, optOutClient);
     }
 
@@ -581,7 +584,7 @@ private AttestationResponseHandler getAttestationTokenRetriever(Vertx vertx, Str
                 throw new IllegalArgumentException(String.format("enclave_platform is providing the wrong value: %s", enclavePlatform));
         }
 
-        return new AttestationResponseHandler(vertx, attestationUrl, clientApiToken, operatorType, this.appVersion, attestationProvider, responseWatcher, CloudUtils.defaultProxy);
+        return new AttestationResponseHandler(vertx, attestationUrl, clientApiToken, operatorType, this.appVersion, attestationProvider, responseWatcher, CloudUtils.defaultProxy, this.uidInstanceIdProvider);
     }
 
     private IOperatorKeyRetriever createOperatorKeyRetriever() throws Exception {
diff --git a/src/main/java/com/uid2/operator/service/IUIDOperatorService.java b/src/main/java/com/uid2/operator/service/IUIDOperatorService.java
@@ -22,7 +22,7 @@ public interface IUIDOperatorService {
 
     List<SaltEntry> getModifiedBuckets(Instant sinceTimestamp);
 
-    void invalidateTokensAsync(UserIdentity userIdentity, Instant asOf, Handler<AsyncResult<Instant>> handler);
+    void invalidateTokensAsync(UserIdentity userIdentity, Instant asOf, String uidTraceId, Handler<AsyncResult<Instant>> handler);
 
     boolean advertisingTokenMatches(String advertisingToken, UserIdentity userIdentity, Instant asOf);
 
diff --git a/src/main/java/com/uid2/operator/service/UIDOperatorService.java b/src/main/java/com/uid2/operator/service/UIDOperatorService.java
@@ -2,6 +2,7 @@
 
 import com.uid2.operator.model.*;
 import com.uid2.operator.util.PrivacyBits;
+import com.uid2.shared.audit.UidInstanceIdProvider;
 import com.uid2.shared.model.SaltEntry;
 import com.uid2.operator.store.IOptOutStore;
 import com.uid2.shared.store.salt.ISaltProvider;
@@ -50,15 +51,17 @@ public class UIDOperatorService implements IUIDOperatorService {
     private final boolean rawUidV3Enabled;
 
     private final Handler<Boolean> saltRetrievalResponseHandler;
+    private final UidInstanceIdProvider uidInstanceIdProvider;
 
     public UIDOperatorService(IOptOutStore optOutStore, ISaltProvider saltProvider, ITokenEncoder encoder, Clock clock,
-                              IdentityScope identityScope, Handler<Boolean> saltRetrievalResponseHandler, boolean identityV3Enabled) {
+                              IdentityScope identityScope, Handler<Boolean> saltRetrievalResponseHandler, boolean identityV3Enabled, UidInstanceIdProvider uidInstanceIdProvider) {
         this.saltProvider = saltProvider;
         this.encoder = encoder;
         this.optOutStore = optOutStore;
         this.clock = clock;
         this.identityScope = identityScope;
         this.saltRetrievalResponseHandler = saltRetrievalResponseHandler;
+        this.uidInstanceIdProvider = uidInstanceIdProvider;
 
         this.testOptOutIdentityForEmail = getFirstLevelHashIdentity(identityScope, IdentityType.Email,
                 InputUtil.normalizeEmail(OptOutIdentityForEmail).getIdentityInput(), Instant.now());
@@ -180,11 +183,11 @@ private ISaltProvider.ISaltSnapshot getSaltProviderSnapshot(Instant asOf) {
     }
 
     @Override
-    public void invalidateTokensAsync(UserIdentity userIdentity, Instant asOf, Handler<AsyncResult<Instant>> handler) {
+    public void invalidateTokensAsync(UserIdentity userIdentity, Instant asOf, String uidTraceId, Handler<AsyncResult<Instant>> handler) {
         final UserIdentity firstLevelHashIdentity = getFirstLevelHashIdentity(userIdentity, asOf);
         final MappedIdentity mappedIdentity = getMappedIdentity(firstLevelHashIdentity, asOf);
 
-        this.optOutStore.addEntry(firstLevelHashIdentity, mappedIdentity.advertisingId, r -> {
+        this.optOutStore.addEntry(firstLevelHashIdentity, mappedIdentity.advertisingId, uidTraceId, this.uidInstanceIdProvider.getInstanceId(), r -> {
             if (r.succeeded()) {
                 handler.handle(Future.succeededFuture(r.result()));
             } else {
diff --git a/src/main/java/com/uid2/operator/store/CloudSyncOptOutStore.java b/src/main/java/com/uid2/operator/store/CloudSyncOptOutStore.java
@@ -7,6 +7,7 @@
 import com.uid2.operator.model.UserIdentity;
 import com.uid2.operator.service.EncodingUtils;
 import com.uid2.shared.Utils;
+import com.uid2.shared.audit.Audit;
 import com.uid2.shared.cloud.CloudStorageException;
 import com.uid2.shared.cloud.DownloadCloudStorage;
 import com.uid2.shared.cloud.ICloudStorage;
@@ -19,6 +20,7 @@
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
 import io.vertx.core.json.JsonObject;
+import io.vertx.ext.web.client.HttpRequest;
 import io.vertx.ext.web.client.HttpResponse;
 import io.vertx.ext.web.client.WebClient;
 import io.vertx.ext.web.codec.BodyCodec;
@@ -86,32 +88,38 @@ public long getOptOutTimestampByAdId(String adId) {
     }
 
     @Override
-    public void addEntry(UserIdentity firstLevelHashIdentity, byte[] advertisingId, Handler<AsyncResult<Instant>> handler) {
+    public void addEntry(UserIdentity firstLevelHashIdentity, byte[] advertisingId, String uidTraceId, String uidInstanceId, Handler<AsyncResult<Instant>> handler) {
         if (remoteApiHost == null) {
             handler.handle(Future.failedFuture("remote api not set"));
             return;
         }
 
-        this.webClient.get(remoteApiPort, remoteApiHost, remoteApiPath).
+        HttpRequest<String> request =this.webClient.get(remoteApiPort, remoteApiHost, remoteApiPath).
             addQueryParam("identity_hash", EncodingUtils.toBase64String(firstLevelHashIdentity.id))
             .addQueryParam("advertising_id", EncodingUtils.toBase64String(advertisingId))
             .putHeader("Authorization", remoteApiBearerToken)
-            .as(BodyCodec.string())
-            .send(ar -> {
-                Exception failure = null;
-                if (ar.failed()) {
-                    failure = new Exception(ar.cause());
-                } else if (ar.result().statusCode() != 200) {
-                    failure = new Exception("optout api http status: " + String.valueOf(ar.result().statusCode()));
-                }
+            .putHeader(Audit.UID_INSTANCE_ID_HEADER, uidInstanceId)
+            .as(BodyCodec.string());
 
-                if (failure == null) {
-                    handler.handle(Future.succeededFuture(Utils.nowUTCMillis()));
-                } else {
-                    LOGGER.error("CloudSyncOptOutStore.addEntry remote web request failed", failure);
-                    handler.handle(Future.failedFuture(failure));
-                }
-            });
+        if (uidTraceId != null) {
+            request = request.putHeader(Audit.UID_TRACE_ID_HEADER, uidTraceId);
+        }
+
+        request.send(ar -> {
+            Exception failure = null;
+            if (ar.failed()) {
+                failure = new Exception(ar.cause());
+            } else if (ar.result().statusCode() != 200) {
+                failure = new Exception("optout api http status: " + String.valueOf(ar.result().statusCode()));
+            }
+
+            if (failure == null) {
+                handler.handle(Future.succeededFuture(Utils.nowUTCMillis()));
+            } else {
+                LOGGER.error("CloudSyncOptOutStore.addEntry remote web request failed", failure);
+                handler.handle(Future.failedFuture(failure));
+            }
+        });
     }
 
     public void registerCloudSync(OptOutCloudSync cloudSync) {
diff --git a/src/main/java/com/uid2/operator/store/IOptOutStore.java b/src/main/java/com/uid2/operator/store/IOptOutStore.java
@@ -17,5 +17,5 @@ public interface IOptOutStore {
 
     long getOptOutTimestampByAdId(String adId);
 
-    void addEntry(UserIdentity firstLevelHashIdentity, byte[] advertisingId, Handler<AsyncResult<Instant>> handler);
+    void addEntry(UserIdentity firstLevelHashIdentity, byte[] advertisingId, String uidTraceId, String uidInstanceId, Handler<AsyncResult<Instant>> handler);
 }
diff --git a/src/main/java/com/uid2/operator/vertx/UIDOperatorVerticle.java b/src/main/java/com/uid2/operator/vertx/UIDOperatorVerticle.java
@@ -21,6 +21,8 @@
 import com.uid2.operator.util.Tuple;
 import com.uid2.shared.Const.Data;
 import com.uid2.shared.Utils;
+import com.uid2.shared.audit.Audit;
+import com.uid2.shared.audit.UidInstanceIdProvider;
 import com.uid2.shared.auth.*;
 import com.uid2.shared.encryption.AesGcm;
 import com.uid2.shared.health.HealthComponent;
@@ -105,6 +107,7 @@ public class UIDOperatorVerticle extends AbstractVerticle {
     private final boolean allowLegacyAPI;
     private final boolean identityV3Enabled;
     private final boolean disableOptoutToken;
+    private final UidInstanceIdProvider uidInstanceIdProvider;
     protected IUIDOperatorService idService;
     private final Map<String, DistributionSummary> _identityMapMetricSummaries = new HashMap<>();
     private final Map<Tuple.Tuple2<String, Boolean>, DistributionSummary> _refreshDurationMetricSummaries = new HashMap<>();
@@ -161,7 +164,8 @@ public UIDOperatorVerticle(IConfigStore configStore,
                                Clock clock,
                                IStatsCollectorQueue statsCollectorQueue,
                                SecureLinkValidatorService secureLinkValidatorService,
-                               Handler<Boolean> saltRetrievalResponseHandler) {
+                               Handler<Boolean> saltRetrievalResponseHandler,
+                               UidInstanceIdProvider uidInstanceIdProvider) {
         this.keyManager = keyManager;
         this.secureLinkValidatorService = secureLinkValidatorService;
         try {
@@ -195,6 +199,7 @@ public UIDOperatorVerticle(IConfigStore configStore,
         this.allowLegacyAPI = config.getBoolean(Const.Config.AllowLegacyAPIProp, false);
         this.identityV3Enabled = config.getBoolean(IdentityV3Prop, false);
         this.disableOptoutToken = config.getBoolean(DisableOptoutTokenProp, false);
+        this.uidInstanceIdProvider = uidInstanceIdProvider;
     }
 
     @Override
@@ -207,7 +212,8 @@ public void start(Promise<Void> startPromise) throws Exception {
                 this.clock,
                 this.identityScope,
                 this.saltRetrievalResponseHandler,
-                this.identityV3Enabled
+                this.identityV3Enabled,
+                this.uidInstanceIdProvider
         );
 
         final Router router = createRoutesSetup();
@@ -1214,9 +1220,10 @@ private void handleValidate(RoutingContext rc) {
 
     private void handleLogoutAsync(RoutingContext rc) {
         final InputUtil.InputVal input = this.phoneSupport ? getTokenInputV1(rc) : getTokenInput(rc);
+        final String uidTraceId = rc.request().getHeader(Audit.UID_TRACE_ID_HEADER);
         if (input.isValid()) {
             final Instant now = Instant.now();
-            this.idService.invalidateTokensAsync(input.toUserIdentity(this.identityScope, 0, now), now, ar -> {
+            this.idService.invalidateTokensAsync(input.toUserIdentity(this.identityScope, 0, now), now, uidTraceId, ar -> {
                 if (ar.succeeded()) {
                     rc.response().end("OK");
                 } else {
@@ -1231,11 +1238,12 @@ private void handleLogoutAsync(RoutingContext rc) {
     private Future handleLogoutAsyncV2(RoutingContext rc) {
         final JsonObject req = (JsonObject) rc.data().get("request");
         final InputUtil.InputVal input = getTokenInputV2(req);
+        final String uidTraceId = rc.request().getHeader(Audit.UID_TRACE_ID_HEADER);
         if (input.isValid()) {
             final Instant now = Instant.now();
 
             Promise promise = Promise.promise();
-            this.idService.invalidateTokensAsync(input.toUserIdentity(this.identityScope, 0, now), now, ar -> {
+            this.idService.invalidateTokensAsync(input.toUserIdentity(this.identityScope, 0, now), now, uidTraceId, ar -> {
                 if (ar.succeeded()) {
                     JsonObject body = new JsonObject();
                     body.put("optout", "OK");
diff --git a/src/test/java/com/uid2/operator/ExtendedUIDOperatorVerticle.java b/src/test/java/com/uid2/operator/ExtendedUIDOperatorVerticle.java
@@ -7,6 +7,7 @@
 import com.uid2.operator.store.IConfigStore;
 import com.uid2.operator.store.IOptOutStore;
 import com.uid2.operator.vertx.UIDOperatorVerticle;
+import com.uid2.shared.audit.UidInstanceIdProvider;
 import com.uid2.shared.store.*;
 import com.uid2.shared.store.salt.ISaltProvider;
 import io.vertx.core.Handler;
@@ -31,8 +32,9 @@ public ExtendedUIDOperatorVerticle(IConfigStore configStore,
                                        Clock clock,
                                        IStatsCollectorQueue statsCollectorQueue,
                                        SecureLinkValidatorService secureLinkValidationService,
-                                       Handler<Boolean> saltRetrievalResponseHandler) {
-        super(configStore, config, clientSideTokenGenerate, siteProvider, clientKeyProvider, clientSideKeypairProvider, keyManager, saltProvider, optOutStore, clock, statsCollectorQueue, secureLinkValidationService, saltRetrievalResponseHandler);
+                                       Handler<Boolean> saltRetrievalResponseHandler,
+                                       UidInstanceIdProvider uidInstanceIdProvider) {
+        super(configStore, config, clientSideTokenGenerate, siteProvider, clientKeyProvider, clientSideKeypairProvider, keyManager, saltProvider, optOutStore, clock, statsCollectorQueue, secureLinkValidationService, saltRetrievalResponseHandler, uidInstanceIdProvider);
     }
 
     public IUIDOperatorService getIdService() {
diff --git a/src/test/java/com/uid2/operator/UIDOperatorServiceTest.java b/src/test/java/com/uid2/operator/UIDOperatorServiceTest.java
diff --git a/src/test/java/com/uid2/operator/UIDOperatorVerticleTest.java b/src/test/java/com/uid2/operator/UIDOperatorVerticleTest.java
diff --git a/src/test/java/com/uid2/operator/benchmark/BenchmarkCommon.java b/src/test/java/com/uid2/operator/benchmark/BenchmarkCommon.java

Original file line number	Diff line number	Diff line change
`@@ -38,5 +38,6 @@`
`38`	`38`	`"failure_shutdown_wait_hours": 120,`
`39`	`39`	`"sharing_token_expiry_seconds": 2592000,`
`40`	`40`	`"operator_type": "public",`
`41`		`- "enable_remote_config": false`
	`41`	`+ "enable_remote_config": false,`
	`42`	`+ "uid_instance_id_prefix": "local-operator"`
`42`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,5 +42,6 @@`
`42`	`42`	`"salts_expired_shutdown_hours": 12,`
`43`	`43`	`"operator_type": "public",`
`44`	`44`	`"disable_optout_token": true,`
`45`		`- "enable_remote_config": false`
	`45`	`+ "enable_remote_config": false,`
	`46`	`+ "uid_instance_id_prefix": "local-operator"`
`46`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,6 @@`
`18`	`18`	`"salts_expired_shutdown_hours": 12,`
`19`	`19`	`"operator_type": "public",`
`20`	`20`	`"disable_optout_token": true,`
`21`		`- "enable_remote_config": false`
	`21`	`+ "enable_remote_config": false,`
	`22`	`+ "uid_instance_id_prefix": "local-operator"`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,6 @@`
`41`	`41`	`"operator_type": "public",`
`42`	`42`	`"encrypted_files": false,`
`43`	`43`	`"disable_optout_token": true,`
`44`		`- "enable_remote_config": false`
	`44`	`+ "enable_remote_config": false,`
	`45`	`+ "uid_instance_id_prefix": "local-operator"`
`45`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,6 @@`
`31`	`31`	`"cloud_refresh_interval": 30,`
`32`	`32`	`"salts_expired_shutdown_hours": 12,`
`33`	`33`	`"operator_type": "private",`
`34`		`- "enable_remote_config": false`
	`34`	`+ "enable_remote_config": false,`
	`35`	`+ "uid_instance_id_prefix": "local-private-operator"`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,5 +44,6 @@`
`44`	`44`	`"salts_expired_shutdown_hours": 12,`
`45`	`45`	`"operator_type": "public",`
`46`	`46`	`"disable_optout_token": true,`
`47`		`- "enable_remote_config": false`
	`47`	`+ "enable_remote_config": false,`
	`48`	`+ "uid_instance_id_prefix": "local-public-operator"`
`48`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,5 +43,6 @@`
`43`	`43`	`"config_scan_period_ms": 300000`
`44`	`44`	`},`
`45`	`45`	`"disable_optout_token": true,`
`46`		`- "enable_remote_config": false`
	`46`	`+ "enable_remote_config": false,`
	`47`	`+ "uid_instance_id_prefix": "local-public-operator"`
`47`	`48`	`}`