Skip to content

Commit

Permalink
chore: bump deps (#4577)
Browse files Browse the repository at this point in the history 
* chore: bump axios from 1.6.8 to 1.7.5

Bumps [axios](https://github.com/axios/axios) from 1.6.8 to 1.7.5.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v1.6.8...v1.7.5)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore: bump deps

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Juan P Lopez <[email protected]>
  • Loading branch information
@dependabot @dolcalmi
dependabot[bot] and dolcalmi authored Aug 30, 2024
1 parent 0d98340 commit 91fff3f
Show file tree
Hide file tree
Showing 9 changed files with 1,099 additions and 805 deletions.
2 changes: 1 addition & 1 deletion apps/consent/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@opentelemetry/semantic-conventions": "^1.24.1",
"@ory/hydra-client": "^2.2.0",
"@t3-oss/env-nextjs": "^0.7.1",
"axios": "^1.6.3",
"axios": "^1.7.5",
"dotenv": "^16.3.1",
"edge-csrf": "^1.0.6",
"graphql": "^16.8.1",
Expand Down
54 changes: 27 additions & 27 deletions core/api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,30 +39,30 @@
},
"dependencies": {
"@apollo/server": "^4.11.0",
"@aws-sdk/client-s3": "^3.629.0",
"@aws-sdk/client-s3": "^3.637.0",
"@galoy/gt3-server-node-express-sdk": "workspace:^",
"@google-cloud/storage": "^7.12.1",
"@grpc/grpc-js": "^1.11.1",
"@grpc/proto-loader": "^0.7.13",
"@ip1sms/disposable-phone-numbers": "^2.1.872",
"@ip1sms/disposable-phone-numbers": "^2.1.889",
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/core": "^1.25.1",
"@opentelemetry/exporter-trace-otlp-http": "^0.52.1",
"@opentelemetry/instrumentation": "^0.52.1",
"@opentelemetry/core": "^1.26.0",
"@opentelemetry/exporter-trace-otlp-http": "^0.53.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/instrumentation-graphql": "^0.42.0",
"@opentelemetry/instrumentation-grpc": "^0.52.1",
"@opentelemetry/instrumentation-http": "^0.52.1",
"@opentelemetry/instrumentation-grpc": "^0.53.0",
"@opentelemetry/instrumentation-http": "^0.53.0",
"@opentelemetry/instrumentation-ioredis": "^0.42.0",
"@opentelemetry/instrumentation-mongodb": "^0.46.0",
"@opentelemetry/instrumentation-net": "^0.38.0",
"@opentelemetry/resources": "^1.25.1",
"@opentelemetry/sdk-trace-base": "^1.25.1",
"@opentelemetry/sdk-trace-node": "^1.25.1",
"@opentelemetry/semantic-conventions": "^1.25.1",
"@ory/client": "^1.6.2",
"@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.14.4",
"@t3-oss/env-core": "^0.7.3",
"ajv": "^8.12.0",
"axios": "^1.7.3",
"ajv": "^8.17.1",
"axios": "^1.7.5",
"basic-auth": "^2.0.1",
"bignumber.js": "^9.1.2",
"bip32": "^4.0.0",
Expand All @@ -75,13 +75,13 @@
"dedent": "^1.5.3",
"express": "^4.19.2",
"express-jwt": "^8.4.1",
"firebase-admin": "^12.3.1",
"firebase-admin": "^12.4.0",
"google-protobuf": "^3.21.4",
"graphql": "^16.8.1",
"graphql": "^16.9.0",
"graphql-middleware": "^6.1.33",
"graphql-query-complexity": "^0.12.0",
"graphql-redis-subscriptions": "^2.6.0",
"graphql-relay": "^0.10.1",
"graphql-query-complexity": "^1.0.0",
"graphql-redis-subscriptions": "^2.6.1",
"graphql-relay": "^0.10.2",
"graphql-shield": "^7.6.4",
"graphql-ws": "^5.16.0",
"invoices": "^3.0.0",
Expand All @@ -92,9 +92,9 @@
"jsonwebtoken": "^9.0.2",
"jwks-rsa": "^3.1.0",
"knex": "^3.1.0",
"libphonenumber-js": "^1.11.5",
"lightning": "^10.18.0",
"ln-service": "^57.18.0",
"libphonenumber-js": "^1.11.7",
"lightning": "^10.19.0",
"ln-service": "^57.19.0",
"lnurl-pay": "^3.0.1",
"lodash.debounce": "^4.0.8",
"lodash.groupby": "^4.6.0",
Expand All @@ -106,7 +106,7 @@
"medici": "^7.0.3",
"mongoose": "8.4.1",
"node-cache": "^5.1.2",
"openai": "^4.55.5",
"openai": "^4.57.0",
"pg": "^8.12.0",
"pino": "9.3.2",
"pino-http": "^10.2.0",
Expand All @@ -115,15 +115,15 @@
"redlock": "^5.0.0-beta.2",
"svix": "1.21.0",
"tiny-secp256k1": "^2.2.3",
"twilio": "^5.2.2",
"twilio": "^5.2.3",
"uuid-by-string": "^4.0.0",
"validator": "^13.12.0",
"ws": "^8.18.0",
"zod": "^3.23.8"
},
"devDependencies": {
"@babel/core": "^7.25.2",
"@babel/preset-env": "^7.25.3",
"@babel/preset-env": "^7.25.4",
"@galoy/eslint-config": "workspace:^",
"@graphql-tools/jest-transform": "^2.0.0",
"@jest/test-sequencer": "^29.7.0",
Expand Down Expand Up @@ -162,7 +162,7 @@
"@typescript-eslint/eslint-plugin": "^7.7.0",
"@typescript-eslint/parser": "^7.7.0",
"@xascode/tscpaths": "0.1.4",
"axios-mock-adapter": "^1.22.0",
"axios-mock-adapter": "^2.0.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
Expand All @@ -187,7 +187,7 @@
"spectaql": "^2.3.1",
"tree-kill": "^1.2.2",
"tsconfig-paths": "^4.2.0",
"tsx": "^4.17.0",
"tsx": "^4.19.0",
"typescript": "^5.5.4",
"zen-observable-ts": "^1.1.0"
},
Expand Down
1 change: 1 addition & 0 deletions core/api/src/graphql/public/subscriptions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const addTracing = () => {
fields[key].resolve = (source, args, context: GraphQLPublicContextForUser, info) => {
const { ip, domainAccount } = context
addAttributesToCurrentSpan({
[SemanticAttributes.USER_ID]: domainAccount?.id,
[SemanticAttributes.ENDUSER_ID]: domainAccount?.id,
[ACCOUNT_USERNAME]: domainAccount?.username,
[SemanticAttributes.HTTP_CLIENT_IP]: ip,
Expand Down
1 change: 1 addition & 0 deletions core/api/src/servers/graphql-admin-api-server.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ const setGqlAdminContext = async (
addAttributesToCurrentSpanAndPropagate(
{
[SemanticAttributes.HTTP_USER_AGENT]: req.headers["user-agent"],
[SemanticAttributes.USER_ID]: tokenPayload.sub,
[SemanticAttributes.ENDUSER_ID]: tokenPayload.sub,
},
next,
Expand Down
1 change: 1 addition & 0 deletions core/api/src/servers/graphql-public-api-server.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ const setGqlContext = async (
[SemanticAttributes.HTTP_CLIENT_IP]: ip,
[SemanticAttributes.HTTP_USER_AGENT]: req.headers["user-agent"],
[ACCOUNT_USERNAME]: username,
[SemanticAttributes.USER_ID]: tokenPayload?.sub,
[SemanticAttributes.ENDUSER_ID]: tokenPayload?.sub,
},
next,
Expand Down
51 changes: 27 additions & 24 deletions core/api/src/services/tracing.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,16 @@ import { MongoDBInstrumentation } from "@opentelemetry/instrumentation-mongodb"
import { Span as SdkSpan, SimpleSpanProcessor } from "@opentelemetry/sdk-trace-base"
import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node"
import {
SEMATTRS_CODE_FUNCTION,
SEMATTRS_CODE_NAMESPACE,
SEMATTRS_HTTP_CLIENT_IP,
SEMATTRS_HTTP_USER_AGENT,
SEMATTRS_ENDUSER_ID,
SEMRESATTRS_SERVICE_NAME,
} from "@opentelemetry/semantic-conventions"
ATTR_CODE_FUNCTION,
ATTR_CODE_NAMESPACE,
ATTR_USER_ID,
ATTR_SERVICE_NAME,
} from "@opentelemetry/semantic-conventions/incubating"

// these have been deprecated but we must keep them to avoid issues with alert system
const ATTR_ENDUSER_ID = "enduser.id"
const ATTR_HTTP_USER_AGENT = "http.user_agent"
const ATTR_HTTP_CLIENT_IP = "http.client_ip"

import {
trace,
Expand Down Expand Up @@ -50,13 +53,13 @@ propagation.setGlobalPropagator(new W3CTraceContextPropagator())
const gqlResponseHook = (span: ExtendedSpan, data: graphqlTypes.ExecutionResult) => {
const baggage = propagation.getBaggage(context.active())
if (baggage) {
const ip = baggage.getEntry(SEMATTRS_HTTP_CLIENT_IP)
const ip = baggage.getEntry(ATTR_HTTP_CLIENT_IP)
if (ip) {
span.setAttribute(SEMATTRS_HTTP_CLIENT_IP, ip.value)
span.setAttribute(ATTR_HTTP_CLIENT_IP, ip.value)
}
const userAgent = baggage.getEntry(SEMATTRS_HTTP_USER_AGENT)
const userAgent = baggage.getEntry(ATTR_HTTP_USER_AGENT)
if (userAgent) {
span.setAttribute(SEMATTRS_HTTP_USER_AGENT, userAgent.value)
span.setAttribute(ATTR_HTTP_USER_AGENT, userAgent.value)
}
}

Expand Down Expand Up @@ -222,7 +225,7 @@ registerInstrumentations({
const provider = new NodeTracerProvider({
resource: Resource.default().merge(
new Resource({
[SEMRESATTRS_SERVICE_NAME]: process.env.TRACING_SERVICE_NAME || "galoy-dev",
[ATTR_SERVICE_NAME]: process.env.TRACING_SERVICE_NAME || "galoy-dev",
}),
),
})
Expand Down Expand Up @@ -388,8 +391,8 @@ const resolveFunctionSpanOptions = ({
ignoreFnArgs?: boolean
}): SpanOptions => {
const attributes: Attributes = {
[SEMATTRS_CODE_FUNCTION]: functionName,
[SEMATTRS_CODE_NAMESPACE]: namespace,
[ATTR_CODE_FUNCTION]: functionName,
[ATTR_CODE_NAMESPACE]: namespace,
...spanAttributes,
}
if (!ignoreFnArgs && functionArgs && functionArgs.length > 0) {
Expand All @@ -398,10 +401,9 @@ const resolveFunctionSpanOptions = ({
for (const key in params) {
// @ts-ignore-next-line no-implicit-any error
const value = params[key]
attributes[`${SEMATTRS_CODE_FUNCTION}.params.${key}`] = value
attributes[`${SEMATTRS_CODE_FUNCTION}.params.${key}.null`] = value === null
attributes[`${SEMATTRS_CODE_FUNCTION}.params.${key}.undefined`] =
value === undefined
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
}
}
return { attributes, root }
Expand Down Expand Up @@ -612,15 +614,16 @@ export const shutdownTracing = async () => {
}

export const SemanticResourceAttributes = {
SERVICE_NAME: SEMRESATTRS_SERVICE_NAME,
SERVICE_NAME: ATTR_SERVICE_NAME,
}

export const SemanticAttributes = {
CODE_FUNCTION: SEMATTRS_CODE_FUNCTION,
CODE_NAMESPACE: SEMATTRS_CODE_NAMESPACE,
HTTP_CLIENT_IP: SEMATTRS_HTTP_CLIENT_IP,
HTTP_USER_AGENT: SEMATTRS_HTTP_USER_AGENT,
ENDUSER_ID: SEMATTRS_ENDUSER_ID,
CODE_FUNCTION: ATTR_CODE_FUNCTION,
CODE_NAMESPACE: ATTR_CODE_NAMESPACE,
HTTP_CLIENT_IP: ATTR_HTTP_CLIENT_IP,
HTTP_USER_AGENT: ATTR_HTTP_USER_AGENT,
ENDUSER_ID: ATTR_ENDUSER_ID,
USER_ID: ATTR_USER_ID,
}

export const ACCOUNT_USERNAME = "account.username"
Expand Down
2 changes: 1 addition & 1 deletion lib/gt3-server-node-express-sdk/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"preinstall": "npx only-allow pnpm"
},
"dependencies": {
"axios": "^1.6.3",
"axios": "^1.7.5",
"qs": "^6.11.2",
"string-random": "^0.1.3"
}
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"pnpm": "8"
},
"resolutions": {
"@types/ws": "^8.5.12",
"protobufjs": "7.2.5",
"http-cache-semantics": "4.1.1"
},
Expand Down
Loading

0 comments on commit 91fff3f

Please sign in to comment.