Merge pull request #714 from solarwinds/NH-120288

Disable some noisy instrumentations by default and add `oracledb`

Author: raphael-theriault-swi

.yarn/versions/5120708f.yml

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

packages/instrumentations/COMPATIBILITY.md

@@ -38,6 +38,7 @@
 | `mysql`                     | `>=2.0.0 <3.0.0`                     | `@opentelemetry/instrumentation-mysql`            |
 | `mysql2`                    | `>=1.4.2 <4.0.0`                     | `@opentelemetry/instrumentation-mysql2`           |
 | `net`                       | `*`                                  | `@opentelemetry/instrumentation-net`              |
+| `oracledb`                  | `>=6.7.0 <7.0.0`                     | `@opentelemetry/instrumentation-oracledb`         |
 | `pg`                        | `>=8.0.3 <9.0.0`                     | `@opentelemetry/instrumentation-pg`               |
 | `pg-pool`                   | `>=2.0.0 <4.0.0`                     | `@opentelemetry/instrumentation-pg`               |
 | `pino`                      | `>=5.14.0 <10.0.0`                   | `@opentelemetry/instrumentation-pino`             |

packages/instrumentations/package.json

@@ -71,10 +71,10 @@
     "@opentelemetry/instrumentation-mysql2": "^0.52.0",
     "@opentelemetry/instrumentation-nestjs-core": "^0.51.0",
     "@opentelemetry/instrumentation-net": "^0.49.0",
+    "@opentelemetry/instrumentation-oracledb": "^0.31.0",
     "@opentelemetry/instrumentation-pg": "^0.58.0",
     "@opentelemetry/instrumentation-pino": "^0.52.0",
     "@opentelemetry/instrumentation-redis": "^0.54.1",
-    "@opentelemetry/instrumentation-redis-4": "^0.49.0",
     "@opentelemetry/instrumentation-restify": "^0.51.0",
     "@opentelemetry/instrumentation-router": "^0.50.0",
     "@opentelemetry/instrumentation-runtime-node": "^0.19.0",

packages/instrumentations/src/index.ts

@@ -47,10 +47,10 @@ import { type MySQLInstrumentation } from "@opentelemetry/instrumentation-mysql"
 import { type MySQL2Instrumentation } from "@opentelemetry/instrumentation-mysql2"
 import { type NestInstrumentation } from "@opentelemetry/instrumentation-nestjs-core"
 import { type NetInstrumentation } from "@opentelemetry/instrumentation-net"
+import { type OracleInstrumentation } from "@opentelemetry/instrumentation-oracledb"
 import { type PgInstrumentation } from "@opentelemetry/instrumentation-pg"
 import { type PinoInstrumentation } from "@opentelemetry/instrumentation-pino"
 import { type RedisInstrumentation as RedisInstrumentationV2 } from "@opentelemetry/instrumentation-redis"
-import { type RedisInstrumentation as RedisInstrumentationV4 } from "@opentelemetry/instrumentation-redis-4"
 import { type RestifyInstrumentation } from "@opentelemetry/instrumentation-restify"
 import { type RouterInstrumentation } from "@opentelemetry/instrumentation-router"
 import { type RuntimeNodeInstrumentation } from "@opentelemetry/instrumentation-runtime-node"
@@ -92,10 +92,10 @@ interface InstrumentationTypes {
   "@opentelemetry/instrumentation-mysql": typeof MySQLInstrumentation
   "@opentelemetry/instrumentation-nestjs-core": typeof NestInstrumentation
   "@opentelemetry/instrumentation-net": typeof NetInstrumentation
+  "@opentelemetry/instrumentation-oracledb": typeof OracleInstrumentation
   "@opentelemetry/instrumentation-pg": typeof PgInstrumentation
   "@opentelemetry/instrumentation-pino": typeof PinoInstrumentation
   "@opentelemetry/instrumentation-redis": typeof RedisInstrumentationV2
-  "@opentelemetry/instrumentation-redis-4": typeof RedisInstrumentationV4
   "@opentelemetry/instrumentation-restify": typeof RestifyInstrumentation
   "@opentelemetry/instrumentation-router": typeof RouterInstrumentation
   "@opentelemetry/instrumentation-runtime-node": typeof RuntimeNodeInstrumentation
@@ -140,10 +140,10 @@ const INSTRUMENTATIONS = {
   "@opentelemetry/instrumentation-mysql": "MySQLInstrumentation",
   "@opentelemetry/instrumentation-nestjs-core": "NestInstrumentation",
   "@opentelemetry/instrumentation-net": "NetInstrumentation",
+  "@opentelemetry/instrumentation-oracledb": "OracleInstrumentation",
   "@opentelemetry/instrumentation-pg": "PgInstrumentation",
   "@opentelemetry/instrumentation-pino": "PinoInstrumentation",
   "@opentelemetry/instrumentation-redis": "RedisInstrumentation",
-  "@opentelemetry/instrumentation-redis-4": "RedisInstrumentation",
   "@opentelemetry/instrumentation-restify": "RestifyInstrumentation",
   "@opentelemetry/instrumentation-router": "RouterInstrumentation",
   "@opentelemetry/instrumentation-runtime-node": "RuntimeNodeInstrumentation",

packages/solarwinds-apm/src/patches.ts

@@ -71,7 +71,12 @@ const PATCHERS = [
     }
   }),
 
+  patcher(["@opentelemetry/instrumentation-cassandra-driver"], (config) => {
+    config.enhancedDatabaseReporting ??= true
+  }),
+
   patcher(["@opentelemetry/instrumentation-fs"], (config) => {
+    config.enabled ??= false
     config.requireParentSpan ??= true
   }),
 
@@ -112,6 +117,16 @@ const PATCHERS = [
     },
   ),
 
+  patcher(
+    [
+      "@opentelemetry/instrumentation-dns",
+      "@opentelemetry/instrumentation-net",
+    ],
+    (config) => {
+      config.enabled ??= false
+    },
+  ),
+
   patcher(
     [
       "@opentelemetry/instrumentation-bunyan",

packages/solarwinds-apm/test/patches.test.ts

@@ -63,6 +63,7 @@ describe("patch", () => {
     })
     expect(configs["@opentelemetry/instrumentation-aws-sdk"]).to.deep.equal({})
     expect(configs["@opentelemetry/instrumentation-fs"]).to.deep.equal({
+      enabled: false,
       requireParentSpan: true,
     })
     expect(configs["@opentelemetry/instrumentation-mysql2"]).to.deep.equal({
@@ -72,6 +73,12 @@ describe("patch", () => {
       requireParentSpan: true,
       addSqlCommenterCommentToQueries: false,
     })
+    expect(configs["@opentelemetry/instrumentation-dns"]).to.deep.equal({
+      enabled: false,
+    })
+    expect(configs["@opentelemetry/instrumentation-net"]).to.deep.equal({
+      enabled: false,
+    })
     expect(configs["@opentelemetry/instrumentation-bunyan"]).to.deep.include({
       disableLogCorrelation: true,
       disableLogSending: true,