From aa0169e267b31d674bbc037113e279ba7cfe021d Mon Sep 17 00:00:00 2001 From: bugslayer-332 Date: Sun, 16 Jul 2023 09:50:25 +0530 Subject: [PATCH] fixed naming convention Signed-off-by: bugslayer-332 --- cmd/collector/app/collector.go | 2 +- cmd/collector/app/flags/flags.go | 12 ++++++------ cmd/collector/app/handler/otlp_receiver.go | 4 ++-- cmd/collector/app/server/zipkin.go | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cmd/collector/app/collector.go b/cmd/collector/app/collector.go index ab9ff0e765f..6ecfd8d0bf9 100644 --- a/cmd/collector/app/collector.go +++ b/cmd/collector/app/collector.go @@ -146,7 +146,7 @@ func (c *Collector) Start(options *flags.CollectorOptions) error { Handler: c.spanHandlers.ZipkinSpansHandler, TLSConfig: options.Zipkin.TLS, HealthCheck: c.hCheck, - CORSSettings: options.Zipkin.CORSSettings, + CORSConfig: options.Zipkin.CORS, Logger: c.logger, MetricsFactory: c.metricsFactory, KeepAlive: options.Zipkin.KeepAlive, diff --git a/cmd/collector/app/flags/flags.go b/cmd/collector/app/flags/flags.go index e1df072e352..fdcbbc4e0dd 100644 --- a/cmd/collector/app/flags/flags.go +++ b/cmd/collector/app/flags/flags.go @@ -127,8 +127,8 @@ type CollectorOptions struct { HTTPHostPort string // TLS configures secure transport for Zipkin endpoint to collect spans TLS tlscfg.Options - // CORSSettings allows CORS requests , sets the values for Allowed Headers and Allowed Origins. - CORSSettings corscfg.Options + // CORS allows CORS requests , sets the values for Allowed Headers and Allowed Origins. + CORS corscfg.Options // KeepAlive configures allow Keep-Alive for Zipkin HTTP server KeepAlive bool } @@ -155,8 +155,8 @@ type HTTPOptions struct { ReadHeaderTimeout time.Duration // IdleTimeout sets the respective parameter of http.Server IdleTimeout time.Duration - // CORSSettings allows CORS requests , sets the values for Allowed Headers and Allowed Origins. - CORSSettings corscfg.Options + // CORS allows CORS requests , sets the values for Allowed Headers and Allowed Origins. + CORS corscfg.Options } // GRPCOptions defines options for a gRPC server @@ -277,7 +277,7 @@ func (cOpts *CollectorOptions) InitFromViper(v *viper.Viper, logger *zap.Logger) if err := cOpts.OTLP.HTTP.initFromViper(v, logger, otlpServerFlagsCfg.HTTP); err != nil { return cOpts, fmt.Errorf("failed to parse OTLP/HTTP server options: %w", err) } - cOpts.OTLP.HTTP.CORSSettings = corsOTLPFlags.InitFromViper(v) + cOpts.OTLP.HTTP.CORS = corsOTLPFlags.InitFromViper(v) if err := cOpts.OTLP.GRPC.initFromViper(v, logger, otlpServerFlagsCfg.GRPC); err != nil { return cOpts, fmt.Errorf("failed to parse OTLP/gRPC server options: %w", err) } @@ -289,7 +289,7 @@ func (cOpts *CollectorOptions) InitFromViper(v *viper.Viper, logger *zap.Logger) } else { return cOpts, fmt.Errorf("failed to parse Zipkin TLS options: %w", err) } - cOpts.Zipkin.CORSSettings = corsZipkinFlags.InitFromViper(v) + cOpts.Zipkin.CORS = corsZipkinFlags.InitFromViper(v) return cOpts, nil } diff --git a/cmd/collector/app/handler/otlp_receiver.go b/cmd/collector/app/handler/otlp_receiver.go index 85d6f49d15a..c27e9fe5fbb 100644 --- a/cmd/collector/app/handler/otlp_receiver.go +++ b/cmd/collector/app/handler/otlp_receiver.go @@ -128,8 +128,8 @@ func applyHTTPSettings(cfg *confighttp.HTTPServerSettings, opts *flags.HTTPOptio if opts.TLS.Enabled { cfg.TLSSetting = applyTLSSettings(&opts.TLS) } - cfg.CORS.AllowedHeaders = opts.CORSSettings.AllowedHeaders - cfg.CORS.AllowedOrigins = opts.CORSSettings.AllowedOrigins + cfg.CORS.AllowedHeaders = opts.CORS.AllowedHeaders + cfg.CORS.AllowedOrigins = opts.CORS.AllowedOrigins } func applyTLSSettings(opts *tlscfg.Options) *configtls.TLSServerSetting { diff --git a/cmd/collector/app/server/zipkin.go b/cmd/collector/app/server/zipkin.go index 048f4a3f1c9..1abe7a43b3b 100644 --- a/cmd/collector/app/server/zipkin.go +++ b/cmd/collector/app/server/zipkin.go @@ -39,7 +39,7 @@ type ZipkinServerParams struct { TLSConfig tlscfg.Options HostPort string Handler handler.ZipkinSpansHandler - CORSSettings corscfg.Options + CORSConfig corscfg.Options HealthCheck *healthcheck.HealthCheck Logger *zap.Logger MetricsFactory metrics.Factory @@ -86,9 +86,9 @@ func serveZipkin(server *http.Server, listener net.Listener, params *ZipkinServe zHandler.RegisterRoutes(r) cors := cors.New(cors.Options{ - AllowedOrigins: params.CORSSettings.AllowedOrigins, + AllowedOrigins: params.CORSConfig.AllowedOrigins, AllowedMethods: []string{"POST"}, // Allowing only POST, because that's the only handled one - AllowedHeaders: params.CORSSettings.AllowedHeaders, + AllowedHeaders: params.CORSConfig.AllowedHeaders, }) recoveryHandler := recoveryhandler.NewRecoveryHandler(params.Logger, true)