code cleanup - skip eSTS telemetry

siddhijain · siddhijain · commit f80390ad3970 · 2026-01-20T11:22:25.000-06:00
diff --git a/common/src/androidTest/java/com/microsoft/identity/common/CommandDispatcherTest.java b/common/src/androidTest/java/com/microsoft/identity/common/CommandDispatcherTest.java
@@ -747,11 +747,6 @@ public ExceptionCommand(@NonNull final CommandParameters parameters,
         public String execute() {
             throw new RuntimeException("An unexpected exception!");
         }
-
-        @Override
-        public boolean isEligibleForEstsTelemetry() {
-            return false;
-        }
     }
 
     static class CommandThrowingIErrorInformationException extends BaseCommand<String> {
@@ -767,11 +762,6 @@ public CommandThrowingIErrorInformationException(@NonNull final CommandParameter
         public String execute() {
             throw new TerminalException("An unexpected exception!", new Exception("Exception"), mErrorCode);
         }
-
-        @Override
-        public boolean isEligibleForEstsTelemetry() {
-            return false;
-        }
     }
 
 
@@ -794,11 +784,6 @@ public boolean isEligibleForCaching() {
             return true;
         }
 
-        @Override
-        public boolean isEligibleForEstsTelemetry() {
-            return false;
-        }
-
         @Override
         public boolean equals(Object o) {
             if (this == o) return true;
@@ -892,11 +877,6 @@ public AcquireTokenResult execute() {
             return result;
         }
 
-        @Override
-        public boolean isEligibleForEstsTelemetry() {
-            return false;
-        }
-
         @Override
         public boolean equals(Object o) {
             if (this == o) return true;
@@ -919,11 +899,6 @@ public Object execute() throws Exception {
             Thread.sleep(10000);
             return null;
         }
-
-        @Override
-        public boolean isEligibleForEstsTelemetry() {
-            return false;
-        }
     }
     private static BaseController getTestController() {
         return new TestBaseController() {
diff --git a/common/src/main/java/com/microsoft/identity/common/internal/commands/Command.java b/common/src/main/java/com/microsoft/identity/common/internal/commands/Command.java
@@ -27,8 +27,6 @@
 public interface Command<T> {
     T execute() throws Exception;
 
-    boolean isEligibleForEstsTelemetry();
-
     BaseController getDefaultController();
 
     boolean isEligibleForCaching();
diff --git a/common/src/main/java/com/microsoft/identity/common/internal/commands/GenerateShrCommand.java b/common/src/main/java/com/microsoft/identity/common/internal/commands/GenerateShrCommand.java
@@ -123,10 +123,4 @@ public GenerateShrResult execute() throws Exception {
 
         return result;
     }
-
-    @Override
-    public boolean isEligibleForEstsTelemetry() {
-        // There is no web service interaction in this flow.
-        return false;
-    }
 }
diff --git a/common/src/main/java/com/microsoft/identity/common/internal/commands/GetCurrentAccountCommand.java b/common/src/main/java/com/microsoft/identity/common/internal/commands/GetCurrentAccountCommand.java
@@ -73,9 +73,4 @@ public List<ICacheRecord> execute() throws Exception {
 
         return result;
     }
-
-    @Override
-    public boolean isEligibleForEstsTelemetry() {
-        return true;
-    }
 }
diff --git a/common/src/main/java/com/microsoft/identity/common/internal/commands/GetDeviceModeCommand.java b/common/src/main/java/com/microsoft/identity/common/internal/commands/GetDeviceModeCommand.java
@@ -53,9 +53,4 @@ public GetDeviceModeCommand(@NonNull CommandParameters parameters,
     public Boolean execute() throws Exception {
         return getControllerFactory().getDefaultController().getDeviceMode(getParameters());
     }
-
-    @Override
-    public boolean isEligibleForEstsTelemetry() {
-        return false;
-    }
 }
diff --git a/common/src/main/java/com/microsoft/identity/common/internal/commands/GetPreferredAuthMethodFromAuthenticator.kt b/common/src/main/java/com/microsoft/identity/common/internal/commands/GetPreferredAuthMethodFromAuthenticator.kt
@@ -44,8 +44,4 @@ class GetPreferredAuthMethodFromAuthenticator(
     override fun execute(): PreferredAuthMethod {
         return controllerFactory.getDefaultController().preferredAuthMethod
     }
-
-    override fun isEligibleForEstsTelemetry(): Boolean {
-        return false
-    }
 }
diff --git a/common/src/main/java/com/microsoft/identity/common/internal/commands/LoadAccountCommand.java b/common/src/main/java/com/microsoft/identity/common/internal/commands/LoadAccountCommand.java
@@ -73,9 +73,4 @@ public List<ICacheRecord> execute() throws Exception {
 
         return result;
     }
-
-    @Override
-    public boolean isEligibleForEstsTelemetry() {
-        return true;
-    }
 }
diff --git a/common/src/main/java/com/microsoft/identity/common/internal/commands/RefreshOnCommand.java b/common/src/main/java/com/microsoft/identity/common/internal/commands/RefreshOnCommand.java
@@ -69,11 +69,6 @@ public VoidResult execute() throws IOException, ClientException, ServiceExceptio
         return new VoidResult();
     }
 
-    @Override
-    public boolean isEligibleForEstsTelemetry() {
-        return false;
-    }
-
     @Override
     public boolean isEligibleForCaching() {
         return false;
diff --git a/common/src/main/java/com/microsoft/identity/common/internal/commands/RemoveAccountCommand.java b/common/src/main/java/com/microsoft/identity/common/internal/commands/RemoveAccountCommand.java
@@ -71,9 +71,4 @@ public Boolean execute() throws Exception {
 
         return result;
     }
-
-    @Override
-    public boolean isEligibleForEstsTelemetry() {
-        return true;
-    }
 }
diff --git a/common/src/main/java/com/microsoft/identity/common/internal/commands/RemoveCurrentAccountCommand.java b/common/src/main/java/com/microsoft/identity/common/internal/commands/RemoveCurrentAccountCommand.java
@@ -72,9 +72,4 @@ public Boolean execute() throws Exception {
 
         return false;
     }
-
-    @Override
-    public boolean isEligibleForEstsTelemetry() {
-        return true;
-    }
 }
