Merge pull request #527 from solarwinds/NH-98076

Use HTTP GetSettings

.yarn/versions/2e6d709d.yml

@@ -0,0 +1,3 @@
+releases:
+  "@solarwinds-apm/sampling": minor
+  solarwinds-apm: minor

packages/sampling/package.json

@@ -36,6 +36,7 @@
     "test": "swtest -p test/tsconfig.json -c src"
   },
   "dependencies": {
+    "@noble/hashes": "^1.6.1",
     "@opentelemetry/sdk-trace-base": "~1.29.0"
   },
   "peerDependencies": {

packages/sampling/src/trace-options.ts

@@ -14,8 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { hmac } from "@noble/hashes/hmac"
+import { sha1 } from "@noble/hashes/sha1"
 import { diag, type DiagLogger } from "@opentelemetry/api"
-import { createHmac } from "crypto"
 
 const TRIGGER_TRACE_KEY = "trigger-trace"
 const TIMESTAMP_KEY = "ts"
@@ -174,10 +175,12 @@ export function validateSignature(
     return Auth.BAD_TIMESTAMP
   }
 
-  const hmac = createHmac("sha1", key)
-  const digest = hmac.update(header).digest()
+  const digest = hmac(sha1, key, header).reduce(
+    (hex, byte) => hex + byte.toString(16).padStart(2, "0"),
+    "",
+  )
 
-  if (signature === digest.toString("hex")) {
+  if (signature === digest) {
     return Auth.OK
   } else {
     return Auth.BAD_SIGNATURE

packages/solarwinds-apm/package.json

@@ -56,7 +56,6 @@
     "test": "swtest -p test/tsconfig.json -c src"
   },
   "dependencies": {
-    "@grpc/grpc-js": "^1.12.2",
     "@opentelemetry/api-logs": "~0.56.0",
     "@opentelemetry/core": "~1.29.0",
     "@opentelemetry/exporter-logs-otlp-proto": "~0.56.0",
@@ -74,7 +73,6 @@
     "@solarwinds-apm/histogram": "workspace:^",
     "@solarwinds-apm/instrumentations": "workspace:^",
     "@solarwinds-apm/module": "workspace:^",
-    "@solarwinds-apm/proto": "workspace:^",
     "@solarwinds-apm/sampling": "workspace:^",
     "json-stringify-safe": "^5.0.1",
     "node-releases": "^2.0.18",

packages/solarwinds-apm/src/appoptics/processing/inbound-metrics.ts

@@ -68,7 +68,7 @@ export class AppopticsInboundMetricsProcessor
         method: meta.method,
         status: meta.status,
         url: meta.url,
-        domain: meta.hostname,
+        domain: null,
       })
     } else {
       transaction = oboe.Span.createSpan({

packages/solarwinds-apm/src/appoptics/reporter.ts

@@ -42,13 +42,11 @@ export async function reporter(
 ): Promise<oboe.Reporter> {
   const reporter = new oboe.Reporter({
     service_key: `${config.serviceKey?.token}:${config.service}`,
-    host: config.collector,
-    certificates:
-      config.trustedpath ??
-      (config.collector.includes("appoptics.com") ? certificate : ""),
+    host: config.collector.hostname,
+    certificates: config.trustedpath ?? (config.appoptics ? certificate : ""),
     grpc_proxy: config.proxy ?? "",
     reporter: "ssl",
-    metric_format: 1,
+    metric_format: config.appoptics ? 1 : 2,
     trace_metrics: 1,
 
     log_level: otelLevelToOboeLevel(config.logLevel),

packages/solarwinds-apm/src/config.ts

@@ -48,9 +48,9 @@ const boolean = z.union([
 
 const regex = z.union([
   z.instanceof(RegExp),
-  z.string().transform((s, ctx) => {
+  z.string().transform((string, ctx) => {
     try {
-      return new RegExp(s)
+      return new RegExp(string)
     } catch (err) {
       ctx.addIssue({
         code: z.ZodIssueCode.custom,
@@ -64,17 +64,32 @@ const regex = z.union([
 const serviceKey = z
   .string()
   .includes(":")
-  .transform((k) => {
-    const [token, ...name] = k.split(":")
+  .transform((string) => {
+    const [token, ...name] = string.split(":")
     return {
       token: token!,
       name: name.join(":"),
     }
   })
 
-const trustedpath = z.string().transform((p, ctx) => {
+const collector = z.string().transform((string, ctx) => {
+  if (!/^https?:/.test(string)) {
+    string = `https://${string}`
+  }
+  try {
+    return new URL(string)
+  } catch (err) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      message: (err as Error).message,
+    })
+    return z.NEVER
+  }
+})
+
+const trustedpath = z.string().transform((tp, ctx) => {
   try {
-    return fs.readFile(p, "utf-8")
+    return fs.readFile(tp, "utf-8")
   } catch (err) {
     ctx.addIssue({
       code: z.ZodIssueCode.custom,
@@ -149,7 +164,7 @@ const schema = z.object({
   serviceKey: serviceKey.optional(),
   enabled: boolean.default(true),
   legacy: boolean.optional(),
-  collector: z.string().default("apm.collector.na-01.cloud.solarwinds.com"),
+  collector: collector.default("apm.collector.na-01.cloud.solarwinds.com"),
   trustedpath: trustedpath.optional(),
   proxy: z.string().optional(),
   logLevel: logLevel.default("warn"),
@@ -188,13 +203,14 @@ export interface Config extends z.input<typeof schema> {
 /** Processed configuration for solarwinds-apm */
 export interface Configuration extends z.output<typeof schema> {
   service: string
+  appoptics: boolean
   legacy: boolean
 
+  headers: Record<string, string>
   otlp: {
     tracesEndpoint?: string
     metricsEndpoint?: string
     logsEndpoint?: string
-    headers: Record<string, string>
   }
 
   source?: string
@@ -264,7 +280,8 @@ export async function read(): Promise<Configuration> {
     ])
   }
 
-  const legacy = raw.legacy ?? raw.collector.includes("appoptics")
+  const appoptics = raw.collector.hostname.includes("appoptics")
+  const legacy = raw.legacy ?? appoptics
   if (legacy && raw.exportLogsEnabled) {
     console.warn("Logs export is not supported when exporting to AppOptics.")
     raw.exportLogsEnabled = false
@@ -274,31 +291,25 @@ export async function read(): Promise<Configuration> {
     ...raw,
 
     service,
+    appoptics,
     legacy,
 
+    headers: raw.serviceKey?.token
+      ? { authorization: `Bearer ${raw.serviceKey.token}` }
+      : {},
     otlp: {
       tracesEndpoint:
         otel.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ??
         otel.OTEL_EXPORTER_OTLP_ENDPOINT?.concat(ENDPOINTS.traces) ??
-        raw.collector
-          .replace(/^apm\.collector\./, "https://otel.collector.")
-          .concat(ENDPOINTS.traces),
+        otelUrl(raw.collector, ENDPOINTS.traces),
       metricsEndpoint:
         otel.OTEL_EXPORTER_OTLP_METRICS_ENDPOINT ??
         otel.OTEL_EXPORTER_OTLP_ENDPOINT?.concat(ENDPOINTS.metrics) ??
-        raw.collector
-          .replace(/^apm\.collector\./, "https://otel.collector.")
-          .concat(ENDPOINTS.metrics),
+        otelUrl(raw.collector, ENDPOINTS.metrics),
       logsEndpoint:
         otel.OTEL_EXPORTER_OTLP_LOGS_ENDPOINT ??
         otel.OTEL_EXPORTER_OTLP_ENDPOINT?.concat(ENDPOINTS.logs) ??
-        raw.collector
-          .replace(/^apm\.collector\./, "https://otel.collector.")
-          .concat(ENDPOINTS.logs),
-
-      headers: raw.serviceKey?.token
-        ? { authorization: `Bearer ${raw.serviceKey.token}` }
-        : {},
+        otelUrl(raw.collector, ENDPOINTS.logs),
     },
 
     source,
@@ -362,3 +373,13 @@ function envObject(prefix = PREFIX) {
       .map(([k, v]) => [fromEnvKey(k, prefix), v]),
   )
 }
+
+function otelUrl(apmUrl: URL, endpoint: string) {
+  const otelUrl = new URL(apmUrl)
+  otelUrl.hostname = apmUrl.hostname.replace(
+    /^apm\.collector\./,
+    "otel.collector.",
+  )
+  otelUrl.pathname = endpoint
+  return otelUrl.href
+}

packages/solarwinds-apm/src/exporters/logs.ts

@@ -22,7 +22,7 @@ export class LogExporter extends OTLPLogExporter {
   constructor(config: Configuration) {
     super({
       url: config.otlp.logsEndpoint,
-      headers: config.otlp.headers,
+      headers: config.headers,
       httpAgentOptions: {
         ca: config.trustedpath,
       },

packages/solarwinds-apm/src/exporters/metrics.ts

@@ -28,7 +28,7 @@ export class MetricExporter extends OTLPMetricExporter {
   constructor(config: Configuration) {
     super({
       url: config.otlp.metricsEndpoint,
-      headers: config.otlp.headers,
+      headers: config.headers,
       httpAgentOptions: {
         ca: config.trustedpath,
       },

packages/solarwinds-apm/src/exporters/traces.ts

@@ -22,7 +22,7 @@ export class TraceExporter extends OTLPTraceExporter {
   constructor(config: Configuration) {
     super({
       url: config.otlp.tracesEndpoint,
-      headers: config.otlp.headers,
+      headers: config.headers,
       httpAgentOptions: {
         ca: config.trustedpath,
       },