Skip to content

Commit

Permalink
Merge pull request #294 from gotd/dependabot/go_modules/github.com/go…
Browse files Browse the repository at this point in the history
…-faster/sdk-0.18.0

chore(deps): bump github.com/go-faster/sdk from 0.15.2 to 0.18.0
  • Loading branch information
ernado authored Jan 20, 2025
2 parents 3506361 + 0e4e6cf commit 94ad84d
Show file tree
Hide file tree
Showing 7 changed files with 107 additions and 92 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: Commit linter

on:
pull_request:

# Common Go workflows from go faster
# See https://github.com/go-faster/x
jobs:
check:
uses: go-faster/x/.github/workflows/commit.yml@main
2 changes: 0 additions & 2 deletions .github/workflows/x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,5 @@ on:
jobs:
test:
uses: go-faster/x/.github/workflows/test.yml@main
commit:
uses: go-faster/x/.github/workflows/commit.yml@main
lint:
uses: go-faster/x/.github/workflows/lint.yml@main
10 changes: 1 addition & 9 deletions .k8s/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,23 +80,15 @@ spec:
memory: 2G
env:
- name: GOMEMLIMIT
value: "2048MiB"
value: "512MiB"
- name: GOMAXPROCS
value: "3"
- name: OTEL_EXPORTER_OTLP_PROTOCOL
value: "grpc"
- name: OTEL_METRICS_EXPORTER
value: "otlp"
- name: OTEL_LOGS_EXPORTER
value: "otlp"
- name: PPROF_ADDR
value: "0.0.0.0:8090"
- name: OTEL_RESOURCE_ATTRIBUTES
value: "service.name=gotd.bot"
- name: OTEL_LOG_LEVEL
value: "DEBUG"
- name: OTEL_TRACES_EXPORTER
value: "otlp"
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: "http://otel-collector.monitoring.svc.cluster.local:4317"
- name: HOME
Expand Down
4 changes: 2 additions & 2 deletions cmd/bot/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ type App struct {
srv *oas.Server
}

func InitApp(m *app.Metrics, mm *iapp.Metrics, logger *zap.Logger) (_ *App, rerr error) {
func InitApp(m *app.Telemetry, mm *iapp.Metrics, logger *zap.Logger) (_ *App, rerr error) {
// Reading app id from env (never hardcode it!).
appID, err := strconv.Atoi(os.Getenv("APP_ID"))
if err != nil {
Expand Down Expand Up @@ -339,7 +339,7 @@ func (b *App) Run(ctx context.Context) error {
return group.Wait()
}

func runBot(ctx context.Context, m *app.Metrics, mm *iapp.Metrics, logger *zap.Logger) (rerr error) {
func runBot(ctx context.Context, m *app.Telemetry, mm *iapp.Metrics, logger *zap.Logger) (rerr error) {
a, err := InitApp(m, mm, logger)
if err != nil {
return errors.Wrap(err, "initialize")
Expand Down
2 changes: 1 addition & 1 deletion cmd/bot/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
)

func main() {
app.Run(func(ctx context.Context, lg *zap.Logger, m *app.Metrics) error {
app.Run(func(ctx context.Context, lg *zap.Logger, m *app.Telemetry) error {
defer func() {
if r := recover(); r != nil {
lg.Error("panic", zap.Any("recover", r))
Expand Down
57 changes: 31 additions & 26 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/cockroachdb/pebble v1.1.3
github.com/go-faster/errors v0.7.1
github.com/go-faster/jx v1.1.0
github.com/go-faster/sdk v0.15.2
github.com/go-faster/sdk v0.18.0
github.com/go-redis/redis/v8 v8.11.5
github.com/google/go-github/v42 v42.0.0
github.com/google/uuid v1.6.0
Expand Down Expand Up @@ -91,7 +91,7 @@ require (
github.com/google/go-querystring v1.1.0 // indirect
github.com/gotd/ige v0.2.2 // indirect
github.com/gotd/neo v0.1.5 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
github.com/hashicorp/hcl/v2 v2.17.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
Expand All @@ -112,7 +112,7 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.20.5 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.60.1 // indirect
github.com/prometheus/common v0.61.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rogpeppe/go-internal v1.13.1 // indirect
github.com/segmentio/asm v1.2.0 // indirect
Expand All @@ -121,39 +121,44 @@ require (
github.com/zclconf/go-cty v1.13.2 // indirect
go.etcd.io/bbolt v1.3.11 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/pdata v1.20.0 // indirect
go.opentelemetry.io/contrib/instrumentation/runtime v0.57.0 // indirect
go.opentelemetry.io/contrib/propagators/autoprop v0.57.0 // indirect
go.opentelemetry.io/contrib/propagators/aws v1.32.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.32.0 // indirect
go.opentelemetry.io/contrib/propagators/jaeger v1.32.0 // indirect
go.opentelemetry.io/contrib/propagators/ot v1.32.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.32.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.54.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.32.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 // indirect
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.opentelemetry.io/contrib/bridges/otelzap v0.8.0 // indirect
go.opentelemetry.io/contrib/instrumentation/runtime v0.58.0 // indirect
go.opentelemetry.io/contrib/propagators/autoprop v0.58.0 // indirect
go.opentelemetry.io/contrib/propagators/aws v1.33.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.33.0 // indirect
go.opentelemetry.io/contrib/propagators/jaeger v1.33.0 // indirect
go.opentelemetry.io/contrib/propagators/ot v1.33.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.9.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.9.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.33.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.33.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.55.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.9.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.33.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.33.0 // indirect
go.opentelemetry.io/otel/log v0.9.0 // indirect
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
go.opentelemetry.io/otel/sdk/log v0.9.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.33.0 // indirect
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/automaxprocs v1.6.0 // indirect
go.uber.org/ratelimit v0.3.1 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/exp v0.0.0-20230725093048-515e97ebf090 // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.8.0 // indirect
golang.org/x/tools v0.28.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/grpc v1.68.0 // indirect
google.golang.org/protobuf v1.35.1 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
google.golang.org/grpc v1.69.2 // indirect
google.golang.org/protobuf v1.35.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
rsc.io/qr v0.2.0 // indirect
Expand Down
Loading

0 comments on commit 94ad84d

Please sign in to comment.