Skip to content

Commit

Permalink
chore: remove camelCase module names
Browse files Browse the repository at this point in the history
  • Loading branch information
dhawal1248 committed Oct 12, 2023
1 parent 05b40dd commit dcb66d9
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 20 deletions.
2 changes: 1 addition & 1 deletion cmd/signozschemamigrator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ USER ${USER_UID}

# copy the binaries from the multi-stage build
COPY .build/${TARGETOS}-${TARGETARCH}/signoz-schema-migrator /signoz-schema-migrator
COPY migrationManager ./migrationManager
COPY migrationmanager ./migrationmanager

# run the binary as the entrypoint and pass the default dsn as a flag
ENTRYPOINT [ "/signoz-schema-migrator" ]
Expand Down
2 changes: 1 addition & 1 deletion cmd/signozschemamigrator/migrate.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"log"
"os"

migrationmanager "github.com/SigNoz/signoz-otel-collector/migrationManager"
"github.com/SigNoz/signoz-otel-collector/migrationmanager"

Check failure on line 9 in cmd/signozschemamigrator/migrate.go

View workflow job for this annotation

GitHub Actions / Analyze

no required module provides package github.com/SigNoz/signoz-otel-collector/migrationmanager; to add it:

Check failure on line 9 in cmd/signozschemamigrator/migrate.go

View workflow job for this annotation

GitHub Actions / Analyze

no required module provides package github.com/SigNoz/signoz-otel-collector/migrationmanager; to add it:

Check failure on line 9 in cmd/signozschemamigrator/migrate.go

View workflow job for this annotation

GitHub Actions / lint-and-test

no required module provides package github.com/SigNoz/signoz-otel-collector/migrationmanager; to add it:
"github.com/spf13/pflag"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
Expand Down
4 changes: 0 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1541,8 +1541,6 @@ golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
Expand Down Expand Up @@ -1647,7 +1645,6 @@ golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
golang.org/x/oauth2 v0.0.0-20180227000427-d7d64896b5ff/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down Expand Up @@ -1815,7 +1812,6 @@ golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
Expand Down
14 changes: 7 additions & 7 deletions migrationManager/manager.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package migrator
package migrationmanager

import (
"context"
"fmt"

"github.com/SigNoz/signoz-otel-collector/migrationManager/migrators"
basemigrator "github.com/SigNoz/signoz-otel-collector/migrationManager/migrators/baseMigrator"
"github.com/SigNoz/signoz-otel-collector/migrationManager/migrators/logs"
"github.com/SigNoz/signoz-otel-collector/migrationManager/migrators/metrics"
"github.com/SigNoz/signoz-otel-collector/migrationManager/migrators/traces"
"github.com/SigNoz/signoz-otel-collector/migrationmanager/migrators"
"github.com/SigNoz/signoz-otel-collector/migrationmanager/migrators/basemigrator"
"github.com/SigNoz/signoz-otel-collector/migrationmanager/migrators/logs"
"github.com/SigNoz/signoz-otel-collector/migrationmanager/migrators/metrics"
"github.com/SigNoz/signoz-otel-collector/migrationmanager/migrators/traces"
"go.uber.org/zap"
)

Expand All @@ -18,7 +18,7 @@ type MigrationManager struct {
}

func New(dsn string, clusterName string, isDurationSortFeatureDisabled bool, isTimestampSortFeatureDisabled bool) (*MigrationManager, error) {
logger := zap.L().With(zap.String("component", "migrationManager"))
logger := zap.L().With(zap.String("component", "migrationmanager"))
cfg := migrators.MigratorConfig{
DSN: dsn,
ClusterName: clusterName,
Expand Down
2 changes: 1 addition & 1 deletion migrationManager/migrators/baseMigrator/migrator.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/ClickHouse/clickhouse-go/v2"
"github.com/ClickHouse/clickhouse-go/v2/lib/driver"
"github.com/SigNoz/signoz-otel-collector/migrationManager/migrators"
"github.com/SigNoz/signoz-otel-collector/migrationmanager/migrators"

Check failure on line 11 in migrationManager/migrators/baseMigrator/migrator.go

View workflow job for this annotation

GitHub Actions / Analyze

no required module provides package github.com/SigNoz/signoz-otel-collector/migrationmanager/migrators; to add it:

Check failure on line 11 in migrationManager/migrators/baseMigrator/migrator.go

View workflow job for this annotation

GitHub Actions / lint-and-test

no required module provides package github.com/SigNoz/signoz-otel-collector/migrationmanager/migrators; to add it:
"github.com/golang-migrate/migrate/v4"
_ "github.com/golang-migrate/migrate/v4/database/clickhouse"
_ "github.com/golang-migrate/migrate/v4/source/file"
Expand Down
4 changes: 2 additions & 2 deletions migrationManager/migrators/logs/migrator.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package logs
import (
"context"

basemigrator "github.com/SigNoz/signoz-otel-collector/migrationManager/migrators/baseMigrator"
"github.com/SigNoz/signoz-otel-collector/migrationmanager/migrators/basemigrator"

Check failure on line 6 in migrationManager/migrators/logs/migrator.go

View workflow job for this annotation

GitHub Actions / Analyze

no required module provides package github.com/SigNoz/signoz-otel-collector/migrationmanager/migrators/basemigrator; to add it:

Check failure on line 6 in migrationManager/migrators/logs/migrator.go

View workflow job for this annotation

GitHub Actions / lint-and-test

no required module provides package github.com/SigNoz/signoz-otel-collector/migrationmanager/migrators/basemigrator; to add it:
)

const (
name = "logs"
database = "signoz_logs"
migrationFolder = "migrationManager/migrators/logs/migrations"
migrationFolder = "migrationmanager/migrators/logs/migrations"
)

type LogsMigrator struct {
Expand Down
4 changes: 2 additions & 2 deletions migrationManager/migrators/metrics/migrator.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import (
"strings"

"github.com/SigNoz/signoz-otel-collector/exporter/clickhousemetricsexporter"
basemigrator "github.com/SigNoz/signoz-otel-collector/migrationManager/migrators/baseMigrator"
"github.com/SigNoz/signoz-otel-collector/migrationmanager/migrators/basemigrator"
)

const (
name = "metrics"
database = "signoz_metrics"
migrationFolder = "migrationManager/migrators/metrics/migrations"
migrationFolder = "migrationmanager/migrators/metrics/migrations"
)

type MetricsMigrator struct {
Expand Down
4 changes: 2 additions & 2 deletions migrationManager/migrators/traces/migrator.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import (

"github.com/ClickHouse/clickhouse-go/v2"
"github.com/SigNoz/signoz-otel-collector/exporter/clickhousetracesexporter"
basemigrator "github.com/SigNoz/signoz-otel-collector/migrationManager/migrators/baseMigrator"
"github.com/SigNoz/signoz-otel-collector/migrationmanager/migrators/basemigrator"
)

const (
name = "traces"
database = "signoz_traces"
migrationFolder = "migrationManager/migrators/traces/migrations"
migrationFolder = "migrationmanager/migrators/traces/migrations"
)

type TracesMigrator struct {
Expand Down

0 comments on commit dcb66d9

Please sign in to comment.