diff --git a/cmd/oteltestbedcol/go.mod b/cmd/oteltestbedcol/go.mod index bd1ba0c15423b..d811207393217 100644 --- a/cmd/oteltestbedcol/go.mod +++ b/cmd/oteltestbedcol/go.mod @@ -394,5 +394,3 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api v0.0.0-20180801171038-322a19404e37 replace github.com/outcaste-io/ristretto v0.2.0 => github.com/outcaste-io/ristretto v0.2.1 - -replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension => ../../extension/ackextension diff --git a/cmd/oteltestbedcol/go.sum b/cmd/oteltestbedcol/go.sum index 5fd442de7a371..1746ad0173798 100644 --- a/cmd/oteltestbedcol/go.sum +++ b/cmd/oteltestbedcol/go.sum @@ -521,6 +521,8 @@ github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM= github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.96.0 h1:dJOE5kknvWgR/WxWtLzYKenob3Ljd7Uw5fnC893Ss3w= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.96.0/go.mod h1:WZXs6MuwTW7oKSMdSvIgGeM4huVgnPlX7asnA99TZjk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= diff --git a/receiver/splunkhecreceiver/receiver.go b/receiver/splunkhecreceiver/receiver.go index 745ba944ecf7d..91744d9a0a364 100644 --- a/receiver/splunkhecreceiver/receiver.go +++ b/receiver/splunkhecreceiver/receiver.go @@ -42,7 +42,6 @@ const ( responseOKWithAckID = `{"text": "Success", "code": 0, "ackId": %d}` responseHecHealthy = `{"text": "HEC is healthy", "code": 17}` responseInvalidMethodPostOnly = `"Only \"POST\" method is supported"` - responseInvalidMethodGetOnly = `"Only \"GET\" method is supported"` responseInvalidEncoding = `"\"Content-Encoding\" must be \"gzip\" or empty"` responseInvalidDataFormat = `{"text":"Invalid data format","code":6}` responseErrEventRequired = `{"text":"Event field is required","code":12}` @@ -79,7 +78,6 @@ var ( invalidEncodingRespBody = []byte(responseInvalidEncoding) invalidFormatRespBody = []byte(responseInvalidDataFormat) invalidMethodRespBodyPostOnly = []byte(responseInvalidMethodPostOnly) - invalidMethodRespBodyGetOnly = []byte(responseInvalidMethodGetOnly) errGzipReaderRespBody = []byte(responseErrGzipReader) errUnmarshalBodyRespBody = []byte(responseErrUnmarshalBody) errInternalServerError = []byte(responseErrInternalServerError) @@ -293,7 +291,7 @@ func (r *splunkReceiver) handleAck(resp http.ResponseWriter, req *http.Request) // check that the channel exists partitionID := req.Header.Get(splunk.HTTPSplunkChannelHeader) - if len(partitionID) <= 0 { + if len(partitionID) == 0 { r.failRequest(ctx, resp, http.StatusBadRequest, requiredDataChannelHeader, 0, nil) return } @@ -337,7 +335,7 @@ func (r *splunkReceiver) handleRawReq(resp http.ResponseWriter, req *http.Reques if r.ackExt != nil { // check channel header exists partitionID = req.Header.Get(splunk.HTTPSplunkChannelHeader) - if len(partitionID) <= 0 { + if len(partitionID) == 0 { r.failRequest(ctx, resp, http.StatusBadRequest, requiredDataChannelHeader, 0, nil) return } @@ -439,7 +437,7 @@ func (r *splunkReceiver) handleReq(resp http.ResponseWriter, req *http.Request) if r.ackExt != nil { // check channel header exists partitionID = req.Header.Get(splunk.HTTPSplunkChannelHeader) - if len(partitionID) <= 0 { + if len(partitionID) == 0 { r.failRequest(ctx, resp, http.StatusBadRequest, requiredDataChannelHeader, 0, nil) return } diff --git a/receiver/splunkhecreceiver/receiver_test.go b/receiver/splunkhecreceiver/receiver_test.go index f35203c46e8e1..06ace788ff3c6 100644 --- a/receiver/splunkhecreceiver/receiver_test.go +++ b/receiver/splunkhecreceiver/receiver_test.go @@ -1401,12 +1401,12 @@ func Test_splunkhecReceiver_handleRawReq_WithAck(t *testing.T) { rcv, err := newLogsReceiver(receivertest.NewNopCreateSettings(), *config, sink) assert.NoError(t, err) - mockHost := mockHost{extensions: map[component.ID]component.Component{ + mh := mockHost{extensions: map[component.ID]component.Component{ id: tt.setupMockAckExtension(t), }} r := rcv.(*splunkReceiver) - assert.NoError(t, r.Start(context.Background(), mockHost)) + assert.NoError(t, r.Start(context.Background(), mh)) defer func() { assert.NoError(t, r.Shutdown(context.Background())) }() @@ -1519,11 +1519,11 @@ func Test_splunkhecReceiver_handleReq_WithAck(t *testing.T) { r := rcv.(*splunkReceiver) w := httptest.NewRecorder() - mockHost := mockHost{extensions: map[component.ID]component.Component{ + mh := mockHost{extensions: map[component.ID]component.Component{ id: tt.setupMockAckExtension(t), }} - assert.NoError(t, r.Start(context.Background(), mockHost)) + assert.NoError(t, r.Start(context.Background(), mh)) defer func() { assert.NoError(t, r.Shutdown(context.Background())) }()