diff --git a/package.json b/package.json index 35a95e65..35f7058c 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "name": "cerbos-sdk-javascript", "private": true, - "packageManager": "pnpm@9.10.0", + "packageManager": "pnpm@9.11.0", "engines": { "node": "22.9.0", - "pnpm": "9.10.0" + "pnpm": "9.11.0" }, "scripts": { "all:parallel": "concurrently --group --prefix=none", @@ -55,9 +55,9 @@ "@microsoft/api-extractor": "7.47.9", "@tsconfig/node18": "18.2.4", "@tsconfig/strictest": "2.0.5", - "@types/node": "18.19.50", - "@typescript-eslint/eslint-plugin": "8.6.0", - "@typescript-eslint/parser": "8.6.0", + "@types/node": "18.19.53", + "@typescript-eslint/eslint-plugin": "8.7.0", + "@typescript-eslint/parser": "8.7.0", "concurrently": "9.0.1", "depcheck": "1.4.7", "eslint": "8.57.1", diff --git a/packages/opentelemetry/CHANGELOG.md b/packages/opentelemetry/CHANGELOG.md index eeaa7f3f..a396aed1 100644 --- a/packages/opentelemetry/CHANGELOG.md +++ b/packages/opentelemetry/CHANGELOG.md @@ -2,7 +2,9 @@ ## [Unreleased] -No notable changes. +### Changed + +- Migrate away from [deprecated semantic attributes](https://github.com/open-telemetry/opentelemetry-js/pull/4690) ([#1018](https://github.com/cerbos/cerbos-sdk-javascript/pull/1018)) ## [0.5.3] - 2024-09-23 diff --git a/packages/opentelemetry/changelog.yaml b/packages/opentelemetry/changelog.yaml index 706a7f70..61962be6 100644 --- a/packages/opentelemetry/changelog.yaml +++ b/packages/opentelemetry/changelog.yaml @@ -1,3 +1,10 @@ +unreleased: + type: patch + + changed: + - summary: Migrate away from [deprecated semantic attributes](https://github.com/open-telemetry/opentelemetry-js/pull/4690) + pull: 1018 + releases: - version: 0.5.3 date: 2024-09-23 diff --git a/packages/opentelemetry/src/transport.ts b/packages/opentelemetry/src/transport.ts index 98ba76a2..7f037491 100644 --- a/packages/opentelemetry/src/transport.ts +++ b/packages/opentelemetry/src/transport.ts @@ -7,11 +7,11 @@ import { trace, } from "@opentelemetry/api"; import { - SEMATTRS_RPC_GRPC_STATUS_CODE, - SEMATTRS_RPC_METHOD, - SEMATTRS_RPC_SERVICE, - SEMATTRS_RPC_SYSTEM, -} from "@opentelemetry/semantic-conventions"; + ATTR_RPC_GRPC_STATUS_CODE, + ATTR_RPC_METHOD, + ATTR_RPC_SERVICE, + ATTR_RPC_SYSTEM, +} from "@opentelemetry/semantic-conventions/incubating"; import type { _AbortHandler, @@ -162,9 +162,9 @@ export class Transport implements _Transport { const status: SpanStatus = { code: SpanStatusCode.UNSET }; const attributes: Attributes = { - [SEMATTRS_RPC_SYSTEM]: "grpc", - [SEMATTRS_RPC_SERVICE]: serviceName, - [SEMATTRS_RPC_METHOD]: methodName, + [ATTR_RPC_SYSTEM]: "grpc", + [ATTR_RPC_SERVICE]: serviceName, + [ATTR_RPC_METHOD]: methodName, }; const span = this.tracer.startSpan(`${serviceName}/${methodName}`, { @@ -189,7 +189,7 @@ export class Transport implements _Transport { const call = { succeeded: (): void => { - attributes[SEMATTRS_RPC_GRPC_STATUS_CODE] = Status.OK; + attributes[ATTR_RPC_GRPC_STATUS_CODE] = Status.OK; finish(); }, failed: (error: unknown): void => { @@ -200,7 +200,7 @@ export class Transport implements _Transport { attributes["cerbos.error"] = error.message; if (error instanceof NotOK) { - attributes[SEMATTRS_RPC_GRPC_STATUS_CODE] = error.code; + attributes[ATTR_RPC_GRPC_STATUS_CODE] = error.code; } } diff --git a/packages/react/package.json b/packages/react/package.json index 7575a20f..09ba5442 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -56,7 +56,7 @@ "use-deep-compare-effect": "^1.8.1" }, "devDependencies": { - "@types/react": "18.3.8", + "@types/react": "18.3.9", "eslint-plugin-react-hooks": "4.6.2" }, "publishConfig": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c220e34b..37ef68e6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13,10 +13,10 @@ importers: version: 0.16.4 '@microsoft/api-documenter': specifier: 7.25.14 - version: 7.25.14(@types/node@18.19.50) + version: 7.25.14(@types/node@18.19.53) '@microsoft/api-extractor': specifier: 7.47.9 - version: 7.47.9(@types/node@18.19.50) + version: 7.47.9(@types/node@18.19.53) '@tsconfig/node18': specifier: 18.2.4 version: 18.2.4 @@ -24,14 +24,14 @@ importers: specifier: 2.0.5 version: 2.0.5 '@types/node': - specifier: 18.19.50 - version: 18.19.50 + specifier: 18.19.53 + version: 18.19.53 '@typescript-eslint/eslint-plugin': - specifier: 8.6.0 - version: 8.6.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2) + specifier: 8.7.0 + version: 8.7.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2) '@typescript-eslint/parser': - specifier: 8.6.0 - version: 8.6.0(eslint@8.57.1)(typescript@5.6.2) + specifier: 8.7.0 + version: 8.7.0(eslint@8.57.1)(typescript@5.6.2) concurrently: specifier: 9.0.1 version: 9.0.1 @@ -43,7 +43,7 @@ importers: version: 8.57.1 eslint-plugin-import: specifier: 2.30.0 - version: 2.30.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1) + version: 2.30.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1) eslint-plugin-tsdoc: specifier: 0.3.0 version: 0.3.0 @@ -141,8 +141,8 @@ importers: version: 1.8.1(react@18.3.1) devDependencies: '@types/react': - specifier: 18.3.8 - version: 18.3.8 + specifier: 18.3.9 + version: 18.3.9 eslint-plugin-react-hooks: specifier: 4.6.2 version: 4.6.2(eslint@8.57.1) @@ -217,25 +217,25 @@ importers: version: 1.27.0 '@testing-library/react': specifier: 16.0.1 - version: 16.0.1(@testing-library/dom@10.4.0)(@types/react@18.3.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 16.0.1(@testing-library/dom@10.4.0)(@types/react@18.3.9)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@testing-library/user-event': specifier: 14.5.2 version: 14.5.2(@testing-library/dom@10.4.0) '@types/react': - specifier: 18.3.8 - version: 18.3.8 + specifier: 18.3.9 + version: 18.3.9 '@types/semver': specifier: 7.5.8 version: 7.5.8 eslint-plugin-vitest: specifier: 0.4.1 - version: 0.4.1(@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2)(vitest@2.1.1(@types/node@18.19.50)(jsdom@25.0.0)) + version: 0.4.1(@typescript-eslint/eslint-plugin@8.7.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2)(vitest@2.1.1(@types/node@18.19.53)(jsdom@25.0.1)) jose: - specifier: 5.9.2 - version: 5.9.2 + specifier: 5.9.3 + version: 5.9.3 jsdom: - specifier: 25.0.0 - version: 25.0.0 + specifier: 25.0.1 + version: 25.0.1 react: specifier: 18.3.1 version: 18.3.1 @@ -247,7 +247,7 @@ importers: version: 7.6.3 vitest: specifier: 2.1.1 - version: 2.1.1(@types/node@18.19.50)(jsdom@25.0.0) + version: 2.1.1(@types/node@18.19.53)(jsdom@25.0.1) packages: @@ -944,8 +944,8 @@ packages: '@types/minimatch@3.0.5': resolution: {integrity: sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==} - '@types/node@18.19.50': - resolution: {integrity: sha512-xonK+NRrMBRtkL1hVCc3G+uXtjh1Al4opBLjqVmipe5ZAaBYWW6cNAiBVZ1BvmkBhep698rP3UM3aRAdSALuhg==} + '@types/node@18.19.53': + resolution: {integrity: sha512-GLxgUgHhDKO1Edw9Q0lvMbiO/IQXJwJlMaqxSGBXMpPy8uhkCs2iiPFaB2Q/gmobnFkckD3rqTBMVjXdwq+nKg==} '@types/parse-json@4.0.2': resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==} @@ -956,8 +956,8 @@ packages: '@types/qs@6.9.16': resolution: {integrity: sha512-7i+zxXdPD0T4cKDuxCUXJ4wHcsJLwENa6Z3dCu8cfCK743OGy5Nu1RmAGqDPsoTDINVEcdXKRvR/zre+P2Ku1A==} - '@types/react@18.3.8': - resolution: {integrity: sha512-syBUrW3/XpnW4WJ41Pft+I+aPoDVbrBVQGEnbD7NijDGlVC+8gV/XKRY+7vMDlfPpbwYt0l1vd/Sj8bJGMbs9Q==} + '@types/react@18.3.9': + resolution: {integrity: sha512-+BpAVyTpJkNWWSSnaLBk6ePpHLOGJKnEQNbINNovPWzvEUyAe3e+/d494QdEh71RekM/qV7lw6jzf1HGrJyAtQ==} '@types/semver@7.5.8': resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} @@ -968,8 +968,8 @@ packages: '@types/uuid@10.0.0': resolution: {integrity: sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==} - '@typescript-eslint/eslint-plugin@8.6.0': - resolution: {integrity: sha512-UOaz/wFowmoh2G6Mr9gw60B1mm0MzUtm6Ic8G2yM1Le6gyj5Loi/N+O5mocugRGY+8OeeKmkMmbxNqUCq3B4Sg==} + '@typescript-eslint/eslint-plugin@8.7.0': + resolution: {integrity: sha512-RIHOoznhA3CCfSTFiB6kBGLQtB/sox+pJ6jeFu6FxJvqL8qRxq/FfGO/UhsGgQM9oGdXkV4xUgli+dt26biB6A==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0 @@ -979,8 +979,8 @@ packages: typescript: optional: true - '@typescript-eslint/parser@8.6.0': - resolution: {integrity: sha512-eQcbCuA2Vmw45iGfcyG4y6rS7BhWfz9MQuk409WD47qMM+bKCGQWXxvoOs1DUp+T7UBMTtRTVT+kXr7Sh4O9Ow==} + '@typescript-eslint/parser@8.7.0': + resolution: {integrity: sha512-lN0btVpj2unxHlNYLI//BQ7nzbMJYBVQX5+pbNXvGYazdlgYonMn4AhhHifQ+J4fGRYA/m1DjaQjx+fDetqBOQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -993,12 +993,12 @@ packages: resolution: {integrity: sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==} engines: {node: ^18.18.0 || >=20.0.0} - '@typescript-eslint/scope-manager@8.6.0': - resolution: {integrity: sha512-ZuoutoS5y9UOxKvpc/GkvF4cuEmpokda4wRg64JEia27wX+PysIE9q+lzDtlHHgblwUWwo5/Qn+/WyTUvDwBHw==} + '@typescript-eslint/scope-manager@8.7.0': + resolution: {integrity: sha512-87rC0k3ZlDOuz82zzXRtQ7Akv3GKhHs0ti4YcbAJtaomllXoSO8hi7Ix3ccEvCd824dy9aIX+j3d2UMAfCtVpg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/type-utils@8.6.0': - resolution: {integrity: sha512-dtePl4gsuenXVwC7dVNlb4mGDcKjDT/Ropsk4za/ouMBPplCLyznIaR+W65mvCvsyS97dymoBRrioEXI7k0XIg==} + '@typescript-eslint/type-utils@8.7.0': + resolution: {integrity: sha512-tl0N0Mj3hMSkEYhLkjREp54OSb/FI6qyCzfiiclvJvOqre6hsZTGSnHtmFLDU8TIM62G7ygEa1bI08lcuRwEnQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '*' @@ -1010,8 +1010,8 @@ packages: resolution: {integrity: sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==} engines: {node: ^18.18.0 || >=20.0.0} - '@typescript-eslint/types@8.6.0': - resolution: {integrity: sha512-rojqFZGd4MQxw33SrOy09qIDS8WEldM8JWtKQLAjf/X5mGSeEFh5ixQlxssMNyPslVIk9yzWqXCsV2eFhYrYUw==} + '@typescript-eslint/types@8.7.0': + resolution: {integrity: sha512-LLt4BLHFwSfASHSF2K29SZ+ZCsbQOM+LuarPjRUuHm+Qd09hSe3GCeaQbcCr+Mik+0QFRmep/FyZBO6fJ64U3w==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@typescript-eslint/typescript-estree@7.18.0': @@ -1023,8 +1023,8 @@ packages: typescript: optional: true - '@typescript-eslint/typescript-estree@8.6.0': - resolution: {integrity: sha512-MOVAzsKJIPIlLK239l5s06YXjNqpKTVhBVDnqUumQJja5+Y94V3+4VUFRA0G60y2jNnTVwRCkhyGQpavfsbq/g==} + '@typescript-eslint/typescript-estree@8.7.0': + resolution: {integrity: sha512-MC8nmcGHsmfAKxwnluTQpNqceniT8SteVwd2voYlmiSWGOtjvGXdPl17dYu2797GVscK30Z04WRM28CrKS9WOg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '*' @@ -1038,8 +1038,8 @@ packages: peerDependencies: eslint: ^8.56.0 - '@typescript-eslint/utils@8.6.0': - resolution: {integrity: sha512-eNp9cWnYf36NaOVjkEUznf6fEgVy1TWpE0o52e4wtojjBx7D1UV2WAWGzR+8Y5lVFtpMLPwNbC67T83DWSph4A==} + '@typescript-eslint/utils@8.7.0': + resolution: {integrity: sha512-ZbdUdwsl2X/s3CiyAu3gOlfQzpbuG3nTWKPoIvAu1pu5r8viiJvv2NPN2AqArL35NCYtw/lrPPfM4gxrMLNLPw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -1048,8 +1048,8 @@ packages: resolution: {integrity: sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==} engines: {node: ^18.18.0 || >=20.0.0} - '@typescript-eslint/visitor-keys@8.6.0': - resolution: {integrity: sha512-wapVFfZg9H0qOYh4grNVQiMklJGluQrOUiOhYRrQWhx7BY/+I1IYb8BczWNbbUpO+pqy0rDciv3lQH5E1bCLrg==} + '@typescript-eslint/visitor-keys@8.7.0': + resolution: {integrity: sha512-b1tx0orFCCh/THWPQa2ZwWzvOeyzzp36vkJYOpVg0u8UVOIsfVrnuC9FqAw9gRKn+rG2VmWQ/zDJZzkxUnj/XQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@ungap/structured-clone@1.2.0': @@ -1958,8 +1958,8 @@ packages: jju@1.4.0: resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==} - jose@5.9.2: - resolution: {integrity: sha512-ILI2xx/I57b20sd7rHZvgiiQrmp2mcotwsAH+5ajbpFQbrYVQdNHYlQhoA5cFb78CgtBOxtC05TeA+mcgkuCqQ==} + jose@5.9.3: + resolution: {integrity: sha512-egLIoYSpcd+QUF+UHgobt5YzI2Pkw/H39ou9suW687MY6PmCwPmkNV/4TNjn1p2tX5xO3j0d0sq5hiYE24bSlg==} js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} @@ -1976,8 +1976,8 @@ packages: resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} hasBin: true - jsdom@25.0.0: - resolution: {integrity: sha512-OhoFVT59T7aEq75TVw9xxEfkXgacpqAhQaYgP9y/fDqWQCMB/b1H66RfmPm/MaeaAIU9nDwMOVTlPN51+ao6CQ==} + jsdom@25.0.1: + resolution: {integrity: sha512-8i7LzZj7BF8uplX+ZyOlIz86V6TAsSs+np6m1kpW9u0JWi4z/1t+FzcK1aek+ybTnAC4KhBL4uXCNT0wcUIeCw==} engines: {node: '>=18'} peerDependencies: canvas: ^2.11.2 @@ -2286,9 +2286,6 @@ packages: resolution: {integrity: sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==} engines: {node: '>=12.0.0'} - psl@1.9.0: - resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==} - punycode@2.3.1: resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} @@ -2297,9 +2294,6 @@ packages: resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==} engines: {node: '>=0.6'} - querystringify@2.2.0: - resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==} - queue-microtask@1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} @@ -2341,9 +2335,6 @@ packages: require-package-name@2.0.1: resolution: {integrity: sha512-uuoJ1hU/k6M0779t3VMVIYpb2VMJk05cehCaABFhXaibcbvfgR8wKiozLjVFSzJPmQMRqIcO0HMyTFqfV09V6Q==} - requires-port@1.0.0: - resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==} - resolve-dir@1.0.1: resolution: {integrity: sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==} engines: {node: '>=0.10.0'} @@ -2565,6 +2556,13 @@ packages: resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==} engines: {node: '>=14.0.0'} + tldts-core@6.1.48: + resolution: {integrity: sha512-3gD9iKn/n2UuFH1uilBviK9gvTNT6iYwdqrj1Vr5mh8FuelvpRNaYVH4pNYqUgOGU4aAdL9X35eLuuj0gRsx+A==} + + tldts@6.1.48: + resolution: {integrity: sha512-SPbnh1zaSzi/OsmHb1vrPNnYuwJbdWjwo5TbBYYMlTtH3/1DSb41t8bcSxkwDmmbG2q6VLPVvQc7Yf23T+1EEw==} + hasBin: true + to-fast-properties@2.0.0: resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} engines: {node: '>=4'} @@ -2573,9 +2571,9 @@ packages: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} - tough-cookie@4.1.4: - resolution: {integrity: sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==} - engines: {node: '>=6'} + tough-cookie@5.0.0: + resolution: {integrity: sha512-FRKsF7cz96xIIeMZ82ehjC3xW2E+O2+v11udrDYewUbszngYhsGa8z6YUMMzO9QJZzzyd0nGGXnML/TReX6W8Q==} + engines: {node: '>=16'} tr46@5.0.0: resolution: {integrity: sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==} @@ -2669,16 +2667,9 @@ packages: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} - universalify@0.2.0: - resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==} - engines: {node: '>= 4.0.0'} - uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} - url-parse@1.5.10: - resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==} - use-deep-compare-effect@1.8.1: resolution: {integrity: sha512-kbeNVZ9Zkc0RFGpfMN3MNfaKNvcLNyxOAAd9O4CBZ+kCBXXscn9s/4I+8ytUER4RDpEYs5+O6Rs4PqiZ+rHr5Q==} engines: {node: '>=10', npm: '>=6'} @@ -3159,35 +3150,35 @@ snapshots: '@js-sdsl/ordered-map@4.4.2': {} - '@microsoft/api-documenter@7.25.14(@types/node@18.19.50)': + '@microsoft/api-documenter@7.25.14(@types/node@18.19.53)': dependencies: - '@microsoft/api-extractor-model': 7.29.8(@types/node@18.19.50) + '@microsoft/api-extractor-model': 7.29.8(@types/node@18.19.53) '@microsoft/tsdoc': 0.15.0 - '@rushstack/node-core-library': 5.9.0(@types/node@18.19.50) - '@rushstack/terminal': 0.14.2(@types/node@18.19.50) - '@rushstack/ts-command-line': 4.22.8(@types/node@18.19.50) + '@rushstack/node-core-library': 5.9.0(@types/node@18.19.53) + '@rushstack/terminal': 0.14.2(@types/node@18.19.53) + '@rushstack/ts-command-line': 4.22.8(@types/node@18.19.53) js-yaml: 3.13.1 resolve: 1.22.8 transitivePeerDependencies: - '@types/node' - '@microsoft/api-extractor-model@7.29.8(@types/node@18.19.50)': + '@microsoft/api-extractor-model@7.29.8(@types/node@18.19.53)': dependencies: '@microsoft/tsdoc': 0.15.0 '@microsoft/tsdoc-config': 0.17.0 - '@rushstack/node-core-library': 5.9.0(@types/node@18.19.50) + '@rushstack/node-core-library': 5.9.0(@types/node@18.19.53) transitivePeerDependencies: - '@types/node' - '@microsoft/api-extractor@7.47.9(@types/node@18.19.50)': + '@microsoft/api-extractor@7.47.9(@types/node@18.19.53)': dependencies: - '@microsoft/api-extractor-model': 7.29.8(@types/node@18.19.50) + '@microsoft/api-extractor-model': 7.29.8(@types/node@18.19.53) '@microsoft/tsdoc': 0.15.0 '@microsoft/tsdoc-config': 0.17.0 - '@rushstack/node-core-library': 5.9.0(@types/node@18.19.50) + '@rushstack/node-core-library': 5.9.0(@types/node@18.19.53) '@rushstack/rig-package': 0.5.3 - '@rushstack/terminal': 0.14.2(@types/node@18.19.50) - '@rushstack/ts-command-line': 4.22.8(@types/node@18.19.50) + '@rushstack/terminal': 0.14.2(@types/node@18.19.53) + '@rushstack/ts-command-line': 4.22.8(@types/node@18.19.53) lodash: 4.17.21 minimatch: 3.0.8 resolve: 1.22.8 @@ -3359,7 +3350,7 @@ snapshots: '@rtsao/scc@1.1.0': {} - '@rushstack/node-core-library@5.9.0(@types/node@18.19.50)': + '@rushstack/node-core-library@5.9.0(@types/node@18.19.53)': dependencies: ajv: 8.13.0 ajv-draft-04: 1.0.0(ajv@8.13.0) @@ -3370,23 +3361,23 @@ snapshots: resolve: 1.22.8 semver: 7.5.4 optionalDependencies: - '@types/node': 18.19.50 + '@types/node': 18.19.53 '@rushstack/rig-package@0.5.3': dependencies: resolve: 1.22.8 strip-json-comments: 3.1.1 - '@rushstack/terminal@0.14.2(@types/node@18.19.50)': + '@rushstack/terminal@0.14.2(@types/node@18.19.53)': dependencies: - '@rushstack/node-core-library': 5.9.0(@types/node@18.19.50) + '@rushstack/node-core-library': 5.9.0(@types/node@18.19.53) supports-color: 8.1.1 optionalDependencies: - '@types/node': 18.19.50 + '@types/node': 18.19.53 - '@rushstack/ts-command-line@4.22.8(@types/node@18.19.50)': + '@rushstack/ts-command-line@4.22.8(@types/node@18.19.53)': dependencies: - '@rushstack/terminal': 0.14.2(@types/node@18.19.50) + '@rushstack/terminal': 0.14.2(@types/node@18.19.53) '@types/argparse': 1.0.38 argparse: 1.0.10 string-argv: 0.3.2 @@ -3410,14 +3401,14 @@ snapshots: lz-string: 1.5.0 pretty-format: 27.5.1 - '@testing-library/react@16.0.1(@testing-library/dom@10.4.0)(@types/react@18.3.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@testing-library/react@16.0.1(@testing-library/dom@10.4.0)(@types/react@18.3.9)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.6 '@testing-library/dom': 10.4.0 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: - '@types/react': 18.3.8 + '@types/react': 18.3.9 '@testing-library/user-event@14.5.2(@testing-library/dom@10.4.0)': dependencies: @@ -3439,7 +3430,7 @@ snapshots: '@types/minimatch@3.0.5': {} - '@types/node@18.19.50': + '@types/node@18.19.53': dependencies: undici-types: 5.26.5 @@ -3449,7 +3440,7 @@ snapshots: '@types/qs@6.9.16': {} - '@types/react@18.3.8': + '@types/react@18.3.9': dependencies: '@types/prop-types': 15.7.13 csstype: 3.1.3 @@ -3460,14 +3451,14 @@ snapshots: '@types/uuid@10.0.0': {} - '@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2)': + '@typescript-eslint/eslint-plugin@8.7.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2)': dependencies: '@eslint-community/regexpp': 4.11.1 - '@typescript-eslint/parser': 8.6.0(eslint@8.57.1)(typescript@5.6.2) - '@typescript-eslint/scope-manager': 8.6.0 - '@typescript-eslint/type-utils': 8.6.0(eslint@8.57.1)(typescript@5.6.2) - '@typescript-eslint/utils': 8.6.0(eslint@8.57.1)(typescript@5.6.2) - '@typescript-eslint/visitor-keys': 8.6.0 + '@typescript-eslint/parser': 8.7.0(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/scope-manager': 8.7.0 + '@typescript-eslint/type-utils': 8.7.0(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/utils': 8.7.0(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/visitor-keys': 8.7.0 eslint: 8.57.1 graphemer: 1.4.0 ignore: 5.3.2 @@ -3478,12 +3469,12 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2)': + '@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.6.2)': dependencies: - '@typescript-eslint/scope-manager': 8.6.0 - '@typescript-eslint/types': 8.6.0 - '@typescript-eslint/typescript-estree': 8.6.0(typescript@5.6.2) - '@typescript-eslint/visitor-keys': 8.6.0 + '@typescript-eslint/scope-manager': 8.7.0 + '@typescript-eslint/types': 8.7.0 + '@typescript-eslint/typescript-estree': 8.7.0(typescript@5.6.2) + '@typescript-eslint/visitor-keys': 8.7.0 debug: 4.3.7 eslint: 8.57.1 optionalDependencies: @@ -3496,15 +3487,15 @@ snapshots: '@typescript-eslint/types': 7.18.0 '@typescript-eslint/visitor-keys': 7.18.0 - '@typescript-eslint/scope-manager@8.6.0': + '@typescript-eslint/scope-manager@8.7.0': dependencies: - '@typescript-eslint/types': 8.6.0 - '@typescript-eslint/visitor-keys': 8.6.0 + '@typescript-eslint/types': 8.7.0 + '@typescript-eslint/visitor-keys': 8.7.0 - '@typescript-eslint/type-utils@8.6.0(eslint@8.57.1)(typescript@5.6.2)': + '@typescript-eslint/type-utils@8.7.0(eslint@8.57.1)(typescript@5.6.2)': dependencies: - '@typescript-eslint/typescript-estree': 8.6.0(typescript@5.6.2) - '@typescript-eslint/utils': 8.6.0(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/typescript-estree': 8.7.0(typescript@5.6.2) + '@typescript-eslint/utils': 8.7.0(eslint@8.57.1)(typescript@5.6.2) debug: 4.3.7 ts-api-utils: 1.3.0(typescript@5.6.2) optionalDependencies: @@ -3515,7 +3506,7 @@ snapshots: '@typescript-eslint/types@7.18.0': {} - '@typescript-eslint/types@8.6.0': {} + '@typescript-eslint/types@8.7.0': {} '@typescript-eslint/typescript-estree@7.18.0(typescript@5.6.2)': dependencies: @@ -3532,10 +3523,10 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@8.6.0(typescript@5.6.2)': + '@typescript-eslint/typescript-estree@8.7.0(typescript@5.6.2)': dependencies: - '@typescript-eslint/types': 8.6.0 - '@typescript-eslint/visitor-keys': 8.6.0 + '@typescript-eslint/types': 8.7.0 + '@typescript-eslint/visitor-keys': 8.7.0 debug: 4.3.7 fast-glob: 3.3.2 is-glob: 4.0.3 @@ -3558,12 +3549,12 @@ snapshots: - supports-color - typescript - '@typescript-eslint/utils@8.6.0(eslint@8.57.1)(typescript@5.6.2)': + '@typescript-eslint/utils@8.7.0(eslint@8.57.1)(typescript@5.6.2)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.1) - '@typescript-eslint/scope-manager': 8.6.0 - '@typescript-eslint/types': 8.6.0 - '@typescript-eslint/typescript-estree': 8.6.0(typescript@5.6.2) + '@typescript-eslint/scope-manager': 8.7.0 + '@typescript-eslint/types': 8.7.0 + '@typescript-eslint/typescript-estree': 8.7.0(typescript@5.6.2) eslint: 8.57.1 transitivePeerDependencies: - supports-color @@ -3574,9 +3565,9 @@ snapshots: '@typescript-eslint/types': 7.18.0 eslint-visitor-keys: 3.4.3 - '@typescript-eslint/visitor-keys@8.6.0': + '@typescript-eslint/visitor-keys@8.7.0': dependencies: - '@typescript-eslint/types': 8.6.0 + '@typescript-eslint/types': 8.7.0 eslint-visitor-keys: 3.4.3 '@ungap/structured-clone@1.2.0': {} @@ -3588,13 +3579,13 @@ snapshots: chai: 5.1.1 tinyrainbow: 1.2.0 - '@vitest/mocker@2.1.1(@vitest/spy@2.1.1)(vite@5.4.7(@types/node@18.19.50))': + '@vitest/mocker@2.1.1(@vitest/spy@2.1.1)(vite@5.4.7(@types/node@18.19.53))': dependencies: '@vitest/spy': 2.1.1 estree-walker: 3.0.3 magic-string: 0.30.11 optionalDependencies: - vite: 5.4.7(@types/node@18.19.50) + vite: 5.4.7(@types/node@18.19.53) '@vitest/pretty-format@2.1.1': dependencies: @@ -4186,17 +4177,17 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.11.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint@8.57.1): + eslint-module-utils@2.11.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint@8.57.1): dependencies: debug: 3.2.7 optionalDependencies: - '@typescript-eslint/parser': 8.6.0(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/parser': 8.7.0(eslint@8.57.1)(typescript@5.6.2) eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 transitivePeerDependencies: - supports-color - eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1): + eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1): dependencies: '@rtsao/scc': 1.1.0 array-includes: 3.1.8 @@ -4207,7 +4198,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint@8.57.1) + eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint@8.57.1) hasown: 2.0.2 is-core-module: 2.15.1 is-glob: 4.0.3 @@ -4218,7 +4209,7 @@ snapshots: semver: 6.3.1 tsconfig-paths: 3.15.0 optionalDependencies: - '@typescript-eslint/parser': 8.6.0(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/parser': 8.7.0(eslint@8.57.1)(typescript@5.6.2) transitivePeerDependencies: - eslint-import-resolver-typescript - eslint-import-resolver-webpack @@ -4233,13 +4224,13 @@ snapshots: '@microsoft/tsdoc': 0.15.0 '@microsoft/tsdoc-config': 0.17.0 - eslint-plugin-vitest@0.4.1(@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2)(vitest@2.1.1(@types/node@18.19.50)(jsdom@25.0.0)): + eslint-plugin-vitest@0.4.1(@typescript-eslint/eslint-plugin@8.7.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2)(vitest@2.1.1(@types/node@18.19.53)(jsdom@25.0.1)): dependencies: '@typescript-eslint/utils': 7.18.0(eslint@8.57.1)(typescript@5.6.2) eslint: 8.57.1 optionalDependencies: - '@typescript-eslint/eslint-plugin': 8.6.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2) - vitest: 2.1.1(@types/node@18.19.50)(jsdom@25.0.0) + '@typescript-eslint/eslint-plugin': 8.7.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2) + vitest: 2.1.1(@types/node@18.19.53)(jsdom@25.0.1) transitivePeerDependencies: - supports-color - typescript @@ -4683,7 +4674,7 @@ snapshots: jju@1.4.0: {} - jose@5.9.2: {} + jose@5.9.3: {} js-tokens@4.0.0: {} @@ -4701,7 +4692,7 @@ snapshots: dependencies: argparse: 2.0.1 - jsdom@25.0.0: + jsdom@25.0.1: dependencies: cssstyle: 4.1.0 data-urls: 5.0.0 @@ -4716,7 +4707,7 @@ snapshots: rrweb-cssom: 0.7.1 saxes: 6.0.0 symbol-tree: 3.2.4 - tough-cookie: 4.1.4 + tough-cookie: 5.0.0 w3c-xmlserializer: 5.0.0 webidl-conversions: 7.0.0 whatwg-encoding: 3.1.1 @@ -5015,19 +5006,15 @@ snapshots: '@protobufjs/path': 1.1.2 '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 - '@types/node': 18.19.50 + '@types/node': 18.19.53 long: 5.2.3 - psl@1.9.0: {} - punycode@2.3.1: {} qs@6.13.0: dependencies: side-channel: 1.0.6 - querystringify@2.2.0: {} - queue-microtask@1.2.3: {} react-dom@18.3.1(react@18.3.1): @@ -5069,8 +5056,6 @@ snapshots: require-package-name@2.0.1: {} - requires-port@1.0.0: {} - resolve-dir@1.0.1: dependencies: expand-tilde: 2.0.2 @@ -5290,18 +5275,21 @@ snapshots: tinyspy@3.0.2: {} + tldts-core@6.1.48: {} + + tldts@6.1.48: + dependencies: + tldts-core: 6.1.48 + to-fast-properties@2.0.0: {} to-regex-range@5.0.1: dependencies: is-number: 7.0.0 - tough-cookie@4.1.4: + tough-cookie@5.0.0: dependencies: - psl: 1.9.0 - punycode: 2.3.1 - universalify: 0.2.0 - url-parse: 1.5.10 + tldts: 6.1.48 tr46@5.0.0: dependencies: @@ -5403,17 +5391,10 @@ snapshots: universalify@0.1.2: {} - universalify@0.2.0: {} - uri-js@4.4.1: dependencies: punycode: 2.3.1 - url-parse@1.5.10: - dependencies: - querystringify: 2.2.0 - requires-port: 1.0.0 - use-deep-compare-effect@1.8.1(react@18.3.1): dependencies: '@babel/runtime': 7.25.6 @@ -5424,12 +5405,12 @@ snapshots: validate-npm-package-name@5.0.1: {} - vite-node@2.1.1(@types/node@18.19.50): + vite-node@2.1.1(@types/node@18.19.53): dependencies: cac: 6.7.14 debug: 4.3.7 pathe: 1.1.2 - vite: 5.4.7(@types/node@18.19.50) + vite: 5.4.7(@types/node@18.19.53) transitivePeerDependencies: - '@types/node' - less @@ -5441,19 +5422,19 @@ snapshots: - supports-color - terser - vite@5.4.7(@types/node@18.19.50): + vite@5.4.7(@types/node@18.19.53): dependencies: esbuild: 0.21.5 postcss: 8.4.47 rollup: 4.22.4 optionalDependencies: - '@types/node': 18.19.50 + '@types/node': 18.19.53 fsevents: 2.3.3 - vitest@2.1.1(@types/node@18.19.50)(jsdom@25.0.0): + vitest@2.1.1(@types/node@18.19.53)(jsdom@25.0.1): dependencies: '@vitest/expect': 2.1.1 - '@vitest/mocker': 2.1.1(@vitest/spy@2.1.1)(vite@5.4.7(@types/node@18.19.50)) + '@vitest/mocker': 2.1.1(@vitest/spy@2.1.1)(vite@5.4.7(@types/node@18.19.53)) '@vitest/pretty-format': 2.1.1 '@vitest/runner': 2.1.1 '@vitest/snapshot': 2.1.1 @@ -5468,12 +5449,12 @@ snapshots: tinyexec: 0.3.0 tinypool: 1.0.1 tinyrainbow: 1.2.0 - vite: 5.4.7(@types/node@18.19.50) - vite-node: 2.1.1(@types/node@18.19.50) + vite: 5.4.7(@types/node@18.19.53) + vite-node: 2.1.1(@types/node@18.19.53) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 18.19.50 - jsdom: 25.0.0 + '@types/node': 18.19.53 + jsdom: 25.0.1 transitivePeerDependencies: - less - lightningcss diff --git a/private/test/package.json b/private/test/package.json index f8eca8b6..9226583d 100644 --- a/private/test/package.json +++ b/private/test/package.json @@ -23,11 +23,11 @@ "@opentelemetry/semantic-conventions": "1.27.0", "@testing-library/react": "16.0.1", "@testing-library/user-event": "14.5.2", - "@types/react": "18.3.8", + "@types/react": "18.3.9", "@types/semver": "7.5.8", "eslint-plugin-vitest": "0.4.1", - "jose": "5.9.2", - "jsdom": "25.0.0", + "jose": "5.9.3", + "jsdom": "25.0.1", "react": "18.3.1", "react-dom": "18.3.1", "semver": "7.6.3", diff --git a/private/test/src/matrix-cerbos/instrumentation.test.ts b/private/test/src/matrix-cerbos/instrumentation.test.ts index d3cc99b0..c0217f08 100644 --- a/private/test/src/matrix-cerbos/instrumentation.test.ts +++ b/private/test/src/matrix-cerbos/instrumentation.test.ts @@ -12,11 +12,11 @@ import { } from "@opentelemetry/sdk-trace-base"; import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node"; import { - SEMATTRS_RPC_GRPC_STATUS_CODE, - SEMATTRS_RPC_METHOD, - SEMATTRS_RPC_SERVICE, - SEMATTRS_RPC_SYSTEM, -} from "@opentelemetry/semantic-conventions"; + ATTR_RPC_GRPC_STATUS_CODE, + ATTR_RPC_METHOD, + ATTR_RPC_SERVICE, + ATTR_RPC_SYSTEM, +} from "@opentelemetry/semantic-conventions/incubating"; import { UnsecuredJWT } from "jose"; import { afterAll, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -51,10 +51,10 @@ import { } from "../servers"; interface ExpectedAttributes extends Attributes { - [SEMATTRS_RPC_SYSTEM]: string; - [SEMATTRS_RPC_SERVICE]: string; - [SEMATTRS_RPC_METHOD]: string; - [SEMATTRS_RPC_GRPC_STATUS_CODE]: Status; + [ATTR_RPC_SYSTEM]: string; + [ATTR_RPC_SERVICE]: string; + [ATTR_RPC_METHOD]: string; + [ATTR_RPC_GRPC_STATUS_CODE]: Status; "cerbos.error"?: string; } @@ -149,10 +149,10 @@ describe("CerbosInstrumentation", () => { ); const attributes: ExpectedAttributes = { - [SEMATTRS_RPC_SYSTEM]: "grpc", - [SEMATTRS_RPC_SERVICE]: "cerbos.svc.v1.CerbosService", - [SEMATTRS_RPC_METHOD]: "CheckResources", - [SEMATTRS_RPC_GRPC_STATUS_CODE]: 0, + [ATTR_RPC_SYSTEM]: "grpc", + [ATTR_RPC_SERVICE]: "cerbos.svc.v1.CerbosService", + [ATTR_RPC_METHOD]: "CheckResources", + [ATTR_RPC_GRPC_STATUS_CODE]: 0, }; expect(result).toEqual({ value: false }); @@ -191,10 +191,10 @@ describe("CerbosInstrumentation", () => { ); const attributes: ExpectedAttributes = { - [SEMATTRS_RPC_SYSTEM]: "grpc", - [SEMATTRS_RPC_SERVICE]: "cerbos.svc.v1.CerbosService", - [SEMATTRS_RPC_METHOD]: "CheckResources", - [SEMATTRS_RPC_GRPC_STATUS_CODE]: Status.INVALID_ARGUMENT, + [ATTR_RPC_SYSTEM]: "grpc", + [ATTR_RPC_SERVICE]: "cerbos.svc.v1.CerbosService", + [ATTR_RPC_METHOD]: "CheckResources", + [ATTR_RPC_GRPC_STATUS_CODE]: Status.INVALID_ARGUMENT, "cerbos.error": invalidArgumentDetails, }; @@ -268,10 +268,10 @@ describe("CerbosInstrumentation", () => { }); const attributes: ExpectedAttributes = { - [SEMATTRS_RPC_SYSTEM]: "grpc", - [SEMATTRS_RPC_SERVICE]: "cerbos.svc.v1.CerbosAdminService", - [SEMATTRS_RPC_METHOD]: "ListAuditLogEntries", - [SEMATTRS_RPC_GRPC_STATUS_CODE]: 0, + [ATTR_RPC_SYSTEM]: "grpc", + [ATTR_RPC_SERVICE]: "cerbos.svc.v1.CerbosAdminService", + [ATTR_RPC_METHOD]: "ListAuditLogEntries", + [ATTR_RPC_GRPC_STATUS_CODE]: 0, }; expect(result).toEqual({ value: entry }); @@ -297,10 +297,10 @@ describe("CerbosInstrumentation", () => { ); const attributes: ExpectedAttributes = { - [SEMATTRS_RPC_SYSTEM]: "grpc", - [SEMATTRS_RPC_SERVICE]: "cerbos.svc.v1.CerbosAdminService", - [SEMATTRS_RPC_METHOD]: "ListAuditLogEntries", - [SEMATTRS_RPC_GRPC_STATUS_CODE]: Status.INVALID_ARGUMENT, + [ATTR_RPC_SYSTEM]: "grpc", + [ATTR_RPC_SERVICE]: "cerbos.svc.v1.CerbosAdminService", + [ATTR_RPC_METHOD]: "ListAuditLogEntries", + [ATTR_RPC_GRPC_STATUS_CODE]: Status.INVALID_ARGUMENT, "cerbos.error": invalidArgumentDetails, }; @@ -353,10 +353,10 @@ describe("CerbosInstrumentation", () => { ); const attributes = { - [SEMATTRS_RPC_SYSTEM]: "grpc", - [SEMATTRS_RPC_SERVICE]: "cerbos.svc.v1.CerbosAdminService", - [SEMATTRS_RPC_METHOD]: "ListAuditLogEntries", - [SEMATTRS_RPC_GRPC_STATUS_CODE]: Status.CANCELLED, + [ATTR_RPC_SYSTEM]: "grpc", + [ATTR_RPC_SERVICE]: "cerbos.svc.v1.CerbosAdminService", + [ATTR_RPC_METHOD]: "ListAuditLogEntries", + [ATTR_RPC_GRPC_STATUS_CODE]: Status.CANCELLED, "cerbos.error": expect.stringContaining("Aborted"), } satisfies Attributes; @@ -375,7 +375,7 @@ describe("CerbosInstrumentation", () => { await expectServerSpan(span, { ...attributes, - [SEMATTRS_RPC_GRPC_STATUS_CODE]: Status.OK, // Although the call is aborted after returning early from for-await on the client, it completes successfully on the server + [ATTR_RPC_GRPC_STATUS_CODE]: Status.OK, // Although the call is aborted after returning early from for-await on the client, it completes successfully on the server }); }); }); @@ -405,39 +405,38 @@ describe("CerbosInstrumentation", () => { kind: SpanKindProto.SPAN_KIND_SERVER, attributes: expect.arrayContaining([ { - key: SEMATTRS_RPC_SYSTEM, + key: ATTR_RPC_SYSTEM, value: { value: { $case: "stringValue", - stringValue: attributes[SEMATTRS_RPC_SYSTEM], + stringValue: attributes[ATTR_RPC_SYSTEM], }, }, }, { - key: SEMATTRS_RPC_SERVICE, + key: ATTR_RPC_SERVICE, value: { value: { $case: "stringValue", - stringValue: attributes[SEMATTRS_RPC_SERVICE], + stringValue: attributes[ATTR_RPC_SERVICE], }, }, }, { - key: SEMATTRS_RPC_METHOD, + key: ATTR_RPC_METHOD, value: { value: { $case: "stringValue", - stringValue: attributes[SEMATTRS_RPC_METHOD], + stringValue: attributes[ATTR_RPC_METHOD], }, }, }, { - key: SEMATTRS_RPC_GRPC_STATUS_CODE, + key: ATTR_RPC_GRPC_STATUS_CODE, value: { value: { $case: "intValue", - intValue: - attributes[SEMATTRS_RPC_GRPC_STATUS_CODE].toString(), + intValue: attributes[ATTR_RPC_GRPC_STATUS_CODE].toString(), }, }, },