Skip to content

Commit

Permalink
code review
Browse files Browse the repository at this point in the history
Signed-off-by: Yuri Shkuro <github@ysh.us>
  • Loading branch information
yurishkuro committed Nov 29, 2024
1 parent b6cd582 commit 5bc515e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions cmd/all-in-one/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (

"github.com/spf13/cobra"
"github.com/spf13/viper"
noopmetric "go.opentelemetry.io/otel/metric/noop"
_ "go.uber.org/automaxprocs"
"go.uber.org/zap"

Expand Down Expand Up @@ -96,6 +97,7 @@ by default uses only in-memory database.`,
Logger: svc.Logger,
TracerProvider: tracer.OTEL,
Metrics: baseFactory,
MeterProvider: noopmetric.NewMeterProvider(),
ReportStatus: telemetry.HCAdapter(svc.HC()),
}

Expand Down Expand Up @@ -164,12 +166,12 @@ by default uses only in-memory database.`,
}

// query
qyeryTelset := baseTelset // copy
qyeryTelset.Metrics = queryMetricsFactory
queryTelset := baseTelset // copy
queryTelset.Metrics = queryMetricsFactory
querySrv := startQuery(
svc, qOpts, qOpts.BuildQueryServiceOptions(storageFactory, logger),
spanReader, dependencyReader, metricsQueryService,
tm, qyeryTelset,
tm, queryTelset,
)

svc.RunAndThen(func() {
Expand Down
2 changes: 1 addition & 1 deletion storage/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/jaegertracing/jaeger/storage/spanstore"
)

// Same as Factory, but without the Initialize method.
// BaseFactory is the same as Factory, but without the Initialize method.
// It was a design mistake originally to add Initialize to the Factory interface.
type BaseFactory interface {
// CreateSpanReader creates a spanstore.Reader.
Expand Down

0 comments on commit 5bc515e

Please # to comment.