Merge branch 'main' into trentm-markdown-table-linting-nope

Author: pichlermarc

.github/workflows/release-please.yml

@@ -29,7 +29,7 @@ jobs:
         run: |
           npm ci --ignore-scripts
 
-      - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+      - uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
         id: otelbot-token
         with:
           app-id: ${{ vars.OTELBOT_JS_CONTRIB_APP_ID }}

.github/workflows/survey-on-merged-pr.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.pull_request.merged == true
     steps:
-      - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+      - uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
         id: otelbot-token
         with:
           app-id: ${{ vars.OTELBOT_APP_ID }}

.github/workflows/update-otel-deps.yaml

@@ -10,7 +10,7 @@ jobs:
   create-or-update-deps-pr:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+      - uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
         id: otelbot-token
         with:
           app-id: ${{ vars.OTELBOT_JS_CONTRIB_APP_ID }}

packages/instrumentation-pg/src/utils.ts

@@ -104,11 +104,13 @@ export function getQuerySpanName(
 }
 
 export function parseNormalizedOperationName(queryText: string) {
-  const indexOfFirstSpace = queryText.indexOf(' ');
+  // Trim the query text to handle leading/trailing whitespace
+  const trimmedQuery = queryText.trim();
+  const indexOfFirstSpace = trimmedQuery.indexOf(' ');
   let sqlCommand =
     indexOfFirstSpace === -1
-      ? queryText
-      : queryText.slice(0, indexOfFirstSpace);
+      ? trimmedQuery
+      : trimmedQuery.slice(0, indexOfFirstSpace);
   sqlCommand = sqlCommand.toUpperCase();
 
   // Handle query text being "COMMIT;", which has an extra semicolon before the space.

packages/instrumentation-pg/test/utils.test.ts

@@ -108,6 +108,27 @@ describe('utils.ts', () => {
       );
     });
 
+    it('remove leading whitespaces when parsing operation names', () => {
+      assert.strictEqual(
+        utils.getQuerySpanName('dbName', { text: ' SELECT $1' }),
+        'pg.query:SELECT dbName'
+      );
+    });
+
+    it('remove trailing whitespaces when parsing operation names', () => {
+      assert.strictEqual(
+        utils.getQuerySpanName('dbName', { text: 'SELECT $1 ' }),
+        'pg.query:SELECT dbName'
+      );
+    });
+
+    it('remove leading and trailing whitespace when parsing operation names', () => {
+      assert.strictEqual(
+        utils.getQuerySpanName('dbName', { text: '  SELECT $1  ' }),
+        'pg.query:SELECT dbName'
+      );
+    });
+
     it('omits db name if missing', () => {
       assert.strictEqual(
         utils.getQuerySpanName(undefined, dummyQuery),