Fix code review remarks

Author: comandeo-mongo

.evergreen/config.yml

@@ -516,51 +516,6 @@ task_groups:
               $DRIVERS_TOOLS/.evergreen/atlas/teardown-atlas-cluster.sh
     tasks:
       - test-full-atlas-task
-
-  - name: test_aws_lambda_task_group
-    setup_group_can_fail_task: true
-    setup_group_timeout_secs: 1800 # 30 minutes
-    setup_group:
-      - func: fetch source
-      - func: create expansions
-      - command: shell.exec
-        params:
-          shell: "bash"
-          working_dir: "src"
-          script: |
-            ${PREPARE_SHELL}
-
-            echo "Setting up Atlas cluster"
-
-            DRIVERS_ATLAS_PUBLIC_API_KEY="${DRIVERS_ATLAS_PUBLIC_API_KEY}" \
-              DRIVERS_ATLAS_PRIVATE_API_KEY="${DRIVERS_ATLAS_PRIVATE_API_KEY}" \
-              DRIVERS_ATLAS_GROUP_ID="${DRIVERS_ATLAS_GROUP_ID}" \
-              DRIVERS_ATLAS_LAMBDA_USER="${DRIVERS_ATLAS_LAMBDA_USER}" \
-              DRIVERS_ATLAS_LAMBDA_PASSWORD="${DRIVERS_ATLAS_LAMBDA_PASSWORD}" \
-              LAMBDA_STACK_NAME="dbx-ruby-lambda" \
-              MONGODB_VERSION="7.0" \
-              task_id="${task_id}" \
-              execution="${execution}" \
-              $DRIVERS_TOOLS/.evergreen/atlas/setup-atlas-cluster.sh
-      - command: expansions.update
-        params:
-          file: src/atlas-expansion.yml
-    teardown_group:
-      - command: shell.exec
-        params:
-          shell: "bash"
-          working_dir: "src"
-          script: |
-            ${PREPARE_SHELL}
-
-            DRIVERS_ATLAS_PUBLIC_API_KEY="${DRIVERS_ATLAS_PUBLIC_API_KEY}" \
-              DRIVERS_ATLAS_PRIVATE_API_KEY="${DRIVERS_ATLAS_PRIVATE_API_KEY}" \
-              DRIVERS_ATLAS_GROUP_ID="${DRIVERS_ATLAS_GROUP_ID}" \
-              LAMBDA_STACK_NAME="dbx-ruby-lambda" \
-              task_id="${task_id}" \
-              execution="${execution}" \
-              $DRIVERS_TOOLS/.evergreen/atlas/teardown-atlas-cluster.sh
-    tasks:
       - test-aws-lambda-deployed
 
   - name: testgcpkms_task_group
@@ -1745,10 +1700,10 @@ buildvariants:
       - name: testazurekms_task_group
         batchtime: 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README
 
-  - matrix_name: atlas-full
+  - matrix_name: atlas-full-and-lambda
     matrix_spec:
       ruby: "ruby-3.2"
-      os: rhel8
+      os: ubuntu2204
     display_name: "Atlas (Full)"
     tasks:
       - name: testatlas_task_group
@@ -1771,11 +1726,3 @@ buildvariants:
     display_name: "Atlas serverless ${ruby} single mongos"
     tasks:
        - name: test-serverless
-
-  - matrix_name: "aws-lambda"
-    matrix_spec:
-      ruby: "ruby-3.2"
-      os: ubuntu2204
-    display_name: "AWS Lambda"
-    tasks:
-       - name: test_aws_lambda_task_group

.evergreen/config/common.yml.erb

@@ -513,51 +513,6 @@ task_groups:
               $DRIVERS_TOOLS/.evergreen/atlas/teardown-atlas-cluster.sh
     tasks:
       - test-full-atlas-task
