diff --git a/.golangci.yml b/.golangci.yml index 1bbc6b39..1b77a54d 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -27,7 +27,7 @@ linters-settings: locale: US cyclop: max-complexity: 17 - package-average: 8 + package-average: 10 godox: keywords: - NOTE @@ -46,5 +46,9 @@ issues: linters: - gosec text: "G107" + - path: internal/serviceconfig/observability/prometheus/generator/main.go + linters: + - gosec + text: "G306" max-issues-per-linter: 0 max-same-issues: 0 diff --git a/devbox.json b/devbox.json index 76f0f2e6..4f485c37 100644 --- a/devbox.json +++ b/devbox.json @@ -1,36 +1,36 @@ { "$schema": "https://raw.githubusercontent.com/jetify-com/devbox/0.13.7/.schema/devbox.schema.json", "env": { - "APP_ENV": "development", - "AWS_ACCESS_KEY_ID": "test", - "AWS_ENDPOINT_URL": "http://localhost:4566", - "AWS_REGION": "us-east-1", - "AWS_SECRET_ACCESS_KEY": "test", - "AWS_SESSION_TOKEN": "", - "BUCKET_IN": "documentin", - "DB_NOSSL": "true", - "DOCUMENT_CLEAN_URL": "http://localstack:4566/queue/us-east-1/000000000000/document_clean", - "DOCUMENT_INIT_URL": "http://localstack:4566/queue/us-east-1/000000000000/document_init", - "DOCUMENT_SYNC_URL": "http://localstack:4566/queue/us-east-1/000000000000/document_sync", - "DOCUMENT_TEXT_URL": "http://localstack:4566/queue/us-east-1/000000000000/document_text", - "JOB_SYNC_URL": "http://localstack:4566/queue/us-east-1/000000000000/job_sync", - "PGDATABASE": "query_orchestration", - "PGHOST": "localhost", - "PGPASSWORD": "pass", - "PGPORT": "5432", - "PGPORT_GENERATE": "5431", - "PGUSER": "postgres", - "QNAME_DOCUMENT_CLEAN": "document_clean", - "QNAME_DOCUMENT_INIT": "document_init", - "QNAME_DOCUMENT_SYNC": "document_sync", - "QNAME_DOCUMENT_TEXT": "document_text", - "QNAME_JOB_SYNC": "job_sync", - "QNAME_QUERY_RUNNER": "query_runner", - "QNAME_QUERY_SYNC": "query_sync", + "APP_ENV": "development", + "AWS_ACCESS_KEY_ID": "test", + "AWS_ENDPOINT_URL": "http://localhost:4566", + "AWS_REGION": "us-east-1", + "AWS_SECRET_ACCESS_KEY": "test", + "AWS_SESSION_TOKEN": "", + "BUCKET_IN": "documentin", + "DB_NOSSL": "true", + "DOCUMENT_CLEAN_URL": "http://localstack:4566/queue/us-east-1/000000000000/document_clean", + "DOCUMENT_INIT_URL": "http://localstack:4566/queue/us-east-1/000000000000/document_init", + "DOCUMENT_SYNC_URL": "http://localstack:4566/queue/us-east-1/000000000000/document_sync", + "DOCUMENT_TEXT_URL": "http://localstack:4566/queue/us-east-1/000000000000/document_text", + "JOB_SYNC_URL": "http://localstack:4566/queue/us-east-1/000000000000/job_sync", + "PGDATABASE": "query_orchestration", + "PGHOST": "localhost", + "PGPASSWORD": "pass", + "PGPORT": "5432", + "PGPORT_GENERATE": "5431", + "PGUSER": "postgres", + "QNAME_DOCUMENT_CLEAN": "document_clean", + "QNAME_DOCUMENT_INIT": "document_init", + "QNAME_DOCUMENT_SYNC": "document_sync", + "QNAME_DOCUMENT_TEXT": "document_text", + "QNAME_JOB_SYNC": "job_sync", + "QNAME_QUERY_RUNNER": "query_runner", + "QNAME_QUERY_SYNC": "query_sync", "QNAME_QUERY_VERSION_SYNC": "query_version_sync", - "QUERY_SYNC_URL": "http://localstack:4566/queue/us-east-1/000000000000/query_sync", - "QUERY_URL": "http://localstack:4566/queue/us-east-1/000000000000/query_runner", - "QUERY_VERSION_SYNC_URL": "http://localstack:4566/queue/us-east-1/000000000000/query_version_sync" + "QUERY_SYNC_URL": "http://localstack:4566/queue/us-east-1/000000000000/query_sync", + "QUERY_URL": "http://localstack:4566/queue/us-east-1/000000000000/query_runner", + "QUERY_VERSION_SYNC_URL": "http://localstack:4566/queue/us-east-1/000000000000/query_version_sync" }, "env_from": ".env", "packages": [ @@ -62,4 +62,4 @@ "echo 'Welcome to the DoczyAI devbox!'" ] } -} +} \ No newline at end of file diff --git a/internal/server/runner/listener.go b/internal/server/runner/listener.go index 44ced488..b569e752 100644 --- a/internal/server/runner/listener.go +++ b/internal/server/runner/listener.go @@ -3,7 +3,9 @@ package runner import ( "context" "errors" + "github.com/aws/aws-sdk-go-v2/service/sqs/types" + "queryorchestration/internal/server" "queryorchestration/internal/serviceconfig/aws" "queryorchestration/internal/serviceconfig/observability" diff --git a/internal/serviceconfig/observability/config.go b/internal/serviceconfig/observability/config.go index e20a531c..19c0473d 100644 --- a/internal/serviceconfig/observability/config.go +++ b/internal/serviceconfig/observability/config.go @@ -3,6 +3,7 @@ package observability import ( "context" "log/slog" + "queryorchestration/internal/serviceconfig/observability/prometheus" "go.opentelemetry.io/otel" diff --git a/internal/serviceconfig/observability/prometheus/generator/main.go b/internal/serviceconfig/observability/prometheus/generator/main.go index 974d0c64..4b49aa12 100644 --- a/internal/serviceconfig/observability/prometheus/generator/main.go +++ b/internal/serviceconfig/observability/prometheus/generator/main.go @@ -6,13 +6,15 @@ import ( "bytes" "fmt" "go/format" - "golang.org/x/text/cases" - "golang.org/x/text/language" "log" "os" - "queryorchestration/internal/serviceconfig/observability/prometheus" "strings" "text/template" + + "golang.org/x/text/cases" + "golang.org/x/text/language" + + "queryorchestration/internal/serviceconfig/observability/prometheus" ) const outputFilename = "./metric_stubs.gen.go" diff --git a/scripts/openapi.yml b/scripts/openapi.yml index bc27ecd6..6001f51c 100644 --- a/scripts/openapi.yml +++ b/scripts/openapi.yml @@ -1,7 +1,7 @@ --- # https://taskfile.dev -version: '3' +version: "3" tasks: lint: @@ -50,4 +50,4 @@ tasks: done generate:metrics:stubs: cmds: - - go generate ./... \ No newline at end of file + - go generate ./...