Merge branch 'main' of github.com:dash0hq/otelbin into selectable-err…

…or-validation-console-texts
dash0hq · Nov 9, 2023 · af89103 · af89103
2 parents cad5584 + 1a13eba
commit af89103
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 17 deletions.
diff --git a/packages/otelbin-validation-image/src/index.ts b/packages/otelbin-validation-image/src/index.ts
@@ -105,6 +105,14 @@ export const validateOtelCol = async (otelcolRealPath: string, configPath: strin
   });
 };
 
+const extractErrorPath = (errorMessage: string) => {
+  const errorPathMatch = errorMessage.match(/^((?:(?:[\w\/]+)(?:\:\:)?)+):[^:]/);
+  if (errorPathMatch) {
+    // We have a prefix for the error that specified a path
+    return errorPathMatch[1]?.split('::');
+  }
+};
+
 export const handler = async (event: APIGatewayEvent): Promise<APIGatewayProxyResult> => {
   const config = event.body;
 
@@ -170,10 +178,13 @@ export const handler = async (event: APIGatewayEvent): Promise<APIGatewayProxyRe
         error = error.substring(defaultErrorPrefix.length);
       }
 
+      const path = extractErrorPath(error);
+
       return {
         statusCode: 200,
         // Unfortunately the collector returns one validation error at the time
         body: JSON.stringify({
+          path,
           message: 'The provided configuration is invalid',
           error,
         }),

diff --git a/packages/otelbin-validation/test/assets/config-undeclared-receiver-named-pipelines.yaml b/packages/otelbin-validation/test/assets/config-undeclared-receiver-named-pipelines.yaml
@@ -0,0 +1,36 @@
+# Learn more about the OpenTelemetry Collector via
+# https://opentelemetry.io/docs/collector/
+
+receivers:
+  otlp:
+    protocols:
+      grpc:
+      http:
+
+processors:
+  batch:
+
+exporters:
+  otlp:
+    endpoint: otelcol:4317
+
+extensions:
+  health_check:
+  pprof:
+  zpages:
+
+service:
+  extensions: [health_check, pprof, zpages]
+  pipelines:
+    traces/dash0:
+      receivers: [jaeger]
+      processors: [batch]
+      exporters: [otlp]
+    metrics/dash0:
+      receivers: [otlp]
+      processors: [batch]
+      exporters: [otlp]
+    logs/dash0:
+      receivers: [otlp]
+      processors: [batch]
+      exporters: [otlp]
diff --git a/packages/otelbin-validation/test/main.test.ts b/packages/otelbin-validation/test/main.test.ts
@@ -53,6 +53,7 @@ const otelcolConfigValid = readConfig('config-default.yaml');
 const otelcolConfigInvalidNoReceivers = readConfig('config-no-receivers.yaml');
 const otelcolConfigInvalidUndeclaredExtension = readConfig('config-undeclared-extension.yaml');
 const otelcolConfigInvalidUndeclaredReceiver = readConfig('config-undeclared-receiver.yaml');
+const otelcolConfigInvalidUndeclaredReceiverNamedPipeline = readConfig('config-undeclared-receiver-named-pipelines.yaml');
 
 describe.each(enumerateTestCases())('Validation API', (distributionName, release) => {
 
@@ -153,12 +154,29 @@ describe.each(enumerateTestCases())('Validation API', (distributionName, release
         })).resolves.toMatchObject({
           status: 200,
           data: {
+            path: ['service', 'pipelines', 'traces'],
             message: 'The provided configuration is invalid',
             error: 'service::pipelines::traces: references receiver "jaeger" which is not configured',
           },
         });
       }, defaultTimeout);
 
