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

fix: enable tracing flag #508

Merged
merged 4 commits into from
Feb 26, 2025
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
25 changes: 25 additions & 0 deletions examples/grid/src/env.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
interface EnvConfig {
readonly bootstrapPeers: string;
readonly enableTracing: boolean;
readonly renderInfoInterval: number;
readonly discoveryInterval: number;
readonly mode: string;
}

function getBooleanFromEnv(key: keyof ImportMetaEnv): boolean {
const value = import.meta.env[key];
return value === "true" || value === "1" || Boolean(value);
}

function getNumberFromEnv(key: keyof ImportMetaEnv): number {
const value = import.meta.env[key];
return Number(value);
}

export const env: EnvConfig = {
bootstrapPeers: import.meta.env.VITE_BOOTSTRAP_PEERS,
enableTracing: getBooleanFromEnv("VITE_ENABLE_TRACING"),
renderInfoInterval: getNumberFromEnv("VITE_RENDER_INFO_INTERVAL"),
discoveryInterval: getNumberFromEnv("VITE_DISCOVERY_INTERVAL"),
mode: import.meta.env.MODE,
};
15 changes: 8 additions & 7 deletions examples/grid/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { DRPNode } from "@ts-drp/node";
import { enableTracing, IMetrics, OpentelemetryMetrics } from "@ts-drp/tracer";

import { env } from "./env";
import { Grid } from "./objects/grid";
import { render, enableUIControls, renderInfo } from "./render";
import { gridState } from "./state";
import { getColorForPeerId } from "./util/color";

export function getNetworkConfigFromEnv() {
const hasBootstrapPeers = Boolean(import.meta.env.VITE_BOOTSTRAP_PEERS);
const hasDiscoveryInterval = Boolean(import.meta.env.VITE_DISCOVERY_INTERVAL);
const hasBootstrapPeers = env.bootstrapPeers;
const hasDiscoveryInterval = env.discoveryInterval;

const hasEnv = hasBootstrapPeers || hasDiscoveryInterval;

Expand All @@ -21,12 +22,12 @@ export function getNetworkConfigFromEnv() {
}

if (hasBootstrapPeers) {
config.bootstrap_peers = import.meta.env.VITE_BOOTSTRAP_PEERS.split(",");
config.bootstrap_peers = env.bootstrapPeers.split(",");
}

if (hasDiscoveryInterval) {
config.pubsub = {
peer_discovery_interval: import.meta.env.VITE_DISCOVERY_INTERVAL,
peer_discovery_interval: env.discoveryInterval,
};
}

Expand Down Expand Up @@ -133,7 +134,7 @@ async function run(metrics?: IMetrics) {

async function main() {
let metrics: IMetrics | undefined = undefined;
if (import.meta.env.VITE_ENABLE_TRACING) {
if (env.enableTracing) {
enableTracing();
metrics = new OpentelemetryMetrics("grid-service-2");
}
Expand All @@ -142,11 +143,11 @@ async function main() {
gridState.node = new DRPNode(networkConfig ? { network_config: networkConfig } : undefined);
await gridState.node.start();
await gridState.node.networkNode.isDialable(async () => {
console.log("Started node", import.meta.env);
console.log("Started node", env.mode);
await run(metrics);
});

setInterval(renderInfo, import.meta.env.VITE_RENDER_INFO_INTERVAL);
setInterval(renderInfo, env.renderInfoInterval);
}

void main();
1 change: 1 addition & 0 deletions examples/grid/vite-env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ interface ImportMetaEnv {
readonly VITE_BOOTSTRAP_PEERS: string;
readonly VITE_DISCOVERY_INTERVAL: number;
readonly VITE_RENDER_INFO_INTERVAL: number;
readonly VITE_ENABLE_TRACING: boolean;
}

interface ImportMeta {
Expand Down
1 change: 1 addition & 0 deletions examples/grid/vite.config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { nodePolyfills } from "vite-plugin-node-polyfills";
export default defineConfig({
define: {
"import.meta.env.VITE_RENDER_INFO_INTERVAL": process.env.VITE_RENDER_INFO_INTERVAL || 1000,
"import.meta.env.VITE_ENABLE_TRACING": process.env.VITE_ENABLE_TRACING || false,
},
build: {
target: "esnext",
Expand Down