From 00cb360fcd2388037b647e6e6841381db152a28b Mon Sep 17 00:00:00 2001 From: Siddharth Date: Thu, 2 Nov 2023 11:05:35 +0530 Subject: [PATCH 1/2] chore: changed otel version in consent and dashboard --- apps/consent/env.ts | 4 - apps/consent/instrumentation.node.ts | 7 +- apps/consent/instrumentation.ts | 2 + apps/consent/package.json | 18 +- apps/dashboard/env.ts | 2 - apps/dashboard/instrumentation.node.ts | 4 +- apps/dashboard/instrumentation.ts | 2 + apps/dashboard/package.json | 18 +- pnpm-lock.yaml | 334 ++++++++++++++----------- 9 files changed, 217 insertions(+), 174 deletions(-) diff --git a/apps/consent/env.ts b/apps/consent/env.ts index aada0a593e..2632bd48e9 100644 --- a/apps/consent/env.ts +++ b/apps/consent/env.ts @@ -8,16 +8,12 @@ export const env = createEnv({ }, shared: { GRAPHQL_ENDPOINT: z.string().default("http://localhost:4455/graphql"), - OTEL_EXPORTER_OTLP_ENDPOINT: z.string().default("http://localhost:4318"), - TRACING_SERVICE_NAME: z.string().default("consent"), NODE_ENV: z.string(), }, runtimeEnv: { CORE_AUTH_URL: process.env.CORE_AUTH_URL, HYDRA_ADMIN_URL: process.env.HYDRA_ADMIN_URL, GRAPHQL_ENDPOINT: process.env.GRAPHQL_ENDPOINT, - OTEL_EXPORTER_OTLP_ENDPOINT: process.env.OTEL_EXPORTER_OTLP_ENDPOINT, - TRACING_SERVICE_NAME: process.env.TRACING_SERVICE_NAME, NODE_ENV: process.env.NODE_ENV, }, }) diff --git a/apps/consent/instrumentation.node.ts b/apps/consent/instrumentation.node.ts index a2e98412c6..89bb57e57f 100644 --- a/apps/consent/instrumentation.node.ts +++ b/apps/consent/instrumentation.node.ts @@ -8,12 +8,11 @@ import { HttpInstrumentation } from "@opentelemetry/instrumentation-http" import { GraphQLInstrumentation } from "@opentelemetry/instrumentation-graphql" import { W3CTraceContextPropagator } from "@opentelemetry/core" -import { env } from "./env" - const sdk = new NodeSDK({ textMapPropagator: new W3CTraceContextPropagator(), resource: new Resource({ - [SemanticResourceAttributes.SERVICE_NAME]: env.TRACING_SERVICE_NAME, + [SemanticResourceAttributes.SERVICE_NAME]: + process.env.TRACING_SERVICE_NAME || "blink-consent", }), spanProcessor: new SimpleSpanProcessor(new OTLPTraceExporter()), instrumentations: [ @@ -31,6 +30,6 @@ process.on("SIGTERM", () => { sdk .shutdown() .then(() => console.log("Tracing terminated")) - .catch((error: Error) => console.log("Error terminating tracing", error)) + .catch((error) => console.log("Error terminating tracing", error)) .finally(() => process.exit(0)) }) diff --git a/apps/consent/instrumentation.ts b/apps/consent/instrumentation.ts index 9a150ca7ec..e357de1a6d 100644 --- a/apps/consent/instrumentation.ts +++ b/apps/consent/instrumentation.ts @@ -1,4 +1,6 @@ export async function register() { + console.log("register", process.env.NEXT_RUNTIME) + if (process.env.NEXT_RUNTIME === "nodejs") { await import("./instrumentation.node") } diff --git a/apps/consent/package.json b/apps/consent/package.json index 56eae0810d..01a0f1e201 100644 --- a/apps/consent/package.json +++ b/apps/consent/package.json @@ -15,15 +15,15 @@ "dependencies": { "@apollo/client": "^3.8.0-rc.2", "@opentelemetry/api": "^1.6.0", - "@opentelemetry/core": "^1.17.1", - "@opentelemetry/exporter-trace-otlp-http": "^0.44.0", - "@opentelemetry/instrumentation-graphql": "^0.35.2", - "@opentelemetry/instrumentation-http": "^0.44.0", - "@opentelemetry/instrumentation-net": "^0.32.2", - "@opentelemetry/resources": "^1.17.1", - "@opentelemetry/sdk-node": "^0.44.0", - "@opentelemetry/sdk-trace-node": "^1.17.1", - "@opentelemetry/semantic-conventions": "^1.17.1", + "@opentelemetry/core": "1.17.0", + "@opentelemetry/exporter-trace-otlp-http": "^0.43.0", + "@opentelemetry/instrumentation-graphql": "^0.35.1", + "@opentelemetry/instrumentation-http": "^0.43.0", + "@opentelemetry/instrumentation-net": "^0.32.1", + "@opentelemetry/resources": "^1.17.0", + "@opentelemetry/sdk-node": "^0.43.0", + "@opentelemetry/sdk-trace-node": "^1.17.0", + "@opentelemetry/semantic-conventions": "^1.17.0", "@ory/hydra-client": "^2.2.0-rc.3", "@t3-oss/env-nextjs": "^0.6.1", "axios": "^1.5.1", diff --git a/apps/dashboard/env.ts b/apps/dashboard/env.ts index a9487d1b30..248c54d425 100644 --- a/apps/dashboard/env.ts +++ b/apps/dashboard/env.ts @@ -9,7 +9,6 @@ export const env = createEnv({ HYDRA_PUBLIC: z.string().default("http://localhost:4444"), NEXTAUTH_URL: z.string().default(""), NEXTAUTH_SECRET: z.string().default("secret"), - OTEL_EXPORTER_OTLP_ENDPOINT: z.string().default("http://localhost:4318"), }, runtimeEnv: { CORE_URL: process.env.CORE_URL, @@ -18,6 +17,5 @@ export const env = createEnv({ CLIENT_ID: process.env.CLIENT_ID, CLIENT_SECRET: process.env.CLIENT_SECRET, HYDRA_PUBLIC: process.env.HYDRA_PUBLIC, - OTEL_EXPORTER_OTLP_ENDPOINT: process.env.OTEL_EXPORTER_OTLP_ENDPOINT, }, }) diff --git a/apps/dashboard/instrumentation.node.ts b/apps/dashboard/instrumentation.node.ts index 1b3243eb76..4512f53167 100644 --- a/apps/dashboard/instrumentation.node.ts +++ b/apps/dashboard/instrumentation.node.ts @@ -12,7 +12,7 @@ const sdk = new NodeSDK({ textMapPropagator: new W3CTraceContextPropagator(), resource: new Resource({ [SemanticResourceAttributes.SERVICE_NAME]: - process.env.TRACING_SERVICE_NAME || "dashboard", + process.env.TRACING_SERVICE_NAME || "blink-dashboard", }), spanProcessor: new SimpleSpanProcessor(new OTLPTraceExporter()), instrumentations: [ @@ -30,6 +30,6 @@ process.on("SIGTERM", () => { sdk .shutdown() .then(() => console.log("Tracing terminated")) - .catch((error: Error) => console.log("Error terminating tracing", error)) + .catch((error) => console.log("Error terminating tracing", error)) .finally(() => process.exit(0)) }) diff --git a/apps/dashboard/instrumentation.ts b/apps/dashboard/instrumentation.ts index 9a150ca7ec..e357de1a6d 100644 --- a/apps/dashboard/instrumentation.ts +++ b/apps/dashboard/instrumentation.ts @@ -1,4 +1,6 @@ export async function register() { + console.log("register", process.env.NEXT_RUNTIME) + if (process.env.NEXT_RUNTIME === "nodejs") { await import("./instrumentation.node") } diff --git a/apps/dashboard/package.json b/apps/dashboard/package.json index 5af44dd8bb..d835e0db5f 100644 --- a/apps/dashboard/package.json +++ b/apps/dashboard/package.json @@ -19,15 +19,15 @@ "@mui/joy": "5.0.0-beta.13", "@mui/material": "^5.14.15", "@opentelemetry/api": "^1.6.0", - "@opentelemetry/core": "^1.17.1", - "@opentelemetry/exporter-trace-otlp-http": "^0.44.0", - "@opentelemetry/instrumentation-graphql": "^0.35.2", - "@opentelemetry/instrumentation-http": "^0.44.0", - "@opentelemetry/instrumentation-net": "^0.32.2", - "@opentelemetry/resources": "^1.17.1", - "@opentelemetry/sdk-node": "^0.44.0", - "@opentelemetry/sdk-trace-node": "^1.17.1", - "@opentelemetry/semantic-conventions": "^1.17.1", + "@opentelemetry/core": "1.17.0", + "@opentelemetry/exporter-trace-otlp-http": "^0.43.0", + "@opentelemetry/instrumentation-graphql": "^0.35.1", + "@opentelemetry/instrumentation-http": "^0.43.0", + "@opentelemetry/instrumentation-net": "^0.32.1", + "@opentelemetry/resources": "^1.17.0", + "@opentelemetry/sdk-node": "^0.43.0", + "@opentelemetry/sdk-trace-node": "^1.17.0", + "@opentelemetry/semantic-conventions": "^1.17.0", "@t3-oss/env-core": "^0.7.0", "@t3-oss/env-nextjs": "^0.6.1", "graphql": "^16.8.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 967f9c6833..7166418c16 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,32 +22,32 @@ importers: specifier: ^1.6.0 version: 1.6.0 '@opentelemetry/core': - specifier: ^1.17.1 - version: 1.17.1(@opentelemetry/api@1.6.0) + specifier: 1.17.0 + version: 1.17.0(@opentelemetry/api@1.6.0) '@opentelemetry/exporter-trace-otlp-http': - specifier: ^0.44.0 - version: 0.44.0(@opentelemetry/api@1.6.0) + specifier: ^0.43.0 + version: 0.43.0(@opentelemetry/api@1.6.0) '@opentelemetry/instrumentation-graphql': - specifier: ^0.35.2 - version: 0.35.2(@opentelemetry/api@1.6.0) + specifier: ^0.35.1 + version: 0.35.1(@opentelemetry/api@1.6.0) '@opentelemetry/instrumentation-http': - specifier: ^0.44.0 - version: 0.44.0(@opentelemetry/api@1.6.0) + specifier: ^0.43.0 + version: 0.43.0(@opentelemetry/api@1.6.0) '@opentelemetry/instrumentation-net': - specifier: ^0.32.2 - version: 0.32.2(@opentelemetry/api@1.6.0) + specifier: ^0.32.1 + version: 0.32.1(@opentelemetry/api@1.6.0) '@opentelemetry/resources': - specifier: ^1.17.1 - version: 1.17.1(@opentelemetry/api@1.6.0) + specifier: ^1.17.0 + version: 1.17.0(@opentelemetry/api@1.6.0) '@opentelemetry/sdk-node': - specifier: ^0.44.0 - version: 0.44.0(@opentelemetry/api@1.6.0) + specifier: ^0.43.0 + version: 0.43.0(@opentelemetry/api@1.6.0) '@opentelemetry/sdk-trace-node': - specifier: ^1.17.1 - version: 1.17.1(@opentelemetry/api@1.6.0) + specifier: ^1.17.0 + version: 1.17.0(@opentelemetry/api@1.6.0) '@opentelemetry/semantic-conventions': - specifier: ^1.17.1 - version: 1.17.1 + specifier: ^1.17.0 + version: 1.17.0 '@ory/hydra-client': specifier: ^2.2.0-rc.3 version: 2.2.0-rc.3 @@ -179,32 +179,32 @@ importers: specifier: ^1.6.0 version: 1.6.0 '@opentelemetry/core': - specifier: ^1.17.1 - version: 1.17.1(@opentelemetry/api@1.6.0) + specifier: 1.17.0 + version: 1.17.0(@opentelemetry/api@1.6.0) '@opentelemetry/exporter-trace-otlp-http': - specifier: ^0.44.0 - version: 0.44.0(@opentelemetry/api@1.6.0) + specifier: ^0.43.0 + version: 0.43.0(@opentelemetry/api@1.6.0) '@opentelemetry/instrumentation-graphql': - specifier: ^0.35.2 - version: 0.35.2(@opentelemetry/api@1.6.0) + specifier: ^0.35.1 + version: 0.35.1(@opentelemetry/api@1.6.0) '@opentelemetry/instrumentation-http': - specifier: ^0.44.0 - version: 0.44.0(@opentelemetry/api@1.6.0) + specifier: ^0.43.0 + version: 0.43.0(@opentelemetry/api@1.6.0) '@opentelemetry/instrumentation-net': - specifier: ^0.32.2 - version: 0.32.2(@opentelemetry/api@1.6.0) + specifier: ^0.32.1 + version: 0.32.1(@opentelemetry/api@1.6.0) '@opentelemetry/resources': - specifier: ^1.17.1 - version: 1.17.1(@opentelemetry/api@1.6.0) + specifier: ^1.17.0 + version: 1.17.0(@opentelemetry/api@1.6.0) '@opentelemetry/sdk-node': - specifier: ^0.44.0 - version: 0.44.0(@opentelemetry/api@1.6.0) + specifier: ^0.43.0 + version: 0.43.0(@opentelemetry/api@1.6.0) '@opentelemetry/sdk-trace-node': - specifier: ^1.17.1 - version: 1.17.1(@opentelemetry/api@1.6.0) + specifier: ^1.17.0 + version: 1.17.0(@opentelemetry/api@1.6.0) '@opentelemetry/semantic-conventions': - specifier: ^1.17.1 - version: 1.17.1 + specifier: ^1.17.0 + version: 1.17.0 '@t3-oss/env-core': specifier: ^0.7.0 version: 0.7.0(typescript@5.2.2)(zod@3.22.4) @@ -5050,18 +5050,20 @@ packages: '@opentelemetry/api': 1.6.0 dev: false - /@opentelemetry/api-logs@0.44.0: - resolution: {integrity: sha512-OctojdKGmXHKAJa4/Ml+Nf7MD9jtYXvZyP64xTh0pNTmtgaTdWW3FURri2DdB/+l7YxRy0tYYZS3/tYEM1pj3w==} - engines: {node: '>=14'} - dependencies: - '@opentelemetry/api': 1.6.0 - dev: false - /@opentelemetry/api@1.6.0: resolution: {integrity: sha512-OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g==} engines: {node: '>=8.0.0'} dev: false + /@opentelemetry/context-async-hooks@1.17.0(@opentelemetry/api@1.6.0): + resolution: {integrity: sha512-bDIRCgpKniSyhORU0fTL9ISW6ucU9nruKyXKwYrEBep/2f3uLz8LFyF51ZUK9QxIwBHw6WJudK/2UqttWzER4w==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.7.0' + dependencies: + '@opentelemetry/api': 1.6.0 + dev: false + /@opentelemetry/context-async-hooks@1.17.1(@opentelemetry/api@1.6.0): resolution: {integrity: sha512-up5I+RiQEkGrVEHtbAtmRgS+ZOnFh3shaDNHqZPBlGy+O92auL6yMmjzYpSKmJOGWowvs3fhVHePa8Exb5iHUg==} engines: {node: '>=14'} @@ -5091,32 +5093,32 @@ packages: '@opentelemetry/semantic-conventions': 1.17.1 dev: false - /@opentelemetry/exporter-jaeger@1.17.1(@opentelemetry/api@1.6.0): - resolution: {integrity: sha512-NW4qm04q4bSmhU6es1AXBWt3itJ2gkrXbKLfwDleC+ZMp3bVV47stByDqhuJzic2f47Im+C733N9RMeBkyqKMQ==} + /@opentelemetry/exporter-jaeger@1.17.0(@opentelemetry/api@1.6.0): + resolution: {integrity: sha512-rWS5CQ+ns0NM3pmOAebaQdOmSnH6/7/P82EotaIq3zWrV5XRnKCRuILii457KnLqAI5zWjRTTEz2judEXNcCgg==} engines: {node: '>=14'} peerDependencies: '@opentelemetry/api': ^1.0.0 dependencies: '@opentelemetry/api': 1.6.0 - '@opentelemetry/core': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/sdk-trace-base': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/semantic-conventions': 1.17.1 + '@opentelemetry/core': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/sdk-trace-base': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/semantic-conventions': 1.17.0 jaeger-client: 3.19.0 dev: false - /@opentelemetry/exporter-trace-otlp-grpc@0.44.0(@opentelemetry/api@1.6.0): - resolution: {integrity: sha512-S1kT/9tVlgZDRYyVfCLYyWZoQTplPD9WcyX+qUPbhJTETORxzJVW9HN8mHwQsXaN7ngqwRLy5GW/nXHL8aqA0w==} + /@opentelemetry/exporter-trace-otlp-grpc@0.43.0(@opentelemetry/api@1.6.0): + resolution: {integrity: sha512-h/oofzwyONMcAeBXD6+E6+foFQg9CPadBFcKAGoMIyVSK7iZgtK5DLEwAF4jz5MhfxWNmwZjHXFRc0GqCRx/tA==} engines: {node: '>=14'} peerDependencies: '@opentelemetry/api': ^1.0.0 dependencies: '@grpc/grpc-js': 1.9.6 '@opentelemetry/api': 1.6.0 - '@opentelemetry/core': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/otlp-grpc-exporter-base': 0.44.0(@opentelemetry/api@1.6.0) - '@opentelemetry/otlp-transformer': 0.44.0(@opentelemetry/api@1.6.0) - '@opentelemetry/resources': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/sdk-trace-base': 1.17.1(@opentelemetry/api@1.6.0) + '@opentelemetry/core': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/otlp-grpc-exporter-base': 0.43.0(@opentelemetry/api@1.6.0) + '@opentelemetry/otlp-transformer': 0.43.0(@opentelemetry/api@1.6.0) + '@opentelemetry/resources': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/sdk-trace-base': 1.17.0(@opentelemetry/api@1.6.0) dev: false /@opentelemetry/exporter-trace-otlp-http@0.43.0(@opentelemetry/api@1.6.0): @@ -5133,46 +5135,44 @@ packages: '@opentelemetry/sdk-trace-base': 1.17.0(@opentelemetry/api@1.6.0) dev: false - /@opentelemetry/exporter-trace-otlp-http@0.44.0(@opentelemetry/api@1.6.0): - resolution: {integrity: sha512-RkorGE6wf6PF5OjMUGBnbUDyaVgmN+vL7OgClJJUTxqbE7WqgbW8dkU04O+1mcB1znXZ1Aej1uDm0pS+eW/upA==} + /@opentelemetry/exporter-trace-otlp-proto@0.43.0(@opentelemetry/api@1.6.0): + resolution: {integrity: sha512-a7gnB0MZ8/+BHH5Lt8UaKPv5yMAGvqj/7TceF4dvaFBOshjBZPrG628creAaKBIpuUwrpUtDRoTb1dbEMeO9tA==} engines: {node: '>=14'} peerDependencies: '@opentelemetry/api': ^1.0.0 dependencies: '@opentelemetry/api': 1.6.0 - '@opentelemetry/core': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/otlp-exporter-base': 0.44.0(@opentelemetry/api@1.6.0) - '@opentelemetry/otlp-transformer': 0.44.0(@opentelemetry/api@1.6.0) - '@opentelemetry/resources': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/sdk-trace-base': 1.17.1(@opentelemetry/api@1.6.0) + '@opentelemetry/core': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/otlp-exporter-base': 0.43.0(@opentelemetry/api@1.6.0) + '@opentelemetry/otlp-proto-exporter-base': 0.43.0(@opentelemetry/api@1.6.0) + '@opentelemetry/otlp-transformer': 0.43.0(@opentelemetry/api@1.6.0) + '@opentelemetry/resources': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/sdk-trace-base': 1.17.0(@opentelemetry/api@1.6.0) dev: false - /@opentelemetry/exporter-trace-otlp-proto@0.44.0(@opentelemetry/api@1.6.0): - resolution: {integrity: sha512-yVW0FXxiLaQOyE3MGr6BtK7ml0DaJH4Qx3yvQYUd/hsJUSZBhYYw2TRaMsaW7XMpe1AvU81qt0l8uLYmcmcLJA==} + /@opentelemetry/exporter-zipkin@1.17.0(@opentelemetry/api@1.6.0): + resolution: {integrity: sha512-0eh/MOELhBByen+t2ZJVSOmtT1NlwSSqdAxu0+Id6ebTHVuslb/GLvJPPMU4Qz7zDHtSvFoR4/+AbOYtVmgQ1g==} engines: {node: '>=14'} peerDependencies: '@opentelemetry/api': ^1.0.0 dependencies: '@opentelemetry/api': 1.6.0 - '@opentelemetry/core': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/otlp-exporter-base': 0.44.0(@opentelemetry/api@1.6.0) - '@opentelemetry/otlp-proto-exporter-base': 0.44.0(@opentelemetry/api@1.6.0) - '@opentelemetry/otlp-transformer': 0.44.0(@opentelemetry/api@1.6.0) - '@opentelemetry/resources': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/sdk-trace-base': 1.17.1(@opentelemetry/api@1.6.0) + '@opentelemetry/core': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/resources': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/sdk-trace-base': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/semantic-conventions': 1.17.0 dev: false - /@opentelemetry/exporter-zipkin@1.17.1(@opentelemetry/api@1.6.0): - resolution: {integrity: sha512-FaLZlIhdpxlZiKu/G8OvA+so4xoCL1hCo/JgNdeSxzI4GnJrmFFbZT6DXgUzXJO7F9Qw3KDE1cBFUHawLVz58g==} + /@opentelemetry/instrumentation-graphql@0.35.1(@opentelemetry/api@1.6.0): + resolution: {integrity: sha512-bAM4W5wU0lZ1UIKK/5b4p8LEU8N6W+VgpcnUIK7GTTDxdhcWTd3Q6oyS6nauhZSzEnAEmmJVXaLQAGIU4sEkyA==} engines: {node: '>=14'} peerDependencies: - '@opentelemetry/api': ^1.0.0 + '@opentelemetry/api': ^1.3.0 dependencies: '@opentelemetry/api': 1.6.0 - '@opentelemetry/core': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/resources': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/sdk-trace-base': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/semantic-conventions': 1.17.1 + '@opentelemetry/instrumentation': 0.41.2(@opentelemetry/api@1.6.0) + transitivePeerDependencies: + - supports-color dev: false /@opentelemetry/instrumentation-graphql@0.35.2(@opentelemetry/api@1.6.0): @@ -5200,6 +5200,21 @@ packages: - supports-color dev: false + /@opentelemetry/instrumentation-http@0.43.0(@opentelemetry/api@1.6.0): + resolution: {integrity: sha512-Ho3IFQFuD0xmcVc0Uq9AvYvROSOuydn4XWRT/h/GO0VCwOeYz/WCwUJvRdS3m1B3AZ4iGJ0q/nhsATp2JX3/gA==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': ^1.3.0 + dependencies: + '@opentelemetry/api': 1.6.0 + '@opentelemetry/core': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/instrumentation': 0.43.0(@opentelemetry/api@1.6.0) + '@opentelemetry/semantic-conventions': 1.17.0 + semver: 7.5.4 + transitivePeerDependencies: + - supports-color + dev: false + /@opentelemetry/instrumentation-http@0.44.0(@opentelemetry/api@1.6.0): resolution: {integrity: sha512-Nlvj3Y2n9q6uIcQq9f33HbcB4Dr62erSwYA37+vkorYnzI2j9PhxKitocRTZnbYsrymYmQJW9mdq/IAfbtVnNg==} engines: {node: '>=14'} @@ -5244,6 +5259,19 @@ packages: - supports-color dev: false + /@opentelemetry/instrumentation-net@0.32.1(@opentelemetry/api@1.6.0): + resolution: {integrity: sha512-r9YC8fFDi+B/JiNfMn+vJaOpgdA83bQM3u4mW9mJi2hAI/LcvjJYPx4aTRLWAPSd/HRG/Olzdvx5LdWvzL8LHg==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': ^1.3.0 + dependencies: + '@opentelemetry/api': 1.6.0 + '@opentelemetry/instrumentation': 0.41.2(@opentelemetry/api@1.6.0) + '@opentelemetry/semantic-conventions': 1.17.1 + transitivePeerDependencies: + - supports-color + dev: false + /@opentelemetry/instrumentation-net@0.32.2(@opentelemetry/api@1.6.0): resolution: {integrity: sha512-dkm5tZ2NP4Pn3LLs8IfizEQfFBJ7qrqvwoHQA20Z4ZjjjfrPd1aHANCYGs0axh/VBT0IACdX6IZZq/0Lb3Ocfw==} engines: {node: '>=14'} @@ -5257,8 +5285,8 @@ packages: - supports-color dev: false - /@opentelemetry/instrumentation@0.44.0(@opentelemetry/api@1.6.0): - resolution: {integrity: sha512-B6OxJTRRCceAhhnPDBshyQO7K07/ltX3quOLu0icEvPK9QZ7r9P1y0RQX8O5DxB4vTv4URRkxkg+aFU/plNtQw==} + /@opentelemetry/instrumentation@0.41.2(@opentelemetry/api@1.6.0): + resolution: {integrity: sha512-rxU72E0pKNH6ae2w5+xgVYZLzc5mlxAbGzF4shxMVK8YC2QQsfN38B2GPbj0jvrKWWNUElfclQ+YTykkNg/grw==} engines: {node: '>=14'} peerDependencies: '@opentelemetry/api': ^1.3.0 @@ -5273,48 +5301,70 @@ packages: - supports-color dev: false - /@opentelemetry/otlp-exporter-base@0.43.0(@opentelemetry/api@1.6.0): - resolution: {integrity: sha512-LXNtRFVuPRXB9q0qdvrLikQ3NtT9Jmv255Idryz3RJPhOh/Fa03sBASQoj3D55OH3xazmA90KFHfhJ/d8D8y4A==} + /@opentelemetry/instrumentation@0.43.0(@opentelemetry/api@1.6.0): + resolution: {integrity: sha512-S1uHE+sxaepgp+t8lvIDuRgyjJWisAb733198kwQTUc9ZtYQ2V2gmyCtR1x21ePGVLoMiX/NWY7WA290hwkjJQ==} engines: {node: '>=14'} peerDependencies: - '@opentelemetry/api': ^1.0.0 + '@opentelemetry/api': ^1.3.0 dependencies: '@opentelemetry/api': 1.6.0 - '@opentelemetry/core': 1.17.0(@opentelemetry/api@1.6.0) + '@types/shimmer': 1.0.3 + import-in-the-middle: 1.4.2 + require-in-the-middle: 7.2.0 + semver: 7.5.4 + shimmer: 1.2.1 + transitivePeerDependencies: + - supports-color + dev: false + + /@opentelemetry/instrumentation@0.44.0(@opentelemetry/api@1.6.0): + resolution: {integrity: sha512-B6OxJTRRCceAhhnPDBshyQO7K07/ltX3quOLu0icEvPK9QZ7r9P1y0RQX8O5DxB4vTv4URRkxkg+aFU/plNtQw==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': ^1.3.0 + dependencies: + '@opentelemetry/api': 1.6.0 + '@types/shimmer': 1.0.3 + import-in-the-middle: 1.4.2 + require-in-the-middle: 7.2.0 + semver: 7.5.4 + shimmer: 1.2.1 + transitivePeerDependencies: + - supports-color dev: false - /@opentelemetry/otlp-exporter-base@0.44.0(@opentelemetry/api@1.6.0): - resolution: {integrity: sha512-DKQqRrfVMe96aSLZiCgIesLcMLfnWH8d4bTpLB1JbU+SAQJ7nVCAfS9U36mjFCVhvNDD7gwfCNrxqFMCHq6FUw==} + /@opentelemetry/otlp-exporter-base@0.43.0(@opentelemetry/api@1.6.0): + resolution: {integrity: sha512-LXNtRFVuPRXB9q0qdvrLikQ3NtT9Jmv255Idryz3RJPhOh/Fa03sBASQoj3D55OH3xazmA90KFHfhJ/d8D8y4A==} engines: {node: '>=14'} peerDependencies: '@opentelemetry/api': ^1.0.0 dependencies: '@opentelemetry/api': 1.6.0 - '@opentelemetry/core': 1.17.1(@opentelemetry/api@1.6.0) + '@opentelemetry/core': 1.17.0(@opentelemetry/api@1.6.0) dev: false - /@opentelemetry/otlp-grpc-exporter-base@0.44.0(@opentelemetry/api@1.6.0): - resolution: {integrity: sha512-RsYW2+ikNDDXM9rY4gCA3lJOu53o4CzCsUJ9DV6r78k/Y0ckWw2GM7R4I6yOmMe4jilxEaHorI3oTJFLD8KYug==} + /@opentelemetry/otlp-grpc-exporter-base@0.43.0(@opentelemetry/api@1.6.0): + resolution: {integrity: sha512-oOpqtDJo9BBa1+nD6ID1qZ55ZdTwEwSSn2idMobw8jmByJKaanVLdr9SJKsn5T9OBqo/c5QY2brMf0TNZkobJQ==} engines: {node: '>=14'} peerDependencies: '@opentelemetry/api': ^1.0.0 dependencies: '@grpc/grpc-js': 1.9.6 '@opentelemetry/api': 1.6.0 - '@opentelemetry/core': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/otlp-exporter-base': 0.44.0(@opentelemetry/api@1.6.0) + '@opentelemetry/core': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/otlp-exporter-base': 0.43.0(@opentelemetry/api@1.6.0) protobufjs: 7.2.5 dev: false - /@opentelemetry/otlp-proto-exporter-base@0.44.0(@opentelemetry/api@1.6.0): - resolution: {integrity: sha512-vgQvWEkXNk8X4BW93+j054TZBVs1ryguXQjeoLeHV/dzopdGuAypI0xC5OtSr+eRftuyPqPl2DVp4tjRq4z4dw==} + /@opentelemetry/otlp-proto-exporter-base@0.43.0(@opentelemetry/api@1.6.0): + resolution: {integrity: sha512-6s74egvK4MbN1ZYpaq5+k8wPe2s/OCUzz6aNwjLHGNAA/f4up6asTMlNE8F5PAmx2nQf2jvx+s90b6DjuEYElg==} engines: {node: '>=14'} peerDependencies: '@opentelemetry/api': ^1.0.0 dependencies: '@opentelemetry/api': 1.6.0 - '@opentelemetry/core': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/otlp-exporter-base': 0.44.0(@opentelemetry/api@1.6.0) + '@opentelemetry/core': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/otlp-exporter-base': 0.43.0(@opentelemetry/api@1.6.0) protobufjs: 7.2.5 dev: false @@ -5333,19 +5383,14 @@ packages: '@opentelemetry/sdk-trace-base': 1.17.0(@opentelemetry/api@1.6.0) dev: false - /@opentelemetry/otlp-transformer@0.44.0(@opentelemetry/api@1.6.0): - resolution: {integrity: sha512-1/KC+aHM1oGEsXyNy7QoxpvErxGdzt26bg9VHyNb4TDILkUFdwrnywnxPc6lXZ6h/8T8Mt718UWOKjNHC514kQ==} + /@opentelemetry/propagator-b3@1.17.0(@opentelemetry/api@1.6.0): + resolution: {integrity: sha512-oklstXImtaly4vDaL+rGtX41YXZR50jp5a7CSEPMcStp1B7ozdZ5G2I5wftrDvOlOcLt/TIkGWDCr/OkVN7kWg==} engines: {node: '>=14'} peerDependencies: - '@opentelemetry/api': '>=1.3.0 <1.7.0' + '@opentelemetry/api': '>=1.0.0 <1.7.0' dependencies: '@opentelemetry/api': 1.6.0 - '@opentelemetry/api-logs': 0.44.0 - '@opentelemetry/core': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/resources': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/sdk-logs': 0.44.0(@opentelemetry/api-logs@0.44.0)(@opentelemetry/api@1.6.0) - '@opentelemetry/sdk-metrics': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/sdk-trace-base': 1.17.1(@opentelemetry/api@1.6.0) + '@opentelemetry/core': 1.17.0(@opentelemetry/api@1.6.0) dev: false /@opentelemetry/propagator-b3@1.17.1(@opentelemetry/api@1.6.0): @@ -5358,6 +5403,16 @@ packages: '@opentelemetry/core': 1.17.1(@opentelemetry/api@1.6.0) dev: false + /@opentelemetry/propagator-jaeger@1.17.0(@opentelemetry/api@1.6.0): + resolution: {integrity: sha512-iZzu8K0QkZZ16JH9yox6hZk7/Rxc4SPeGU37pvlB9DtzfNxAEX1FMK9zvowv3ve7r2uzZNpa7JGVUwpy5ewdHQ==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.7.0' + dependencies: + '@opentelemetry/api': 1.6.0 + '@opentelemetry/core': 1.17.0(@opentelemetry/api@1.6.0) + dev: false + /@opentelemetry/propagator-jaeger@1.17.1(@opentelemetry/api@1.6.0): resolution: {integrity: sha512-p+P4lf2pbqd3YMfZO15QCGsDwR2m1ke2q5+dq6YBLa/q0qiC2eq4cD/qhYBBed5/X4PtdamaVGHGsp+u3GXHDA==} engines: {node: '>=14'} @@ -5408,19 +5463,6 @@ packages: '@opentelemetry/resources': 1.17.0(@opentelemetry/api@1.6.0) dev: false - /@opentelemetry/sdk-logs@0.44.0(@opentelemetry/api-logs@0.44.0)(@opentelemetry/api@1.6.0): - resolution: {integrity: sha512-UN3ofh9Jj54gIgrSXNRWAoaH6iPvrrjed5YAtqO9cW65U+5QPzk1Rv95vjAcY9VTrmMWvuqgEK1CYObG6Hu4OQ==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.4.0 <1.7.0' - '@opentelemetry/api-logs': '>=0.39.1' - dependencies: - '@opentelemetry/api': 1.6.0 - '@opentelemetry/api-logs': 0.44.0 - '@opentelemetry/core': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/resources': 1.17.1(@opentelemetry/api@1.6.0) - dev: false - /@opentelemetry/sdk-metrics@1.17.0(@opentelemetry/api@1.6.0): resolution: {integrity: sha512-HlWM27yGmYuwCoVRe3yg2PqKnIsq0kEF0HQgvkeDWz2NYkq9fFaSspR6kvjxUTbghAlZrabiqbgyKoYpYaXS3w==} engines: {node: '>=14'} @@ -5433,39 +5475,28 @@ packages: lodash.merge: 4.6.2 dev: false - /@opentelemetry/sdk-metrics@1.17.1(@opentelemetry/api@1.6.0): - resolution: {integrity: sha512-eHdpsMCKhKhwznxvEfls8Wv3y4ZBWkkXlD3m7vtHIiWBqsMHspWSfie1s07mM45i/bBCf6YBMgz17FUxIXwmZA==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.3.0 <1.7.0' - dependencies: - '@opentelemetry/api': 1.6.0 - '@opentelemetry/core': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/resources': 1.17.1(@opentelemetry/api@1.6.0) - lodash.merge: 4.6.2 - dev: false - - /@opentelemetry/sdk-node@0.44.0(@opentelemetry/api@1.6.0): - resolution: {integrity: sha512-MkMJcUcqjNV/A5/y6quedSO3CIDXY17jM8sxQa0Hwmx77+/QiXJkSe4Zv0ysf37mV5+8QEt4rsq7adKg+LtaEg==} + /@opentelemetry/sdk-node@0.43.0(@opentelemetry/api@1.6.0): + resolution: {integrity: sha512-2C2OTZ7UgXahLAUBT4rpKHeQf/of349vZhHnljQNarvl3N5Oa8pu8dm6LLkiKHtLzX4LY26bpZuHiVjEzEwDoQ==} engines: {node: '>=14'} + requiresBuild: true peerDependencies: '@opentelemetry/api': '>=1.3.0 <1.7.0' dependencies: '@opentelemetry/api': 1.6.0 - '@opentelemetry/api-logs': 0.44.0 - '@opentelemetry/core': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/exporter-jaeger': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/exporter-trace-otlp-grpc': 0.44.0(@opentelemetry/api@1.6.0) - '@opentelemetry/exporter-trace-otlp-http': 0.44.0(@opentelemetry/api@1.6.0) - '@opentelemetry/exporter-trace-otlp-proto': 0.44.0(@opentelemetry/api@1.6.0) - '@opentelemetry/exporter-zipkin': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/instrumentation': 0.44.0(@opentelemetry/api@1.6.0) - '@opentelemetry/resources': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/sdk-logs': 0.44.0(@opentelemetry/api-logs@0.44.0)(@opentelemetry/api@1.6.0) - '@opentelemetry/sdk-metrics': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/sdk-trace-base': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/sdk-trace-node': 1.17.1(@opentelemetry/api@1.6.0) - '@opentelemetry/semantic-conventions': 1.17.1 + '@opentelemetry/api-logs': 0.43.0 + '@opentelemetry/core': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/exporter-jaeger': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/exporter-trace-otlp-grpc': 0.43.0(@opentelemetry/api@1.6.0) + '@opentelemetry/exporter-trace-otlp-http': 0.43.0(@opentelemetry/api@1.6.0) + '@opentelemetry/exporter-trace-otlp-proto': 0.43.0(@opentelemetry/api@1.6.0) + '@opentelemetry/exporter-zipkin': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/instrumentation': 0.43.0(@opentelemetry/api@1.6.0) + '@opentelemetry/resources': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/sdk-logs': 0.43.0(@opentelemetry/api-logs@0.43.0)(@opentelemetry/api@1.6.0) + '@opentelemetry/sdk-metrics': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/sdk-trace-base': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/sdk-trace-node': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/semantic-conventions': 1.17.0 transitivePeerDependencies: - supports-color dev: false @@ -5494,6 +5525,21 @@ packages: '@opentelemetry/semantic-conventions': 1.17.1 dev: false + /@opentelemetry/sdk-trace-node@1.17.0(@opentelemetry/api@1.6.0): + resolution: {integrity: sha512-Twlaje+t16b5j62CfcaKU869rP9oyBG/sVQWBI5+kDaWuP/YIFnF4LbovaEahK9GwAnW8vPIn6iYLAl/jZBidA==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.7.0' + dependencies: + '@opentelemetry/api': 1.6.0 + '@opentelemetry/context-async-hooks': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/core': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/propagator-b3': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/propagator-jaeger': 1.17.0(@opentelemetry/api@1.6.0) + '@opentelemetry/sdk-trace-base': 1.17.0(@opentelemetry/api@1.6.0) + semver: 7.5.4 + dev: false + /@opentelemetry/sdk-trace-node@1.17.1(@opentelemetry/api@1.6.0): resolution: {integrity: sha512-J56DaG4cusjw5crpI7x9rv4bxDF27DtKYGxXJF56KIvopbNKpdck5ZWXBttEyqgAVPDwHMAXWDL1KchHzF0a3A==} engines: {node: '>=14'} From af4f17f822f1182f0d9853fe5ea1f1966908f717 Mon Sep 17 00:00:00 2001 From: Siddharth Date: Thu, 2 Nov 2023 11:34:09 +0530 Subject: [PATCH 2/2] chore: service name changed --- apps/consent/instrumentation.node.ts | 2 +- apps/dashboard/instrumentation.node.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/consent/instrumentation.node.ts b/apps/consent/instrumentation.node.ts index 89bb57e57f..af84095679 100644 --- a/apps/consent/instrumentation.node.ts +++ b/apps/consent/instrumentation.node.ts @@ -12,7 +12,7 @@ const sdk = new NodeSDK({ textMapPropagator: new W3CTraceContextPropagator(), resource: new Resource({ [SemanticResourceAttributes.SERVICE_NAME]: - process.env.TRACING_SERVICE_NAME || "blink-consent", + process.env.TRACING_SERVICE_NAME || "consent", }), spanProcessor: new SimpleSpanProcessor(new OTLPTraceExporter()), instrumentations: [ diff --git a/apps/dashboard/instrumentation.node.ts b/apps/dashboard/instrumentation.node.ts index 4512f53167..a794a8756e 100644 --- a/apps/dashboard/instrumentation.node.ts +++ b/apps/dashboard/instrumentation.node.ts @@ -12,7 +12,7 @@ const sdk = new NodeSDK({ textMapPropagator: new W3CTraceContextPropagator(), resource: new Resource({ [SemanticResourceAttributes.SERVICE_NAME]: - process.env.TRACING_SERVICE_NAME || "blink-dashboard", + process.env.TRACING_SERVICE_NAME || "dashboard", }), spanProcessor: new SimpleSpanProcessor(new OTLPTraceExporter()), instrumentations: [