Fix client type value in statistics

hazelcast · Jan 20, 2021 · e1786f3 · e1786f3
1 parent e635cba
commit e1786f3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/network/ClientConnectionManager.ts b/src/network/ClientConnectionManager.ts
@@ -73,7 +73,8 @@ import {AddressProvider} from '../connection/AddressProvider';
 const CONNECTION_REMOVED_EVENT_NAME = 'connectionRemoved';
 const CONNECTION_ADDED_EVENT_NAME = 'connectionAdded';
 
-const CLIENT_TYPE = 'NJS';
+/** @internal */
+export const CLIENT_TYPE = 'NJS';
 const SERIALIZATION_VERSION = 1;
 const SET_TIMEOUT_MAX_DELAY = 2147483647;
 const BINARY_PROTOCOL_VERSION = Buffer.from('CP2');

diff --git a/src/statistics/Statistics.ts b/src/statistics/Statistics.ts
@@ -17,6 +17,7 @@
 
 import {HazelcastClient} from '../HazelcastClient';
 import {ClientConnection} from '../network/ClientConnection';
+import {CLIENT_TYPE} from '../network/ClientConnectionManager';
 import {Properties} from '../config/Properties';
 import {ClientStatisticsCodec} from '../codec/ClientStatisticsCodec';
 import {
@@ -238,7 +239,7 @@ export class Statistics {
                         connection: ClientConnection): void {
         this.addAttribute(stats, 'lastStatisticsCollectionTime', Date.now());
         this.addAttribute(stats, 'enterprise', 'false');
-        this.addAttribute(stats, 'clientType', this.client.getClusterService().getLocalClient().type);
+        this.addAttribute(stats, 'clientType', CLIENT_TYPE);
         this.addAttribute(stats, 'clientVersion', BuildInfo.getClientVersion());
         this.addAttribute(stats, 'clusterConnectionTimestamp', connection.getStartTime());
         this.addAttribute(stats, 'clientAddress', connection.getLocalAddress().toString());

diff --git a/test/integration/statistics/StatisticsTest.js b/test/integration/statistics/StatisticsTest.js
@@ -115,7 +115,7 @@ describe('StatisticsTest (default period)', function () {
         expect(extractIntStatValue(stats, 'lastStatisticsCollectionTime')).to.be
             .within(Date.now() - Statistics.PERIOD_SECONDS_DEFAULT_VALUE * 2000, Date.now());
         expect(extractBooleanStatValue(stats, 'enterprise')).to.be.false;
-        expect(extractStringStatValue(stats, 'clientType')).to.equal('NodeJS');
+        expect(extractStringStatValue(stats, 'clientType')).to.equal('NJS');
         expect(extractStringStatValue(stats, 'clientVersion')).to.equal(BuildInfo.getClientVersion());
         const connection = client.getConnectionManager().getRandomConnection();
         expect(extractIntStatValue(stats, 'clusterConnectionTimestamp')).to.equal(connection.getStartTime());