From 0ed7a5da7f072db929d4245f01472c098f2d6721 Mon Sep 17 00:00:00 2001 From: Rathijit Paul <30369246+rathijitpapon@users.noreply.github.com> Date: Fri, 28 Jun 2024 11:48:24 +0600 Subject: [PATCH] :construction: fix linting issues and remove unnecessary packages --- agency/.env.template | 2 +- frontend/next.config.mjs | 10 +-- server/Cargo.lock | 173 +-------------------------------------- server/Cargo.toml | 15 +--- 4 files changed, 9 insertions(+), 191 deletions(-) diff --git a/agency/.env.template b/agency/.env.template index dead636e..a551e1cc 100644 --- a/agency/.env.template +++ b/agency/.env.template @@ -82,7 +82,7 @@ TRACING__SENTRY_DSN= # TRACING__ENVIRONMENT= # TRACING__PHOENIX_API= # TRACING__PROJECT_NAME= -# TRACING__SERVIVE_NAME= +# TRACING__SERVICE_NAME= # TRACING__JAEGER_ENDPOINT= # GROQ API Configuration diff --git a/frontend/next.config.mjs b/frontend/next.config.mjs index cce7847f..c8e7ffcf 100644 --- a/frontend/next.config.mjs +++ b/frontend/next.config.mjs @@ -1,4 +1,4 @@ -import {withSentryConfig} from '@sentry/nextjs'; +import { withSentryConfig } from '@sentry/nextjs' /** @type {import('next').NextConfig} */ const nextConfig = { experimental: { @@ -30,8 +30,8 @@ export default withSentryConfig(nextConfig, { // For all available options, see: // https://github.com/getsentry/sentry-webpack-plugin#options - org: "curieo", - project: "search", + org: 'curieo', + project: 'search', // Only print logs for uploading source maps in CI silent: !process.env.CI, @@ -46,7 +46,7 @@ export default withSentryConfig(nextConfig, { // This can increase your server load as well as your hosting bill. // Note: Check that the configured route will not match with your Next.js middleware, otherwise reporting of client- // side errors will fail. - tunnelRoute: "/monitoring", + tunnelRoute: '/monitoring', // Hides source maps from generated client bundles hideSourceMaps: true, @@ -59,4 +59,4 @@ export default withSentryConfig(nextConfig, { // https://docs.sentry.io/product/crons/ // https://vercel.com/docs/cron-jobs automaticVercelMonitors: true, -}); \ No newline at end of file +}) \ No newline at end of file diff --git a/server/Cargo.lock b/server/Cargo.lock index f38ca78c..49c1c29f 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -412,12 +412,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" -[[package]] -name = "cache-padded" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "981520c98f422fcc584dc1a95c334e6953900b9106bc47a9839b81790009eb21" - [[package]] name = "cc" version = "1.0.90" @@ -632,16 +626,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - [[package]] name = "dashmap" version = "5.5.3" @@ -1377,12 +1361,6 @@ dependencies = [ "hashbrown 0.14.3", ] -[[package]] -name = "integer-encoding" -version = "3.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" - [[package]] name = "ipnet" version = "2.9.0" @@ -1528,33 +1506,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "minitrace" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197d538cd69839d49a593c8c72df44291b0ea3296ecc0c85529002c53c8fbc6f" -dependencies = [ - "minitrace-macro", - "minstant", - "once_cell", - "parking_lot", - "pin-project", - "rand", - "rtrb", -] - -[[package]] -name = "minitrace-macro" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14efd4b574325fcb981bce1ac700b9ccf071ec2eb94f7a6a6b583a84f228ba47" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "miniz_oxide" version = "0.7.2" @@ -1564,16 +1515,6 @@ dependencies = [ "adler", ] -[[package]] -name = "minstant" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb9b5c752f145ac5046bccc3c4f62892e3c950c1d1eab80c5949cd68a2078db" -dependencies = [ - "ctor", - "web-time", -] - [[package]] name = "mio" version = "0.8.11" @@ -1795,31 +1736,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "opentelemetry-jaeger" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501b471b67b746d9a07d4c29f8be00f952d1a2eca356922ede0098cbaddff19f" -dependencies = [ - "async-trait", - "futures-core", - "futures-util", - "opentelemetry", - "opentelemetry-semantic-conventions", - "opentelemetry_sdk", - "thrift", - "tokio", -] - -[[package]] -name = "opentelemetry-jaeger-propagator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c190755e0aeec909343896f94670446ac686dd1eaf5e2beb4149a7148cfe1d6c" -dependencies = [ - "opentelemetry", -] - [[package]] name = "opentelemetry-otlp" version = "0.16.0" @@ -1856,23 +1772,6 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1869fb4bb9b35c5ba8a1e40c9b128a7b4c010d07091e864a29da19e4fe2ca4d7" -[[package]] -name = "opentelemetry-stdout" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6d080bf06af02b738feb2e6830cf72c30b76ca18b40f555cdf1b53e7b491bfe" -dependencies = [ - "async-trait", - "chrono", - "futures-util", - "opentelemetry", - "opentelemetry_sdk", - "ordered-float 4.2.0", - "serde", - "serde_json", - "thiserror", -] - [[package]] name = "opentelemetry_sdk" version = "0.23.0" @@ -1887,24 +1786,14 @@ dependencies = [ "lazy_static", "once_cell", "opentelemetry", - "ordered-float 4.2.0", + "ordered-float", "percent-encoding", "rand", - "serde_json", "thiserror", "tokio", "tokio-stream", ] -[[package]] -name = "ordered-float" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" -dependencies = [ - "num-traits", -] - [[package]] name = "ordered-float" version = "4.2.0" @@ -2156,30 +2045,6 @@ dependencies = [ "syn 2.0.53", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro2" version = "1.0.79" @@ -2496,15 +2361,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rtrb" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e704dd104faf2326a320140f70f0b736d607c1caa1b1748a6c568a79819109" -dependencies = [ - "cache-padded", -] - [[package]] name = "rust-ini" version = "0.19.0" @@ -2779,7 +2635,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c90802b38c899a2c9e557dff25ad186362eddf755d5f5244001b172dd03bead" dependencies = [ - "axum 0.7.4", "http 1.1.0", "pin-project", "sentry-core", @@ -2897,16 +2752,12 @@ dependencies = [ "futures", "hyper 1.2.0", "log", - "minitrace", "oauth2", "once_cell", "openssl-sys", "opentelemetry", - "opentelemetry-jaeger", - "opentelemetry-jaeger-propagator", "opentelemetry-otlp", "opentelemetry-semantic-conventions", - "opentelemetry-stdout", "opentelemetry_sdk", "password-auth", "prost", @@ -3367,28 +3218,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - -[[package]] -name = "thrift" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e54bc85fc7faa8bc175c4bab5b92ba8d9a3ce893d0e9f42cc455c8ab16a9e09" -dependencies = [ - "byteorder", - "integer-encoding", - "log", - "ordered-float 2.10.1", - "threadpool", -] - [[package]] name = "time" version = "0.3.36" diff --git a/server/Cargo.toml b/server/Cargo.toml index 5f52aeb2..4e182910 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -66,23 +66,12 @@ time = { version = "0.3.36", features = ["serde"] } dashmap = { version = "5.5.3", features = ["inline", "serde"] } tokio-stream = { version = "0.1.15", features = ["full"] } sentry = { version = "0.34.0", features = ["tracing"] } -sentry-tower = { version = "0.34.0", features = [ - "http", - "axum", - "axum-matched-path", -] } +sentry-tower = { version = "0.34.0", features = ["http"] } regex = "1.10.5" -minitrace = { version = "0.6", features = ["enable"] } -opentelemetry-jaeger = { version = "0.22.0", features = ["rt-tokio"] } opentelemetry = "0.23.0" -opentelemetry-jaeger-propagator = "0.2.0" opentelemetry_sdk = { version = "0.23.0", features = ["rt-tokio"] } tracing-opentelemetry = "0.24.0" -opentelemetry-stdout = "0.4.0" -opentelemetry-otlp = { version = "0.16.0", features = [ - # "http-proto", - "tls-roots", -] } +opentelemetry-otlp = { version = "0.16.0", features = ["tls-roots"] } opentelemetry-semantic-conventions = "0.15.0" [dependencies.openssl-sys]