geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bschucha...@apache.org
Subject [geode] branch feature/GEODE-7358 updated (ee12299 -> 2556313)
Date Wed, 30 Oct 2019 15:55:34 GMT
This is an automated email from the ASF dual-hosted git repository.

bschuchardt pushed a change to branch feature/GEODE-7358
in repository https://gitbox.apache.org/repos/asf/geode.git.


 discard ee12299  fixing problems with durable client ids
 discard 38646da  picking up a change that IntelliJ didn't auto-save & fixing serializables test
 discard bf99c0c  fixing failing unit tests
 discard 02e8af4  fixing failing tests
    omit c84e9a8  GEODE-7358: Membership code should use InternalDistributedMember as the membership identifier
     add 9574591  GEODE-7171: Encapsulate metrics session (#4203)
     add bd03dc7  GEODE-7283: Store MethodAuthorizer in Context (#4179)
     add 30b35cd  GEODE-7360: Fix Flaky Cq Security Test (#4227)
     add 44183f6  Add 1.9.2 to old versions (#4221)
     add 4a413d9  GEODE-7357: Updating the documentation for member-timeout (#4224)
     add 090af9c  GEODE-7286: Reset _socketClosed AtomicBoolean when durable client reconnects
     add fcfe0ad  GEODE-7363: Add member type common tag
     add 9f50198  GEODE-7350: Do not suspect hydra.MasterDescription.master.locators={}
     add 7f29489  GEODE-7355: Refactored dependency on DistributionStats to use a Funct… (#4228)
     add 850f6d9  GEODE-7326: Add cache gets timers (#4223)
     add 078c0c3  GEODE-7365: increase DistributedTest timeout by 45m (to 3h) (#4231)
     add 8081dad  GEODE-7334: do not Jackson libraries from outside of the war file except Jackson annotations (#4225)
     add 5874bfc  GEODE-6973: The pdxRegion.size() should be called outside of TX context to avoid messaging. (#4233)
     add 000073d  GEODE-7375: Fix metrics test port allocation (#4248)
     add 2cb2c48  GEODE-7365: Increase AcceptanceTest timeout by 30m to 1h30m (#4249)
     add 7868cb6  GEODE-7361: sever ties to PoolStatHelper & CoreLoggingExecutors (#4238)
     add 52c9d9d  GEODE-7341: Provide a way to avoid memory lock if over committed (#4210)
     add 182de42  GEODE-7177: Changing packages in geode-logging (#4232)
     add d108246  GEODE-7367: Unignore Tomcat8WithOldModulesMixedWithCurrentCanDoPutFromCurrentModuleTest (#4241)
     add 156a7cb  GEODE-7367: Unignored Tomcat8WithOldModuleCanDoPutsTest (#4242)
     add a132259  GEODE-7367: Unignore TomcatSessionBackwardsCompatibilityTomcat7079WithOldModuleCanDoPutsTest
     add ca1a8b3  GEODE-7367: Unignore Tomcat7079WithOldModulesMixedWithCurrentCanDoPutFromCurrentModuleTest (#4244)
     add 4f0b4c0  GEODE-7367: Unignored Tomcat7079WithOldModulesMixedWithCurrentCanDoPutFromOldModuleTest
     add f6d7e85  GEODE-7367: Unignore  TomcatSessionBackwardsCompatibilityTomcat8WithOldModulesMixedWithCurrentCanDoPutFromOldModuleTest
     add d30e2e8  GEODE-7374: Fix class cast exception (#4247)
     add 87a54c2  GEODE-7358: Membership code should use InternalDistributedMember as the membership identifier
     add 2be698d  fixing failing tests
     add 2bd4620  fixing failing unit tests
     add 86be3f4  picking up a change that IntelliJ didn't auto-save & fixing serializables test
     add 2556313  fixing problems with durable client ids

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (ee12299)
            \
             N -- N -- N   refs/heads/feature/GEODE-7358 (2556313)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .../src/test/resources/expected-pom.xml            |  12 +
 .../gradle/plugins/DependencyConstraints.groovy    |   2 +
 ci/pipelines/shared/jinja.variables.yml            |   8 +-
 geode-assembly/build.gradle                        |   3 +
 .../geode/session/tests/ContainerInstall.java      |   2 +-
 .../geode/session/tests/ContainerManager.java      |   2 +-
 .../geode/session/tests/ServerContainer.java       |   2 +-
 .../geode/test/junit/rules/HttpResponseAssert.java |   2 +-
 .../apache/geode/metrics/CacheGetsTimerTest.java   | 530 +++++++++++++++++
 .../geode/metrics/GatewayReceiverMetricsTest.java  |   8 +-
 .../geode/metrics/MemberTypeCommonTagsTest.java    | 247 ++++++++
 .../apache/geode/metrics/MicrometerBinderTest.java |   5 +-
 .../geode/metrics/RegionEntriesGaugeTest.java      |  22 +-
 .../metrics/SimpleMetricsPublishingService.java    |   8 +-
 .../FunctionExecutionsTimerClusterTest.java        |  29 +-
 .../FunctionExecutionsTimerLonerTest.java          |  10 +-
 .../FunctionExecutionsTimerNoResultTest.java       |  11 +-
 .../web/RestSecurityPostProcessorTest.java         |  31 +-
 .../integrationTest/resources/expected_jars.txt    |   4 -
 ...bilityTomcat7079WithOldModuleCanDoPutsTest.java |   2 -
 ...edWithCurrentCanDoPutFromCurrentModuleTest.java |   2 -
 ...sMixedWithCurrentCanDoPutFromOldModuleTest.java |   2 -
 ...atibilityTomcat8WithOldModuleCanDoPutsTest.java |   2 -
 ...edWithCurrentCanDoPutFromCurrentModuleTest.java |   2 -
 ...sMixedWithCurrentCanDoPutFromOldModuleTest.java |   2 -
 .../cli/CreateDataSourceCommandDUnitTest.java      |   2 +-
 .../geode/connectors/jdbc/JdbcAsyncWriter.java     |   2 +-
 .../jdbc/internal/JdbcConnectorServiceImpl.java    |   2 +-
 .../api/AlertingServiceDistributedTest.java        |   2 +-
 ...rtingServiceWithoutListenerDistributedTest.java |   2 +-
 .../cache/management/ResourceManagerDUnitTest.java |   2 +-
 .../geode/cache/query/dunit/PdxQueryDUnitTest.java |   2 +-
 .../dunit/QueryDataInconsistencyDUnitTest.java     |   2 +-
 .../cache/query/dunit/QueryIndexDUnitTest.java     |   2 +-
 .../cache/query/dunit/QueryUsingPoolDUnitTest.java |   2 +-
 .../ResourceManagerWithQueryMonitorDUnitTest.java  |   2 +-
 .../InitializeIndexEntryDestroyQueryDUnitTest.java |   2 +-
 .../DistributedLockServiceDUnitTest.java           |   2 +-
 .../apache/geode/distributed/LocatorDUnitTest.java |   2 +-
 .../geode/distributed/ServerLauncherDUnitTest.java |   2 +-
 .../ClusterDistributionManagerDUnitTest.java       |   2 +-
 ...lusterDistributionManagerForAdminDUnitTest.java |   2 +-
 .../internal/cache/ClearRvvLockingDUnitTest.java   |   2 +-
 ...ntServerTransactionFailoverDistributedTest.java |   2 +-
 ...overWithMixedVersionServersDistributedTest.java |   2 +-
 .../internal/cache/ConnectDisconnectDUnitTest.java |   2 +-
 .../geode/internal/cache/GridAdvisorDUnitTest.java |   2 +-
 .../cache/PersistentRegionRecoveryDUnitTest.java   |   2 +-
 .../cache/backup/BackupDistributedTest.java        |   2 +-
 .../backup/IncrementalBackupDistributedTest.java   |   2 +-
 .../ClientServerFunctionExecutionDUnitTest.java    |   2 +-
 .../cache/execute/FunctionRetryTestBase.java       |   2 +-
 .../execute/FunctionServiceStatsDUnitTest.java     |   2 +-
 ...lientServerFunctionExecutionNoAckDUnitTest.java |   2 +-
 ...ientServerRegionFunctionExecutionDUnitTest.java |   2 +-
 ...erRegionFunctionExecutionFailoverDUnitTest.java |   2 +-
 ...egionFunctionExecutionNoSingleHopDUnitTest.java |   2 +-
 ...ctionExecutionSelectorNoSingleHopDUnitTest.java |   2 +-
 ...rRegionFunctionExecutionSingleHopDUnitTest.java |   2 +-
 .../cache/execute/PRClientServerTestBase.java      |   2 +-
 .../cache/execute/PRSetOperationJTADUnitTest.java  |   2 +-
 .../cache/execute/PRSetOperationTXDUnitTest.java   |   2 +-
 .../cache/execute/PRTransactionDUnitTest.java      |   2 +-
 .../PersistentPartitionedRegionTestBase.java       |   2 +-
 .../ClientServerForceInvalidateDUnitTest.java      |   2 +-
 ...ientConnectDisconnectSocketDistributedTest.java | 132 +++++
 .../cache/tx/SetOperationJTADistributedTest.java   |   2 +-
 .../internal/jta/ClientServerJTADUnitTest.java     |   2 +-
 .../ClientServerJTAFailoverDistributedTest.java    |   2 +-
 .../internal/jta/dunit/LoginTimeOutDUnitTest.java  |   2 +-
 .../MeterSubregistryReconnectDistributedTest.java  |  23 +-
 ...butedSystemMXBeanWithAlertsDistributedTest.java |   2 +-
 .../CreateJndiBindingCommandDUnitTest.java         |   2 +-
 .../cli/util/MergeLogsDistributedTest.java         |   2 +-
 ...rConfigServerRestartWithJarDeployDUnitTest.java |   2 +-
 .../internal/security/MultiGfshDUnitTest.java      |   2 +-
 ...onUsingLegacySecurityWithFailoverDUnitTest.java |   2 +-
 ...erConfigServerRestartWithJarDeployFunction.java |   2 +-
 .../org/apache/geode/SetOperationTXJUnitTest.java  |   2 +-
 .../java/org/apache/geode/TXJUnitTest.java         |   2 +-
 .../AlertingServiceWithClusterIntegrationTest.java |   2 +-
 .../AlertingServiceWithLonerIntegrationTest.java   |   2 +-
 .../geode/cache/CacheFactoryIntegrationTest.java   |  12 +-
 .../DefaultQuerySecurityIntegrationTest.java       | 170 ++++--
 .../internal/ExecutionContextIntegrationTest.java  | 348 ++++++++++++
 .../query/internal/ExecutionContextJUnitTest.java  | 382 -------------
 ...nalDistributedSystemBuilderIntegrationTest.java |  15 +-
 .../InternalDistributedSystemJUnitTest.java        |  79 ++-
 ...alDistributedSystemSecurityIntegrationTest.java |  18 +-
 .../tcpserver/TCPClientSSLIntegrationTest.java     |   7 +-
 .../internal/tcpserver/TCPServerSSLJUnitTest.java  |   7 +-
 ...itionedRegionSingleNodeOperationsJUnitTest.java |   2 +-
 .../cache/control/MemoryMonitorJUnitTest.java      |   2 +-
 .../control/MemoryMonitorOffHeapJUnitTest.java     |   2 +-
 .../cache/ha/HARQAddOperationJUnitTest.java        |   2 +-
 .../datasource/ConnectionPoolingJUnitTest.java     |   2 +-
 .../internal/jta/BlockingTimeOutJUnitTest.java     |   2 +-
 .../internal/jta/JtaIntegrationJUnitTest.java      |   2 +-
 .../internal/jta/SetOperationJTAJUnitTest.java     |   2 +-
 .../internal/jta/functional/CacheJUnitTest.java    |   2 +-
 .../GemFireStatSamplerIntegrationTest.java         |   2 +-
 .../statistics/StatSamplerIntegrationTest.java     |   2 +-
 .../internal/BannerLoggingIntegrationTest.java     |   2 +-
 ...StartupConfigurationLoggingIntegrationTest.java |   2 +-
 .../LogLevelChangesWithCacheIntegrationTest.java   |   2 +-
 ...hangesWithDistributedSystemIntegrationTest.java |   2 +-
 .../api/LoggingWithLocatorIntegrationTest.java     |   2 +-
 .../DistributedSystemMXBeanIntegrationTest.java    |   2 +-
 .../MemberMXBeanShowLogIntegrationTest.java        |   2 +-
 .../DescribeConnectionCommandIntegrationTest.java  |   2 +-
 .../ShowMetricsCommandIntegrationTest.java         |   2 +-
 .../ChangeLogLevelFunctionIntegrationTest.java     |   2 +-
 .../internal/security/CliCommandsSecurityTest.java |   2 +-
 .../FailWithLoggerErrorInOutputJUnitTest.java      |   2 +-
 .../FailWithLoggerFatalInOutputJUnitTest.java      |   2 +-
 .../FailWithLoggerWarnInOutputJUnitTest.java       |   2 +-
 .../test/process/ProcessWrapperJUnitTest.java      |   4 +-
 .../main/java/org/apache/geode/DataSerializer.java |   2 +-
 .../main/java/org/apache/geode/SystemFailure.java  |   2 +-
 .../admin/internal/AbstractHealthEvaluator.java    |   2 +-
 .../admin/internal/AdminDistributedSystemImpl.java |   2 +-
 .../geode/admin/internal/CacheHealthEvaluator.java |   2 +-
 .../internal/DisabledManagedEntityController.java  |   2 +-
 .../internal/DistributedSystemConfigImpl.java      |   2 +-
 .../internal/DistributedSystemHealthMonitor.java   |   4 +-
 .../admin/internal/DistributionLocatorImpl.java    |   2 +-
 .../internal/EnabledManagedEntityController.java   |   4 +-
 .../admin/internal/GemFireHealthEvaluator.java     |   2 +-
 .../internal/ManagedEntityControllerFactory.java   |   2 +-
 .../internal/SystemMemberCacheEventProcessor.java  |   2 +-
 .../geode/admin/internal/SystemMemberImpl.java     |   2 +-
 .../internal/AdminDistributedSystemJmxImpl.java    |   2 +-
 .../apache/geode/admin/jmx/internal/AgentImpl.java |   4 +-
 .../geode/admin/jmx/internal/AgentLauncher.java    |   4 +-
 .../admin/jmx/internal/CacheServerJmxImpl.java     |   2 +-
 .../admin/jmx/internal/GemFireHealthJmxImpl.java   |   2 +-
 .../apache/geode/admin/jmx/internal/MBeanUtil.java |   2 +-
 .../jmx/internal/MX4JServerSocketFactory.java      |   2 +-
 .../geode/admin/jmx/internal/MailManager.java      |   2 +-
 .../jmx/internal/MemberInfoWithStatsMBean.java     |   2 +-
 .../jmx/internal/StatisticResourceJmxImpl.java     |   2 +-
 .../geode/admin/jmx/internal/SystemMemberJmx.java  |   2 +-
 .../admin/jmx/internal/SystemMemberJmxImpl.java    |   2 +-
 .../alerting/internal/ClusterAlertMessaging.java   |   4 +-
 .../internal/AsyncEventQueueFactoryImpl.java       |   2 +-
 .../internal/ParallelAsyncEventQueueImpl.java      |   2 +-
 .../internal/SerialAsyncEventQueueImpl.java        |   2 +-
 .../geode/cache/client/ClientCacheFactory.java     |  16 +-
 .../geode/cache/client/internal/AbstractOp.java    |   2 +-
 .../client/internal/AutoConnectionSourceImpl.java  |   2 +-
 .../client/internal/ClientMetadataService.java     |   2 +-
 .../client/internal/ClientPartitionAdvisor.java    |   2 +-
 .../cache/client/internal/ConnectionConnector.java |   2 +-
 .../client/internal/ConnectionFactoryImpl.java     |   2 +-
 .../cache/client/internal/ConnectionImpl.java      |   2 +-
 .../internal/DataSerializerRecoveryListener.java   |   2 +-
 .../geode/cache/client/internal/DestroyOp.java     |   2 +-
 .../cache/client/internal/EndpointManagerImpl.java |   2 +-
 .../client/internal/ExecuteFunctionNoAckOp.java    |   2 +-
 .../cache/client/internal/ExecuteFunctionOp.java   |   2 +-
 .../internal/ExecuteRegionFunctionNoAckOp.java     |   2 +-
 .../client/internal/ExecuteRegionFunctionOp.java   |   2 +-
 .../internal/ExecuteRegionFunctionSingleHopOp.java |   2 +-
 .../internal/ExplicitConnectionSourceImpl.java     |   2 +-
 .../geode/cache/client/internal/GetAllOp.java      |   2 +-
 .../client/internal/GetClientPRMetaDataOp.java     |   2 +-
 .../internal/GetClientPartitionAttributesOp.java   |   2 +-
 .../apache/geode/cache/client/internal/GetOp.java  |   2 +-
 .../internal/InstantiatorRecoveryListener.java     |   2 +-
 .../geode/cache/client/internal/InvalidateOp.java  |   2 +-
 .../cache/client/internal/LiveServerPinger.java    |   2 +-
 .../cache/client/internal/OpExecutorImpl.java      |   2 +-
 .../internal/PdxRegistryRecoveryListener.java      |   2 +-
 .../geode/cache/client/internal/PoolImpl.java      |   2 +-
 .../geode/cache/client/internal/PutAllOp.java      |   2 +-
 .../apache/geode/cache/client/internal/PutOp.java  |   2 +-
 .../cache/client/internal/QueueConnectionImpl.java |   2 +-
 .../cache/client/internal/QueueManagerImpl.java    |   4 +-
 .../cache/client/internal/QueueStateImpl.java      |   2 +-
 .../client/internal/RegisterInterestTracker.java   |   2 +-
 .../geode/cache/client/internal/RemoveAllOp.java   |   2 +-
 .../cache/client/internal/ServerDenyList.java      |   2 +-
 .../cache/client/internal/ServerRegionProxy.java   |   2 +-
 .../client/internal/SingleHopClientExecutor.java   |   4 +-
 .../internal/pooling/ConnectionManagerImpl.java    |   4 +-
 .../cache/query/internal/AttributeDescriptor.java  |   9 +-
 .../geode/cache/query/internal/CompiledIn.java     |   2 +-
 .../cache/query/internal/CompiledIteratorDef.java  |   4 +-
 .../geode/cache/query/internal/CompiledLike.java   |   2 +-
 .../cache/query/internal/CompiledOperation.java    |   4 +-
 .../cache/query/internal/DefaultQueryService.java  |   8 +-
 .../cache/query/internal/ExecutionContext.java     |  27 +-
 .../geode/cache/query/internal/MethodDispatch.java |  10 +-
 .../geode/cache/query/internal/PathUtils.java      |  17 +-
 .../cache/query/internal/ProxyQueryService.java    |   2 +-
 .../geode/cache/query/internal/QCompiler.java      |   2 +-
 .../geode/cache/query/internal/QueryMonitor.java   |   2 +-
 .../geode/cache/query/internal/QueryUtils.java     |   2 +-
 .../cache/query/internal/RuntimeIterator.java      |   8 +-
 .../cache/query/internal/cq/CqAttributesImpl.java  |   2 +-
 .../cache/query/internal/index/AbstractIndex.java  |   2 +-
 .../query/internal/index/CompactRangeIndex.java    |   2 +-
 .../cache/query/internal/index/HashIndex.java      |   2 +-
 .../cache/query/internal/index/IndexManager.java   |   4 +-
 .../query/internal/parse/ASTMethodInvocation.java  |   2 +-
 .../geode/cache/server/internal/LoadMonitor.java   |   2 +-
 .../geode/distributed/DistributedSystem.java       |   5 +-
 .../apache/geode/distributed/LocatorLauncher.java  |   2 +-
 .../apache/geode/distributed/ServerLauncher.java   |   4 +-
 .../internal/AbstractDistributionConfig.java       |   2 +-
 .../internal/ClusterDistributionManager.java       |   6 +-
 .../distributed/internal/ClusterElderManager.java  |   2 +-
 .../internal/ClusterOperationExecutors.java        |   2 +-
 .../apache/geode/distributed/internal/DSClock.java |   2 +-
 .../distributed/internal/DistributionAdvisor.java  |   2 +-
 .../distributed/internal/DistributionMessage.java  |   2 +-
 .../distributed/internal/DistributionStats.java    |   2 +-
 .../internal/FunctionExecutionPooledExecutor.java  |   2 +-
 .../distributed/internal/HealthMonitorImpl.java    |   4 +-
 .../internal/HighPriorityAckedMessage.java         |   2 +-
 .../InternalConfigurationPersistenceService.java   |   2 +-
 .../internal/InternalDistributedSystem.java        | 155 +++--
 .../distributed/internal/InternalLocator.java      |   4 +-
 .../distributed/internal/LocatorLoadSnapshot.java  |   2 +-
 .../internal/LonerDistributionManager.java         |   2 +-
 .../internal/PooledExecutorWithDMStats.java        |   9 +-
 .../geode/distributed/internal/PrimaryHandler.java |   2 +-
 .../distributed/internal/ProtocolCheckerImpl.java  |   2 +-
 .../geode/distributed/internal/ReplyMessage.java   |   2 +-
 .../distributed/internal/ReplyProcessor21.java     |   2 +-
 .../internal/RuntimeDistributionConfigImpl.java    |   2 +-
 .../distributed/internal/SerialAckedMessage.java   |   2 +-
 .../geode/distributed/internal/ServerLocator.java  |   2 +-
 .../geode/distributed/internal/StartupMessage.java |   2 +-
 .../distributed/internal/StartupOperation.java     |   2 +-
 .../internal/StartupResponseMessage.java           |   2 +-
 .../StartupResponseWithVersionMessage.java         |   2 +-
 .../internal/WaitForViewInstallation.java          |   2 +-
 .../distributed/internal/direct/DirectChannel.java |   2 +-
 .../distributed/internal/locks/DLockGrantor.java   |   4 +-
 .../internal/locks/DLockQueryProcessor.java        |   2 +-
 .../locks/DLockRecoverGrantorProcessor.java        |   2 +-
 .../internal/locks/DLockReleaseProcessor.java      |   2 +-
 .../internal/locks/DLockRequestProcessor.java      |   2 +-
 .../distributed/internal/locks/DLockService.java   |   2 +-
 .../distributed/internal/locks/DLockToken.java     |   2 +-
 .../internal/locks/DeposeGrantorProcessor.java     |   2 +-
 .../internal/locks/ElderInitProcessor.java         |   2 +-
 .../distributed/internal/locks/ElderState.java     |   2 +-
 .../internal/locks/GrantorRequestProcessor.java    |   2 +-
 .../locks/NonGrantorDestroyedProcessor.java        |   2 +-
 .../membership/adapter/GMSMembershipManager.java   |   2 +-
 .../internal/membership/gms/GMSMembershipView.java |   1 +
 .../internal/membership/gms/GMSUtil.java           |   2 +-
 .../internal/membership/gms/Services.java          |   2 +-
 .../membership/gms/fd/GMSHealthMonitor.java        |   2 +-
 .../membership/gms/locator/GMSLocator.java         |   2 +-
 .../membership/gms/membership/GMSJoinLeave.java    |   4 +-
 .../membership/gms/messenger/GMSQuorumChecker.java |   2 +-
 .../internal/streaming/StreamingOperation.java     |   2 +-
 .../distributed/internal/tcpserver/TcpClient.java  |   2 +-
 .../distributed/internal/tcpserver/TcpServer.java  |  48 +-
 .../org/apache/geode/internal/DeployedJar.java     |   2 +-
 .../apache/geode/internal/DistributionLocator.java |   4 +-
 .../geode/internal/InternalDataSerializer.java     |   2 +-
 .../geode/internal/InternalInstantiator.java       |   2 +-
 .../org/apache/geode/internal/JarDeployer.java     |   2 +-
 .../java/org/apache/geode/internal/OSProcess.java  |   2 +-
 .../internal/ObjectInputStreamFilterWrapper.java   |   2 +-
 .../org/apache/geode/internal/SystemTimer.java     |   2 +-
 .../admin/ClientHealthMonitoringRegion.java        |   2 +-
 .../geode/internal/admin/ClientStatsManager.java   |   2 +-
 .../geode/internal/admin/StatAlertsManager.java    |   2 +-
 .../remote/AdminConsoleDisconnectMessage.java      |   2 +-
 .../geode/internal/admin/remote/AdminRequest.java  |   2 +-
 .../admin/remote/AlertLevelChangeMessage.java      |   2 +-
 .../internal/admin/remote/CliLegacyMessage.java    |   2 +-
 .../internal/admin/remote/CompactRequest.java      |   2 +-
 .../internal/admin/remote/DestroyEntryMessage.java |   2 +-
 .../admin/remote/DestroyRegionMessage.java         |   2 +-
 .../internal/admin/remote/FetchHostResponse.java   |   2 +-
 .../internal/admin/remote/LicenseInfoResponse.java |   2 +-
 .../admin/remote/MissingPersistentIDsRequest.java  |   2 +-
 .../remote/PrepareRevokePersistentIDRequest.java   |   2 +-
 .../admin/remote/RegionSubRegionsSizeResponse.java |   2 +-
 .../internal/admin/remote/RemoteGemFireVM.java     |   2 +-
 .../admin/remote/RemoteGfManagerAgent.java         |   4 +-
 .../admin/remote/RevokePersistentIDRequest.java    |   2 +-
 .../internal/admin/remote/ShutdownAllRequest.java  |   4 +-
 .../internal/admin/remote/TailLogResponse.java     |   2 +-
 .../internal/cache/AbstractBucketRegionQueue.java  |   2 +-
 .../geode/internal/cache/AbstractDiskRegion.java   |   2 +-
 .../geode/internal/cache/AbstractRegion.java       |   4 +-
 .../geode/internal/cache/AbstractRegionMap.java    |   2 +-
 .../internal/cache/AbstractUpdateOperation.java    |   2 +-
 .../cache/AddCacheServerProfileMessage.java        |   2 +-
 .../geode/internal/cache/AfterCompletion.java      |   2 +-
 .../apache/geode/internal/cache/BaseRegionMap.java |   2 +-
 .../geode/internal/cache/BeforeCompletion.java     |   2 +-
 .../apache/geode/internal/cache/BucketAdvisor.java |   2 +-
 .../internal/cache/BucketPersistenceAdvisor.java   |   2 +-
 .../apache/geode/internal/cache/BucketRegion.java  |   2 +-
 .../geode/internal/cache/BucketRegionQueue.java    |   2 +-
 .../internal/cache/CacheDistributionAdvisor.java   |   2 +-
 .../geode/internal/cache/CachePerfStats.java       |   3 +
 .../geode/internal/cache/CacheServerImpl.java      |   2 +-
 .../geode/internal/cache/CloseCacheMessage.java    |   2 +-
 .../internal/cache/ClusterConfigurationLoader.java |   2 +-
 .../geode/internal/cache/ColocationHelper.java     |   2 +-
 .../geode/internal/cache/ColocationLogger.java     |   4 +-
 .../internal/cache/CreateRegionProcessor.java      |   2 +-
 .../cache/DestroyPartitionedRegionMessage.java     |   2 +-
 .../internal/cache/DestroyRegionOperation.java     |   2 +-
 .../apache/geode/internal/cache/DiskInitFile.java  |   2 +-
 .../apache/geode/internal/cache/DiskStoreImpl.java |   6 +-
 .../geode/internal/cache/DiskStoreMonitor.java     |   4 +-
 .../internal/cache/DistTXAdjunctCommitMessage.java |   2 +-
 .../geode/internal/cache/DistTXCommitMessage.java  |   2 +-
 .../internal/cache/DistTXPrecommitMessage.java     |   2 +-
 .../internal/cache/DistTXRollbackMessage.java      |   2 +-
 .../geode/internal/cache/DistTXStateProxyImpl.java |   2 +-
 .../internal/cache/DistributedCacheOperation.java  |   2 +-
 .../internal/cache/DistributedPutAllOperation.java |   2 +-
 .../geode/internal/cache/DistributedRegion.java    |   4 +-
 .../DistributedRegionFunctionStreamingMessage.java |   2 +-
 .../cache/DistributedRemoveAllOperation.java       |   2 +-
 .../apache/geode/internal/cache/EntriesSet.java    |   2 +-
 .../geode/internal/cache/EntryEventImpl.java       |   2 +-
 .../geode/internal/cache/EntryExpiryTask.java      |   2 +-
 .../org/apache/geode/internal/cache/EventID.java   |   2 +-
 .../geode/internal/cache/ExpirationScheduler.java  |   2 +-
 .../apache/geode/internal/cache/ExpiryTask.java    |   2 +-
 .../apache/geode/internal/cache/FilterProfile.java |   2 +-
 .../internal/cache/FindDurableQueueProcessor.java  |   2 +-
 .../geode/internal/cache/FindRemoteTXMessage.java  |   2 +-
 .../internal/cache/FindVersionTagOperation.java    |   2 +-
 .../FunctionStreamingOrderedReplyMessage.java      |   2 +-
 .../cache/FunctionStreamingReplyMessage.java       |   2 +-
 .../geode/internal/cache/GemFireCacheImpl.java     |  21 +-
 .../org/apache/geode/internal/cache/HARegion.java  |   2 +-
 .../internal/cache/InitialImageFlowControl.java    |   2 +-
 .../internal/cache/InitialImageOperation.java      |   4 +-
 .../apache/geode/internal/cache/InternalCache.java |   2 +-
 .../geode/internal/cache/InternalCacheBuilder.java |  69 +--
 .../cache/InternalCacheForClientAccess.java        |   5 -
 .../geode/internal/cache/InternalRegion.java       |   1 +
 .../geode/internal/cache/InvalidateOperation.java  |   2 +-
 .../internal/cache/JtaAfterCompletionMessage.java  |   2 +-
 .../internal/cache/JtaBeforeCompletionMessage.java |   2 +-
 .../cache/LatestLastAccessTimeReplyProcessor.java  |   2 +-
 .../apache/geode/internal/cache/LocalDataSet.java  |   2 +-
 .../apache/geode/internal/cache/LocalRegion.java   |   3 +-
 .../cache/MemberFunctionStreamingMessage.java      |   2 +-
 .../org/apache/geode/internal/cache/Oplog.java     |   2 +-
 .../apache/geode/internal/cache/OverflowOplog.java |   2 +-
 .../geode/internal/cache/OverflowOplogSet.java     |   2 +-
 .../internal/cache/PRHARedundancyProvider.java     |   4 +-
 .../geode/internal/cache/PRQueryProcessor.java     |   4 +-
 .../internal/cache/PartitionAttributesImpl.java    |   2 +-
 .../cache/PartitionRegionConfigValidator.java      |   2 +-
 .../geode/internal/cache/PartitionedRegion.java    |   4 +-
 .../internal/cache/PartitionedRegionDataStore.java |   2 +-
 .../internal/cache/PartitionedRegionHelper.java    |   2 +-
 .../cache/PartitionedRegionQueryEvaluator.java     |   5 +-
 .../cache/PartitionedRegionRedundancyTracker.java  |   2 +-
 .../geode/internal/cache/PeerTXStateStub.java      |   2 +-
 .../geode/internal/cache/PersistentOplogSet.java   |   2 +-
 .../geode/internal/cache/PoolFactoryImpl.java      |   2 +-
 .../geode/internal/cache/PoolManagerImpl.java      |   2 +-
 .../geode/internal/cache/ProxyBucketRegion.java    |   2 +-
 .../geode/internal/cache/RegionPerfStats.java      |  67 ++-
 .../apache/geode/internal/cache/RegionStats.java   |   3 +
 .../internal/cache/ReleaseClearLockMessage.java    |   2 +-
 .../cache/RemoveCacheServerProfileMessage.java     |   2 +-
 .../cache/SearchLoadAndWriteProcessor.java         |   2 +-
 .../geode/internal/cache/SenderIdMonitor.java      |   2 +-
 .../internal/cache/SingleThreadJTAExecutor.java    |   2 +-
 .../geode/internal/cache/StateFlushOperation.java  |   2 +-
 .../geode/internal/cache/TXCommitMessage.java      |   4 +-
 .../apache/geode/internal/cache/TXEntryState.java  |   2 +-
 .../geode/internal/cache/TXFarSideCMTracker.java   |   2 +-
 .../apache/geode/internal/cache/TXManagerImpl.java |   2 +-
 .../org/apache/geode/internal/cache/TXMessage.java |   2 +-
 .../internal/cache/TXRegionLockRequestImpl.java    |   2 +-
 .../apache/geode/internal/cache/TXRegionState.java |   2 +-
 .../internal/cache/TXRemoteCommitMessage.java      |   2 +-
 .../internal/cache/TXRemoteRollbackMessage.java    |   2 +-
 .../org/apache/geode/internal/cache/TXState.java   |   2 +-
 .../geode/internal/cache/TXStateProxyImpl.java     |   2 +-
 .../geode/internal/cache/TombstoneService.java     |   4 +-
 .../internal/cache/TxCallbackEventFactoryImpl.java |   2 +-
 .../internal/cache/UpdateAttributesProcessor.java  |   2 +-
 .../cache/UpdateEntryVersionOperation.java         |   2 +-
 .../geode/internal/cache/UpdateOperation.java      |   2 +-
 .../geode/internal/cache/VMLRURegionMap.java       |   2 +-
 .../internal/cache/backup/BackupFileCopier.java    |   2 +-
 .../geode/internal/cache/backup/BackupService.java |   4 +-
 .../geode/internal/cache/backup/BackupStep.java    |   2 +-
 .../geode/internal/cache/backup/BackupTask.java    |   2 +-
 .../internal/cache/backup/FinishBackupRequest.java |   2 +-
 .../internal/cache/backup/FinishBackupStep.java    |   2 +-
 .../cache/backup/PrepareBackupRequest.java         |   2 +-
 .../internal/cache/backup/PrepareBackupStep.java   |   2 +-
 .../cache/backup/TemporaryBackupFiles.java         |   2 +-
 .../internal/cache/control/HeapMemoryMonitor.java  |   4 +-
 .../cache/control/InternalResourceManager.java     |   4 +-
 .../cache/control/OffHeapMemoryMonitor.java        |   4 +-
 .../cache/control/RebalanceOperationImpl.java      |   2 +-
 .../internal/cache/control/ResourceAdvisor.java    |   2 +-
 .../cache/entries/AbstractRegionEntry.java         |   2 +-
 .../geode/internal/cache/entries/DiskEntry.java    |   2 +-
 .../cache/event/DistributedEventTracker.java       |   2 +-
 .../cache/eviction/AbstractEvictionList.java       |   2 +-
 .../geode/internal/cache/eviction/HeapEvictor.java |   2 +-
 .../cache/eviction/LRUListWithAsyncSorting.java    |   4 +-
 .../cache/eviction/LRUListWithSyncSorting.java     |   2 +-
 .../internal/cache/eviction/RegionEvictorTask.java |   2 +-
 .../internal/cache/execute/AbstractExecution.java  |   2 +-
 .../DistributedRegionFunctionResultSender.java     |   2 +-
 .../cache/execute/FunctionExecutionNodePruner.java |   2 +-
 .../execute/FunctionStreamingResultCollector.java  |   2 +-
 .../cache/execute/MemberFunctionResultSender.java  |   2 +-
 .../PartitionedRegionFunctionResultSender.java     |   2 +-
 .../execute/ServerRegionFunctionExecutor.java      |   2 +-
 .../ServerToClientFunctionResultSender.java        |   2 +-
 .../ServerToClientFunctionResultSender65.java      |   2 +-
 .../geode/internal/cache/ha/HARegionQueue.java     |   4 +-
 .../internal/cache/ha/QueueRemovalMessage.java     |   2 +-
 .../cache/locks/TXLessorDepartureHandler.java      |   2 +-
 .../internal/cache/locks/TXLockServiceImpl.java    |   2 +-
 .../cache/locks/TXOriginatorRecoveryProcessor.java |   2 +-
 .../locks/TXRecoverGrantorMessageProcessor.java    |   2 +-
 .../internal/cache/map/AbstractRegionMapPut.java   |   2 +-
 .../internal/cache/map/RegionMapCommitPut.java     |   2 +-
 .../geode/internal/cache/map/RegionMapDestroy.java |   2 +-
 .../geode/internal/cache/map/RegionMapPut.java     |   2 +-
 .../AllBucketProfilesUpdateMessage.java            |   2 +-
 .../partitioned/BecomePrimaryBucketMessage.java    |   2 +-
 .../cache/partitioned/BucketBackupMessage.java     |   2 +-
 .../partitioned/BucketProfileUpdateMessage.java    |   2 +-
 .../cache/partitioned/BucketSizeMessage.java       |   2 +-
 .../cache/partitioned/ContainsKeyValueMessage.java |   2 +-
 .../cache/partitioned/CreateBucketMessage.java     |   2 +-
 .../partitioned/DeposePrimaryBucketMessage.java    |   2 +-
 .../internal/cache/partitioned/DestroyMessage.java |   2 +-
 .../cache/partitioned/DumpAllPRConfigMessage.java  |   2 +-
 .../internal/cache/partitioned/DumpB2NRegion.java  |   2 +-
 .../cache/partitioned/DumpBucketsMessage.java      |   2 +-
 .../cache/partitioned/FetchBulkEntriesMessage.java |   2 +-
 .../cache/partitioned/FetchEntriesMessage.java     |   2 +-
 .../cache/partitioned/FetchEntryMessage.java       |   2 +-
 .../cache/partitioned/FetchKeysMessage.java        |   2 +-
 .../partitioned/FetchPartitionDetailsMessage.java  |   2 +-
 .../internal/cache/partitioned/FlushMessage.java   |   2 +-
 .../internal/cache/partitioned/GetMessage.java     |   2 +-
 .../cache/partitioned/IdentityRequestMessage.java  |   2 +-
 .../cache/partitioned/IdentityUpdateMessage.java   |   2 +-
 .../cache/partitioned/IndexCreationMsg.java        |   2 +-
 .../cache/partitioned/InterestEventMessage.java    |   2 +-
 .../cache/partitioned/InvalidateMessage.java       |   2 +-
 .../partitioned/ManageBackupBucketMessage.java     |   2 +-
 .../cache/partitioned/ManageBucketMessage.java     |   2 +-
 .../cache/partitioned/MoveBucketMessage.java       |   2 +-
 .../PRFunctionStreamingResultCollector.java        |   2 +-
 .../cache/partitioned/PRTombstoneMessage.java      |   2 +-
 .../partitioned/PRUpdateEntryVersionMessage.java   |   2 +-
 .../cache/partitioned/PartitionMessage.java        |   2 +-
 .../PartitionedRegionFunctionStreamingMessage.java |   2 +-
 .../partitioned/PartitionedRegionRebalanceOp.java  |   2 +-
 .../partitioned/PersistentBucketRecoverer.java     |   4 +-
 .../cache/partitioned/PrimaryRequestMessage.java   |   2 +-
 .../cache/partitioned/PutAllPRMessage.java         |   2 +-
 .../internal/cache/partitioned/PutMessage.java     |   2 +-
 .../internal/cache/partitioned/QueryMessage.java   |   2 +-
 .../cache/partitioned/RecoveryRunnable.java        |   2 +-
 .../internal/cache/partitioned/RegionAdvisor.java  |   2 +-
 .../cache/partitioned/RemoveAllPRMessage.java      |   2 +-
 .../cache/partitioned/RemoveBucketMessage.java     |   2 +-
 .../cache/partitioned/RemoveIndexesMessage.java    |   2 +-
 .../internal/cache/partitioned/SizeMessage.java    |   2 +-
 .../partitioned/StreamingPartitionOperation.java   |   2 +-
 .../rebalance/BucketOperatorWrapper.java           |   2 +-
 .../partitioned/rebalance/MovePrimariesFPR.java    |   2 +-
 .../rebalance/RemoveOverRedundancy.java            |   2 +-
 .../partitioned/rebalance/SatisfyRedundancy.java   |   2 +-
 .../rebalance/SatisfyRedundancyFPR.java            |   2 +-
 .../cache/partitioned/rebalance/model/Member.java  |   2 +-
 .../model/PartitionedRegionLoadModel.java          |   2 +-
 .../cache/persistence/CanonicalIdHolder.java       |   2 +-
 .../cache/persistence/DiskInitFileParser.java      |   2 +-
 .../cache/persistence/MembershipViewRequest.java   |   2 +-
 .../cache/persistence/PersistenceAdvisorImpl.java  |   2 +-
 .../PersistenceInitialImageAdvisor.java            |   2 +-
 .../cache/persistence/PersistentMemberManager.java |   2 +-
 .../persistence/PersistentStateQueryMessage.java   |   2 +-
 .../PrepareNewPersistentMemberMessage.java         |   2 +-
 .../persistence/RemovePersistentMemberMessage.java |   2 +-
 .../cache/tier/InternalClientMembership.java       |   4 +-
 .../internal/cache/tier/sockets/AcceptorImpl.java  |   8 +-
 .../internal/cache/tier/sockets/BaseCommand.java   |   2 +-
 .../cache/tier/sockets/CacheClientNotifier.java    |   2 +-
 .../cache/tier/sockets/CacheClientProxy.java       |   7 +-
 .../cache/tier/sockets/CacheClientUpdater.java     |   4 +-
 .../cache/tier/sockets/ChunkedMessage.java         |   2 +-
 .../cache/tier/sockets/ClientHealthMonitor.java    |   4 +-
 .../tier/sockets/ClientProxyMembershipID.java      |   2 +-
 .../ClientRegistrationEventQueueManager.java       |   2 +-
 .../tier/sockets/ClientRegistrationMetadata.java   |   2 +-
 .../tier/sockets/ClientUpdateMessageImpl.java      |   2 +-
 .../cache/tier/sockets/ClientUserAuths.java        |   2 +-
 .../cache/tier/sockets/HAEventWrapper.java         |   2 +-
 .../internal/cache/tier/sockets/Handshake.java     |   2 +-
 .../geode/internal/cache/tier/sockets/Message.java |   2 +-
 .../cache/tier/sockets/ObjectPartList.java         |   2 +-
 .../sockets/RemoveClientFromDenylistMessage.java   |   2 +-
 .../cache/tier/sockets/ServerConnection.java       |   2 +-
 .../tier/sockets/ServerSideHandshakeFactory.java   |   2 +-
 .../cache/tier/sockets/TcpServerFactory.java       |  21 +-
 .../cache/tier/sockets/VersionedObjectList.java    |   2 +-
 .../cache/tier/sockets/command/AddPdxEnum.java     |   2 +-
 .../cache/tier/sockets/command/AddPdxType.java     |   2 +-
 .../tier/sockets/command/ExecuteFunction66.java    |   2 +-
 .../internal/cache/tier/sockets/command/Get70.java |  41 +-
 .../tier/sockets/command/GetAllWithCallback.java   |   2 +-
 .../cache/tier/sockets/command/GetEntry70.java     |   7 +-
 .../geode/internal/cache/tx/ClientTXStateStub.java |   2 +-
 .../internal/cache/tx/RemoteClearMessage.java      |   2 +-
 .../cache/tx/RemoteContainsKeyValueMessage.java    |   2 +-
 .../internal/cache/tx/RemoteDestroyMessage.java    |   2 +-
 .../internal/cache/tx/RemoteFetchEntryMessage.java |   2 +-
 .../internal/cache/tx/RemoteFetchKeysMessage.java  |   2 +-
 .../cache/tx/RemoteFetchVersionMessage.java        |   2 +-
 .../geode/internal/cache/tx/RemoteGetMessage.java  |   2 +-
 .../internal/cache/tx/RemoteInvalidateMessage.java |   2 +-
 .../internal/cache/tx/RemoteOperationMessage.java  |   2 +-
 .../internal/cache/tx/RemotePutAllMessage.java     |   2 +-
 .../geode/internal/cache/tx/RemotePutMessage.java  |   2 +-
 .../internal/cache/tx/RemoteRemoveAllMessage.java  |   2 +-
 .../geode/internal/cache/tx/RemoteSizeMessage.java |   2 +-
 .../cache/versions/RegionVersionHolder.java        |   2 +-
 .../cache/versions/RegionVersionVector.java        |   2 +-
 .../geode/internal/cache/versions/VersionTag.java  |   2 +-
 .../internal/cache/wan/AbstractGatewaySender.java  |   4 +-
 .../wan/AbstractGatewaySenderEventProcessor.java   |   4 +-
 .../internal/cache/wan/GatewaySenderAdvisor.java   |   4 +-
 .../wan/GatewaySenderEventCallbackDispatcher.java  |   2 +-
 ...aySenderQueueEntrySynchronizationOperation.java |   2 +-
 .../WaitUntilGatewaySenderFlushedCoordinator.java  |   2 +-
 ...currentParallelGatewaySenderEventProcessor.java |   4 +-
 .../ParallelGatewaySenderEventProcessor.java       |   2 +-
 .../wan/parallel/ParallelGatewaySenderQueue.java   |   4 +-
 .../wan/parallel/ParallelQueueRemovalMessage.java  |   2 +-
 .../cache/wan/serial/BatchDestroyOperation.java    |   2 +-
 ...oncurrentSerialGatewaySenderEventProcessor.java |   4 +-
 .../serial/SerialGatewaySenderEventProcessor.java  |   4 +-
 .../cache/wan/serial/SerialGatewaySenderQueue.java |   2 +-
 .../wan/serial/SerialSecondaryGatewayListener.java |   2 +-
 .../internal/cache/xmlcache/CacheCreation.java     |   7 +-
 .../internal/cache/xmlcache/CacheXmlParser.java    |   2 +-
 .../cache/xmlcache/CacheXmlPropertyResolver.java   |   2 +-
 .../xmlcache/CacheXmlPropertyResolverHelper.java   |   2 +-
 .../cache/xmlcache/GatewayReceiverCreation.java    |   2 +-
 .../cache/xmlcache/SerializerCreation.java         |   2 +-
 .../internal/datasource/AbstractDataSource.java    |   2 +-
 .../internal/datasource/AbstractPoolCache.java     |   4 +-
 .../datasource/ConnectionPoolCacheImpl.java        |   2 +-
 .../internal/datasource/DataSourceFactory.java     |   2 +-
 .../datasource/FacetsJCAConnectionManagerImpl.java |   2 +-
 .../datasource/GemFireBasicDataSource.java         |   2 +-
 .../datasource/GemFireConnPooledDataSource.java    |   2 +-
 .../datasource/GemFireTransactionDataSource.java   |   2 +-
 .../datasource/JCAConnectionManagerImpl.java       |   2 +-
 .../internal/datasource/ManagedPoolCacheImpl.java  |   2 +-
 .../internal/datasource/TranxPoolCacheImpl.java    |   2 +-
 .../apache/geode/internal/jndi/JNDIInvoker.java    |   2 +-
 .../geode/internal/jta/TransactionManagerImpl.java |   4 +-
 .../internal/logging/CoreLoggingExecutors.java     |  12 +-
 .../geode/internal/logging/LogWriterImpl.java      |   1 +
 .../metrics/CacheLifecycleMetricsSession.java      | 170 ------
 .../metrics/CacheMeterRegistryFactory.java         |  60 --
 .../metrics/GeodeCompositeMeterRegistry.java       |  55 --
 .../monitoring/ThreadsMonitoringProcess.java       |   2 +-
 .../monitoring/executor/AbstractExecutor.java      |   2 +-
 .../internal/net/InetAddressUtilsWithLogging.java  |   2 +-
 .../apache/geode/internal/net/NioSslEngine.java    |   2 +-
 .../apache/geode/internal/net/SocketCloser.java    |   2 +-
 .../apache/geode/internal/net/SocketCreator.java   |   2 +-
 .../DisconnectingOutOfOffHeapMemoryListener.java   |   2 +-
 .../geode/internal/offheap/FreeListManager.java    |   2 +-
 .../internal/offheap/MemoryAllocatorImpl.java      |   2 +-
 .../process/BlockingProcessStreamReader.java       |   2 +-
 .../internal/process/ControlFileWatchdog.java      |   4 +-
 .../internal/process/FileControllableProcess.java  |   2 +-
 .../process/NonBlockingProcessStreamReader.java    |   2 +-
 .../internal/process/ProcessStreamReader.java      |   2 +-
 .../geode/internal/process/StartupStatus.java      |   2 +-
 .../security/IntegratedSecurityService.java        |   2 +-
 .../security/shiro/SecurityManagerProvider.java    |   2 +-
 .../geode/internal/shared/NativeCallsJNAImpl.java  |   2 +-
 .../geode/internal/statistics/CallbackSampler.java |   4 +-
 .../internal/statistics/GemFireStatSampler.java    |   2 +-
 .../geode/internal/statistics/HostStatSampler.java |   4 +-
 .../statistics/LocalStatisticsFactory.java         |   2 +-
 .../geode/internal/statistics/SampleCollector.java |   2 +-
 .../internal/statistics/SimpleStatSampler.java     |   2 +-
 .../internal/statistics/StatArchiveHandler.java    |   2 +-
 .../internal/statistics/StatArchiveWriter.java     |   2 +-
 .../internal/statistics/StatMonitorHandler.java    |   4 +-
 .../geode/internal/statistics/StatisticsImpl.java  |   2 +-
 .../apache/geode/internal/stats50/VMStats50.java   |   2 +-
 .../org/apache/geode/internal/tcp/Connection.java  |   4 +-
 .../apache/geode/internal/tcp/ConnectionTable.java |   4 +-
 .../geode/internal/tcp/DirectReplySender.java      |   2 +-
 .../org/apache/geode/internal/tcp/MsgReader.java   |   2 +-
 .../apache/geode/internal/tcp/MsgStreamerList.java |   2 +-
 .../org/apache/geode/internal/tcp/TCPConduit.java  |   4 +-
 .../concurrent/CustomEntryConcurrentHashMap.java   |   2 +-
 .../geode/logging/internal/LoggingSession.java     |   2 +-
 .../logging/internal/log4j/LogWriterLogger.java    |   2 +-
 .../apache/geode/management/cli/CliFunction.java   |   2 +-
 .../geode/management/internal/AgentUtil.java       |   2 +-
 .../management/internal/BaseManagementService.java |   2 +-
 .../management/internal/FederatingManager.java     |   2 +-
 .../management/internal/FederationComponent.java   |   2 +-
 .../management/internal/JmxManagerAdvisor.java     |   2 +-
 .../management/internal/JmxManagerLocator.java     |   2 +-
 .../geode/management/internal/LocalManager.java    |   4 +-
 .../geode/management/internal/MBeanJMXAdapter.java |   2 +-
 .../management/internal/MBeanProxyFactory.java     |   2 +-
 .../internal/MBeanProxyInfoRepository.java         |   2 +-
 .../internal/MBeanProxyInvocationHandler.java      |   2 +-
 .../geode/management/internal/ManagementAgent.java |   2 +-
 .../internal/ManagementCacheListener.java          |   2 +-
 .../management/internal/ManagementFunction.java    |   2 +-
 .../internal/ManagementMembershipListener.java     |   2 +-
 .../internal/MonitoringRegionCacheListener.java    |   2 +-
 .../management/internal/NotificationHubClient.java |   2 +-
 .../geode/management/internal/RestAgent.java       |   2 +-
 .../internal/SystemManagementService.java          |   4 +-
 .../api/GeodeClusterManagementServiceBuilder.java  |   2 +-
 .../api/LocatorClusterManagementService.java       |   2 +-
 .../internal/beans/CacheServerBridge.java          |   2 +-
 .../management/internal/beans/DataQueryEngine.java |   2 +-
 .../internal/beans/DistributedSystemBridge.java    |   2 +-
 .../management/internal/beans/FileUploader.java    |   2 +-
 .../internal/beans/LocatorMBeanBridge.java         |   2 +-
 .../internal/beans/ManagementAdapter.java          |   2 +-
 .../internal/beans/MemberMBeanBridge.java          |   4 +-
 .../internal/beans/QueryDataFunction.java          |   2 +-
 .../internal/beans/stats/MBeanStatsMonitor.java    |   2 +-
 .../cli/commands/AlterRuntimeConfigCommand.java    |   2 +-
 .../cli/commands/ChangeLogLevelCommand.java        |   2 +-
 .../cli/commands/CreateGatewaySenderCommand.java   |   2 +-
 .../cli/commands/CreateJndiBindingCommand.java     |   2 +-
 .../internal/cli/commands/CreateRegionCommand.java |   2 +-
 .../cli/commands/DescribeRegionCommand.java        |   2 +-
 .../cli/commands/DestroyGatewaySenderCommand.java  |   2 +-
 .../cli/commands/DiskStoreCommandsUtils.java       |   2 +-
 .../ExportClusterConfigurationCommand.java         |   2 +-
 .../internal/cli/commands/ExportLogsCommand.java   |   2 +-
 .../cli/commands/ExportLogsInterceptor.java        |   2 +-
 .../ImportClusterConfigurationCommand.java         |   2 +-
 .../cli/commands/ListJndiBindingCommand.java       |   2 +-
 .../internal/cli/commands/PutCommand.java          |   2 +-
 .../internal/cli/commands/QueryCommand.java        |   2 +-
 .../internal/cli/commands/RebalanceCommand.java    |   2 +-
 .../internal/cli/commands/ShutdownCommand.java     |   4 +-
 .../cli/commands/StartGatewaySenderCommand.java    |   2 +-
 .../cli/functions/AlterRuntimeConfigFunction.java  |   2 +-
 .../cli/functions/CacheRealizationFunction.java    |   2 +-
 .../cli/functions/ChangeLogLevelFunction.java      |   2 +-
 .../functions/CreateAsyncEventQueueFunction.java   |   2 +-
 .../cli/functions/CreateJndiBindingFunction.java   |   2 +-
 .../cli/functions/DataCommandFunction.java         |   2 +-
 .../internal/cli/functions/DeployFunction.java     |   2 +-
 .../cli/functions/DescribeDiskStoreFunction.java   |   2 +-
 .../functions/DestroyGatewayReceiverFunction.java  |   2 +-
 .../cli/functions/ExportConfigFunction.java        |   2 +-
 .../internal/cli/functions/ExportLogsFunction.java |   2 +-
 .../functions/FetchRegionAttributesFunction.java   |   2 +-
 .../functions/GatewayReceiverCreateFunction.java   |   2 +-
 .../cli/functions/GatewaySenderCreateFunction.java |   2 +-
 .../cli/functions/ListDeployedFunction.java        |   2 +-
 .../cli/functions/ListFunctionFunction.java        |   2 +-
 .../internal/cli/functions/NetstatFunction.java    |   2 +-
 .../internal/cli/functions/RebalanceFunction.java  |   2 +-
 .../cli/functions/RegionAlterFunction.java         |   2 +-
 .../cli/functions/RegionCreateFunction.java        |   2 +-
 .../cli/functions/RegionDestroyFunction.java       |   2 +-
 .../internal/cli/functions/ShutDownFunction.java   |   4 +-
 .../cli/functions/SizeExportLogsFunction.java      |   2 +-
 .../internal/cli/functions/UndeployFunction.java   |   2 +-
 .../cli/functions/UserFunctionExecution.java       |   2 +-
 .../internal/cli/remote/CommandExecutor.java       |   2 +-
 .../internal/cli/remote/MemberCommandService.java  |   5 +-
 .../geode/management/internal/cli/shell/Gfsh.java  |   2 +-
 .../internal/cli/shell/JmxOperationInvoker.java    |   2 +-
 .../management/internal/cli/util/LogExporter.java  |   2 +-
 .../management/internal/cli/util/LogFilter.java    |   2 +-
 .../management/internal/cli/util/MergeLogs.java    |   2 +-
 .../callbacks/ConfigurationChangeListener.java     |   2 +-
 .../internal/configuration/domain/XmlEntity.java   |   2 +-
 .../functions/DownloadJarFunction.java             |   2 +-
 .../functions/GetClusterConfigurationFunction.java |   2 +-
 .../functions/RecreateCacheFunction.java           |   2 +-
 .../configuration/realizers/MemberRealizer.java    |   2 +-
 .../internal/messages/CompactRequest.java          |   2 +-
 .../internal/operation/OperationManager.java       |   2 +-
 .../internal/web/shell/HttpOperationInvoker.java   |   2 +-
 .../geode/metrics/MetricsPublishingService.java    |  25 +-
 .../org/apache/geode/metrics/MetricsSession.java   |  21 +-
 .../internal/CloseableMeterBinder.java}            |  10 +-
 .../metrics/internal/CompoundMeterBinder.java      |  78 +++
 .../InternalDistributedSystemMetricsService.java   | 314 ++++++++++
 .../geode/metrics/internal/MetricsService.java     |  89 +++
 .../metrics/internal/StandardMeterBinder.java      |  48 ++
 .../org/apache/geode/metrics/package-info.java     |   7 +-
 .../pdx/internal/AutoSerializableManager.java      |   2 +-
 .../geode/pdx/internal/ClientTypeRegistration.java |   2 +-
 .../geode/pdx/internal/PeerTypeRegistration.java   |  17 +-
 .../apache/geode/pdx/internal/TypeRegistry.java    |   2 +-
 .../geode/pdx/internal/json/PdxInstanceHelper.java |   2 +-
 .../pdx/internal/json/PdxInstanceSortedHelper.java |   2 +-
 .../geode/pdx/internal/json/PdxListHelper.java     |   2 +-
 .../query/internal/AttributeDescriptorTest.java    | 127 ++---
 ...est.java => CompiledAggregateFunctionTest.java} |   8 +-
 .../cache/query/internal/ExecutionContextTest.java |  60 ++
 .../cache/query/internal/MethodDispatchTest.java   |  65 +--
 ...ltsJUnitTest.java => NWayMergeResultsTest.java} | 279 +++++----
 .../geode/cache/query/internal/QCompilerTest.java  |  17 +-
 ...nitTest.java => QueryExecutionContextTest.java} |  41 +-
 .../internal/index/CompactRangeIndexTest.java      |   5 +
 .../java/org/apache/geode/cache30/TestHeapLRU.java |   2 +-
 .../internal/InternalDistributedSystemTest.java    | 108 ++++
 .../MembershipDependenciesJUnitTest.java           |  16 +-
 .../tcpserver/TcpServerDependenciesTest.java       |  15 +-
 .../cache/AbstractDistributedRegionJUnitTest.java  |   2 +-
 .../geode/internal/cache/GemFireCacheImplTest.java |  31 +-
 ...ernalCacheBuilderAllowsMultipleSystemsTest.java | 313 ++++------
 .../internal/cache/InternalCacheBuilderTest.java   | 498 ++++++----------
 .../cache/PartitionedRegionQueryEvaluatorTest.java | 128 ++---
 .../geode/internal/cache/RegionPerfStatsTest.java  | 203 +++++--
 .../cache/tier/sockets/command/Get70Test.java      | 167 ++++--
 ...SerialGatewaySenderEventProcessorJUnitTest.java |   2 +-
 .../CacheLifecycleMetricsSessionBuilderTest.java   | 109 ----
 .../metrics/CacheLifecycleMetricsSessionTest.java  | 323 -----------
 .../CacheMeterRegistryFactoryBindersTest.java      | 112 ----
 .../metrics/CacheMeterRegistryFactoryTest.java     | 159 ------
 .../metrics/GeodeCompositeMeterRegistryTest.java   |  56 --
 .../monitoring/ThreadsMonitoringJUnitTest.java     |   2 +-
 .../size/ReflectionObjectSizerJUnitTest.java       |   2 +-
 .../util/InternalCacheBuilderTestUtil.java         | 149 +++++
 .../cli/remote/MemberCommandServiceTest.java       |  56 ++
 .../metrics/internal/CompoundMeterBinderTest.java  | 110 ++++
 ...DistributedSystemMetricsServiceBuilderTest.java | 329 +++++++++++
 ...nternalDistributedSystemMetricsServiceTest.java | 630 +++++++++++++++++++++
 .../metrics/internal/StandardMeterBinderTest.java  |  92 +++
 .../pdx/internal/PeerTypeRegistrationTest.java     |  15 +
 ...ientStatisticsPublicationSecurityDUnitTest.java |   2 +-
 .../cache/query/cq/dunit/CqDataDUnitTest.java      |   2 +-
 .../query/cq/dunit/CqDataUsingPoolDUnitTest.java   |   2 +-
 .../cache/query/cq/dunit/CqPerfDUnitTest.java      |   2 +-
 .../cache/query/cq/dunit/CqQueryDUnitTest.java     |   2 +-
 ...tyExecutionContextTamperingDistributedTest.java |  11 +-
 .../cache/tier/sockets/DurableClientTestBase.java  |   2 +-
 .../cache/tier/sockets/DurableClientTestCase.java  |  27 +-
 .../cache/query/cq/internal/ClientCQImpl.java      |   4 +-
 .../geode/cache/query/cq/internal/CqQueryImpl.java |   2 +-
 .../cache/query/cq/internal/CqServiceImpl.java     |   2 +-
 .../cache/query/cq/internal/CqServiceVsdStats.java |   2 +-
 .../cache/query/cq/internal/ServerCQImpl.java      |   2 +-
 .../cache/query/cq/internal/command/ExecuteCQ.java |   2 +-
 .../query/cq/internal/command/ExecuteCQ61.java     |   2 +-
 .../topics/gemfire_properties.html.md.erb          |   9 +-
 .../geode/cache30/MultiVMRegionTestCase.java       |   2 +-
 .../org/apache/geode/cache30/RegionTestCase.java   |   2 +-
 .../geode/internal/cache/CommitFunction.java       |   2 +-
 .../internal/cache/NestedTransactionFunction.java  |   2 +-
 .../cache/PartitionedRegionGetSomeKeys.java        |   2 +-
 .../geode/internal/cache/RollbackFunction.java     |   2 +-
 .../internal/cache/functions/TestFunction.java     |   2 +-
 .../sockets/ClientServerMiscDUnitTestBase.java     |   2 +-
 .../commands/ExportLogsDistributedTestBase.java    |   2 +-
 .../ShowLogCommandDistributedTestBase.java         |   2 +-
 .../generator/AuthzCredentialGenerator.java        |   2 +-
 .../security/generator/CredentialGenerator.java    |   2 +-
 .../generator/LdapUserCredentialGenerator.java     |   2 +-
 .../security/generator/SSLCredentialGenerator.java |   2 +-
 .../security/templates/LdapUserAuthenticator.java  |   2 +-
 .../geode/security/templates/PKCSAuthInit.java     |   2 +-
 .../security/templates/PKCSAuthenticator.java      |   2 +-
 .../geode/security/templates/XmlErrorHandler.java  |   2 +-
 .../apache/geode/test/dunit/IgnoredException.java  |   2 +-
 .../apache/geode/test/dunit/LogWriterUtils.java    |   2 +-
 .../org/apache/geode/test/dunit/ThreadUtils.java   |   2 +-
 .../main/java/org/apache/geode/test/dunit/VM.java  |   2 +-
 .../java/org/apache/geode/test/dunit/Wait.java     |   2 +-
 .../dunit/cache/internal/JUnit4CacheTestCase.java  |   2 +-
 .../apache/geode/test/dunit/internal/ChildVM.java  |   2 +-
 .../dunit/internal/JUnit4DistributedTestCase.java  |   2 +-
 .../geode/test/dunit/internal/RemoteDUnitVM.java   |   2 +-
 .../apache/geode/test/dunit/rules/MemberVM.java    |   2 +-
 .../apache/geode/test/greplogs/LogConsumer.java    |   2 +
 .../org/apache/geode/test/greplogs/Patterns.java   |   4 +-
 .../geode/test/greplogs/LogConsumerTest.java       |  10 +
 .../geode/internal/cache/InternalHttpService.java  |   8 +-
 .../org/apache/geode/cache/query/CacheUtils.java   |   2 +-
 .../cache/control/TestMemoryThresholdListener.java |   2 +-
 .../cache/ha/TestBlockingHARegionQueue.java        |   2 +-
 .../internal/cache/wan/MyAsyncEventListener.java   |   2 +-
 .../internal/statistics/StatSamplerTestCase.java   |   2 +-
 .../org/apache/geode/test/assertj/Conditions.java  |  14 +-
 .../geode/test/junit/rules/gfsh/GfshExecution.java |  14 +-
 .../junit/rules/gfsh/internal/ProcessLogger.java   |   2 +-
 .../geode/test/micrometer/AbstractMeterAssert.java |  45 +-
 .../apache/geode/test/micrometer/TimerAssert.java  |  27 +
 .../apache/geode/test/process/ProcessWrapper.java  |   2 +-
 .../geode/test/micrometer/MeterAssertTest.java     |  23 +
 .../impl/AlertAppenderIntegrationTest.java         |   2 +-
 .../BothLogWriterAppendersIntegrationTest.java     |   2 +-
 .../CacheWithCustomLogConfigIntegrationTest.java   |   2 +-
 ...gurationWithLogLevelChangesIntegrationTest.java |   2 +-
 ...mWithBothLogWriterAppendersIntegrationTest.java |   2 +-
 ...edSystemWithLogLevelChangesIntegrationTest.java |   2 +-
 .../internal/impl/FastLoggerIntegrationTest.java   |   4 +-
 ...FastLoggerWithDefaultConfigIntegrationTest.java |   4 +-
 ...reVerboseMarkerFilterAcceptIntegrationTest.java |   2 +-
 ...fireVerboseMarkerFilterDenyIntegrationTest.java |   2 +-
 .../impl/GeodeConsoleAppenderIntegrationTest.java  |   2 +-
 ...odeConsoleAppenderWithCacheIntegrationTest.java |   2 +-
 ...leAppenderWithSystemOutRuleIntegrationTest.java |   2 +-
 ...deVerboseMarkerFilterAcceptIntegrationTest.java |   2 +-
 ...eodeVerboseMarkerFilterDenyIntegrationTest.java |   2 +-
 ...gServiceWithCustomLogConfigIntegrationTest.java |   2 +-
 .../impl/LogWriterAppenderIntegrationTest.java     |   2 +-
 ...AppenderWithMemberNameInXmlIntegrationTest.java |   2 +-
 ...oggingWithDistributedSystemIntegrationTest.java |   4 +-
 .../SecurityLogWriterAppenderIntegrationTest.java  |   2 +-
 .../internal/FastLoggerDisabledLevelBenchmark.java |   2 +-
 .../internal/FastLoggerEnabledLevelBenchmark.java  |   2 +-
 .../internal/FastLoggerParameterTypeBenchmark.java |   2 +-
 .../log4j/internal/impl/CacheLoggingBenchmark.java |   2 +-
 .../internal/impl/LogWriterAppenderBenchmark.java  |   2 +-
 .../log4j/internal/impl/Log4jLoggingProvider.java  |   2 +-
 geode-logging/build.gradle                         |   2 +
 .../internal/executors}/LoggingExecutors.java      |   4 +-
 .../internal/executors}/LoggingThread.java         |   2 +-
 .../internal/executors}/LoggingThreadFactory.java  |   2 +-
 .../LoggingUncaughtExceptionHandler.java           |   3 +-
 .../internal/log4j/api}/FastLogger.java            |   2 +-
 .../internal/log4j/api}/LogService.java            |   5 +-
 .../internal/log4j/api}/LogWithToString.java       |   2 +-
 .../api}/message/GemFireParameterizedMessage.java  |   4 +-
 .../GemFireParameterizedMessageFactory.java        |   2 +-
 .../executors/LoggingDependenciesTest.java         |  43 ++
 .../executors}/LoggingThreadFactoryTest.java       |   8 +-
 .../internal/executors}/LoggingThreadTest.java     |   4 +-
 .../LoggingUncaughtExceptionHandlerTest.java       |  11 +-
 .../log4j/api}/FastLoggerTest.java                 |   7 +-
 .../internal/log4j/api}/LogServiceTest.java        |   9 +-
 ...ncyWithRegionCreatedBeforeReindexDUnitTest.java |   2 +-
 .../NestedObjectSeralizerIntegrationTest.java      |   2 +-
 ...ctSerializerOnGrandSubclassIntegrationTest.java |   2 +-
 .../geode/cache/lucene/FlatFormatSerializer.java   |   2 +-
 .../lucene/internal/DestroyLuceneIndexMessage.java |   2 +-
 .../lucene/internal/IndexRepositoryFactory.java    |   2 +-
 .../lucene/internal/LuceneBucketListener.java      |   2 +-
 .../cache/lucene/internal/LuceneEventListener.java |   2 +-
 .../cache/lucene/internal/LuceneIndexImpl.java     |   2 +-
 .../cache/lucene/internal/LuceneQueryImpl.java     |   2 +-
 .../lucene/internal/LuceneRegionListener.java      |   2 +-
 .../cache/lucene/internal/LuceneServiceImpl.java   |   2 +-
 .../internal/PartitionedRepositoryManager.java     |   2 +-
 .../cache/lucene/internal/StringQueryProvider.java |   2 +-
 .../internal/directory/DumpDirectoryFiles.java     |   2 +-
 .../internal/distributed/LuceneQueryFunction.java  |   2 +-
 .../distributed/TopEntriesCollectorManager.java    |   2 +-
 .../distributed/TopEntriesFunctionCollector.java   |   2 +-
 .../lucene/internal/filesystem/FileSystem.java     |   2 +-
 .../internal/repository/IndexRepositoryImpl.java   |   2 +-
 .../serializer/HeterogeneousLuceneSerializer.java  |   2 +-
 .../repository/serializer/PdxLuceneSerializer.java |   2 +-
 .../serializer/ReflectionLuceneSerializer.java     |   2 +-
 .../internal/results/LuceneGetPageFunction.java    |   2 +-
 .../lucene/internal/xml/LuceneIndexCreation.java   |   2 +-
 .../repository/LuceneIndexMemoryOverheadTest.java  |   2 +-
 .../LuceneSearchWithRollingUpgradeDUnit.java       |   2 +-
 .../internal/memcached/GeodeMemcachedService.java  |   2 +-
 .../memcached/commands/StorageCommand.java         |   2 +-
 .../protocol/protobuf/v1/ProtobufOpsProcessor.java |   2 +-
 .../protobuf/v1/ProtobufStreamProcessor.java       |   2 +-
 .../DisconnectClientRequestOperationHandler.java   |   2 +-
 ...uteFunctionOnRegionRequestOperationHandler.java |   2 +-
 .../operations/GetAllRequestOperationHandler.java  |   2 +-
 .../operations/GetSizeRequestOperationHandler.java |   2 +-
 .../OqlQueryRequestOperationHandler.java           |   2 +-
 .../v1/operations/PutRequestOperationHandler.java  |   2 +-
 .../security/HandshakeRequestOperationHandler.java |   2 +-
 .../protocol/protobuf/v1/state/RequireVersion.java |   2 +-
 .../org/apache/geode/cache/util/AutoBalancer.java  |   2 +-
 .../geode/redis/internal/GeodeRedisService.java    |   2 +-
 .../cache/wan/Simple2CacheServerDUnitTest.java     |   2 +-
 .../geode/internal/cache/wan/WANTestBase.java      |   2 +-
 .../wan/misc/NewWanAuthenticationDUnitTest.java    |   2 +-
 ...rialGatewaySenderOperationsDistributedTest.java |   2 +-
 .../client/internal/GatewaySenderBatchOp.java      |   2 +-
 .../internal/locator/wan/LocatorDiscovery.java     |   2 +-
 .../locator/wan/LocatorMembershipListenerImpl.java |   4 +-
 .../locator/wan/WanLocatorDiscovererImpl.java      |   4 +-
 .../cache/wan/AbstractRemoteGatewaySender.java     |   2 +-
 .../internal/cache/wan/GatewayReceiverImpl.java    |   2 +-
 .../wan/GatewaySenderEventRemoteDispatcher.java    |   2 +-
 .../cache/wan/GatewaySenderFactoryImpl.java        |   2 +-
 .../wan/parallel/ParallelGatewaySenderImpl.java    |   2 +-
 .../RemoteParallelGatewaySenderEventProcessor.java |   2 +-
 ...oncurrentSerialGatewaySenderEventProcessor.java |   2 +-
 .../RemoteSerialGatewaySenderEventProcessor.java   |   2 +-
 .../cache/wan/serial/SerialGatewaySenderImpl.java  |   2 +-
 geode-web-api/build.gradle                         |  21 +-
 .../web/controllers/AbstractBaseController.java    |   2 +-
 .../web/controllers/BaseControllerAdvice.java      |   2 +-
 .../web/controllers/CommonCrudController.java      |   2 +-
 .../web/controllers/FunctionAccessController.java  |   2 +-
 .../web/controllers/PdxBasedCrudController.java    |   2 +-
 .../web/controllers/QueryAccessController.java     |   2 +-
 .../controllers/ManagementControllerAdvice.java    |   2 +-
 .../controllers/AbstractCommandsController.java    |   2 +-
 .../support/LoginHandlerInterceptor.java           |   2 +-
 settings.gradle                                    |   1 +
 .../geode/pmd/xml/StaticFieldsMustBeImmutable.xml  |   2 +-
 930 files changed, 6132 insertions(+), 3779 deletions(-)
 create mode 100644 geode-assembly/src/acceptanceTest/java/org/apache/geode/metrics/CacheGetsTimerTest.java
 create mode 100644 geode-assembly/src/acceptanceTest/java/org/apache/geode/metrics/MemberTypeCommonTagsTest.java
 create mode 100644 geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientConnectDisconnectSocketDistributedTest.java
 create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/ExecutionContextIntegrationTest.java
 delete mode 100644 geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/ExecutionContextJUnitTest.java
 delete mode 100644 geode-core/src/main/java/org/apache/geode/internal/metrics/CacheLifecycleMetricsSession.java
 delete mode 100644 geode-core/src/main/java/org/apache/geode/internal/metrics/CacheMeterRegistryFactory.java
 delete mode 100644 geode-core/src/main/java/org/apache/geode/internal/metrics/GeodeCompositeMeterRegistry.java
 rename geode-core/src/main/java/org/apache/geode/{internal/cache/ReconnectableCache.java => metrics/internal/CloseableMeterBinder.java} (79%)
 create mode 100644 geode-core/src/main/java/org/apache/geode/metrics/internal/CompoundMeterBinder.java
 create mode 100644 geode-core/src/main/java/org/apache/geode/metrics/internal/InternalDistributedSystemMetricsService.java
 create mode 100644 geode-core/src/main/java/org/apache/geode/metrics/internal/MetricsService.java
 create mode 100644 geode-core/src/main/java/org/apache/geode/metrics/internal/StandardMeterBinder.java
 rename geode-core/src/test/java/org/apache/geode/cache/query/internal/{CompiledAggregateFunctionJUnitTest.java => CompiledAggregateFunctionTest.java} (95%)
 create mode 100644 geode-core/src/test/java/org/apache/geode/cache/query/internal/ExecutionContextTest.java
 rename geode-core/src/test/java/org/apache/geode/cache/query/internal/{NWayMergeResultsJUnitTest.java => NWayMergeResultsTest.java} (62%)
 rename geode-core/src/test/java/org/apache/geode/cache/query/internal/{QueryExecutionContextJUnitTest.java => QueryExecutionContextTest.java} (60%)
 create mode 100644 geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemTest.java
 delete mode 100644 geode-core/src/test/java/org/apache/geode/internal/metrics/CacheLifecycleMetricsSessionBuilderTest.java
 delete mode 100644 geode-core/src/test/java/org/apache/geode/internal/metrics/CacheLifecycleMetricsSessionTest.java
 delete mode 100644 geode-core/src/test/java/org/apache/geode/internal/metrics/CacheMeterRegistryFactoryBindersTest.java
 delete mode 100644 geode-core/src/test/java/org/apache/geode/internal/metrics/CacheMeterRegistryFactoryTest.java
 delete mode 100644 geode-core/src/test/java/org/apache/geode/internal/metrics/GeodeCompositeMeterRegistryTest.java
 create mode 100644 geode-core/src/test/java/org/apache/geode/internal/util/InternalCacheBuilderTestUtil.java
 create mode 100644 geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/MemberCommandServiceTest.java
 create mode 100644 geode-core/src/test/java/org/apache/geode/metrics/internal/CompoundMeterBinderTest.java
 create mode 100644 geode-core/src/test/java/org/apache/geode/metrics/internal/InternalDistributedSystemMetricsServiceBuilderTest.java
 create mode 100644 geode-core/src/test/java/org/apache/geode/metrics/internal/InternalDistributedSystemMetricsServiceTest.java
 create mode 100644 geode-core/src/test/java/org/apache/geode/metrics/internal/StandardMeterBinderTest.java
 rename geode-core/src/main/java/org/apache/geode/internal/metrics/CompositeMeterRegistryFactory.java => geode-junit/src/main/java/org/apache/geode/test/assertj/Conditions.java (69%)
 rename geode-logging/src/main/java/org/apache/geode/{internal/logging => logging/internal/executors}/LoggingExecutors.java (97%)
 rename geode-logging/src/main/java/org/apache/geode/{internal/logging => logging/internal/executors}/LoggingThread.java (97%)
 rename geode-logging/src/main/java/org/apache/geode/{internal/logging => logging/internal/executors}/LoggingThreadFactory.java (98%)
 rename geode-logging/src/main/java/org/apache/geode/{internal/logging => logging/internal/executors}/LoggingUncaughtExceptionHandler.java (96%)
 rename geode-logging/src/main/java/org/apache/geode/{internal/logging/log4j => logging/internal/log4j/api}/FastLogger.java (98%)
 rename geode-logging/src/main/java/org/apache/geode/{internal/logging => logging/internal/log4j/api}/LogService.java (88%)
 rename geode-logging/src/main/java/org/apache/geode/{internal/logging => logging/internal/log4j/api}/LogWithToString.java (93%)
 rename geode-logging/src/main/java/org/apache/geode/{internal/logging/log4j => logging/internal/log4j/api}/message/GemFireParameterizedMessage.java (99%)
 rename geode-logging/src/main/java/org/apache/geode/{internal/logging/log4j => logging/internal/log4j/api}/message/GemFireParameterizedMessageFactory.java (97%)
 create mode 100644 geode-logging/src/test/java/org/apache/geode/logging/internal/executors/LoggingDependenciesTest.java
 rename geode-logging/src/test/java/org/apache/geode/{internal/logging => logging/internal/executors}/LoggingThreadFactoryTest.java (91%)
 rename geode-logging/src/test/java/org/apache/geode/{internal/logging => logging/internal/executors}/LoggingThreadTest.java (94%)
 rename geode-logging/src/test/java/org/apache/geode/{internal/logging => logging/internal/executors}/LoggingUncaughtExceptionHandlerTest.java (91%)
 rename geode-logging/src/test/java/org/apache/geode/logging/{log4j/internal => internal/log4j/api}/FastLoggerTest.java (95%)
 rename geode-logging/src/test/java/org/apache/geode/{internal/logging => logging/internal/log4j/api}/LogServiceTest.java (90%)


Mime
View raw message