change get_instance back to new

hathitrust · Jul 24, 2024 · de8df11 · de8df11
1 parent 75b7ae1
commit de8df11
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 30 deletions.
diff --git a/bin/metrics_exporter.pl b/bin/metrics_exporter.pl
@@ -7,24 +7,22 @@
 # Metrics exporter for prometheus statistics gathered via ingest.
 # Usage: plackup -p 9090 ./bin/metrics_exporter.pl
 
-my $metrics = HTFeed::JobMetrics->get_instance();
+my $metrics = HTFeed::JobMetrics->new();
 
 my $app = sub {
-  my $env = shift;
+    my $env = shift;
 
-  my $rendered = $metrics->pretty();
+    my $rendered = $metrics->pretty();
+    my $response = Plack::Response->new();
+    $response->content_type('text/plain');
 
-  my $response = Plack::Response->new();
-  $response->content_type('text/plain');
-
-  if ($rendered) {
-    $response->status(200);
-    $response->body($rendered);
-  } else {
-    $response->status(500);
-    $response->body("# metrics rendering failed");
-  }
-
-  return $response->finalize;
+    if ($rendered) {
+        $response->status(200);
+        $response->body($rendered);
+    } else {
+        $response->status(500);
+        $response->body("# metrics rendering failed");
+    }
 
+    return $response->finalize;
 };
diff --git a/lib/HTFeed/JobMetrics.pm b/lib/HTFeed/JobMetrics.pm
@@ -22,11 +22,8 @@ the various stages of an ingest job, such as number of items downloaded,
 number of bytes downloaded and amount of time spent downloading
 (as well as the other job stages, not just download).
 
-This class implements the singleton pattern, and as such has a
-get_instance() method instead of a "normal" new() function.
-
-The singleton instance is stored in the aptly named
-$singleton variable.
+This class implements the singleton pattern. The singleton instance is
+stored in the aptly named $singleton variable.
 
 CLI provided by and documented in JobMetricsCLI.pm.
 
@@ -40,9 +37,8 @@ CLI provided by and documented in JobMetricsCLI.pm.
 
 my $singleton = undef;
 
-# This class implements the singleton pattern.
-# Call get_instance instead of new.
-sub get_instance {
+# This class implements the singleton pattern (but constructor is still new()).
+sub new {
     # Re-use singleton if defined.
     if (!defined $singleton) {
         my $class = shift;

diff --git a/lib/HTFeed/JobMetricsCLI.pm b/lib/HTFeed/JobMetricsCLI.pm
@@ -68,7 +68,7 @@ Note that histograms must be set up with buckets ahead of time.
 
 =cut
 
-my $job_metrics = HTFeed::JobMetrics->get_instance();
+my $job_metrics = HTFeed::JobMetrics->new();
 
 if (!caller) {
     GetOptions(

diff --git a/lib/HTFeed/QueueRunner.pm b/lib/HTFeed/QueueRunner.pm
@@ -30,7 +30,7 @@ sub new {
     # for testing
     $self->{should_fork} = $params{should_fork};
     $self->{should_fork} = 1 if not defined $self->{should_fork};
-    $self->{job_metrics} = HTFeed::JobMetrics->get_instance;
+    $self->{job_metrics} = HTFeed::JobMetrics->new;
     set_config($self->{staging_root}, 'staging_root');
     HTFeed::StagingSetup::make_stage();
 

diff --git a/lib/HTFeed/Stage.pm b/lib/HTFeed/Stage.pm
@@ -30,7 +30,7 @@ sub new {
         @_,
         has_run => 0,
         failed  => 0,
-	job_metrics => HTFeed::JobMetrics->get_instance
+	job_metrics => HTFeed::JobMetrics->new
     };
 
     unless ( $self->{volume} && $self->{volume}->isa("HTFeed::Volume") ) {

diff --git a/lib/HTFeed/Stage/Unpack.pm b/lib/HTFeed/Stage/Unpack.pm
@@ -58,7 +58,8 @@ sub _extract_file {
     my $infile       = shift;
     my $outdir       = shift;
     my $otheroptions = shift || '';
-    my $job_metrics  = HTFeed::JobMetrics->get_instance;
+
+    my $job_metrics  = HTFeed::JobMetrics->new;
     my $start_time   = $job_metrics->time;
 
     my $full_command = sprintf($command, $infile, $outdir, $otheroptions);

diff --git a/lib/HTFeed/Storage.pm b/lib/HTFeed/Storage.pm
@@ -63,7 +63,7 @@ sub new {
         did_encryption => 0,
         name           => $name,
         timestamp      => $timestamp,
-        job_metrics    => HTFeed::JobMetrics->get_instance(),
+        job_metrics    => HTFeed::JobMetrics->new(),
     };
     bless($self, $class);
 

diff --git a/t/job_metrics.t b/t/job_metrics.t
@@ -12,7 +12,7 @@ use HTFeed::JobMetrics;
 
 describe "HTFeed::JobMetrics" => sub {
     # SETUP start
-    my $jm             = HTFeed::JobMetrics->get_instance;
+    my $jm             = HTFeed::JobMetrics->new;
     my $item_metric    = "ingest_pack_items_total";
     my $byte_metric    = "ingest_pack_bytes_w_total";
     my $invalid_metric = "not a valid metric";
@@ -75,7 +75,7 @@ describe "HTFeed::JobMetrics" => sub {
         # match($item_metric).
         my $expected_count = 5;
         # Get 5 jm instances
-        my @jms = (map { HTFeed::JobMetrics->get_instance } (1..5));
+        my @jms = (map { HTFeed::JobMetrics->new } (1..5));
         foreach my $sequence_jm (@jms) {
             $sequence_jm->inc($item_metric);
         }