Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
chore(otel-node): fix lint issues
  • Loading branch information
david-luna committed Mar 25, 2025
commit 8763749b88430d387417d81d4e8a622dffc7d73a
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ const http = require('http');
const {basename} = require('path');
const test = require('tape');
const semver = require('semver');
const {runTestFixtures, filterOutGcpDetectorSpans, assertDeepMatch} = require('./testutils');
const {
runTestFixtures,
filterOutGcpDetectorSpans,
assertDeepMatch,
} = require('./testutils');

let skip = process.env.TEST_GENAI_MODEL === undefined;
if (skip) {
Expand Down Expand Up @@ -36,7 +40,7 @@ const testFixtures = [
// span 7e8ca8 "embeddings all-minilm:22m" (26.4ms, SPAN_KIND_CLIENT, GenAI openai)
// +9ms `- span 39fc32 "POST" (16.7ms, SPAN_KIND_CLIENT, POST http://127.0.0.1:11434/v1/embeddings -> 200)
const spans = filterOutGcpDetectorSpans(col.sortedSpans);
console.log(spans)
console.log(spans);
assertDeepMatch(
t,
spans,
Expand Down
10 changes: 8 additions & 2 deletions packages/opentelemetry-node/test/instr-elasticsearch.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
// and later.

const test = require('tape');
const {filterOutDnsNetSpans, filterOutGcpDetectorSpans, runTestFixtures} = require('./testutils');
const {
filterOutDnsNetSpans,
filterOutGcpDetectorSpans,
runTestFixtures,
} = require('./testutils');

const skip = process.env.ES_URL === undefined;
if (skip) {
Expand All @@ -20,7 +24,9 @@ function checkTelemetry(t, col) {
// Expected a trace like this:
// span 91a6b1 "search" (13.4ms, SPAN_KIND_CLIENT, GET http://localhost:9200/)
// +2ms `- span 14278c "GET" (10.8ms, SPAN_KIND_CLIENT, GET http://localhost:9200/_search?q=pants -> 200)
const spans = filterOutGcpDetectorSpans(filterOutDnsNetSpans(col.sortedSpans));
const spans = filterOutGcpDetectorSpans(
filterOutDnsNetSpans(col.sortedSpans)
);
t.equal(spans.length, 2);
t.equal(spans[0].name, 'search');
t.equal(spans[0].kind, 'SPAN_KIND_CLIENT', 'kind');
Expand Down
4 changes: 3 additions & 1 deletion packages/opentelemetry-node/test/instr-express.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ const testFixtures = [
// +0ms `- span 2092ee "middleware - query" (0.1ms, SPAN_KIND_INTERNAL)
// +0ms `- span 033a59 "middleware - expressInit" (0.1ms, SPAN_KIND_INTERNAL)
// +1ms `- span 5573dc "request handler - /hi/:name" (0.0ms, SPAN_KIND_INTERNAL)
const spans = filterOutGcpDetectorSpans(filterOutDnsNetSpans(col.sortedSpans));
const spans = filterOutGcpDetectorSpans(
filterOutDnsNetSpans(col.sortedSpans)
);
t.equal(spans.length, 10);

t.equal(spans[0].scope.name, '@opentelemetry/instrumentation-http');
Expand Down
8 changes: 6 additions & 2 deletions packages/opentelemetry-node/test/instr-fastify.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ const testFixtures = [
},
// verbose: true,
checkTelemetry: (t, col) => {
const spans = filterOutGcpDetectorSpans(filterOutDnsNetSpans(col.sortedSpans));
const spans = filterOutGcpDetectorSpans(
filterOutDnsNetSpans(col.sortedSpans)
);

t.equal(spans.length, 4);
t.ok(
Expand Down Expand Up @@ -71,7 +73,9 @@ const testFixtures = [
// span 6e0fc9 "GET" (1.6ms, SPAN_KIND_CLIENT, GET http://localhost:3000/hi/Bob -> 200)
// +1ms `- span 40c4a8 "GET /hi/:name" (0.3ms, SPAN_KIND_SERVER, GET http://localhost:3000/hi/Bob -> 200)
// +0ms `- span 74a68a "request handler - fastify" (0.1ms, SPAN_KIND_INTERNAL)
const spans = filterOutGcpDetectorSpans(filterOutDnsNetSpans(col.sortedSpans));
const spans = filterOutGcpDetectorSpans(
filterOutDnsNetSpans(col.sortedSpans)
);
t.equal(spans.length, 6);

t.equal(spans[0].scope.name, '@opentelemetry/instrumentation-http');
Expand Down
10 changes: 8 additions & 2 deletions packages/opentelemetry-node/test/instr-grpc.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
// Test that instrumentation-grpc generates the telemetry we expect.

const test = require('tape');
const {filterOutDnsNetSpans, runTestFixtures, filterOutGcpDetectorSpans} = require('./testutils');
const {
filterOutDnsNetSpans,
runTestFixtures,
filterOutGcpDetectorSpans,
} = require('./testutils');

/** @type {import('./testutils').TestFixture[]} */
const testFixtures = [
Expand All @@ -19,7 +23,9 @@ const testFixtures = [
},
// verbose: true,
checkTelemetry: (t, col) => {
const spans = filterOutGcpDetectorSpans(filterOutDnsNetSpans(col.sortedSpans));
const spans = filterOutGcpDetectorSpans(
filterOutDnsNetSpans(col.sortedSpans)
);
t.equal(spans.length, 2);
t.equal(spans[0].kind, 'SPAN_KIND_CLIENT');
t.equal(spans[1].kind, 'SPAN_KIND_SERVER');
Expand Down
6 changes: 5 additions & 1 deletion packages/opentelemetry-node/test/instr-hapi.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
// Test that 'hapi' instrumentation generates the telemetry we expect.

const test = require('tape');
const {runTestFixtures, findObjInArray, filterOutGcpDetectorSpans} = require('./testutils');
const {
runTestFixtures,
findObjInArray,
filterOutGcpDetectorSpans,
} = require('./testutils');

/** @type {import('./testutils').TestFixture[]} */
const testFixtures = [
Expand Down
10 changes: 8 additions & 2 deletions packages/opentelemetry-node/test/instr-mongodb.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
// Test that 'mongodb' instrumentation generates the telemetry we expect.

const test = require('tape');
const {filterOutDnsNetSpans, filterOutGcpDetectorSpans, runTestFixtures} = require('./testutils');
const {
filterOutDnsNetSpans,
filterOutGcpDetectorSpans,
runTestFixtures,
} = require('./testutils');

let skip = process.env.MONGODB_HOST === undefined;
if (skip) {
Expand Down Expand Up @@ -36,7 +40,9 @@ const testFixtures = [
// +13ms `- span 1e5ee2 "mongodb.insert" (1.4ms, SPAN_KIND_CLIENT)
// +3ms `- span 3d4723 "mongodb.delete" (0.6ms, SPAN_KIND_CLIENT)
// +1ms `- span 1c1373 "mongodb.endSessions" (0.3ms, SPAN_KIND_CLIENT)
const spans = filterOutGcpDetectorSpans(filterOutDnsNetSpans(col.sortedSpans));
const spans = filterOutGcpDetectorSpans(
filterOutDnsNetSpans(col.sortedSpans)
);
t.equal(spans.length, 4);

t.equal(spans[0].name, 'manual-parent-span');
Expand Down
10 changes: 8 additions & 2 deletions packages/opentelemetry-node/test/instr-mongoose.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
// Test that 'mongoose' instrumentation generates the telemetry we expect.

const test = require('tape');
const {filterOutDnsNetSpans, filterOutGcpDetectorSpans, runTestFixtures} = require('./testutils');
const {
filterOutDnsNetSpans,
filterOutGcpDetectorSpans,
runTestFixtures,
} = require('./testutils');

let skip = process.env.MONGODB_HOST === undefined;
if (skip) {
Expand Down Expand Up @@ -40,7 +44,9 @@ const testFixtures = [
// +13ms `- span 5be842 "mongodb.drop" (0.8ms, SPAN_KIND_CLIENT)
// +1ms `- span 13d56b "mongodb.endSessions" (0.3ms, SPAN_KIND_CLIENT)
// -20ms `- span c4e688 "mongoose.User.save" (18.9ms, SPAN_KIND_CLIENT)
const spans = filterOutGcpDetectorSpans(filterOutDnsNetSpans(col.sortedSpans));
const spans = filterOutGcpDetectorSpans(
filterOutDnsNetSpans(col.sortedSpans)
);
t.equal(spans.length, 7);

t.equal(spans[0].name, 'manual-parent-span');
Expand Down
10 changes: 8 additions & 2 deletions packages/opentelemetry-node/test/instr-mysql.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
// Test that 'mysql' instrumentation generates the telemetry we expect.

const test = require('tape');
const {filterOutDnsNetSpans, filterOutGcpDetectorSpans, runTestFixtures} = require('./testutils');
const {
filterOutDnsNetSpans,
filterOutGcpDetectorSpans,
runTestFixtures,
} = require('./testutils');

let skip = process.env.MYSQL_HOST === undefined;
if (skip) {
Expand All @@ -31,7 +35,9 @@ const testFixtures = [
// span 8ef53e "manual-parent-span" (21.7ms, SPAN_KIND_INTERNAL)
// +1ms `- span 715182 "tcp.connect" (9.4ms, SPAN_KIND_INTERNAL)
// +2ms `- span 430253 "SELECT" (18.2ms, SPAN_KIND_CLIENT)
const spans = filterOutGcpDetectorSpans(filterOutDnsNetSpans(col.sortedSpans));
const spans = filterOutGcpDetectorSpans(
filterOutDnsNetSpans(col.sortedSpans)
);
t.equal(spans.length, 2);

t.equal(spans[0].name, 'manual-parent-span');
Expand Down
10 changes: 8 additions & 2 deletions packages/opentelemetry-node/test/instr-mysql2.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
// Test that 'mysql2' instrumentation generates the telemetry we expect.

const test = require('tape');
const {filterOutDnsNetSpans, filterOutGcpDetectorSpans, runTestFixtures} = require('./testutils');
const {
filterOutDnsNetSpans,
filterOutGcpDetectorSpans,
runTestFixtures,
} = require('./testutils');

let skip = process.env.MYSQL_HOST === undefined;
if (skip) {
Expand All @@ -31,7 +35,9 @@ const testFixtures = [
// span 8ef53e "manual-parent-span" (21.7ms, SPAN_KIND_INTERNAL)
// +1ms `- span 715182 "tcp.connect" (9.4ms, SPAN_KIND_INTERNAL)
// +2ms `- span 430253 "SELECT" (18.2ms, SPAN_KIND_CLIENT)
const spans = filterOutGcpDetectorSpans(filterOutDnsNetSpans(col.sortedSpans));
const spans = filterOutGcpDetectorSpans(
filterOutDnsNetSpans(col.sortedSpans)
);
t.equal(spans.length, 2);

t.equal(spans[0].name, 'manual-parent-span');
Expand Down
10 changes: 8 additions & 2 deletions packages/opentelemetry-node/test/instr-pg.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
*/

const test = require('tape');
const {filterOutDnsNetSpans, filterOutGcpDetectorSpans, runTestFixtures} = require('./testutils');
const {
filterOutDnsNetSpans,
filterOutGcpDetectorSpans,
runTestFixtures,
} = require('./testutils');

const skip = process.env.PGHOST === undefined;
if (skip) {
Expand All @@ -29,7 +33,9 @@ const testFixtures = [
// span 102150 "manual-parent-span" (7.5ms, SPAN_KIND_INTERNAL)
// +3ms `- span 539d9d "pg.connect" (12.0ms, SPAN_KIND_CLIENT)
// +13ms `- span 115c08 "pg.query:SELECT postgres" (2.4ms, SPAN_KIND_CLIENT)
const spans = filterOutGcpDetectorSpans(filterOutDnsNetSpans(col.sortedSpans));
const spans = filterOutGcpDetectorSpans(
filterOutDnsNetSpans(col.sortedSpans)
);
t.equal(spans.length, 3);
spans.slice(1).forEach((s) => {
t.equal(s.traceId, spans[0].traceId, 'traceId');
Expand Down
10 changes: 8 additions & 2 deletions packages/opentelemetry-node/test/instr-tedious.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@

const test = require('tape');
const semver = require('semver');
const {filterOutDnsNetSpans, filterOutGcpDetectorSpans, runTestFixtures} = require('./testutils');
const {
filterOutDnsNetSpans,
filterOutGcpDetectorSpans,
runTestFixtures,
} = require('./testutils');

const tediousVer = require('tedious/package.json').version;
let skip = process.env.MSSQL_HOST === undefined;
Expand Down Expand Up @@ -45,7 +49,9 @@ const testFixtures = [
// ------ trace d1755e (2 spans) ------
// span 6bb8d8 "manual-parent-span" (54.3ms, SPAN_KIND_INTERNAL)
// +51ms `- span fb837e "execSql master" (3.0ms, SPAN_KIND_CLIENT)
const spans = filterOutGcpDetectorSpans(filterOutDnsNetSpans(col.sortedSpans));
const spans = filterOutGcpDetectorSpans(
filterOutDnsNetSpans(col.sortedSpans)
);
t.equal(spans.length, 2);

const s = spans.pop();
Expand Down
10 changes: 8 additions & 2 deletions packages/opentelemetry-node/test/instr-undici.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
const {satisfies} = require('semver');
const test = require('tape');

const {filterOutDnsNetSpans, runTestFixtures, filterOutGcpDetectorSpans} = require('./testutils');
const {
filterOutDnsNetSpans,
runTestFixtures,
filterOutGcpDetectorSpans,
} = require('./testutils');

function getNodeVerRangeForCurrUndici() {
const undiciVer = require('undici/package.json').version;
Expand Down Expand Up @@ -34,7 +38,9 @@ const testFixtures = [
},
// verbose: true,
checkTelemetry: (t, col) => {
const spans = filterOutGcpDetectorSpans(filterOutDnsNetSpans(col.sortedSpans));
const spans = filterOutGcpDetectorSpans(
filterOutDnsNetSpans(col.sortedSpans)
);
t.equal(spans.length, 1);
const span = spans[0];
t.equal(span.scope.name, '@opentelemetry/instrumentation-undici');
Expand Down
7 changes: 3 additions & 4 deletions packages/opentelemetry-node/test/testutils.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,9 @@ function filterOutGcpDetectorSpans(spans) {
return spans.filter(
(s) =>
s.scope.name !== '@opentelemetry/instrumentation-http' ||
![
'169.254.169.254',
'metadata.google.internal.',
].includes(s.attributes['server.address'])
!['169.254.169.254', 'metadata.google.internal.'].includes(
s.attributes['server.address']
)
);
}

Expand Down
Loading