Skip to content

Commit

Permalink
chore: bump deps + fix lint issues
Browse files Browse the repository at this point in the history
  • Loading branch information
dolcalmi committed Feb 20, 2025
1 parent 23fd0db commit 9a2f009
Show file tree
Hide file tree
Showing 3 changed files with 1,163 additions and 1,108 deletions.
56 changes: 28 additions & 28 deletions core/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,27 +39,27 @@
},
"dependencies": {
"@apollo/server": "^4.11.3",
"@aws-sdk/client-s3": "^3.723.0",
"@aws-sdk/client-s3": "^3.750.0",
"@galoy/gt3-server-node-express-sdk": "workspace:^",
"@google-cloud/storage": "^7.14.0",
"@grpc/grpc-js": "^1.12.5",
"@google-cloud/storage": "^7.15.1",
"@grpc/grpc-js": "^1.12.6",
"@grpc/proto-loader": "^0.7.13",
"@ip1sms/disposable-phone-numbers": "^2.1.1023",
"@ip1sms/disposable-phone-numbers": "^2.1.1071",
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/core": "^1.26.0",
"@opentelemetry/exporter-trace-otlp-http": "^0.53.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/instrumentation-graphql": "^0.43.0",
"@opentelemetry/instrumentation-grpc": "^0.53.0",
"@opentelemetry/instrumentation-http": "^0.53.0",
"@opentelemetry/core": "^1.30.1",
"@opentelemetry/exporter-trace-otlp-http": "^0.57.2",
"@opentelemetry/instrumentation": "^0.57.2",
"@opentelemetry/instrumentation-graphql": "^0.47.1",
"@opentelemetry/instrumentation-grpc": "^0.57.2",
"@opentelemetry/instrumentation-http": "^0.57.2",
"@opentelemetry/instrumentation-ioredis": "^0.43.0",
"@opentelemetry/instrumentation-mongodb": "^0.47.0",
"@opentelemetry/instrumentation-net": "^0.39.0",
"@opentelemetry/resources": "^1.26.0",
"@opentelemetry/sdk-trace-base": "^1.26.0",
"@opentelemetry/sdk-trace-node": "^1.26.0",
"@opentelemetry/semantic-conventions": "^1.27.0",
"@ory/client": "^1.15.6",
"@opentelemetry/instrumentation-mongodb": "^0.52.0",
"@opentelemetry/instrumentation-net": "^0.43.1",
"@opentelemetry/resources": "^1.30.1",
"@opentelemetry/sdk-trace-base": "^1.30.1",
"@opentelemetry/sdk-trace-node": "^1.30.1",
"@opentelemetry/semantic-conventions": "^1.30.0",
"@ory/client": "^1.16.7",
"@t3-oss/env-core": "^0.7.3",
"ajv": "^8.17.1",
"axios": "^1.7.9",
Expand Down Expand Up @@ -92,9 +92,9 @@
"jsonwebtoken": "^9.0.2",
"jwks-rsa": "^3.1.0",
"knex": "^3.1.0",
"libphonenumber-js": "^1.11.17",
"lightning": "^10.23.0",
"ln-service": "^57.23.0",
"libphonenumber-js": "^1.11.20",
"lightning": "^10.23.1",
"ln-service": "^57.23.1",
"lnurl-pay": "^4.0.0",
"lodash.debounce": "^4.0.8",
"lodash.groupby": "^4.6.0",
Expand All @@ -106,17 +106,17 @@
"medici": "^7.1.0",
"mongoose": "8.10.1",
"node-cache": "^5.1.2",
"openai": "^4.77.3",
"pg": "^8.13.1",
"openai": "^4.85.2",
"pg": "^8.13.3",
"pino": "9.6.0",
"pino-http": "^10.3.0",
"pino-http": "^10.4.0",
"prom-client": "^15.1.3",
"rate-limiter-flexible": "^5.0.1",
"redlock": "^5.0.0-beta.2",
"snappy": "^7.2.2",
"svix": "1.37.0",
"tiny-secp256k1": "^2.2.3",
"twilio": "^5.4.0",
"twilio": "^5.4.4",
"uuid-by-string": "^4.0.0",
"validator": "^13.12.0",
"ws": "^8.18.0",
Expand Down Expand Up @@ -182,14 +182,14 @@
"node-jose": "^2.2.0",
"nodemon": "^3.1.9",
"otplib": "^12.0.1",
"pino-pretty": "^11.3.0",
"prettier": "^3.4.2",
"pino-pretty": "^13.0.0",
"prettier": "^3.5.1",
"protoc-gen-js": "^3.21.4",
"spectaql": "^2.3.1",
"tree-kill": "^1.2.2",
"tsconfig-paths": "^4.2.0",
"tsx": "^4.19.2",
"typescript": "^5.7.2",
"tsx": "^4.19.3",
"typescript": "^5.7.3",
"zen-observable-ts": "^1.1.0"
},
"pnpm": {
Expand Down
24 changes: 16 additions & 8 deletions core/api/src/services/tracing.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { IncomingMessage } from "http"
import { W3CTraceContextPropagator } from "@opentelemetry/core"
import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http"
import { registerInstrumentations } from "@opentelemetry/instrumentation"
Expand All @@ -9,13 +10,14 @@ import { MongoDBInstrumentation } from "@opentelemetry/instrumentation-mongodb"
import { Span as SdkSpan, SimpleSpanProcessor } from "@opentelemetry/sdk-trace-base"
import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node"
import {
ATTR_CODE_FUNCTION,
ATTR_CODE_FUNCTION_NAME,
ATTR_CODE_NAMESPACE,
ATTR_USER_ID,
ATTR_SERVICE_NAME,
} from "@opentelemetry/semantic-conventions/incubating"
} from "@opentelemetry/semantic-conventions/build/src/index-incubating"

