Merge remote-tracking branch 'origin/main' into molly/global-context-part-2

Author: molly-moen

org-code-javabuilder/protocol/src/main/java/org/code/protocol/JavabuilderContext.java

@@ -3,6 +3,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * This class is meant to keep track of shared singletons that should only exist for the lifetime of
+ * one Javabuilder session. Any class can be registered as long as it extends
+ * JavabuilderSharedObject, but only one object per class can be registered.
+ */
 public class JavabuilderContext {
   private static JavabuilderContext contextInstance;
   private Map<Class, JavabuilderSharedObject> sharedObjects;

template.yml.erb

@@ -652,6 +652,12 @@ Resources:
 
   HighUsageCompositeAlarm:
     Type: AWS::CloudWatch::CompositeAlarm
+    DependsOn:
+      - HighHttpRequestsAlarm
+      -  HighWebsocketConnectionsAlarm
+      -  NeighborhoodHighInvocationsAlarm
+      -  TheaterHighInvocationsAlarm
+      -  PlaygroundHighInvocationsAlarm
     Properties:
         ActionsEnabled: true
         AlarmActions: