Merge branch 'main' into fix_mysql2_span_name

open-telemetry · Mar 1, 2022 · c54657c · c54657c
2 parents f663a96 + 8020e22
commit c54657c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/src/utils.ts b/plugins/node/opentelemetry-instrumentation-mysql2/src/utils.ts
@@ -105,7 +105,7 @@ export function getDbStatement(
 export function getSpanName(query: string | Query | QueryOptions): string {
   const rawQuery = typeof query === 'object' ? query.sql : query;
   // Extract the SQL verb
-  return rawQuery.split(' ')[0];
+  return rawQuery?.split(' ')?.[0];
 }
 
 export const once = (fn: Function) => {

diff --git a/renovate.json b/renovate.json
@@ -13,10 +13,8 @@
       "rangeStrategy": "bump"
     }
   ],
-  "assignees": [
-    "@dyladan",
-    "@mayurkale22"
-  ],
+  "ignoreDeps": ["lerna", "lerna-changelog"],
+  "assignees": ["@blumamir", "@dyladan", "@legendecas", "@Rauno56", "@vmarchaud"],
   "schedule": [
     "before 3am on Friday"
   ],