-
-  - name: test_aws_lambda_task_group
-    setup_group_can_fail_task: true
-    setup_group_timeout_secs: 1800 # 30 minutes
-    setup_group:
-      - func: fetch source
-      - func: create expansions
-      - command: shell.exec
-        params:
-          shell: "bash"
-          working_dir: "src"
-          script: |
-            ${PREPARE_SHELL}
-
-            echo "Setting up Atlas cluster"
-
-            DRIVERS_ATLAS_PUBLIC_API_KEY="${DRIVERS_ATLAS_PUBLIC_API_KEY}" \
-              DRIVERS_ATLAS_PRIVATE_API_KEY="${DRIVERS_ATLAS_PRIVATE_API_KEY}" \
-              DRIVERS_ATLAS_GROUP_ID="${DRIVERS_ATLAS_GROUP_ID}" \
-              DRIVERS_ATLAS_LAMBDA_USER="${DRIVERS_ATLAS_LAMBDA_USER}" \
-              DRIVERS_ATLAS_LAMBDA_PASSWORD="${DRIVERS_ATLAS_LAMBDA_PASSWORD}" \
-              LAMBDA_STACK_NAME="dbx-ruby-lambda" \
-              MONGODB_VERSION="7.0" \
-              task_id="${task_id}" \
-              execution="${execution}" \
-              $DRIVERS_TOOLS/.evergreen/atlas/setup-atlas-cluster.sh
-      - command: expansions.update
-        params:
-          file: src/atlas-expansion.yml
-    teardown_group:
-      - command: shell.exec
-        params:
-          shell: "bash"
-          working_dir: "src"
-          script: |
-            ${PREPARE_SHELL}
-
-            DRIVERS_ATLAS_PUBLIC_API_KEY="${DRIVERS_ATLAS_PUBLIC_API_KEY}" \
-              DRIVERS_ATLAS_PRIVATE_API_KEY="${DRIVERS_ATLAS_PRIVATE_API_KEY}" \
-              DRIVERS_ATLAS_GROUP_ID="${DRIVERS_ATLAS_GROUP_ID}" \
-              LAMBDA_STACK_NAME="dbx-ruby-lambda" \
-              task_id="${task_id}" \
-              execution="${execution}" \
-              $DRIVERS_TOOLS/.evergreen/atlas/teardown-atlas-cluster.sh
-    tasks:
       - test-aws-lambda-deployed
 
   - name: testgcpkms_task_group

.evergreen/config/standard.yml.erb

@@ -494,10 +494,10 @@ buildvariants:
       - name: testazurekms_task_group
         batchtime: 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README
 
-  - matrix_name: atlas-full
+  - matrix_name: atlas-full-and-lambda
     matrix_spec:
       ruby: <%= latest_ruby %>
-      os: rhel8
+      os: ubuntu2204
     display_name: "Atlas (Full)"
     tasks:
       - name: testatlas_task_group
@@ -520,11 +520,3 @@ buildvariants:
     display_name: "Atlas serverless ${ruby} single mongos"
     tasks:
        - name: test-serverless
-
-  - matrix_name: "aws-lambda"
-    matrix_spec:
-      ruby: <%= latest_ruby %>
-      os: ubuntu2204
-    display_name: "AWS Lambda"
-    tasks:
-       - name: test_aws_lambda_task_group

spec/faas/ruby-sam-app/mongodb/app.rb

@@ -3,113 +3,147 @@
 require 'mongo'
 require 'json'
 
-$open_connections = 0
-$heartbeats_count = 0
-$total_heartbeat_time = 0
-$commands_count = 0
-$total_command_time = 0
+class StatsAggregator
+
+  def initialize
+    @open_connections = 0
+    @heartbeats_count = 0
+    @total_heartbeat_time = 0
+    @commands_count = 0
+    @total_command_time = 0
+  end
+
+  def add_command(duration)
+    @commands_count += 1
+    @total_command_time += duration
+  end
+
+  def add_heartbeat(duration)
+    @heartbeats_count += 1
+    @total_heartbeat_time += duration
+  end
+
+  def add_connection
+    @open_connections += 1
+  end
+
+  def remove_connection
+    @open_connections -= 1
+  end
+
+  def average_heartbeat_time
+    if @heartbeats_count == 0
+      0
+    else
+      @total_heartbeat_time / @heartbeats_count
+    end
+  end
+
+  def average_command_time
+    if @commands_count == 0
+      0
+    else
+      @total_command_time / @commands_count
+    end
+  end
 
