aerospike 6.0.2 → 6.1.0

package/binding.gyp

@@ -84,6 +84,8 @@
         'src/main/expressions.cc',
         'src/main/async.cc',
         'src/main/command.cc',
+        'src/main/commands/disable_metrics.cc',
+        'src/main/commands/enable_metrics.cc',
         'src/main/commands/apply_async.cc',
         'src/main/commands/batch_exists.cc',
         'src/main/commands/batch_get.cc',

package/lib/aerospike.js

@@ -186,6 +186,7 @@ exports.CommandQueuePolicy = require('./policy').CommandQueuePolicy
 exports.InfoPolicy = require('./policy').InfoPolicy
 exports.ListPolicy = require('./policy').ListPolicy
 exports.MapPolicy = require('./policy').MapPolicy
+exports.MetricsPolicy = require('./policy').MetricsPolicy
 exports.AdminPolicy = require('./policy').AdminPolicy
 
 /**
@@ -738,6 +739,7 @@ exports.setupGlobalCommandQueue = function (policy) {
  */
 exports.batchType = require('./batch_type')
 
+exports.MetricsListeners = require('./metrics_listeners')
 /**
  * The {@link module:aerospike/commit_status|aerospike/commit_status}
  * module contains a list of commit statuses.

package/lib/client.js

@@ -1,5 +1,5 @@
 // *****************************************************************************
-// Copyright 2013-2024 Aerospike, Inc.
+// Copyright 2013-2025 Aerospike, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License")
 // you may not use this file except in compliance with the License.
@@ -255,6 +255,36 @@ Client.prototype.commit = function (transaction, callback) {
   return cmd.execute()
 }
 
+Client.prototype.enableMetrics = function (policy, callback) {
+  let args
+
+  if (typeof policy === 'function') {
+    callback = policy
+    policy = null
+  }
+
+  if (!(policy) || !(policy.metricsListeners)) {
+    args = [policy, null, null, null, null]
+  } else {
+    args = [
+      policy,
+      policy.metricsListeners.enableListener,
+      policy.metricsListeners.snapshotListener,
+      policy.metricsListeners.nodeCloseListener,
+      policy.metricsListeners.disableListener
+    ]
+  }
+
+  const cmd = new Commands.EnableMetrics(this, args, callback)
+
+  return cmd.execute()
+}
+
+Client.prototype.disableMetrics = function (callback) {
+  const cmd = new Commands.DisableMetrics(this, [], callback)
+  return cmd.execute()
+}
+
 /**
  * @function Client#contextToBase64
  *

package/lib/commands/index.js

@@ -35,6 +35,8 @@ exports.BatchRemove = class BatchRemoveCommand extends BatchCommand('batchRemove
 exports.BatchSelect = class BatchSelectCommand extends BatchCommand('batchSelect') { }
 exports.ChangePassword = class ChangePasswordCommand extends Command('changePassword') { }
 exports.Connect = class ConnectCommand extends ConnectCommandBase('connect') { }
+exports.DisableMetrics = class DisableMetricsCommand extends Command('disableMetrics') { }
+exports.EnableMetrics = class EnableMetricsCommand extends Command('enableMetrics') { }
 exports.Exists = class ExistsCommand extends ExistsCommandBase('existsAsync') { }
 exports.Get = class GetCommand extends ReadRecordCommand('getAsync') { }
 exports.IndexCreate = class IndexCreateCommand extends Command('indexCreate') { }

package/lib/metrics_listeners.js

@@ -0,0 +1,28 @@
+// *****************************************************************************
+// Copyright 2025 Aerospike, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License")
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// *****************************************************************************
+
+'use strict'
+
+class MetricsListeners {
+  constructor (options) {
+    this.enableListener = options.enableListener
+    this.snapshotListener = options.snapshotListener
+    this.nodeCloseListener = options.nodeCloseListener
+    this.disableListener = options.disableListener
+  }
+}
+
+module.exports = MetricsListeners

package/lib/policies/metrics_policy.js

@@ -0,0 +1,37 @@
+// *****************************************************************************
+// Copyright 2025 Aerospike, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License")
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// *****************************************************************************
+
+'use strict'
+
+class MetricsPolicy {
+  constructor (props) {
+    props = props || {}
+
+    this.metricsListeners = props.metricsListeners
+
+    this.reportDir = props.reportDir
+
+    this.reportSizeLimit = props.reportSizeLimit
+
+    this.interval = props.interval
+
+    this.latencyColumns = props.latencyColumns
+
+    this.latencyShift = props.latecnyShift
+  }
+}
+
+module.exports = MetricsPolicy

package/lib/policy.js

@@ -31,6 +31,7 @@ const HLLPolicy = require('./policies/hll_policy')
 const InfoPolicy = require('./policies/info_policy')
 const ListPolicy = require('./policies/list_policy')
 const MapPolicy = require('./policies/map_policy')
+const MetricsPolicy = require('./policies/metrics_policy')
 const OperatePolicy = require('./policies/operate_policy')
 const QueryPolicy = require('./policies/query_policy')
 const ReadPolicy = require('./policies/read_policy')
@@ -429,6 +430,8 @@ exports.InfoPolicy = InfoPolicy
  */
 exports.AdminPolicy = AdminPolicy
 
