diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index a4cb86d2..ad25aa61 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -48,7 +48,7 @@ services: restart: always otel-collector: - image: otel/opentelemetry-collector-contrib:0.114.0@sha256:37fa87091cfaaec7234a27e4e395a40c31c2bfaea97a349a4afef6d9e9681197 + image: otel/opentelemetry-collector-contrib:0.115.1@sha256:d2da12c4336a79758826700be9e21ecf4a9f7d945b7f8a58ba55ee3fa45427c8 command: - "--config=/etc/otel-collector-config.yaml" depends_on: @@ -75,13 +75,13 @@ services: - vmdata:/storage loki: - image: grafana/loki:3.3.0@sha256:58b60b901255c209d3455d8a1979a3f73d1d09686a0a858c2c93025a969eb550 + image: grafana/loki:3.3.1@sha256:7e30f1aa1b17970a29739432b5f3df30bf2b3e4bdfc22e896452c18bcfe017be command: - "-config.file=/etc/loki/local-config.yaml" restart: always grafana: - image: grafana/grafana:11.3.1@sha256:fa801ab6e1ae035135309580891e09f7eb94d1abdbd2106bdc288030b028158c + image: grafana/grafana:11.4.0@sha256:d8ea37798ccc41061a62ab080f2676dda6bf7815558499f901bdb0f533a456fb depends_on: - victoriametrics - loki diff --git a/.github/workflows/sonarscan.yml b/.github/workflows/sonarscan.yml index 2f993113..796d3045 100644 --- a/.github/workflows/sonarscan.yml +++ b/.github/workflows/sonarscan.yml @@ -37,7 +37,7 @@ jobs: run: npm run build -- --sourcemap - name: Upload coverage report to Codecov - uses: codecov/codecov-action@015f24e6818733317a2da2edd6290ab26238649a # v5.0.7 + uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1 with: token: ${{ secrets.CODECOV_TOKEN }} files: ./coverage/lcov.info diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml index 4cc5b003..342425ae 100644 --- a/docker-compose-ci.yml +++ b/docker-compose-ci.yml @@ -1,6 +1,6 @@ services: dzhura: - image: node:lts-alpine@sha256:b64ced2e7cd0a4816699fe308ce6e8a08ccba463c757c00c14cd372e3d2c763e + image: node:lts-alpine@sha256:6e80991f69cc7722c561e5d14d5e72ab47c0d6b6cfb3ae50fb9cf9a7b30fdf97 read_only: true volumes: - ".:/usr/src/service" diff --git a/package-lock.json b/package-lock.json index 9ac7ee84..4e0caed4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,8 +15,8 @@ "@myrotvorets/express-otel-middlewares": "^1.2.3", "@myrotvorets/express-request-logger": "^1.2.2", "@myrotvorets/oav-installer": "^5.0.0", - "@myrotvorets/opentelemetry-configurator": "^7.11.0", - "@myrotvorets/opentelemetry-plugin-knex": "^0.35.0", + "@myrotvorets/opentelemetry-configurator": "^7.12.0", + "@myrotvorets/opentelemetry-plugin-knex": "^0.37.0", "@myrotvorets/otel-utils": "^1.4.0", "@opentelemetry/api": "^1.9.0", "awilix": "^12.0.3", @@ -24,7 +24,7 @@ "express": "^4.21.2", "express-openapi-validator": "^5.3.9", "knex": "^3.1.0", - "mysql2": "^3.11.4", + "mysql2": "^3.11.5", "wpautop": "^1.0.0" }, "devDependencies": { @@ -2796,52 +2796,20 @@ } }, "node_modules/@myrotvorets/opentelemetry-plugin-knex": { - "version": "0.35.0", - "resolved": "https://npm.pkg.github.com/download/@myrotvorets/opentelemetry-plugin-knex/0.35.0/52d5979e722cfd86aef3bff24d8422b132dbbaeb", - "integrity": "sha512-JnwhkKA46BZAMwkJdsGc8/XNAOp1uw15MVqtXTc9RBkhyMmJJgzCx0JVut4e3gwT6ny10uJnfg3YGEgTtx4Mhg==", + "version": "0.37.0", + "resolved": "https://npm.pkg.github.com/download/@myrotvorets/opentelemetry-plugin-knex/0.37.0/d6ed15be0eff271783684dc54f049431a946982f", + "integrity": "sha512-AkAdszCsq92l863D+tO08sos6Q2Gq8izRyFTMvqg+fYM7xP30x14gfNeV9kWWwMpS5XkJBAvjhdrhdqJWgBlmg==", "license": "MIT", "dependencies": { "@opentelemetry/api": "^1.0.1", "@opentelemetry/core": "^1.0.0", - "@opentelemetry/instrumentation": "^0.53.0", + "@opentelemetry/instrumentation": "^0.55.0", "@opentelemetry/semantic-conventions": "^1.26.0" }, "peerDependencies": { "knex": "^1.0.0 || ^2.0.0 || ^3.0.1" } }, - "node_modules/@myrotvorets/opentelemetry-plugin-knex/node_modules/@opentelemetry/api-logs": { - "version": "0.53.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.53.0.tgz", - "integrity": "sha512-8HArjKx+RaAI8uEIgcORbZIPklyh1YLjPSBus8hjRmvLi6DeFzgOcdZ7KwPabKj8mXF8dX0hyfAyGfycz0DbFw==", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/api": "^1.0.0" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/@myrotvorets/opentelemetry-plugin-knex/node_modules/@opentelemetry/instrumentation": { - "version": "0.53.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.53.0.tgz", - "integrity": "sha512-DMwg0hy4wzf7K73JJtl95m/e0boSoWhH07rfvHvYzQtBD3Bmv0Wc1x733vyZBqmFm8OjJD0/pfiUg1W3JjFX0A==", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/api-logs": "0.53.0", - "@types/shimmer": "^1.2.0", - "import-in-the-middle": "^1.8.1", - "require-in-the-middle": "^7.1.1", - "semver": "^7.5.2", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - } - }, "node_modules/@myrotvorets/opentelemetry-resource-detectors": { "version": "1.2.2", "resolved": "https://npm.pkg.github.com/download/@myrotvorets/opentelemetry-resource-detectors/1.2.2/75e07faeb4c977fe883b312f7c777b187cb5b670", diff --git a/package.json b/package.json index fabc1692..d5128b7a 100644 --- a/package.json +++ b/package.json @@ -29,8 +29,8 @@ "@myrotvorets/express-otel-middlewares": "^1.2.3", "@myrotvorets/express-request-logger": "^1.2.2", "@myrotvorets/oav-installer": "^5.0.0", - "@myrotvorets/opentelemetry-configurator": "^7.11.0", - "@myrotvorets/opentelemetry-plugin-knex": "^0.35.0", + "@myrotvorets/opentelemetry-configurator": "^7.12.0", + "@myrotvorets/opentelemetry-plugin-knex": "^0.37.0", "@myrotvorets/otel-utils": "^1.4.0", "@opentelemetry/api": "^1.9.0", "awilix": "^12.0.3", @@ -38,7 +38,7 @@ "express": "^4.21.2", "express-openapi-validator": "^5.3.9", "knex": "^3.1.0", - "mysql2": "^3.11.4", + "mysql2": "^3.11.5", "wpautop": "^1.0.0" }, "devDependencies": {