diff --git a/bun.lock b/bun.lock index 84c3550..b571b2a 100644 --- a/bun.lock +++ b/bun.lock @@ -22,6 +22,8 @@ "@opentelemetry/sdk-metrics": "^2.6.0", "@opentelemetry/sdk-trace-base": "^2.6.0", "@opentelemetry/semantic-conventions": "^1.40.0", + "http-proxy-agent": "^9.1.0", + "https-proxy-agent": "^9.1.0", }, "devDependencies": { "@opencode/plugin": "2.0.20", @@ -501,7 +503,7 @@ "acorn-jsx": ["acorn-jsx@5.3.2", "", { "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="], - "agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="], + "agent-base": ["agent-base@9.0.0", "", {}, "sha512-TQf59BsZnytt8GdJKLPfUZ54g/iaUL2OWDSFCCvMOhsHduDQxO8xC4PNeyIkVcA5KwL2phPSv0douC0fgWzmnA=="], "ai": ["ai@6.0.300", "", { "dependencies": { "@ai-sdk/gateway": "3.0.209", "@ai-sdk/provider": "3.0.18", "@ai-sdk/provider-utils": "4.0.57", "@opentelemetry/api": "^1.9.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ZBT30eQTy6exP+EWJJxm3DMb34m9td8STy+hfnvKdjhyEQoM8vQN5YfFLTRVVTCONHoM+y5K+Tudb6PTFrpikA=="], @@ -721,9 +723,9 @@ "http-cache-semantics": ["http-cache-semantics@4.2.0", "", {}, "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ=="], - "http-proxy-agent": ["http-proxy-agent@7.0.2", "", { "dependencies": { "agent-base": "^7.1.0", "debug": "^4.3.4" } }, "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig=="], + "http-proxy-agent": ["http-proxy-agent@9.1.0", "", { "dependencies": { "agent-base": "9.0.0", "debug": "^4.3.4", "proxy-agent-negotiate": "1.1.0" } }, "sha512-2NxoveTT58mjYT4n3RPTEfCZGLMbidoO8XEieXfpSYxu+PQJ1qpx4ypwH6N+uF9twBPIvRRgvkvW5HUTYWENig=="], - "https-proxy-agent": ["https-proxy-agent@7.0.6", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "4" } }, "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw=="], + "https-proxy-agent": ["https-proxy-agent@9.1.0", "", { "dependencies": { "agent-base": "9.0.0", "debug": "^4.3.4", "proxy-agent-negotiate": "1.1.0" } }, "sha512-ag87y7cJJ9/3+GxFr8Oy4O5faDsGRGnBGsJj/YjOSsSx/5eadKLYTMPlzuR6obgoCDDm0abAAZitXXQkMOPSpA=="], "iconv-lite": ["iconv-lite@0.7.3", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ=="], @@ -933,6 +935,8 @@ "protobufjs": ["protobufjs@7.5.4", "", { "dependencies": { "@protobufjs/aspromise": "^1.1.2", "@protobufjs/base64": "^1.1.2", "@protobufjs/codegen": "^2.0.4", "@protobufjs/eventemitter": "^1.1.0", "@protobufjs/fetch": "^1.1.0", "@protobufjs/float": "^1.0.2", "@protobufjs/inquire": "^1.1.0", "@protobufjs/path": "^1.1.2", "@protobufjs/pool": "^1.1.0", "@protobufjs/utf8": "^1.1.0", "@types/node": ">=13.7.0", "long": "^5.0.0" } }, "sha512-CvexbZtbov6jW2eXAvLukXjXUW1TzFaivC46BpWc/3BpcCysb5Vffu+B3XHMm8lVEuy2Mm4XGex8hBSg1yapPg=="], + "proxy-agent-negotiate": ["proxy-agent-negotiate@1.1.0", "", { "peerDependencies": { "kerberos": "^2.0.0" }, "optionalPeers": ["kerberos"] }, "sha512-N8IBcM3UgCVzz2L2Lqv8DVntDnnC8/hiV4nEDUPkqq72TPUgYWjQc+bdZlBPZK9LzPAvOY//gAt0S0DApoOXWQ=="], + "punycode": ["punycode@2.3.1", "", {}, "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="], "pure-rand": ["pure-rand@8.4.0", "", {}, "sha512-IoM8YF/jY0hiugFo/wOWqfmarlE6J0wc6fDK1PhftMk7MGhVZl88sZimmqBBFomLOCSmcCCpsfj7wXASCpvK9A=="], @@ -1105,6 +1109,12 @@ "@modelcontextprotocol/core/zod": ["zod@4.6.5", "", {}, "sha512-v5l/aFXZQeai4awLbOpSoHecE9UiMrnfx75tEXLjNonXVARxQ5mOeipTjROUchszUNCqnE+hqAMujRsRHsut2Q=="], + "@npmcli/agent/agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="], + + "@npmcli/agent/http-proxy-agent": ["http-proxy-agent@7.0.2", "", { "dependencies": { "agent-base": "^7.1.0", "debug": "^4.3.4" } }, "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig=="], + + "@npmcli/agent/https-proxy-agent": ["https-proxy-agent@7.0.6", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "4" } }, "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw=="], + "@npmcli/arborist/minimatch": ["minimatch@10.2.5", "", { "dependencies": { "brace-expansion": "^5.0.5" } }, "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg=="], "@npmcli/map-workspaces/minimatch": ["minimatch@10.2.5", "", { "dependencies": { "brace-expansion": "^5.0.5" } }, "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg=="], @@ -1113,6 +1123,10 @@ "@opencode/core/diff": ["diff@8.0.4", "", {}, "sha512-DPi0FmjiSU5EvQV0++GFDOJ9ASQUVFh5kD+OzOnYdi7n3Wpm9hWWGfB/O2blfHcMVTL5WkQXSnRiK9makhrcnw=="], + "@opencode/core/http-proxy-agent": ["http-proxy-agent@7.0.2", "", { "dependencies": { "agent-base": "^7.1.0", "debug": "^4.3.4" } }, "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig=="], + + "@opencode/core/https-proxy-agent": ["https-proxy-agent@7.0.6", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "4" } }, "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw=="], + "@opencode/core/ignore": ["ignore@7.0.5", "", {}, "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg=="], "@opencode/simulation/ws": ["ws@8.21.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g=="], @@ -1217,6 +1231,8 @@ "engine.io-client/ws": ["ws@8.21.3", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-201TZ/kPWxoPr/OKWjquZR1SWKXcvxdH+e1xrx89b3YbmzLMFCLfnaG1HFIgWzJOEWZ7MvpK++odZufgYR50Rw=="], + "gaxios/https-proxy-agent": ["https-proxy-agent@7.0.6", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "4" } }, "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw=="], + "gcp-metadata/gaxios": ["gaxios@7.1.3", "", { "dependencies": { "extend": "^3.0.2", "https-proxy-agent": "^7.0.1", "node-fetch": "^3.3.2", "rimraf": "^5.0.1" } }, "sha512-YGGyuEdVIjqxkxVH1pUTMY/XtmmsApXrCVv5EU25iX6inEPbV+VakJfLealkBtJN69AQmh1eGOdCl9Sm1UP6XQ=="], "gcp-metadata/google-logging-utils": ["google-logging-utils@1.1.3", "", {}, "sha512-eAmLkjDjAFCVXg7A1unxHsLf961m6y17QFqXqAXGj/gVkKFrEICfStRfwUlGNfeCEjNRa32JEWOUTlYXPyyKvA=="], @@ -1241,6 +1257,8 @@ "rimraf/glob": ["glob@10.5.0", "", { "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg=="], + "socks-proxy-agent/agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="], + "string-width/strip-ansi": ["strip-ansi@7.2.0", "", { "dependencies": { "ansi-regex": "^6.2.2" } }, "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w=="], "string-width-cjs/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="], @@ -1281,6 +1299,10 @@ "@npmcli/map-workspaces/minimatch/brace-expansion": ["brace-expansion@5.0.5", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ=="], + "@opencode/core/http-proxy-agent/agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="], + + "@opencode/core/https-proxy-agent/agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="], + "@opencode/util/@opentelemetry/exporter-trace-otlp-http/@opentelemetry/otlp-exporter-base": ["@opentelemetry/otlp-exporter-base@0.219.0", "", { "dependencies": { "@opentelemetry/core": "2.8.0", "@opentelemetry/otlp-transformer": "0.219.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-zvIxQX/AZUVKDU+hCuYx+7UkiP7GRdnk1ZbFQRYzHvYp47cAWR4j3IhoPhV9KaeXEv2xdGq3IA6PnpzDmLcmSA=="], "@opencode/util/@opentelemetry/exporter-trace-otlp-http/@opentelemetry/otlp-transformer": ["@opentelemetry/otlp-transformer@0.219.0", "", { "dependencies": { "@opentelemetry/api-logs": "0.219.0", "@opentelemetry/core": "2.8.0", "@opentelemetry/resources": "2.8.0", "@opentelemetry/sdk-logs": "0.219.0", "@opentelemetry/sdk-metrics": "2.8.0", "@opentelemetry/sdk-trace-base": "2.8.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-aaYKAyXhw9VchKZVGOopD3Gw/kPsyrX2c6IQ0AW32mTjqmZOh5Y6Gf5OYqTNqVktAeBjmFinhyFaCwW6GYK9YQ=="], @@ -1307,6 +1329,10 @@ "cross-spawn/which/isexe": ["isexe@2.0.0", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="], + "gaxios/https-proxy-agent/agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="], + + "gcp-metadata/gaxios/https-proxy-agent": ["https-proxy-agent@7.0.6", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "4" } }, "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw=="], + "glob/minimatch/brace-expansion": ["brace-expansion@5.0.5", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ=="], "gray-matter/js-yaml/argparse": ["argparse@1.0.10", "", { "dependencies": { "sprintf-js": "~1.0.2" } }, "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="], @@ -1347,6 +1373,8 @@ "@typescript-eslint/typescript-estree/minimatch/brace-expansion/balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="], + "gcp-metadata/gaxios/https-proxy-agent/agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="], + "glob/minimatch/brace-expansion/balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="], "ignore-walk/minimatch/brace-expansion/balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="], diff --git a/package.json b/package.json index 18fa578..191cb57 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,9 @@ "@opentelemetry/sdk-logs": "^0.213.0", "@opentelemetry/sdk-metrics": "^2.6.0", "@opentelemetry/sdk-trace-base": "^2.6.0", - "@opentelemetry/semantic-conventions": "^1.40.0" + "@opentelemetry/semantic-conventions": "^1.40.0", + "http-proxy-agent": "^9.1.0", + "https-proxy-agent": "^9.1.0" }, "description": "OpenTelemetry telemetry plugin for opencode CLI", "devDependencies": { diff --git a/src/config.ts b/src/config.ts index a0425a9..0a471d9 100644 --- a/src/config.ts +++ b/src/config.ts @@ -24,6 +24,7 @@ export type PluginConfig = { metricPrefix: string otlpHeaders: string | undefined otlpHeadersHelper: string | undefined + otlpProxyUrl: string | undefined resourceAttributes: string | undefined spanAttributes: string | undefined traceparent: string | undefined @@ -71,6 +72,7 @@ export type OtelPluginOptions = { metricPrefix?: string otlpHeaders?: string otlpHeadersHelper?: string + otlpProxyUrl?: string resourceAttributes?: string spanAttributes?: string traceparent?: string @@ -155,6 +157,8 @@ export function loadConfig(options: OtelPluginOptions = {}): PluginConfig { const resolvedOptions = typeof options === "object" && options !== null ? options : {} const otlpHeaders = pickString(resolvedOptions.otlpHeaders) ?? process.env["OPENCODE_OTLP_HEADERS"] const otlpHeadersHelper = pickString(resolvedOptions.otlpHeadersHelper) ?? process.env["OPENCODE_OTLP_HEADERS_HELPER"] + const otlpProxyUrl = pickString(resolvedOptions.otlpProxyUrl) + ?? (hasNonEmptyEnv("OPENCODE_OTLP_PROXY_URL") ? process.env["OPENCODE_OTLP_PROXY_URL"] : undefined) const resourceAttributes = pickString(resolvedOptions.resourceAttributes) ?? process.env["OPENCODE_RESOURCE_ATTRIBUTES"] const spanAttributes = pickString(resolvedOptions.spanAttributes) ?? process.env["OPENCODE_SPAN_ATTRIBUTES"] const traceparent = pickString(resolvedOptions.traceparent) ?? process.env["OPENCODE_TRACEPARENT"] @@ -210,6 +214,7 @@ export function loadConfig(options: OtelPluginOptions = {}): PluginConfig { metricPrefix: pickString(resolvedOptions.metricPrefix) ?? process.env["OPENCODE_METRIC_PREFIX"] ?? "opencode.", otlpHeaders, otlpHeadersHelper, + otlpProxyUrl, resourceAttributes, spanAttributes, traceparent, diff --git a/src/otel.ts b/src/otel.ts index 4963e62..0761008 100644 --- a/src/otel.ts +++ b/src/otel.ts @@ -43,6 +43,34 @@ export function buildResource(version: string, resourceAttributes = process.env[ return resourceFromAttributes(attrs) } +export function proxyBypassed( + endpoint: string, + noProxy: string | undefined = process.env["NO_PROXY"] ?? process.env["no_proxy"], +): boolean { + let hostname: string + let hostWithPort: string + try { + const url = new URL(endpoint) + hostname = url.hostname.toLowerCase() + const defaultPort = url.protocol === "https:" ? "443" : url.protocol === "http:" ? "80" : "" + const port = url.port || defaultPort + hostWithPort = port ? `${hostname}:${port}` : hostname + } catch { + return false + } + if (hostname === "localhost" || hostname === "::1" || hostname === "[::1]" || /^127\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(hostname)) return true + if (!noProxy) return false + for (const entry of noProxy.split(",")) { + const pattern = entry.trim().toLowerCase() + if (!pattern) continue + if (pattern === "*") return true + const normalized = pattern.startsWith(".") ? pattern.slice(1) : pattern + if (hostWithPort === normalized || hostWithPort.endsWith("." + normalized)) return true + if (hostname === normalized || hostname.endsWith("." + normalized)) return true + } + return false +} + /** Handles returned by `setupOtel`, used for graceful shutdown. */ export type OtelProviders = { meterProvider: MeterProvider @@ -104,6 +132,7 @@ export async function setupOtel( version: string, otlpHeaders?: string, otlpHeadersHelper?: string, + otlpProxyUrl?: string, resourceAttributes?: string, metricsTemporality?: MetricsTemporality, ): Promise { @@ -111,6 +140,19 @@ export async function setupOtel( const staticHeaders = parseOtlpHeaders(otlpHeaders) const dynamicHeaders = new DynamicHeaders(staticHeaders, otlpHeadersHelper) const temporalityPreference = metricTemporalityPreference(metricsTemporality) + const effectiveProxyUrl = otlpProxyUrl && !proxyBypassed(endpoint) ? otlpProxyUrl : undefined + const agentOptions = effectiveProxyUrl + ? { + httpAgentOptions: ((protocol: string) => { + if (protocol === "http:") { + const { HttpProxyAgent } = require("http-proxy-agent") as typeof import("http-proxy-agent") + return new HttpProxyAgent(effectiveProxyUrl) + } + const { HttpsProxyAgent } = require("https-proxy-agent") as typeof import("https-proxy-agent") + return new HttpsProxyAgent(effectiveProxyUrl) + }) as import("@opentelemetry/otlp-exporter-base").OTLPExporterNodeConfigBase["httpAgentOptions"], + } + : {} if (otlpHeadersHelper) { try { await dynamicHeaders.refresh() @@ -119,19 +161,19 @@ export async function setupOtel( } } const makeMetricExporter = (headers: HeadersMap) => withoutOtlpHeaderEnvironment(() => protocol === "http/protobuf" - ? new OTLPProtoMetricExporter({ url: buildHttpSignalUrl(endpoint, "metrics"), headers, temporalityPreference }) + ? new OTLPProtoMetricExporter({ url: buildHttpSignalUrl(endpoint, "metrics"), headers, temporalityPreference, ...agentOptions }) : protocol === "http/json" - ? new OTLPHttpMetricExporter({ url: buildHttpSignalUrl(endpoint, "metrics"), headers, temporalityPreference }) + ? new OTLPHttpMetricExporter({ url: buildHttpSignalUrl(endpoint, "metrics"), headers, temporalityPreference, ...agentOptions }) : new OTLPMetricExporter({ url: endpoint, metadata: createGrpcMetadata(headers), temporalityPreference })) const makeLogExporter = (headers: HeadersMap) => withoutOtlpHeaderEnvironment(() => protocol === "http/protobuf" - ? new OTLPProtoLogExporter({ url: buildHttpSignalUrl(endpoint, "logs"), headers }) + ? new OTLPProtoLogExporter({ url: buildHttpSignalUrl(endpoint, "logs"), headers, ...agentOptions }) : protocol === "http/json" - ? new OTLPHttpLogExporter({ url: buildHttpSignalUrl(endpoint, "logs"), headers }) + ? new OTLPHttpLogExporter({ url: buildHttpSignalUrl(endpoint, "logs"), headers, ...agentOptions }) : new OTLPLogExporter({ url: endpoint, metadata: createGrpcMetadata(headers) })) const makeTraceExporter = (headers: HeadersMap) => withoutOtlpHeaderEnvironment(() => protocol === "http/protobuf" - ? new OTLPProtoTraceExporter({ url: buildHttpSignalUrl(endpoint, "traces"), headers }) + ? new OTLPProtoTraceExporter({ url: buildHttpSignalUrl(endpoint, "traces"), headers, ...agentOptions }) : protocol === "http/json" - ? new OTLPHttpTraceExporter({ url: buildHttpSignalUrl(endpoint, "traces"), headers }) + ? new OTLPHttpTraceExporter({ url: buildHttpSignalUrl(endpoint, "traces"), headers, ...agentOptions }) : new OTLPTraceExporter({ url: endpoint, metadata: createGrpcMetadata(headers) })) const metricExporter = otlpHeadersHelper ? new RefreshingMetricExporter(makeMetricExporter, dynamicHeaders) diff --git a/src/plugin.ts b/src/plugin.ts index 2ecb0e9..92ebb6d 100644 --- a/src/plugin.ts +++ b/src/plugin.ts @@ -2,7 +2,7 @@ import { ROOT_CONTEXT } from "@opentelemetry/api" import pkg from "../package.json" with { type: "json" } import { loadConfig, parseAttributePairs, resolveHelperPath, resolveLogLevel, type OtelPluginOptions } from "./config.ts" import { probeEndpoint } from "./probe.ts" -import { forceFlushOtel } from "./otel.ts" +import { forceFlushOtel, proxyBypassed } from "./otel.ts" import { remoteParentContext } from "./trace-context.ts" import { acquireSharedOtel, acquireTracingState, createFlushScheduler, flushSharedOtel, releaseSharedOtel } from "./state.ts" import { LEVELS, type HandlerContext, type Level, type OpenCodeContext, type OpenCodeEvent } from "./types.ts" @@ -66,7 +66,10 @@ export async function setup(ctx: OpenCodeContext): Promise<() => Promise> headersHelperSet: !!config.otlpHeadersHelper, }) - const probe = await probeEndpoint(config.endpoint) + const probeTarget = config.otlpProxyUrl && config.protocol !== "grpc" && !proxyBypassed(config.endpoint) + ? config.otlpProxyUrl + : config.endpoint + const probe = await probeEndpoint(probeTarget) if (probe.ok) { await log("info", "OTLP endpoint reachable", { endpoint: config.endpoint, ms: probe.ms }) } else { diff --git a/src/state.ts b/src/state.ts index e3395c0..a4cb698 100644 --- a/src/state.ts +++ b/src/state.ts @@ -61,6 +61,7 @@ export async function acquireSharedOtel(config: PluginConfig, version: string): version, config.otlpHeaders, config.otlpHeadersHelper, + config.otlpProxyUrl, config.resourceAttributes, config.metricsTemporality, ) diff --git a/tests/config.test.ts b/tests/config.test.ts index f3d0d5c..27f08cf 100644 --- a/tests/config.test.ts +++ b/tests/config.test.ts @@ -67,6 +67,7 @@ describe("loadConfig", () => { "OPENCODE_OTLP_LOGS_INTERVAL", "OPENCODE_OTLP_HEADERS", "OPENCODE_OTLP_HEADERS_HELPER", + "OPENCODE_OTLP_PROXY_URL", "OPENCODE_RESOURCE_ATTRIBUTES", "OPENCODE_SPAN_ATTRIBUTES", "OPENCODE_TRACEPARENT", @@ -96,6 +97,17 @@ describe("loadConfig", () => { expect(cfg.protocol).toBe("grpc") expect(cfg.metricsInterval).toBe(60000) expect(cfg.logsInterval).toBe(5000) + expect(cfg.otlpProxyUrl).toBeUndefined() + }) + + test("otlpProxyUrl from OPENCODE_OTLP_PROXY_URL", () => { + process.env["OPENCODE_OTLP_PROXY_URL"] = "http://proxy.example:8080" + expect(loadConfig().otlpProxyUrl).toBe("http://proxy.example:8080") + }) + + test("otlpProxyUrl from OPENCODE_OTLP_PROXY_URL", () => { + process.env["OPENCODE_OTLP_PROXY_URL"] = "http://proxy.example:8080" + expect(loadConfig().otlpProxyUrl).toBe("http://proxy.example:8080") }) test("enabled when OPENCODE_ENABLE_TELEMETRY is set", () => { diff --git a/tests/otel.test.ts b/tests/otel.test.ts index 7d7b305..2aa2778 100644 --- a/tests/otel.test.ts +++ b/tests/otel.test.ts @@ -9,7 +9,27 @@ import { OTLPMetricExporter as OTLPProtoMetricExporter } from "@opentelemetry/ex import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-grpc" import { OTLPTraceExporter as OTLPHttpTraceExporter } from "@opentelemetry/exporter-trace-otlp-http" import { OTLPTraceExporter as OTLPProtoTraceExporter } from "@opentelemetry/exporter-trace-otlp-proto" -import { buildResource, forceFlushOtel, setupOtel, type OtelProviders } from "../src/otel.ts" +import { buildResource, forceFlushOtel, proxyBypassed, setupOtel, type OtelProviders } from "../src/otel.ts" + +describe("proxyBypassed", () => { + test("always bypasses loopback endpoints", () => { + expect(proxyBypassed("http://localhost:4318")).toBe(true) + expect(proxyBypassed("http://127.0.0.1:4318")).toBe(true) + expect(proxyBypassed("http://[::1]:4318/v1/traces")).toBe(true) + }) + + test("does not bypass remote hosts without NO_PROXY", () => { + expect(proxyBypassed("https://collector.example.com")).toBe(false) + }) + + test("honors NO_PROXY suffixes and the wildcard", () => { + expect(proxyBypassed("https://collector.internal.example", "internal.example")).toBe(true) + expect(proxyBypassed("https://collector.internal.example", ".internal.example")).toBe(true) + expect(proxyBypassed("https://collector.example.com", "internal.example")).toBe(false) + expect(proxyBypassed("https://collector.example.com", "*")).toBe(true) + expect(proxyBypassed("https://collector.example.com", "other.example, collector.example.com")).toBe(true) + }) +}) let providers: OtelProviders | undefined @@ -130,11 +150,20 @@ describe("setupOtel", () => { expect(exporters.trace).toBeInstanceOf(OTLPHttpTraceExporter) }) + test("accepts an OTLP forward proxy URL for HTTP exporters", async () => { + providers = await setupOtel("http://collector:4318", "http/json", 60000, 5000, "1.2.3", undefined, undefined, "http://proxy.example:8080") + const exporters = exportersOf(providers) + + expect(exporters.metric).toBeInstanceOf(OTLPHttpMetricExporter) + expect(exporters.log).toBeInstanceOf(OTLPHttpLogExporter) + expect(exporters.trace).toBeInstanceOf(OTLPHttpTraceExporter) + }) + test("uses the accepted metrics temporality rather than a rejected setup's environment", async () => { const original = process.env["OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE"] try { process.env["OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE"] = "cumulative" - providers = await setupOtel("http://collector:4318", "http/json", 60000, 5000, "2.0.0", undefined, undefined, "", "delta") + providers = await setupOtel("http://collector:4318", "http/json", 60000, 5000, "2.0.0", undefined, undefined, undefined, "", "delta") const exporter = exportersOf(providers).metric as OTLPHttpMetricExporter expect(exporter.selectAggregationTemporality(InstrumentType.COUNTER)).toBe(AggregationTemporality.DELTA) } finally {