+      test('rejects configuration with undeclared receiver in named pipeline', async () => {
+        await expect(axios.post(validationUrl, otelcolConfigInvalidUndeclaredReceiverNamedPipeline, {
+          headers: {
+            'Content-Type': 'application/yaml',
+            'X-Api-Key': apiKey,
+          },
+        })).resolves.toMatchObject({
+          status: 200,
+          data: {
+            path: ['service', 'pipelines', 'traces/dash0'],
+            message: 'The provided configuration is invalid',
+            error: 'service::pipelines::traces/dash0: references receiver "jaeger" which is not configured',
+          },
+        });
+      }, defaultTimeout);
+
       test('rejects configuration with undeclared extension', async () => {
         await expect(axios.post(validationUrl, otelcolConfigInvalidUndeclaredExtension, {
           headers: {
@@ -168,6 +186,7 @@ describe.each(enumerateTestCases())('Validation API', (distributionName, release
         })).resolves.toMatchObject({
           status: 200,
           data: {
+            path: ['service', 'extensions'],
             message: 'The provided configuration is invalid',
             error: 'service::extensions: references extension "health_check" which is not configured',
           },

diff --git a/packages/otelbin/src/components/AppHeader.tsx b/packages/otelbin/src/components/AppHeader.tsx
@@ -6,7 +6,6 @@ import { LogIn } from "lucide-react";
 import { Share } from "~/components/share/Share";
 import { SignedIn, SignedOut, SignInButton, UserButton } from "@clerk/nextjs";
 import { Button } from "~/components/button";
-import InfoBox from "./validation-type/InfoBox";
 import ValidationType from "./validation-type/ValidationType";
 
 export default function AppHeader() {
@@ -21,8 +20,6 @@ export default function AppHeader() {
 				<div className="w-px bg-neutral-350 h-full">&nbsp;</div>
 
 				<ValidationType />
-
-				<InfoBox />
 			</div>
 			<div className="flex gap-x-2">
 				<Share />

diff --git a/packages/otelbin/src/components/validation-type/ValidationType.tsx b/packages/otelbin/src/components/validation-type/ValidationType.tsx
@@ -9,6 +9,7 @@ import ValidationTypeContent from "./ValidationTypeContent";
 import { useDistributions } from "../validation/useDistributions";
 import { useUrlState } from "~/lib/urlState/client/useUrlState";
 import { distroBinding, distroVersionBinding } from "../validation/binding";
+import InfoBox from "./InfoBox";
 
 export interface ICurrentDistro {
 	distro: string;
@@ -28,19 +29,22 @@ export default function ValidationType() {
 			: undefined;
 
 	return (
-		<Popover open={open} onOpenChange={setOpen} modal={true}>
-			<PopoverTrigger asChild>
-				<Button size="xs" variant="cta">
-					Validation:{" "}
-					<strong>{`${currentDistro?.provider ?? "Browser-only"} ${currentDistro ? " – " : ""} ${
-						currentDistro ? currentDistro.version : ""
-					}`}</strong>{" "}
-					<Down />
-				</Button>
-			</PopoverTrigger>
-			<PopoverContent align="start" className="p-0 max-w-[480px] overflow-y-auto max-h-[90vh]">
-				<ValidationTypeContent currentDistro={currentDistro} data={data} setOpen={setOpen} />
-			</PopoverContent>
-		</Popover>
+		<div className="flex items-center gap-x-4">
+			<Popover open={open} onOpenChange={setOpen} modal={true}>
+				<PopoverTrigger asChild>
+					<Button size="xs" variant="cta">
+						Validation:{" "}
+						<strong>{`${currentDistro?.provider ?? "Browser-only"} ${currentDistro ? " – " : ""} ${
+							currentDistro ? currentDistro.version : ""
+						}`}</strong>{" "}
+						<Down />
+					</Button>
+				</PopoverTrigger>
+				<PopoverContent align="start" className="p-0 max-w-[480px] overflow-y-auto max-h-[90vh]">
+					<ValidationTypeContent currentDistro={currentDistro} data={data} setOpen={setOpen} />
+				</PopoverContent>
+			</Popover>
+			{distro === null && distroVersion === null && <InfoBox />}
+		</div>
 	);
 }