Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add observability with openllmetry #2

Merged
merged 1 commit into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions create-app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export async function createApp({
postInstallAction,
dataSource,
tools,
observability,
}: InstallAppArgs): Promise<void> {
const root = path.resolve(appPath);

Expand Down Expand Up @@ -90,6 +91,7 @@ export async function createApp({
postInstallAction,
dataSource,
tools,
observability,
};

if (frontend) {
Expand Down Expand Up @@ -143,5 +145,15 @@ export async function createApp({
`file://${root}/README.md`,
)} and learn how to get started.`,
);

if (args.observability === "opentelemetry") {
console.log(
`\n${yellow("Observability")}: Visit the ${terminalLink(
"documentation",
"https://traceloop.com/docs/openllmetry/integrations",
)} to set up the environment variables and start seeing execution traces.`,
);
}

console.log();
}
2 changes: 2 additions & 0 deletions helpers/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export type TemplateDataSource = {
config: TemplateDataSourceConfig;
};
export type TemplateDataSourceType = "none" | "file" | "folder" | "web";
export type TemplateObservability = "none" | "opentelemetry";
// Config for both file and folder
export type FileSourceConfig = {
path?: string;
Expand Down Expand Up @@ -49,4 +50,5 @@ export interface InstallTemplateArgs {
externalPort?: number;
postInstallAction?: TemplatePostInstallAction;
tools?: Tool[];
observability?: TemplateObservability;
}
63 changes: 52 additions & 11 deletions helpers/typescript.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ export const installTSTemplate = async ({
vectorDb,
postInstallAction,
backend,
observability,
}: InstallTemplateArgs & { backend: boolean }) => {
console.log(bold(`Using ${packageManager}.`));

Expand All @@ -81,19 +82,47 @@ export const installTSTemplate = async ({
});

/**
* If next.js is not used as a backend, update next.config.js to use static site generation.
* If next.js is used, update its configuration if necessary
*/
if (framework === "nextjs" && !backend) {
// update next.config.json for static site generation
const nextConfigJsonFile = path.join(root, "next.config.json");
const nextConfigJson: any = JSON.parse(
await fs.readFile(nextConfigJsonFile, "utf8"),
if (framework === "nextjs") {
if (!backend) {
// update next.config.json for static site generation
const nextConfigJsonFile = path.join(root, "next.config.json");
const nextConfigJson: any = JSON.parse(
await fs.readFile(nextConfigJsonFile, "utf8"),
);
nextConfigJson.output = "export";
nextConfigJson.images = { unoptimized: true };
await fs.writeFile(
nextConfigJsonFile,
JSON.stringify(nextConfigJson, null, 2) + os.EOL,
);
}

const webpackConfigOtelFile = path.join(root, "webpack.config.o11y.mjs");
if (observability === "opentelemetry") {
const webpackConfigDefaultFile = path.join(root, "webpack.config.mjs");
await fs.rm(webpackConfigDefaultFile);
await fs.rename(webpackConfigOtelFile, webpackConfigDefaultFile);
} else {
await fs.rm(webpackConfigOtelFile);
}
}

if (observability && observability !== "none") {
const chosenObservabilityPath = path.join(
templatesDir,
"components",
"observability",
"typescript",
observability,
);
nextConfigJson.output = "export";
nextConfigJson.images = { unoptimized: true };
await fs.writeFile(
nextConfigJsonFile,
JSON.stringify(nextConfigJson, null, 2) + os.EOL,
const relativeObservabilityPath = framework === "nextjs" ? "app" : "src";

await copy(
"**",
path.join(root, relativeObservabilityPath, "observability"),
{ cwd: chosenObservabilityPath },
);
}

Expand Down Expand Up @@ -202,6 +231,18 @@ export const installTSTemplate = async ({
};
}

if (observability === "opentelemetry") {
packageJson.dependencies = {
...packageJson.dependencies,
"@traceloop/node-server-sdk": "^0.5.19",
};

packageJson.devDependencies = {
...packageJson.devDependencies,
"node-loader": "^2.0.0",
};
}

if (!eslint) {
// Remove packages starting with "eslint" from devDependencies
packageJson.devDependencies = Object.fromEntries(
Expand Down
22 changes: 22 additions & 0 deletions questions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,28 @@ export const askQuestions = async (
}
}

if (program.framework === "express" || program.framework === "nextjs") {
if (!program.observability) {
if (ciInfo.isCI) {
program.observability = getPrefOrDefault("observability");
}
} else {
const { observability } = await prompts({
type: "select",
name: "observability",
message: "Would you like to set up observability?",
choices: [
{ title: "No", value: "none" },
{ title: "OpenTelemetry", value: "opentelemetry" },
],
initial: 0,
});

program.observability = observability;
preferences.observability = observability;
}
}

if (!program.model) {
if (ciInfo.isCI) {
program.model = getPrefOrDefault("model");
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import * as traceloop from "@traceloop/node-server-sdk";
import * as LlamaIndex from "llamaindex";

export const initObservability = () => {
traceloop.initialize({
appName: "llama-app",
disableBatch: true,
instrumentModules: {
llamaIndex: LlamaIndex,
},
});
};
3 changes: 3 additions & 0 deletions templates/types/simple/express/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import cors from "cors";
import "dotenv/config";
import express, { Express, Request, Response } from "express";
import { initObservability } from "./src/observability";
import chatRouter from "./src/routes/chat.route";

const app: Express = express();
Expand All @@ -11,6 +12,8 @@ const env = process.env["NODE_ENV"];
const isDevelopment = !env || env === "development";
const prodCorsOrigin = process.env["PROD_CORS_ORIGIN"];

initObservability();

app.use(express.json());

if (isDevelopment) {
Expand Down
1 change: 1 addition & 0 deletions templates/types/simple/express/src/observability/init.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const initObservability = () => {};
3 changes: 3 additions & 0 deletions templates/types/streaming/express/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import cors from "cors";
import "dotenv/config";
import express, { Express, Request, Response } from "express";
import { initObservability } from "./src/observability";
import chatRouter from "./src/routes/chat.route";

const app: Express = express();
Expand All @@ -11,6 +12,8 @@ const env = process.env["NODE_ENV"];
const isDevelopment = !env || env === "development";
const prodCorsOrigin = process.env["PROD_CORS_ORIGIN"];

initObservability();

app.use(express.json());

if (isDevelopment) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const initObservability = () => {};
3 changes: 3 additions & 0 deletions templates/types/streaming/nextjs/app/api/chat/route.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import { initObservability } from "@/app/observability";
import { StreamingTextResponse } from "ai";
import { ChatMessage, MessageContent, OpenAI } from "llamaindex";
import { NextRequest, NextResponse } from "next/server";
import { createChatEngine } from "./engine";
import { LlamaIndexStream } from "./llamaindex-stream";

initObservability();

export const runtime = "nodejs";
export const dynamic = "force-dynamic";

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const initObservability = () => {};
2 changes: 1 addition & 1 deletion templates/types/streaming/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"remark-code-import": "^1.2.0",
"remark-gfm": "^3.0.1",
"remark-math": "^5.1.1",
"supports-color": "^9.4.0",
"supports-color": "^8.1.1",
"tailwind-merge": "^2.1.0"
},
"devDependencies": {
Expand Down
16 changes: 16 additions & 0 deletions templates/types/streaming/nextjs/webpack.config.o11y.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
export default function webpack(config, isServer) {
// See https://webpack.js.org/configuration/resolve/#resolvealias
config.resolve.alias = {
...config.resolve.alias,
sharp$: false,
"onnxruntime-node$": false,
};
config.module.rules.push({
test: /\.node$/,
loader: "node-loader",
});
if (isServer) {
config.ignoreWarnings = [{ module: /opentelemetry/ }];
}
return config;
}
Loading