fix: work with remote server (#69)

traceloop · May 11, 2023 · d219a40 · d219a40
1 parent a0fd1e2
commit d219a40
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/jest-opentelemetry.config.js b/jest-opentelemetry.config.js
@@ -1,4 +1,4 @@
 module.exports = {
   timeout: 2000,
-  useRemoteOtelReceiver: false,
+  useLocalOtelReceiver: true, // default (false) is to use traceloop backend
 };
diff --git a/package.json b/package.json
@@ -9,8 +9,8 @@
     "start:test-servers": "lerna run --scope @traceloop/test-servers start",
     "docker:instrument-opentelemetry": "docker build -f packages/instrument-opentelemetry/Dockerfile . -t instrument-opentelemetry",
     "docker:test-servers": "docker build -f packages/test-servers/Dockerfile . -t test-servers",
-    "test": "jest",
-    "test-ci": "concurrently -k --success \"command-1\" --hide 0 \"npm:start:test-servers\" \"npm:test\"",
+    "test": "TRACELOOP_URL='http://localhost:4123/v1/traces' jest",
+    "test-ci": "TRACELOOP_URL='http://localhost:4123/v1/traces' concurrently -k --success \"command-1\" --hide 0 \"npm:start:test-servers\" \"npm:test\"",
     "release": "npm run build && lerna publish --conventional-commits --no-private"
   },
   "workspaces": [

diff --git a/packages/expect-opentelemetry/src/trace-loop/fetch-traces.ts b/packages/expect-opentelemetry/src/trace-loop/fetch-traces.ts
@@ -10,15 +10,15 @@ export interface FetchTracesConfig {
   pollInterval: number;
   awaitAllSpansInTraceTimeout: number;
   url: string;
-  customerId: string;
+  apiKey: string;
 }
 
 export const fetchTracesConfigBase: FetchTracesConfig = {
   maxPollTime: 9000,
   pollInterval: 1000,
   awaitAllSpansInTraceTimeout: 2000,
-  url: 'http://localhost:4123/v1/traces',
-  customerId: 'local',
+  url: process.env.TRACELOOP_URL || 'https://api.traceloop.dev/v1/traces',
+  apiKey: process.env.TRACELOOP_API_KEY || 'none',
 };
 
 /**

diff --git a/packages/expect-opentelemetry/src/utils.ts b/packages/expect-opentelemetry/src/utils.ts
@@ -1,4 +1,5 @@
 import http from 'http';
+import https from 'https';
 import { opentelemetry } from '@traceloop/otel-proto';
 import { FetchTracesConfig } from './trace-loop/fetch-traces';
 
@@ -88,7 +89,8 @@ export function httpGetBinary(
 ): Promise<Buffer> {
   const url = `${config.url}/${traceloopId}`;
   return new Promise((resolve, reject) => {
-    http.get(url, { headers: { Authorization: config.customerId } }, (res) => {
+    const method = config.url.includes('https') ? https : http;
+    method.get(url, { headers: { Authorization: config.apiKey } }, (res) => {
       const { statusCode } = res;
 
       if (!statusCode || statusCode < 200 || statusCode >= 300) {

diff --git a/packages/jest-environment-otel/src/global.ts b/packages/jest-environment-otel/src/global.ts
@@ -18,7 +18,7 @@ export async function setup(jestConfig: JestConfig = {}) {
     didAlreadyRunInWatchMode = true;
   }
 
-  if (config.useRemoteOtelReceiver) {
+  if (!config?.useLocalOtelReceiver) {
     return;
   }