remove old code

ZNeumann · ZNeumann · commit 5ca4df615326 · 2024-10-01T10:54:55.000-04:00
diff --git a/agent/php_internal_instrument.c b/agent/php_internal_instrument.c
@@ -770,7 +770,6 @@ static void nr_php_instrument_datastore_operation_call(
     nr_datastore_t datastore,
     const char* operation,
     nr_datastore_instance_t* instance,
-    bool instance_only,
     INTERNAL_FUNCTION_PARAMETERS) {
   int zcaught = 0;
   nr_segment_t* segment = NULL;
@@ -780,7 +779,6 @@ static void nr_php_instrument_datastore_operation_call(
       },
       .operation = nr_strdup(operation),
       .instance  = instance,
-      .instance_only = instance_only,
       .callbacks = {
           .backtrace = nr_php_backtrace_callback,
       },
@@ -836,7 +834,7 @@ NR_INNER_WRAPPER(mysqli_commit) {
   }
 
   nr_php_instrument_datastore_operation_call(nr_wrapper, NR_DATASTORE_MYSQL,
-                                             "commit", instance, false,
+                                             "commit", instance,
                                              INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 
@@ -1531,7 +1529,7 @@ NR_INNER_WRAPPER(mysqli_stmt_prepare) {
  */
 NR_INNER_WRAPPER(memcache_function) {
   nr_php_instrument_datastore_operation_call(nr_wrapper, NR_DATASTORE_MEMCACHE,
-                                             nr_wrapper->extra, NULL, false,
+                                             nr_wrapper->extra, NULL,
                                              INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 
@@ -1627,7 +1625,7 @@ NR_INNER_WRAPPER(redis_connect) {
   }
 
   nr_php_instrument_datastore_operation_call(nr_wrapper, NR_DATASTORE_REDIS,
-                                             nr_wrapper->extra, instance, false,
+                                             nr_wrapper->extra, instance,
                                              INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 
@@ -1686,7 +1684,7 @@ NR_INNER_WRAPPER(redis_function) {
   instance = nr_php_redis_retrieve_datastore_instance(this_obj TSRMLS_CC);
 
   nr_php_instrument_datastore_operation_call(nr_wrapper, NR_DATASTORE_REDIS,
-                                             nr_wrapper->extra, instance, false,
+                                             nr_wrapper->extra, instance,
                                              INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 
@@ -2679,7 +2677,7 @@ NR_INNER_WRAPPER(ob_flush_common) {
  */
 NR_INNER_WRAPPER(mongodb_execute) {
   nr_php_instrument_datastore_operation_call(nr_wrapper, NR_DATASTORE_MONGODB,
-                                             "execute", NULL, false,
+                                             "execute", NULL,
                                              INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 
diff --git a/axiom/nr_segment_datastore.c b/axiom/nr_segment_datastore.c
@@ -12,33 +12,6 @@
 #include "util_sql.h"
 #include "util_logging.h"
 
-static nr_status_t create_instance_metric(nr_segment_t* segment,
-                                   const char* product,
-                                   nr_segment_datastore_t* datastore,
-                                   const nr_datastore_instance_t* instance) {
-  /*
-   * If a datastore instance was provided, we need to add the relevant data to
-   * the segment and the relavant metrics.
-   */
-  nrtxn_t* txn = segment->txn;
-  char* instance_metric = NULL;
-  if (NULL == instance || 0 == txn->options.instance_reporting_enabled) {
-    return NR_FAILURE;
-  }
-
-  if (txn->options.database_name_reporting_enabled) {
-    nr_datastore_instance_set_database_name(&datastore->instance,
-                                            instance->database_name);
-  }
-
-  instance_metric = nr_formatf("Datastore/instance/%s/%s/%s", product,
-                               instance->host, instance->port_path_or_id);
-  nr_segment_add_metric(segment, instance_metric, false);
-
-  nr_free(instance_metric);
-  return NR_SUCCESS;
-}
-
 static char* create_metrics(nr_segment_t* segment,
                             nrtime_t duration,
                             const char* product,
@@ -51,6 +24,7 @@ static char* create_metrics(nr_segment_t* segment,
   char* rollup_metric = NULL;
   char* scoped_metric = NULL;
   char* statement_metric = NULL;
+  char* instance_metric = NULL;
 
   nrm_force_add(txn->unscoped_metrics, "Datastore/all", duration);
 
@@ -76,12 +50,28 @@ static char* create_metrics(nr_segment_t* segment,
   nr_free(operation_metric);
   nr_free(statement_metric);
 
-  create_instance_metric(segment, product, datastore, instance);
-  if (NULL != instance && 0 != txn->options.instance_reporting_enabled) {
-    nr_datastore_instance_set_host(&datastore->instance, instance->host);
-    nr_datastore_instance_set_port_path_or_id(&datastore->instance,
-                                              instance->port_path_or_id);
+  /*
+   * If a datastore instance was provided, we need to add the relevant data to
+   * the segment and the relavant metrics.
+   */
+  if (NULL == instance || 0 == txn->options.instance_reporting_enabled) {
+    return scoped_metric;
+  }
+
+  if (txn->options.database_name_reporting_enabled) {
+    nr_datastore_instance_set_database_name(&datastore->instance,
+                                            instance->database_name);
   }
+
+  instance_metric = nr_formatf("Datastore/instance/%s/%s/%s", product,
+                               instance->host, instance->port_path_or_id);
+  nr_segment_add_metric(segment, instance_metric, false);
+  nr_datastore_instance_set_host(&datastore->instance, instance->host);
+  nr_datastore_instance_set_port_path_or_id(&datastore->instance,
+                                            instance->port_path_or_id);
+
+  nr_free(instance_metric);
+
   return scoped_metric;
 }
 
@@ -218,14 +208,10 @@ bool nr_segment_datastore_end(nr_segment_t** segment_ptr,
    * The allWeb and allOther rollup metrics are created at the end of the
    * transaction since the background status may change.
    */
-  if (!params->instance_only) {
-    scoped_metric
-        = create_metrics(segment, duration, datastore_string, collection,
-                         operation, &datastore, params->instance);
-    nr_segment_set_name(segment, scoped_metric);
-  } else {
-    create_instance_metric(segment, datastore_string, &datastore, params->instance);
-  }
+  scoped_metric
+      = create_metrics(segment, duration, datastore_string, collection,
+                       operation, &datastore, params->instance);
+  nr_segment_set_name(segment, scoped_metric);
 
   /*
    * Add the explain plan, if we have one.
diff --git a/axiom/nr_segment_datastore.h b/axiom/nr_segment_datastore.h
@@ -24,9 +24,6 @@ typedef struct _nr_segment_datastore_params_t {
                        extracted from the SQL for SQL segments. */
   nr_datastore_instance_t*
       instance; /* Any instance information that was collected. */
-  bool instance_only; /* true if only the instance metric is wanted,
-                         collection and operation fields will not be
-                         used or extracted from the SQL */
 
   /*
    * Datastore type fields.
diff --git a/axiom/tests/test_segment_datastore.c b/axiom/tests/test_segment_datastore.c
@@ -197,35 +197,6 @@ static void test_create_metrics_no_table_no_operation(void) {
   nr_txn_destroy(&txn);
 }
 
-static void test_create_metrics_instance_only(void) {
-  nrtxn_t* txn = new_txn(0);
-  nrtime_t duration = 4 * NR_TIME_DIVISOR;
-  nr_segment_datastore_params_t params = sample_segment_datastore_params();
-  nr_datastore_instance_t instance = {.host = "hostname",
-                                      .port_path_or_id = "123",
-                                      .database_name = "my database"};
-  nr_segment_t* segment = NULL;
-  char* tname = "create metrics";
-
-  params.instance = &instance;
-  params.instance_only = true;
-  segment = nr_segment_start(txn, NULL, NULL);
-  segment->start_time = 1 * NR_TIME_DIVISOR;
-  segment->stop_time = 1 * NR_TIME_DIVISOR + duration;
-
-  test_segment_datastore_end_and_keep(&segment, &params);
-
-  /*
-   * Test : Create only the instance metric
-   */
-  test_metric_vector_size(segment->metrics, 1);
-  test_segment_metric_created(tname, segment->metrics,
-                              "Datastore/instance/MongoDB/hostname/123",
-                              false);
-
-  nr_txn_destroy(&txn);
-}
-
 static void test_instance_info_reporting_disabled(void) {
   nrtxn_t* txn = new_txn(0);
   nrtime_t duration = 4 * NR_TIME_DIVISOR;
@@ -1156,7 +1127,6 @@ tlib_parallel_info_t parallel_info = {.suggested_nthreads = 2, .state_size = 0};
 void test_main(void* p NRUNUSED) {
   test_bad_parameters();
   test_create_metrics();
-  test_create_metrics_instance_only();
   test_create_metrics_no_table();
   test_create_metrics_no_table_no_operation();
   test_instance_info_reporting_disabled();