diff --git a/common/src/main/java/com/microsoft/identity/common/nativeauth/internal/commands/BaseNativeAuthCommand.kt b/common/src/main/java/com/microsoft/identity/common/nativeauth/internal/commands/BaseNativeAuthCommand.kt
@@ -63,8 +63,4 @@ abstract class BaseNativeAuthCommand<T>(
     override fun willReachTokenEndpoint(): Boolean {
         return false
     }
-
-    override fun isEligibleForEstsTelemetry(): Boolean {
-        return true
-    }
 }
diff --git a/common4j/src/main/com/microsoft/identity/common/java/commands/DeviceCodeFlowAuthResultCommand.java b/common4j/src/main/com/microsoft/identity/common/java/commands/DeviceCodeFlowAuthResultCommand.java
@@ -119,9 +119,4 @@ public AuthorizationResult execute() throws Exception {
             span.end();
         }
     }
-
-    @Override
-    public boolean isEligibleForEstsTelemetry() {
-        return true;
-    }
 }
diff --git a/common4j/src/main/com/microsoft/identity/common/java/commands/DeviceCodeFlowCommand.java b/common4j/src/main/com/microsoft/identity/common/java/commands/DeviceCodeFlowCommand.java
@@ -145,9 +145,4 @@ public AcquireTokenResult execute() throws Exception {
             span.end();
         }
     }
-
-    @Override
-    public boolean isEligibleForEstsTelemetry() {
-        return true;
-    }
 }
diff --git a/common4j/src/main/com/microsoft/identity/common/java/commands/DeviceCodeFlowTokenResultCommand.java b/common4j/src/main/com/microsoft/identity/common/java/commands/DeviceCodeFlowTokenResultCommand.java
@@ -114,9 +114,4 @@ public AcquireTokenResult execute() throws Exception {
             span.end();
         }
     }
-
-    @Override
-    public boolean isEligibleForEstsTelemetry() {
-        return true;
-    }
 }
diff --git a/common4j/src/main/com/microsoft/identity/common/java/commands/ICommand.java b/common4j/src/main/com/microsoft/identity/common/java/commands/ICommand.java
@@ -32,11 +32,6 @@ public interface ICommand<T> {
      */
     T execute() throws Exception;
 
-    /**
-     * Returns true if this command should be sent with ESTS Telemetry.
-     */
-    boolean isEligibleForEstsTelemetry();
-
     /**
      * Returns a correlation ID associated to the command.
      */
diff --git a/common4j/src/main/com/microsoft/identity/common/java/commands/InteractiveTokenCommand.java b/common4j/src/main/com/microsoft/identity/common/java/commands/InteractiveTokenCommand.java
@@ -109,9 +109,4 @@ public void onFinishAuthorizationSession(int requestCode,
                                              @NonNull final PropertyBag data) {
         mController.onFinishAuthorizationSession(requestCode, resultCode, data);
     }
-
-    @Override
-    public boolean isEligibleForEstsTelemetry() {
-        return true;
-    }
 }
