Skip to content

Commit

Permalink
Removed Comments
Browse files Browse the repository at this point in the history
Signed-off-by: Wise-Wizard <[email protected]>
  • Loading branch information
Wise-Wizard committed Jul 16, 2024
1 parent 3b20fb9 commit 29d0096
Showing 1 changed file with 6 additions and 19 deletions.
25 changes: 6 additions & 19 deletions cmd/jaeger/internal/extension/jaegerquery/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ package jaegerquery

import (
"context"
"errors"
"fmt"

"go.opentelemetry.io/collector/component"
Expand All @@ -25,10 +24,9 @@ var (
)

type server struct {
config *Config
server *queryApp.Server
telset component.TelemetrySettings
closeTracer func(ctx context.Context) error
config *Config
server *queryApp.Server
telset component.TelemetrySettings
}

func newServer(config *Config, otel component.TelemetrySettings) *server {
Expand Down Expand Up @@ -72,11 +70,7 @@ func (s *server) Start(_ context.Context, host component.Host) error {
// TODO OTel-collector does not initialize the tracer currently
// https://github.com/open-telemetry/opentelemetry-collector/issues/7532
//nolint
// tracerProvider, err := jtracer.New("jaeger")
// if err != nil {
// return fmt.Errorf("could not initialize a tracer: %w", err)
// }
// s.closeTracer = tracerProvider.Close

telset := telemetery.Setting{
Logger: s.telset.Logger,
TracerProvider: s.telset.TracerProvider,
Expand Down Expand Up @@ -132,13 +126,6 @@ func (s *server) makeQueryOptions() *queryApp.QueryOptions {
}
}

func (s *server) Shutdown(ctx context.Context) error {
var errs []error
if s.server != nil {
errs = append(errs, s.server.Close())
}
if s.closeTracer != nil {
errs = append(errs, s.closeTracer(ctx))
}
return errors.Join(errs...)
func (s *server) Shutdown(_ context.Context) error {
return s.server.Close()
}

0 comments on commit 29d0096

Please sign in to comment.