@oneuptime/common 10.0.45 → 10.0.46

package/Server/Services/Index.ts

@@ -33,6 +33,7 @@ import IncidentStateService from "./IncidentStateService";
 import IncidentStateTimelineService from "./IncidentStateTimelineService";
 //Labels.
 import LabelService from "./LabelService";
+import KubernetesClusterService from "./KubernetesClusterService";
 import LlmProviderService from "./LlmProviderService";
 import LogService from "./LogService";
 import MailService from "./MailService";
@@ -256,6 +257,7 @@ const services: Array<BaseService> = [
   IncidentFeedService,
 
   LabelService,
+  KubernetesClusterService,
   LlmProviderService,
 
   MailService,

package/Server/Utils/StartServer.ts

@@ -19,6 +19,7 @@ import Express, {
   NextFunction,
   OneUptimeRequest,
   RequestHandler,
+  headerValueToString,
 } from "./Express";
 import logger from "./Logger";
 import "./Process";
@@ -117,9 +118,9 @@ app.use((req: ExpressRequest, _res: ExpressResponse, next: NextFunction) => {
 });
 
 /*
- * Parse protobuf (binary) bodies for OTLP ingestion before JSON/gzip middleware.
- * The .NET OpenTelemetry SDK (and others) send telemetry data as application/x-protobuf.
- * Without this, express.json() skips protobuf requests and req.body remains undefined.
+ * Parse protobuf (binary) bodies for non-OTLP routes.
+ * OTLP HTTP ingestion bypasses the global body parsers and handles raw/gzip
+ * payloads in the telemetry router to avoid conflicts with the merged app stack.
  */
 const protobufBodyParserMiddleware: RequestHandler = ExpressRaw({
   type: ["application/x-protobuf", "application/protobuf"],
@@ -127,15 +128,18 @@ const protobufBodyParserMiddleware: RequestHandler = ExpressRaw({
 });
 
 app.use((req: OneUptimeRequest, res: ExpressResponse, next: NextFunction) => {
-  const contentType: string | undefined = req.headers["content-type"];
+  if (req.path.includes("/otlp/v1/")) {
+    return next();
+  }
 
-  if (
-    contentType &&
-    (contentType.includes("application/x-protobuf") ||
-      contentType.includes("application/protobuf"))
-  ) {
-    protobufBodyParserMiddleware(req, res, next);
-  } else if (req.headers["content-encoding"] === "gzip") {
+  const contentType: string | undefined = headerValueToString(
+    req.headers["content-type"],
+  );
+  const contentEncoding: string | undefined = headerValueToString(
+    req.headers["content-encoding"],
+  );
+
+  if (contentEncoding?.includes("gzip")) {
     const buffers: any = [];
 
     req.on("data", (chunk: any) => {
@@ -159,13 +163,22 @@ app.use((req: OneUptimeRequest, res: ExpressResponse, next: NextFunction) => {
         next();
       });
     });
+  } else if (
+    contentType &&
+    (contentType.includes("application/x-protobuf") ||
+      contentType.includes("application/protobuf"))
+  ) {
+    protobufBodyParserMiddleware(req, res, next);
   } else {
     jsonBodyParserMiddleware(req, res, next);
   }
 });
 
 app.use((req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
-  if (req.headers["content-encoding"] === "gzip") {
+  if (
+    req.path.includes("/otlp/v1/") ||
+    headerValueToString(req.headers["content-encoding"])?.includes("gzip")
+  ) {
     next();
   } else {
     urlEncodedMiddleware(req, res, next);

package/Tests/UI/Components/ComponentsModal.test.tsx

@@ -86,7 +86,9 @@ describe("ComponentsModal", () => {
       />,
     );
     expect(
-      screen.getByPlaceholderText("Search components..."),
+      screen.getByPlaceholderText(
+        "Search components by name, description, or category",
+      ),
     ).toBeInTheDocument();
   });
 
@@ -101,7 +103,7 @@ describe("ComponentsModal", () => {
       />,
     );
     for (const cat of mockedCategories) {
-      expect(screen.getByText(cat.name)).toBeInTheDocument();
+      expect(screen.getAllByText(cat.name).length).toBeGreaterThanOrEqual(1);
     }
     for (const comp of mockedComponents) {
       expect(screen.getByText(comp.title)).toBeInTheDocument();
@@ -187,9 +189,14 @@ describe("ComponentsModal", () => {
         categories={mockedCategories}
       />,
     );
-    fireEvent.change(screen.getByPlaceholderText("Search components..."), {
-      target: { value: "Non-existent Ccmponent" },
-    });
+    fireEvent.change(
+      screen.getByPlaceholderText(
+        "Search components by name, description, or category",
+      ),
+      {
+        target: { value: "Non-existent Ccmponent" },
+      },
+    );
     expect(
       screen.getByText(
         "No components that match your search. If you are looking for an integration that does not exist currently - you can use Custom Code or API component to build anything you like.",
@@ -246,10 +253,20 @@ describe("ComponentsModal", () => {
         0,
         comp.title.length - comp.title.length / 2,
       );
-      fireEvent.change(screen.getByPlaceholderText("Search components..."), {
-        target: { value: partialTitle },
-      });
-      expect(screen.getByText(comp.title)).toBeInTheDocument();
+      fireEvent.change(
+        screen.getByPlaceholderText(
+          "Search components by name, description, or category",
+        ),
+        {
+          target: { value: partialTitle },
+        },
+      );
+      // title may be split across elements due to search highlighting
+      expect(
+        screen.getByText((_content: string | null, element: Element | null) => {
+          return element?.textContent === comp.title;
+        }),
+      ).toBeInTheDocument();
 
       // check other components are not displayed
       mockedComponents
@@ -273,9 +290,14 @@ describe("ComponentsModal", () => {
       />,
     );
     mockedComponents.forEach((comp: ComponentMetadata) => {
-      fireEvent.change(screen.getByPlaceholderText("Search components..."), {
-        target: { value: comp.description },
-      });
+      fireEvent.change(
+        screen.getByPlaceholderText(
+          "Search components by name, description, or category",
+        ),
+        {
+          target: { value: comp.description },
+        },
+      );
       expect(screen.getByText(comp.title)).toBeInTheDocument();
 
       // check other components are not displayed
@@ -300,9 +322,14 @@ describe("ComponentsModal", () => {
       />,
     );
     mockedComponents.forEach((comp: ComponentMetadata) => {
-      fireEvent.change(screen.getByPlaceholderText("Search components..."), {
-        target: { value: comp.category },
-      });
+      fireEvent.change(
+        screen.getByPlaceholderText(
+          "Search components by name, description, or category",
+        ),
+        {
+          target: { value: comp.category },
+        },
+      );
       expect(screen.getByText(comp.title)).toBeInTheDocument();
 
       // check other components are not displayed
@@ -328,7 +355,7 @@ describe("ComponentsModal", () => {
     );
     mockedComponents.forEach((comp: ComponentMetadata) => {
       const searchInput: HTMLElement = screen.getByPlaceholderText(
-        "Search components...",
+        "Search components by name, description, or category",
       );
       fireEvent.change(searchInput, { target: { value: comp.title } });
       fireEvent.change(searchInput, { target: { value: "" } }); // clear search
@@ -341,14 +368,15 @@ describe("ComponentsModal", () => {
 
   it("should return multiple components when similar titles match", () => {
     // we add a new component where its title is a substring of another component's title
-    const commonWord: string = mockedComponents[0]?.title.substring(0, 5) || "";
+    const localComponents: ComponentMetadata[] = [...mockedComponents];
+    const commonWord: string = localComponents[0]?.title.substring(0, 5) || "";
     const newComponent: ComponentMetadata = getComponentMetadata(
       mockedCategories[1]?.name,
     );
     newComponent.title += commonWord;
-    mockedComponents.push(newComponent);
+    localComponents.push(newComponent);
     const componentsWithCommonWord: ComponentMetadata[] =
-      mockedComponents.filter((comp: ComponentMetadata) => {
+      localComponents.filter((comp: ComponentMetadata) => {
         return comp.title.includes(commonWord);
       });
 
@@ -357,41 +385,57 @@ describe("ComponentsModal", () => {
         componentsType={ComponentType.Component}
         onCloseModal={mockOnCloseModal}
         onComponentClick={mockOnComponentClick}
-        components={mockedComponents}
+        components={localComponents}
         categories={mockedCategories}
       />,
     );
 
-    fireEvent.change(screen.getByPlaceholderText("Search components..."), {
-      target: { value: commonWord },
-    });
+    fireEvent.change(
+      screen.getByPlaceholderText(
+        "Search components by name, description, or category",
+      ),
+      {
+        target: { value: commonWord },
+      },
+    );
     componentsWithCommonWord.forEach((comp: ComponentMetadata) => {
-      expect(screen.getByText(comp.title)).toBeInTheDocument();
+      // title may be split across elements due to search highlighting
+      expect(
+        screen.getByText((_content: string | null, element: Element | null) => {
+          return element?.textContent === comp.title;
+        }),
+      ).toBeInTheDocument();
     });
   });
 
   it("should return return components with similar descriptions", () => {
     // we add a new component where its title is a substring of another component's description
+    const localComponents: ComponentMetadata[] = [...mockedComponents];
     const partialDescription: string =
-      mockedComponents[0]?.description.substring(0, 10) || "";
+      localComponents[0]?.description.substring(0, 10) || "";
     const newComponent: ComponentMetadata = getComponentMetadata(
       mockedCategories[1]?.name,
     );
     newComponent.title = partialDescription || "";
-    mockedComponents.push(newComponent);
+    localComponents.push(newComponent);
     render(
       <ComponentsModal
         componentsType={ComponentType.Component}
         onCloseModal={mockOnCloseModal}
         onComponentClick={mockOnComponentClick}
-        components={mockedComponents}
+        components={localComponents}
         categories={mockedCategories}
       />,
     );
 
-    fireEvent.change(screen.getByPlaceholderText("Search components..."), {
-      target: { value: partialDescription },
-    });
+    fireEvent.change(
+      screen.getByPlaceholderText(
+        "Search components by name, description, or category",
+      ),
+      {
+        target: { value: partialDescription },
+      },
+    );
     expect(
       screen.getAllByText(new RegExp(partialDescription, "i")),
     ).toHaveLength(2);
@@ -399,11 +443,12 @@ describe("ComponentsModal", () => {
 
   it("should return components with the same category", () => {
     // we add two components with the same category as the first component
-    const commonCategory: string | undefined = mockedComponents[0]?.category;
-    mockedComponents.push(getComponentMetadata(commonCategory));
-    mockedComponents.push(getComponentMetadata(commonCategory));
+    const localComponents: ComponentMetadata[] = [...mockedComponents];
+    const commonCategory: string | undefined = localComponents[0]?.category;
+    localComponents.push(getComponentMetadata(commonCategory));
+    localComponents.push(getComponentMetadata(commonCategory));
     const componentsInCommonCategory: ComponentMetadata[] =
-      mockedComponents.filter((comp: ComponentMetadata) => {
+      localComponents.filter((comp: ComponentMetadata) => {
         return comp.category === commonCategory;
       });
 
@@ -412,14 +457,19 @@ describe("ComponentsModal", () => {
         componentsType={ComponentType.Component}
         onCloseModal={mockOnCloseModal}
         onComponentClick={mockOnComponentClick}
-        components={mockedComponents}
+        components={localComponents}
         categories={mockedCategories}
       />,
     );
 
-    fireEvent.change(screen.getByPlaceholderText("Search components..."), {
-      target: { value: commonCategory },
-    });
+    fireEvent.change(
+      screen.getByPlaceholderText(
+        "Search components by name, description, or category",
+      ),
+      {
+        target: { value: commonCategory },
+      },
+    );
     componentsInCommonCategory.forEach((comp: ComponentMetadata) => {
       expect(screen.getByText(comp.title)).toBeInTheDocument();
     });