("");
+ const javaAgentVersion = currentJavaAgentVersion || latestJavaAgentVersion;
+
+ const schema = useConfigSchema(schemaVersion);
+ const starter = useConfigStarter(schemaVersion);
const root = (schema.data as GroupNode | null) ?? null;
return (
@@ -294,17 +331,30 @@ export function ConfigurationBuilderPage() {
- {versions.data && version ? (
-
- ) : null}
+
+ {schemaVersionsState.data && schemaVersion ? (
+
+ ) : null}
+ {javaAgentVersions.length > 0 && javaAgentVersion ? (
+
+ ) : null}
+
- {!version || schema.loading || starter.loading ? (
+ {!schemaVersion || schema.loading || starter.loading ? (
Loading schema…
) : schema.error ? (
Failed to load schema.
@@ -314,13 +364,14 @@ export function ConfigurationBuilderPage() {
) : null}
- {!version || schema.loading || starter.loading ? (
+ {!schemaVersion || schema.loading || starter.loading ? (
Loading schema…
) : schema.error ? (
Failed to load schema.
@@ -330,7 +381,8 @@ export function ConfigurationBuilderPage() {
) : null}
diff --git a/ecosystem-explorer/src/hooks/use-latest-java-agent-version.test.ts b/ecosystem-explorer/src/hooks/use-latest-java-agent-version.test.ts
deleted file mode 100644
index c8ccbc6d..00000000
--- a/ecosystem-explorer/src/hooks/use-latest-java-agent-version.test.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { describe, it, expect, vi, beforeEach } from "vitest";
-import { renderHook } from "@testing-library/react";
-import type { VersionsIndex } from "@/types/javaagent";
-
-const useVersionsMock = vi.fn();
-vi.mock("@/hooks/use-javaagent-data", () => ({
- useVersions: () => useVersionsMock(),
-}));
-
-import { useLatestJavaAgentVersion } from "./use-latest-java-agent-version";
-
-describe("useLatestJavaAgentVersion", () => {
- beforeEach(() => useVersionsMock.mockReset());
-
- it("returns the version flagged is_latest", () => {
- const data: VersionsIndex = {
- versions: [
- { version: "2.26.1", is_latest: false },
- { version: "2.27.0", is_latest: true },
- ],
- };
- useVersionsMock.mockReturnValue({ data, loading: false, error: null });
- const { result } = renderHook(() => useLatestJavaAgentVersion());
- expect(result.current).toBe("2.27.0");
- });
-
- it("falls back to the first version when none is flagged is_latest", () => {
- const data: VersionsIndex = {
- versions: [
- { version: "2.26.1", is_latest: false },
- { version: "2.27.0", is_latest: false },
- ],
- };
- useVersionsMock.mockReturnValue({ data, loading: false, error: null });
- const { result } = renderHook(() => useLatestJavaAgentVersion());
- expect(result.current).toBe("2.26.1");
- });
-
- it("returns undefined while loading", () => {
- useVersionsMock.mockReturnValue({ data: null, loading: true, error: null });
- const { result } = renderHook(() => useLatestJavaAgentVersion());
- expect(result.current).toBeUndefined();
- });
-
- it("returns undefined when versions is empty", () => {
- useVersionsMock.mockReturnValue({
- data: { versions: [] },
- loading: false,
- error: null,
- });
- const { result } = renderHook(() => useLatestJavaAgentVersion());
- expect(result.current).toBeUndefined();
- });
-});
diff --git a/ecosystem-explorer/src/hooks/use-latest-java-agent-version.ts b/ecosystem-explorer/src/hooks/use-latest-java-agent-version.ts
deleted file mode 100644
index 743e901a..00000000
--- a/ecosystem-explorer/src/hooks/use-latest-java-agent-version.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { useMemo } from "react";
-import { useVersions } from "@/hooks/use-javaagent-data";
-
-export function useLatestJavaAgentVersion(): string | undefined {
- const { data } = useVersions();
- return useMemo(
- () => data?.versions.find((v) => v.is_latest)?.version ?? data?.versions[0]?.version,
- [data]
- );
-}
diff --git a/ecosystem-explorer/src/test/integration/configuration-builder-instrumentation-version.integration.test.tsx b/ecosystem-explorer/src/test/integration/configuration-builder-instrumentation-version.integration.test.tsx
new file mode 100644
index 00000000..61cabb98
--- /dev/null
+++ b/ecosystem-explorer/src/test/integration/configuration-builder-instrumentation-version.integration.test.tsx
@@ -0,0 +1,134 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { describe, it, expect, beforeAll, afterAll, beforeEach } from "vitest";
+import { screen, waitFor, within } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import schemaVersionsIndex from "../../../public/data/configuration/versions-index.json";
+import javaAgentVersionsIndex from "../../../public/data/javaagent/versions-index.json";
+import { installFetchInterceptor, uninstallFetchInterceptor } from "./helpers/fetch-interceptor";
+import { renderBuilderPage as renderPage } from "./helpers/render-builder-page";
+
+const latestSchemaVersion = schemaVersionsIndex.versions.find((v) => v.is_latest)!.version;
+const latestAgentVersion = javaAgentVersionsIndex.versions.find((v) => v.is_latest)!.version;
+const otherAgentVersion = javaAgentVersionsIndex.versions.find((v) => !v.is_latest)?.version;
+
+beforeAll(() => installFetchInterceptor());
+afterAll(() => uninstallFetchInterceptor());
+beforeEach(() => localStorage.clear());
+
+async function findAgentSelector(): Promise {
+ return (await screen.findByLabelText("Agent", {}, { timeout: 10_000 })) as HTMLSelectElement;
+}
+
+async function openInstrumentationTab(user: ReturnType) {
+ await screen.findByRole("switch", { name: /Enable Resource/i }, { timeout: 10_000 });
+ const sidebar = screen.getByRole("complementary");
+ await user.click(within(sidebar).getByRole("tab", { name: /Instrumentation/i }));
+}
+
+describe("ConfigurationBuilderPage version selectors", () => {
+ it("renders Schema and Agent selectors side by side in the page header", async () => {
+ renderPage();
+ const schema = (await screen.findByLabelText(
+ "Schema",
+ {},
+ { timeout: 10_000 }
+ )) as HTMLSelectElement;
+ const agent = await findAgentSelector();
+ expect(schema.value).toBe(latestSchemaVersion);
+ expect(agent.value).toBe(latestAgentVersion);
+ });
+
+ it("re-runs the registry lookup and updates the Instrumentation tab when the Agent version changes", async () => {
+ if (!otherAgentVersion) return;
+ renderPage();
+ const user = userEvent.setup();
+ const agent = await findAgentSelector();
+
+ await openInstrumentationTab(user);
+ const reactorRow = (await screen.findByTestId(
+ "instrumentation-row-reactor",
+ {},
+ { timeout: 10_000 }
+ )) as HTMLElement;
+ expect(within(reactorRow).getByText("2 versions")).toBeInTheDocument();
+
+ await user.selectOptions(agent, otherAgentVersion);
+
+ await waitFor(
+ () => {
+ const updated = screen.getByTestId("instrumentation-row-reactor");
+ expect(within(updated).queryByText("2 versions")).toBeNull();
+ },
+ { timeout: 10_000 }
+ );
+ });
+
+ it("updates the YAML preview header from the SDK tab when the Agent version changes", async () => {
+ if (!otherAgentVersion) return;
+ renderPage();
+ const user = userEvent.setup();
+ const preview = (await screen.findByLabelText(
+ "Output Preview",
+ {},
+ { timeout: 10_000 }
+ )) as HTMLElement;
+ expect(preview.textContent).toContain(`Java agent: ${latestAgentVersion}`);
+
+ const agent = await findAgentSelector();
+ await user.selectOptions(agent, otherAgentVersion);
+
+ await waitFor(() => {
+ expect(preview.textContent).toContain(`Java agent: ${otherAgentVersion}`);
+ });
+ expect(preview.textContent).not.toContain(`Java agent: ${latestAgentVersion}`);
+ });
+
+ it("preserves user-entered configuration values when the Agent version changes", async () => {
+ if (!otherAgentVersion) return;
+ renderPage();
+ const user = userEvent.setup();
+ const resourceToggle = await screen.findByRole(
+ "switch",
+ { name: /Enable Resource/i },
+ { timeout: 10_000 }
+ );
+ expect(resourceToggle).toHaveAttribute("aria-checked", "true");
+ await user.click(resourceToggle);
+ await waitFor(() => expect(resourceToggle).toHaveAttribute("aria-checked", "false"));
+
+ const agent = await findAgentSelector();
+ await user.selectOptions(agent, otherAgentVersion);
+
+ expect(resourceToggle).toHaveAttribute("aria-checked", "false");
+ });
+
+ it("does not persist the Agent selection: remount resets to latest with empty localStorage", async () => {
+ if (!otherAgentVersion) return;
+ const { unmount } = renderPage();
+ const user = userEvent.setup();
+ const agent = await findAgentSelector();
+ await user.selectOptions(agent, otherAgentVersion);
+ expect(agent.value).toBe(otherAgentVersion);
+
+ unmount();
+ expect(localStorage.length).toBe(0);
+
+ renderPage();
+ const reloaded = await findAgentSelector();
+ expect(reloaded.value).toBe(latestAgentVersion);
+ });
+});