diff --git a/common4j/src/main/com/microsoft/identity/common/java/commands/RopcTokenCommand.java b/common4j/src/main/com/microsoft/identity/common/java/commands/RopcTokenCommand.java
@@ -67,11 +67,6 @@ public AcquireTokenResult execute() throws Exception {
         }
     }
 
-    @Override
-    public boolean isEligibleForEstsTelemetry() {
-        return false;
-    }
-
     @Override
     public boolean isEligibleForCaching() {
         return true;
diff --git a/common4j/src/main/com/microsoft/identity/common/java/commands/SilentTokenCommand.java b/common4j/src/main/com/microsoft/identity/common/java/commands/SilentTokenCommand.java
@@ -158,10 +158,4 @@ public boolean isEligibleForCaching() {
         }
         return true;
     }
-
-    @Override
-    public boolean isEligibleForEstsTelemetry() {
-        return true;
-    }
-
 }
diff --git a/common4j/src/main/com/microsoft/identity/common/java/controllers/CommandDispatcher.java b/common4j/src/main/com/microsoft/identity/common/java/controllers/CommandDispatcher.java
@@ -364,15 +364,8 @@ public void run() {
 
                         initTelemetryForCommand(command);
 
-                        EstsTelemetry.getInstance().emitApiId(command.getPublicApiId());
-
                         CommandResult<?> commandResult = null;
 
-                        //Log operation parameters
-                        if (command.getParameters() instanceof SilentTokenCommandParameters) {
-                            EstsTelemetry.getInstance().emitForceRefresh(((SilentTokenCommandParameters) command.getParameters()).isForceRefresh());
-                        }
-
                         codeMarkerManager.markCode(isDeviceCodeFlowRequest ? ACQUIRE_TOKEN_DCF_COMMAND_EXECUTION_START : ACQUIRE_TOKEN_SILENT_COMMAND_EXECUTION_START);
                         try {
                             commandResult = executeCommand(command);
@@ -383,7 +376,6 @@ public void run() {
                                 + correlationId + ", with the status : " + commandResult.getStatus().getLogStatus()
                                 + " is cacheable : " + command.isEligibleForCaching());
                         // TODO 1309671 : change required to stop the LocalAuthenticationResult object from mutating in cases of cached command.
-                        EstsTelemetry.getInstance().flush(command, commandResult);
                         finalFuture.setResult(commandResult);
                     } catch (final Throwable t) {
                         Logger.info(TAG + methodName, "Request encountered an exception with correlation id : **" + correlationId);
@@ -448,14 +440,11 @@ public void run() {
                         initializeDiagnosticContext(correlationId, commandParameters.getSdkType() == null ?
                                         SdkType.UNKNOWN.getProductName() : commandParameters.getSdkType().getProductName(),
                                 commandParameters.getSdkVersion());
-                        EstsTelemetry.getInstance().initTelemetryForCommand(command);
-                        EstsTelemetry.getInstance().emitApiId(command.getPublicApiId());
 
                         CommandResult commandResult = executeCommand(command);
                         Logger.info(TAG + methodName, "Completed as owner for correlation id : **"
                                 + correlationId + statusMsg(commandResult.getStatus().getLogStatus())
                                 + " is cacheable : " + command.isEligibleForCaching());
-                        EstsTelemetry.getInstance().flush(command, commandResult);
                         finalFuture.setResult(commandResult);
                     } catch (final Throwable t) {
                         Logger.info(TAG + methodName, "Request encountered an exception with correlation id : **" + correlationId);
@@ -470,12 +459,6 @@ public void run() {
         }
     }
 
-    private static void initTelemetryForCommand(@NonNull final BaseCommand<?> command) {
-        EstsTelemetry.getInstance().setUp(
-                command.getParameters().getPlatformComponents());
-        EstsTelemetry.getInstance().initTelemetryForCommand(command);
-    }
-
     private static void logParameters(@NonNull String tag, @NonNull String correlationId,
                                       @NonNull CommandParameters parameters,
                                       @Nullable String publicApiId) {
@@ -759,10 +742,6 @@ public void run() {
 
                             logParameters(TAG + methodName, correlationId, commandParameters, command.getPublicApiId());
 
-                            initTelemetryForCommand(command);
-
-                            EstsTelemetry.getInstance().emitApiId(command.getPublicApiId());
-
                             final BaseException[] receiverException = new BaseException[1];
 
                             final LocalBroadcaster.IReceiverCallback resultReceiver = new LocalBroadcaster.IReceiverCallback() {
diff --git a/common4j/src/main/com/microsoft/identity/common/java/eststelemetry/EstsTelemetry.java b/common4j/src/main/com/microsoft/identity/common/java/eststelemetry/EstsTelemetry.java
diff --git a/common4j/src/main/com/microsoft/identity/common/java/flighting/CommonFlight.java b/common4j/src/main/com/microsoft/identity/common/java/flighting/CommonFlight.java
diff --git a/common4j/src/main/com/microsoft/identity/common/java/opentelemetry/AttributeName.java b/common4j/src/main/com/microsoft/identity/common/java/opentelemetry/AttributeName.java
diff --git a/common4j/src/test/com/microsoft/identity/common/java/eststelemetry/EstsTelemetryTest.java b/common4j/src/test/com/microsoft/identity/common/java/eststelemetry/EstsTelemetryTest.java
diff --git a/common4j/src/test/com/microsoft/identity/common/java/eststelemetry/MockAuthenticationResult.java b/common4j/src/test/com/microsoft/identity/common/java/eststelemetry/MockAuthenticationResult.java
diff --git a/common4j/src/test/com/microsoft/identity/common/java/eststelemetry/MockCommand.java b/common4j/src/test/com/microsoft/identity/common/java/eststelemetry/MockCommand.java
diff --git a/common4j/src/test/com/microsoft/identity/common/java/eststelemetry/MockCommandResult.java b/common4j/src/test/com/microsoft/identity/common/java/eststelemetry/MockCommandResult.java

Original file line number	Diff line number	Diff line change
`@@ -123,10 +123,4 @@ public GenerateShrResult execute() throws Exception {`
`123`	`123`
`124`	`124`	`return result;`
`125`	`125`	`}`
`126`		`-`
`127`		`- @Override`
`128`		`- public boolean isEligibleForEstsTelemetry() {`
`129`		`- // There is no web service interaction in this flow.`
`130`		`- return false;`
`131`		`- }`
`132`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,4 @@ public List<ICacheRecord> execute() throws Exception {`
`73`	`73`
`74`	`74`	`return result;`
`75`	`75`	`}`
`76`		`-`
`77`		`- @Override`
`78`		`- public boolean isEligibleForEstsTelemetry() {`
`79`		`- return true;`
`80`		`- }`
`81`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,4 @@ public GetDeviceModeCommand(@NonNull CommandParameters parameters,`
`53`	`53`	`public Boolean execute() throws Exception {`
`54`	`54`	`return getControllerFactory().getDefaultController().getDeviceMode(getParameters());`
`55`	`55`	`}`
`56`		`-`
`57`		`- @Override`
`58`		`- public boolean isEligibleForEstsTelemetry() {`
`59`		`- return false;`
`60`		`- }`
`61`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,4 @@ class GetPreferredAuthMethodFromAuthenticator(`
`44`	`44`	`override fun execute(): PreferredAuthMethod {`
`45`	`45`	`return controllerFactory.getDefaultController().preferredAuthMethod`
`46`	`46`	`}`
`47`		`-`
`48`		`- override fun isEligibleForEstsTelemetry(): Boolean {`
`49`		`- return false`
`50`		`- }`
`51`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,4 @@ public Boolean execute() throws Exception {`
`71`	`71`
`72`	`72`	`return result;`
`73`	`73`	`}`
`74`		`-`
`75`		`- @Override`
`76`		`- public boolean isEligibleForEstsTelemetry() {`
`77`		`- return true;`
`78`		`- }`
`79`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,4 @@ public Boolean execute() throws Exception {`
`72`	`72`
`73`	`73`	`return false;`
`74`	`74`	`}`
`75`		`-`
`76`		`- @Override`
`77`		`- public boolean isEligibleForEstsTelemetry() {`
`78`		`- return true;`
`79`		`- }`
`80`	`75`	`}`