Merge APM changes (#99)

config/confighttp/confighttp.go

@@ -32,7 +32,7 @@ type HTTPClientSettings struct {
 	Endpoint string `mapstructure:"endpoint"`
 
 	// TLSSetting struct exposes TLS client configuration.
-	TLSSetting configtls.TLSClientSetting `mapstructure:"tls"`
+	TLSSetting configtls.TLSClientSetting `mapstructure:"tls,omitempty"`
 
 	// ReadBufferSize for HTTP client. See http.Transport.ReadBufferSize.
 	ReadBufferSize int `mapstructure:"read_buffer_size"`
@@ -49,7 +49,7 @@ type HTTPClientSettings struct {
 	Headers map[string]configopaque.String `mapstructure:"headers"`
 
 	// Custom Round Tripper to allow for individual components to intercept HTTP requests
-	CustomRoundTripper func(next http.RoundTripper) (http.RoundTripper, error)
+	CustomRoundTripper func(next http.RoundTripper) (http.RoundTripper, error) `mapstructure:"-"`
 
 	// Auth configuration for outgoing HTTP calls.
 	Auth *configauth.Authentication `mapstructure:"auth"`

exporter/lokiexporter/factory_test.go

@@ -21,6 +21,7 @@ const (
 func TestExporter_new(t *testing.T) {
 	t.Run("with valid config", func(t *testing.T) {
 		config := &Config{
+
 			HTTPClientSettings: confighttp.HTTPClientSettings{
 				Endpoint: validEndpoint,
 			},

processor/resourcedetectionprocessor/go.mod

@@ -126,6 +126,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/e
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders => ../../internal/metadataproviders
 
+replace go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp
+
 retract (
 	v0.76.2
 	v0.76.1