// these have been deprecated but we must keep them to avoid issues with alert system
const ATTR_CODE_FUNCTION_PREFIX = "code.function"
const ATTR_ENDUSER_ID = "enduser.id"
const ATTR_HTTP_USER_AGENT = "http.user_agent"
const ATTR_HTTP_CLIENT_IP = "http.client_ip"
Expand All @@ -42,6 +44,7 @@ import { Resource } from "@opentelemetry/resources"
import { baseLogger } from "./logger"

import { ErrorLevel, RankedErrorLevel, parseErrorFromUnknown } from "@/domain/shared"

type ExtendedException = Exclude<Exception, string> & {
level?: ErrorLevel
}
Expand Down Expand Up @@ -193,7 +196,10 @@ registerInstrumentations({
instrumentations: [
new NetInstrumentation(),
new HttpInstrumentation({
ignoreIncomingPaths: ["/healthz"],
ignoreIncomingRequestHook: (request: IncomingMessage): boolean => {
const url = request.url || ""
return url.includes("/healthz")
},
headersToSpanAttributes: {
server: {
requestHeaders: [
Expand Down Expand Up @@ -391,7 +397,8 @@ const resolveFunctionSpanOptions = ({
ignoreFnArgs?: boolean
}): SpanOptions => {
const attributes: Attributes = {
[ATTR_CODE_FUNCTION]: functionName,
[ATTR_CODE_FUNCTION_NAME]: functionName,
[ATTR_CODE_FUNCTION_PREFIX]: functionName,
[ATTR_CODE_NAMESPACE]: namespace,
...spanAttributes,
}
Expand All @@ -401,9 +408,10 @@ const resolveFunctionSpanOptions = ({
for (const key in params) {
// @ts-ignore-next-line no-implicit-any error
const value = params[key]
attributes[`${ATTR_CODE_FUNCTION}.params.${key}`] = value
attributes[`${ATTR_CODE_FUNCTION}.params.${key}.null`] = value === null
attributes[`${ATTR_CODE_FUNCTION}.params.${key}.undefined`] = value === undefined
attributes[`${ATTR_CODE_FUNCTION_PREFIX}.params.${key}`] = value
attributes[`${ATTR_CODE_FUNCTION_PREFIX}.params.${key}.null`] = value === null
attributes[`${ATTR_CODE_FUNCTION_PREFIX}.params.${key}.undefined`] =
value === undefined
}
}
return { attributes, root }
Expand Down Expand Up @@ -618,7 +626,7 @@ export const SemanticResourceAttributes = {
}

export const SemanticAttributes = {
CODE_FUNCTION: ATTR_CODE_FUNCTION,
CODE_FUNCTION: ATTR_CODE_FUNCTION_PREFIX,
CODE_NAMESPACE: ATTR_CODE_NAMESPACE,
HTTP_CLIENT_IP: ATTR_HTTP_CLIENT_IP,
HTTP_USER_AGENT: ATTR_HTTP_USER_AGENT,
Expand Down
Loading

0 comments on commit 9a2f009

Please sign in to comment.