@@ -30,11 +30,11 @@ import (
30
30
const headerContentEncoding = "Content-Encoding"
31
31
32
32
// HTTPClientSettings defines settings for creating an HTTP client.
33
- // Deprecated: [v0.94.0] Use HTTPClientConfig instead
34
- type HTTPClientSettings = HTTPClientConfig
33
+ // Deprecated: [v0.94.0] Use ClientConfig instead
34
+ type HTTPClientSettings = ClientConfig
35
35
36
- // HTTPClientConfig defines settings for creating an HTTP client.
37
- type HTTPClientConfig struct {
36
+ // ClientConfig defines settings for creating an HTTP client.
37
+ type ClientConfig struct {
38
38
// The target URL to send data to (e.g.: http://some.url:9411/v1/traces).
39
39
Endpoint string `mapstructure:"endpoint"`
40
40
@@ -107,28 +107,28 @@ type HTTPClientConfig struct {
107
107
// the default values of 'MaxIdleConns' and 'IdleConnTimeout'.
108
108
// Other config options are not added as they are initialized with 'zero value' by GoLang as default.
109
109
// We encourage to use this function to create an object of HTTPClientSettings.
110
- // Deprecated: [v0.94.0] Use NewDefaultHTTPClientConfig instead
111
- func NewDefaultHTTPClientSettings () HTTPClientConfig {
112
- return NewDefaultHTTPClientConfig ()
110
+ // Deprecated: [v0.94.0] Use NewDefaultClientConfig instead
111
+ func NewDefaultHTTPClientSettings () ClientConfig {
112
+ return NewDefaultClientConfig ()
113
113
}
114
114
115
- // NewDefaultHTTPClientConfig returns HTTPClientConfig type object with
115
+ // NewDefaultClientConfig returns ClientConfig type object with
116
116
// the default values of 'MaxIdleConns' and 'IdleConnTimeout'.
117
117
// Other config options are not added as they are initialized with 'zero value' by GoLang as default.
118
- // We encourage to use this function to create an object of HTTPClientConfig .
119
- func NewDefaultHTTPClientConfig () HTTPClientConfig {
118
+ // We encourage to use this function to create an object of ClientConfig .
119
+ func NewDefaultClientConfig () ClientConfig {
120
120
// The default values are taken from the values of 'DefaultTransport' of 'http' package.
121
121
maxIdleConns := 100
122
122
idleConnTimeout := 90 * time .Second
123
123
124
- return HTTPClientConfig {
124
+ return ClientConfig {
125
125
MaxIdleConns : & maxIdleConns ,
126
126
IdleConnTimeout : & idleConnTimeout ,
127
127
}
128
128
}
129
129
130
130
// ToClient creates an HTTP client.
131
- func (hcs * HTTPClientConfig ) ToClient (host component.Host , settings component.TelemetrySettings ) (* http.Client , error ) {
131
+ func (hcs * ClientConfig ) ToClient (host component.Host , settings component.TelemetrySettings ) (* http.Client , error ) {
132
132
tlsCfg , err := hcs .TLSSetting .LoadTLSConfig ()
133
133
if err != nil {
134
134
return nil , err
@@ -257,11 +257,11 @@ func (interceptor *headerRoundTripper) RoundTrip(req *http.Request) (*http.Respo
257
257
}
258
258
259
259
// HTTPServerSettings defines settings for creating an HTTP server.
260
- // Deprecated: [v0.94.0] Use HTTPServerConfig instead
261
- type HTTPServerSettings = HTTPServerConfig
260
+ // Deprecated: [v0.94.0] Use ServerConfig instead
261
+ type HTTPServerSettings = ServerConfig
262
262
263
- // HTTPServerConfig defines settings for creating an HTTP server.
264
- type HTTPServerConfig struct {
263
+ // ServerConfig defines settings for creating an HTTP server.
264
+ type ServerConfig struct {
265
265
// Endpoint configures the listening address for the server.
266
266
Endpoint string `mapstructure:"endpoint"`
267
267
@@ -287,7 +287,7 @@ type HTTPServerConfig struct {
287
287
}
288
288
289
289
// ToListener creates a net.Listener.
290
- func (hss * HTTPServerConfig ) ToListener () (net.Listener , error ) {
290
+ func (hss * ServerConfig ) ToListener () (net.Listener , error ) {
291
291
listener , err := net .Listen ("tcp" , hss .Endpoint )
292
292
if err != nil {
293
293
return nil , err
@@ -306,14 +306,14 @@ func (hss *HTTPServerConfig) ToListener() (net.Listener, error) {
306
306
}
307
307
308
308
// toServerOptions has options that change the behavior of the HTTP server
309
- // returned by HTTPServerConfig .ToServer().
309
+ // returned by ServerConfig .ToServer().
310
310
type toServerOptions struct {
311
311
errHandler func (w http.ResponseWriter , r * http.Request , errorMsg string , statusCode int )
312
312
decoders map [string ]func (body io.ReadCloser ) (io.ReadCloser , error )
313
313
}
314
314
315
315
// ToServerOption is an option to change the behavior of the HTTP server
316
- // returned by HTTPServerConfig .ToServer().
316
+ // returned by ServerConfig .ToServer().
317
317
type ToServerOption func (opts * toServerOptions )
318
318
319
319
// WithErrorHandler overrides the HTTP error handler that gets invoked
@@ -336,7 +336,7 @@ func WithDecoder(key string, dec func(body io.ReadCloser) (io.ReadCloser, error)
336
336
}
337
337
338
338
// ToServer creates an http.Server from settings object.
339
- func (hss * HTTPServerConfig ) ToServer (host component.Host , settings component.TelemetrySettings , handler http.Handler , opts ... ToServerOption ) (* http.Server , error ) {
339
+ func (hss * ServerConfig ) ToServer (host component.Host , settings component.TelemetrySettings , handler http.Handler , opts ... ToServerOption ) (* http.Server , error ) {
340
340
internal .WarnOnUnspecifiedHost (settings .Logger , hss .Endpoint )
341
341
342
342
serverOpts := & toServerOptions {}
0 commit comments