+exports.MetricsPolicy = MetricsPolicy
+
 /**
  * A policy affecting the behavior of list operations.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aerospike",
-  "version": "6.0.2",
+  "version": "6.1.0",
   "description": "Aerospike Client Library",
   "keywords": [
     "aerospike",

package/src/include/client.h

@@ -88,6 +88,8 @@ class AerospikeClient : public Nan::ObjectWrap {
 	static NAN_METHOD(ChangePassword);
 	static NAN_METHOD(Close);
 	static NAN_METHOD(Connect);
+	static NAN_METHOD(DisableMetrics);
+	static NAN_METHOD(EnableMetrics);
 	static NAN_METHOD(ExistsAsync);
 	static NAN_METHOD(GetAsync);
 	static NAN_METHOD(GetNodes);

package/src/include/conversions.h

@@ -22,7 +22,10 @@ extern "C" {
 #include <aerospike/aerospike.h>
 #include <aerospike/aerospike_key.h>
 #include <aerospike/aerospike_batch.h>
+#include <aerospike/aerospike_stats.h>
+#include <aerospike/as_metrics_writer.h>
 #include <aerospike/as_job.h>
+#include <aerospike/as_node.h>
 #include <aerospike/as_key.h>
 #include <aerospike/as_record.h>
 #include <aerospike/as_scan.h>
@@ -107,6 +110,9 @@ int get_optional_int64_property(int64_t *intp, bool *defined,
 int get_optional_string_property(char **strp, bool *defined,
 								 v8::Local<v8::Object> obj, char const *prop,
 								 const LogInfo *log);
+int get_optional_uint64_property(uint64_t *intp, bool *defined,
+								 v8::Local<v8::Object> obj, char const *prop,
+								 const LogInfo *log);
 int get_optional_uint32_property(uint32_t *intp, bool *defined,
 								 v8::Local<v8::Object> obj, char const *prop,
 								 const LogInfo *log);
@@ -119,6 +125,9 @@ bool get_optional_list_policy(as_list_policy *policy, bool *has_policy,
 							  v8::Local<v8::Object> obj, const LogInfo *log);
 bool get_map_policy(as_map_policy *policy, v8::Local<v8::Object> obj,
 					const LogInfo *log);
+int get_optional_report_dir_property(char **report_dir, bool *defined,
+								v8::Local<v8::Object> obj, const char *prop,
+								const LogInfo *log);
 
 // Functions to convert C client structure to v8 object(map)
 v8::Local<v8::Object> error_to_jsobject(as_error *error, const LogInfo *log);
@@ -180,6 +189,17 @@ int batch_remove_record_from_jsobject(as_batch_records *batch,
 void batch_records_free(as_batch_records *records, const LogInfo *log);
 int udfargs_from_jsobject(char **filename, char **funcname, as_list **args,
 						  v8::Local<v8::Object> obj, const LogInfo *log);
+
+typedef struct {
+    uint32_t *connection;
+    uint32_t *write;
+    uint32_t *read;
+    uint32_t *batch;
+    uint32_t *query;
+} latency;
+
+void cluster_to_jsobject(as_cluster_s* cluster, v8::Local<v8::Object> v8_cluster, latency* latency, uint32_t bucket_max);
+void node_to_jsobject(as_node_s* node, v8::Local<v8::Object> v8_node, latency* latency, uint32_t bucket_max);
 int extract_blob_from_jsobject(uint8_t **data, int *len,
 							   v8::Local<v8::Object> obj, const LogInfo *log);
 int list_from_jsarray(as_list **list, v8::Local<v8::Array> array,
@@ -206,3 +226,15 @@ int setGeneration(v8::Local<v8::Object> obj, uint16_t *generation,
 				  const LogInfo *log);
 
 size_t as_strlcpy(char *d, const char *s, size_t bufsize);
+
+static inline void
+as_conn_stats_init_internal(as_conn_stats* stats)
+{
+	stats->in_pool = 0;
+	stats->in_use = 0;
+	stats->opened = 0;
+	stats->closed = 0;
+};
+
+void
+as_conn_stats_sum_internal(as_conn_stats* stats, as_async_conn_pool* pool);

package/src/include/policy.h

@@ -23,6 +23,8 @@ extern "C" {
 #include <aerospike/as_policy.h>
 #include <aerospike/as_partition_filter.h>
 #include <aerospike/as_event.h>
+#include <aerospike/as_metrics_writer.h>
+#include <aerospike/as_metrics.h>
 }
 
 // Functions to convert v8 policies to C structures
@@ -54,6 +56,8 @@ int infopolicy_from_jsobject(as_policy_info *policy, v8::Local<v8::Object> obj,
 							 const LogInfo *log);
 int adminpolicy_from_jsobject(as_policy_admin *policy, v8::Local<v8::Object> obj,
 							 const LogInfo *log);
+int metricspolicy_from_jsobject_with_listeners(as_metrics_policy *policy, v8::Local<v8::Object> obj,
+							 as_metrics_listeners* listeners, const LogInfo *log);
 int applypolicy_from_jsobject(as_policy_apply *policy,
 							  v8::Local<v8::Object> obj, const LogInfo *log);
 int scanpolicy_from_jsobject(as_policy_scan *policy, v8::Local<v8::Object> obj,

package/src/main/client.cc

@@ -60,6 +60,7 @@ NAN_METHOD(AerospikeClient::New)
 	client->log->fd = g_log_info.fd;
 	client->log->level = g_log_info.level;
 
+
 	// initialize the config to default values.
 	as_config config;
 	as_config_init(&config);
@@ -121,8 +122,10 @@ NAN_METHOD(AerospikeClient::Close)
 	events_callback_close(&client->as->config);
 	aerospike_close(client->as, &err);
 	aerospike_destroy(client->as);
+
 	free(client->as);
 	free(client->log);
+
 	client->closed = true;
 }
 
@@ -295,6 +298,8 @@ void AerospikeClient::Init()
 	Nan::SetPrototypeMethod(tpl, "close", Close);
 	Nan::SetPrototypeMethod(tpl, "connect", Connect);
 	Nan::SetPrototypeMethod(tpl, "existsAsync", ExistsAsync);
+	Nan::SetPrototypeMethod(tpl, "disableMetrics", DisableMetrics);
+	Nan::SetPrototypeMethod(tpl, "enableMetrics", EnableMetrics);
 	Nan::SetPrototypeMethod(tpl, "getAsync", GetAsync);
 	Nan::SetPrototypeMethod(tpl, "getNodes", GetNodes);
 	Nan::SetPrototypeMethod(tpl, "getStats", GetStats);

package/src/main/commands/disable_metrics.cc

@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright 2013-2023 Aerospike, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+
+#include "client.h"
+#include "command.h"
+
+
+
+extern "C" {
+#include <aerospike/as_metrics.h>
+}
+
+using namespace v8;
+
+NAN_METHOD(AerospikeClient::DisableMetrics)
+{
+	TYPE_CHECK_REQ(info[0], IsFunction, "Callback must be a function");
+
+	AerospikeClient *client =
+		Nan::ObjectWrap::Unwrap<AerospikeClient>(info.This());
+	AsyncCommand *cmd =
+		new AsyncCommand("DisableMetrics", client, info[0].As<Function>());
+
+	if (aerospike_disable_metrics(client->as, &cmd->err) != AEROSPIKE_OK) {
+		cmd->ErrorCallback(&cmd->err);
+		goto Cleanup;
+	}
+	else{
+		Local<Value> argv[] = {Nan::Null(), Nan::Null()};
+		cmd->Callback(2, argv);
+	}
+
+Cleanup:
+	delete cmd;
+}