+  def reset
+    @open_connections = 0
+    @heartbeats_count = 0
+    @total_heartbeat_time = 0
+    @commands_count = 0
+    @total_command_time = 0
+  end
+
+  def result
+    {
+      average_heartbeat_time: average_heartbeat_time,
+      average_command_time: average_command_time,
+      heartbeats_count: @heartbeats_count,
+      open_connections: @open_connections,
+    }
+  end
+end
 
 class CommandMonitor
-  def started(event)
+
+  def initialize(stats_aggregator)
+    @stats_aggregator = stats_aggregator
   end
 
+  def started(event); end
+
   def failed(event)
-    $commands_count += 1
-    $total_command_time += event.duration
+    @stats_aggregator.add_command(event.duration)
   end
 
   def succeeded(event)
-    $commands_count += 1
-    $total_command_time += event.duration
+    @stats_aggregator.add_command(event.duration)
   end
 end
 
 class HeartbeatMonitor
-  def started(event)
+
+  def initialize(stats_aggregator)
+    @stats_aggregator = stats_aggregator
   end
 
+  def started(event); end
+
   def succeeded(event)
-    $heartbeats_count += 1
-    $total_heartbeat_time += event.duration
+    @stats_aggregator.add_heartbeat(event.duration)
   end
 
   def failed(event)
-    $heartbeats_count += 1
-    $total_heartbeat_time += event.duration
+    @stats_aggregator.add_heartbeat(event.duration)
   end
 end
 
 class PoolMonitor
+
+  def initialize(stats_aggregator)
+    @stats_aggregator = stats_aggregator
+  end
+
   def published(event)
     case event
     when Mongo::Monitoring::Event::Cmap::ConnectionCreated
-      $open_connections += 1
+      @stats_aggregator.add_connection
     when Mongo::Monitoring::Event::Cmap::ConnectionClosed
-      $open_connections -= 1
+      @stats_aggregator.remove_connection
     end
   end
 end
 
-command_monitor = CommandMonitor.new
-heartbeat_monitor = HeartbeatMonitor.new
-pool_monitor = PoolMonitor.new
+$stats_aggregator = StatsAggregator.new
+
+command_monitor = CommandMonitor.new($stats_aggregator)
+heartbeat_monitor = HeartbeatMonitor.new($stats_aggregator)
+pool_monitor = PoolMonitor.new($stats_aggregator)
 
 sdam_proc = proc do |client|
   client.subscribe(Mongo::Monitoring::COMMAND, command_monitor)
   client.subscribe(Mongo::Monitoring::SERVER_HEARTBEAT, heartbeat_monitor)
   client.subscribe(Mongo::Monitoring::CONNECTION_POOL, pool_monitor)
 end
 
-$client = Mongo::Client.new(ENV['MONGODB_URI'], sdam_proc: sdam_proc)
-
 puts 'Connecting'
+$client = Mongo::Client.new(ENV['MONGODB_URI'], sdam_proc: sdam_proc)
+# Populate the connection pool
 $client.use('lambda_test').database.list_collections
 puts 'Connected'
 
-def reset_counters
-  $heartbeats_count = 0
-  $total_heartbeat_time = 0
-  $commands_count = 0
-  $total_command_time = 0
-  $open_connections = 0
-end
-
-def average_heartbeat_time
-  if $heartbeats_count == 0
-    0
-  else
-    $total_heartbeat_time / $heartbeats_count
-  end
-end
-
-def average_command_time
-  if $commands_count == 0
-    0
-  else
-    $total_command_time / $commands_count
-  end
-end
-
 def lambda_handler(event:, context:)
   db = $client.use('lambda_test')
   collection = db[:test_collection]
   result = collection.insert_one({ name: 'test' })
   collection.delete_one({ _id: result.inserted_id })
-  response = {
-    average_heartbeat_time: average_heartbeat_time,
-    average_command_time: average_command_time,
-    heartbeats_count: $heartbeats_count,
-    open_connections: $open_connections,
-  }.to_json
-  reset_counters
+  response = $stats_aggregator.result.to_json
+  $stats_aggregator.reset
   puts "Response: #{response}"
 
   {
     statusCode: 200,
     body: response
   }
 end
-
-
-lambda_handler(event: nil, context: nil)