Skip to content

Commit f709abf

Browse files
ravisuhagravisuhag
committed
refactor: migrate pkg/errors to stdlib errors and fmt.Errorf
Replace all direct usage of github.com/pkg/errors with stdlib: - errors.Wrap(err, "msg") → fmt.Errorf("msg: %w", err) - errors.Wrapf(err, "fmt", args) → fmt.Errorf("fmt: %w", args, err) - errors.Errorf("fmt", args) → fmt.Errorf("fmt", args) - errors.New("msg") → errors.New("msg") (stdlib) pkg/errors remains as an indirect dependency (used by third-party libraries) but Meteor no longer imports it directly.
1 parent ef5f159 commit f709abf

24 files changed

Lines changed: 78 additions & 65 deletions

File tree

‎agent/agent.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import (
88
"sync/atomic"
99
"time"
1010

11-
"github.com/pkg/errors"
11+
"errors"
12+
1213
"github.com/raystack/meteor/metrics/otelmw"
1314
"github.com/raystack/meteor/models"
1415
"github.com/raystack/meteor/plugins"

‎generator/recipe.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ package generator
22

33
import (
44
_ "embed"
5+
"fmt"
56
"io"
67
"strings"
78
"text/template"
89

9-
"github.com/pkg/errors"
1010
"github.com/raystack/meteor/registry"
1111
)
1212

@@ -54,7 +54,7 @@ func Recipe(p RecipeParams) (*TemplateData, error) {
5454

5555
sourceInfo, err := registry.Extractors.Info(p.Source)
5656
if err != nil {
57-
return nil, errors.Wrap(err, "failed to provide extractor information")
57+
return nil, fmt.Errorf("failed to provide extractor information: %w", err)
5858
}
5959

6060
tem.Source.SampleConfig = sourceInfo.SampleConfig
@@ -64,7 +64,7 @@ func Recipe(p RecipeParams) (*TemplateData, error) {
6464
for _, sink := range p.Sinks {
6565
info, err := registry.Sinks.Info(sink)
6666
if err != nil {
67-
return nil, errors.Wrap(err, "failed to provide sink information")
67+
return nil, fmt.Errorf("failed to provide sink information: %w", err)
6868
}
6969
tem.Sinks[sink] = info.SampleConfig
7070
}
@@ -74,7 +74,7 @@ func Recipe(p RecipeParams) (*TemplateData, error) {
7474
for _, procc := range p.Processors {
7575
info, err := registry.Processors.Info(procc)
7676
if err != nil {
77-
return nil, errors.Wrap(err, "failed to provide processor information")
77+
return nil, fmt.Errorf("failed to provide processor information: %w", err)
7878
}
7979
tem.Processors[procc] = info.SampleConfig
8080
}
@@ -93,7 +93,7 @@ func RecipeWriteTo(p RecipeParams, writer io.Writer) error {
9393
template.New("recipe.yaml").Funcs(TemplateFuncs).Parse(RecipeTemplate),
9494
)
9595
if err := tmpl.Execute(writer, *tem); err != nil {
96-
return errors.Wrap(err, "failed to execute template")
96+
return fmt.Errorf("failed to execute template: %w", err)
9797
}
9898
return nil
9999
}

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ require (
3434
github.com/mitchellh/mapstructure v1.5.0
3535
github.com/nsf/jsondiff v0.0.0-20260207060731-8e8d90c4c0ac
3636
github.com/ory/dockertest/v3 v3.12.0
37-
github.com/pkg/errors v0.9.1
3837
github.com/prestodb/presto-go-client v1.0.0
3938
github.com/raystack/optimus v0.7.2-0.20230725205201-5874457c7bbe
4039
github.com/raystack/salt v0.7.0
@@ -139,6 +138,7 @@ require (
139138
github.com/moby/sys/user v0.4.0 // indirect
140139
github.com/mtibben/percent v0.2.1 // indirect
141140
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
141+
github.com/pkg/errors v0.9.1 // indirect
142142
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
143143
github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect
144144
github.com/sagikazarmark/locafero v0.12.0 // indirect

‎plugins/extractors/bigquery/auditlog/auditlog.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ import (
55
"fmt"
66
"time"
77

8+
"errors"
9+
810
"cloud.google.com/go/bigquery"
911
"cloud.google.com/go/logging/logadmin"
10-
"github.com/pkg/errors"
1112
"github.com/raystack/meteor/plugins"
1213
log "github.com/raystack/salt/observability/logger"
1314
"go.opentelemetry.io/otel"

‎plugins/extractors/bigquery/auditlog/logdata.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package auditlog
22

33
import (
4-
"github.com/pkg/errors"
4+
"errors"
5+
"fmt"
6+
57
"github.com/raystack/meteor/plugins"
68
loggingpb "google.golang.org/genproto/googleapis/cloud/bigquery/logging/v1"
79
)
@@ -55,12 +57,12 @@ func (ld *LogData) validateAuditData() (err error) {
5557
// if referenced tables is empty, we don't count it
5658
stats := job.GetJobStatistics()
5759
if stats == nil {
58-
err = errors.Errorf("job statistics is nil")
60+
err = fmt.Errorf("job statistics is nil")
5961
return
6062
}
6163

6264
if len(stats.ReferencedTables) == 0 {
63-
err = errors.Errorf("no referenced tables found")
65+
err = fmt.Errorf("no referenced tables found")
6466
return
6567
}
6668

@@ -84,7 +86,7 @@ func (ld *LogData) validateAuditData() (err error) {
8486

8587
if jobStatus.GetError() != nil {
8688
if jobErrMsg := jobStatus.GetError().GetMessage(); jobErrMsg != "" {
87-
err = errors.Errorf("job status has error: %s", jobErrMsg)
89+
err = fmt.Errorf("job status has error: %s", jobErrMsg)
8890
return
8991
}
9092
}

‎plugins/extractors/bigquery/auditlog/stats.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package auditlog
22

33
import (
4-
"github.com/pkg/errors"
4+
"errors"
5+
"fmt"
6+
57
"github.com/raystack/meteor/plugins/extractors/bigquery/sqlparser"
68
)
79

@@ -42,7 +44,7 @@ func (b *TableStats) Populate(ld *LogData) (err error) {
4244
sqlQuery, err := b.processedLog.GetQuery()
4345
if err != nil {
4446
// log query not exist here
45-
err = errors.Wrap(err, "can't get query")
47+
err = fmt.Errorf("can't get query: %w", err)
4648
return
4749
}
4850

‎plugins/extractors/bigquery/bigquery.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ import (
1212
"sync"
1313
"time"
1414

15+
"errors"
16+
1517
"cloud.google.com/go/bigquery"
1618
datacatalog "cloud.google.com/go/datacatalog/apiv1"
1719
"cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
18-
"github.com/pkg/errors"
1920
"github.com/raystack/meteor/models"
2021
meteorv1beta1 "github.com/raystack/meteor/models/raystack/meteor/v1beta1"
2122
"github.com/raystack/meteor/plugins"

‎plugins/extractors/cassandra/cassandra.go‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import (
55
_ "embed" // used to print the embedded assets
66
"fmt"
77

8-
"github.com/pkg/errors"
9-
108
"github.com/gocql/gocql"
119
"github.com/raystack/meteor/models"
1210
"github.com/raystack/meteor/plugins/sqlutil"
@@ -105,7 +103,7 @@ func (e *Extractor) Init(ctx context.Context, config plugins.Config) (err error)
105103
cluster.ProtoVersion = 4
106104
cluster.Port = e.config.Port
107105
if e.session, err = cluster.CreateSession(); err != nil {
108-
return errors.Wrap(err, "failed to create session")
106+
return fmt.Errorf("failed to create session: %w", err)
109107
}
110108

111109
return
@@ -126,15 +124,15 @@ func (e *Extractor) Extract(ctx context.Context, emit plugins.Emit) (err error)
126124
for scanner.Next() {
127125
var keyspace string
128126
if err = scanner.Scan(&keyspace); err != nil {
129-
return errors.Wrapf(err, "failed to iterate over %s", keyspace)
127+
return fmt.Errorf("failed to iterate over %s: %w", keyspace, err)
130128
}
131129

132130
// skip if database is default
133131
if e.isExcludedKeyspace(keyspace) {
134132
continue
135133
}
136134
if err = e.extractTables(keyspace); err != nil {
137-
return errors.Wrapf(err, "failed to extract tables from %s", keyspace)
135+
return fmt.Errorf("failed to extract tables from %s: %w", keyspace, err)
138136
}
139137
}
140138

@@ -151,13 +149,13 @@ func (e *Extractor) extractTables(keyspace string) (err error) {
151149
for scanner.Next() {
152150
var tableName string
153151
if err = scanner.Scan(&tableName); err != nil {
154-
return errors.Wrapf(err, "failed to iterate over %s", tableName)
152+
return fmt.Errorf("failed to iterate over %s: %w", tableName, err)
155153
}
156154
if e.isExcludedTable(keyspace, tableName) {
157155
continue
158156
}
159157
if err = e.processTable(keyspace, tableName); err != nil {
160-
return errors.Wrap(err, "failed to process table")
158+
return fmt.Errorf("failed to process table: %w", err)
161159
}
162160
}
163161

@@ -168,7 +166,7 @@ func (e *Extractor) extractTables(keyspace string) (err error) {
168166
func (e *Extractor) processTable(keyspace string, tableName string) (err error) {
169167
columns, err := e.extractColumns(keyspace, tableName)
170168
if err != nil {
171-
return errors.Wrap(err, "failed to extract columns")
169+
return fmt.Errorf("failed to extract columns: %w", err)
172170
}
173171

174172
// push table to channel

‎plugins/extractors/cassandra/cassandra_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"github.com/gocql/gocql"
1616
"github.com/ory/dockertest/v3"
1717
"github.com/ory/dockertest/v3/docker"
18-
"github.com/pkg/errors"
1918
"github.com/raystack/meteor/models"
2019
meteorv1beta1 "github.com/raystack/meteor/models/raystack/meteor/v1beta1"
2120
"github.com/raystack/meteor/plugins"
@@ -165,7 +164,7 @@ func setup() (err error) {
165164
fmt.Sprintf(`GRANT ALL PERMISSIONS ON ALL KEYSPACES TO '%s'`, user),
166165
})
167166
if err != nil {
168-
return errors.Wrap(err, "fail to create database")
167+
return fmt.Errorf("fail to create database: %w", err)
169168
}
170169

171170
//create and populate tables
@@ -176,7 +175,7 @@ func setup() (err error) {
176175
fmt.Sprintf(`INSERT INTO %s.jobs (jobid, job, department) VALUES (2, 'test2', 'test22');`, keyspace),
177176
})
178177
if err != nil {
179-
return errors.Wrap(err, "fail to populate database")
178+
return fmt.Errorf("fail to populate database: %w", err)
180179
}
181180
return
182181
}

‎plugins/extractors/cassandra/localConfig/cassandra.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ commitlog_segment_size_in_mb: 32
1717
seed_provider:
1818
- class_name: org.apache.cassandra.locator.SimpleSeedProvider
1919
parameters:
20-
- seeds: "172.17.0.3"
20+
- seeds: "172.17.0.2"
2121
concurrent_reads: 32
2222
concurrent_writes: 32
2323
concurrent_counter_writes: 32
@@ -28,14 +28,14 @@ trickle_fsync: false
2828
trickle_fsync_interval_in_kb: 10240
2929
storage_port: 7000
3030
ssl_storage_port: 7001
31-
listen_address: 172.17.0.3
32-
broadcast_address: 172.17.0.3
31+
listen_address: 172.17.0.2
32+
broadcast_address: 172.17.0.2
3333
start_native_transport: true
3434
native_transport_port: 9042
3535
start_rpc: false
3636
rpc_address: 0.0.0.0
3737
rpc_port: 9160
38-
broadcast_rpc_address: 172.17.0.3
38+
broadcast_rpc_address: 172.17.0.2
3939
rpc_keepalive: true
4040
rpc_server_type: sync
4141
thrift_framed_transport_size_in_mb: 15

0 commit comments

Comments
 (0)