[exporter/honeycomb] fix lint for honeycombexporter (open-telemetry#1…

…2205) [exporter/honeycomb] fix link for honeycombexporter Signed-off-by: Ziqi Zhao <[email protected]>
sakulali · Jul 11, 2022 · 1da2fb9 · 1da2fb9
1 parent c62a9a8
commit 1da2fb9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/exporter/honeycombexporter/honeycomb.go b/exporter/honeycombexporter/honeycomb.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// nolint:errcheck
 package honeycombexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/honeycombexporter"
 
 import (
@@ -150,13 +149,16 @@ func (e *honeycombExporter) pushTraceData(ctx context.Context, td ptrace.Traces)
  startTime := timestampToTime(span.StartTimestamp())
  endTime := timestampToTime(span.EndTimestamp())
 
- ev.Add(event{
+ err := ev.Add(event{
  ID: getHoneycombSpanID(span.SpanID()),
  TraceID: getHoneycombTraceID(span.TraceID()),
  ParentID: getHoneycombSpanID(span.ParentSpanID()),
  Name: span.Name(),
  DurationMilli: float64(endTime.Sub(startTime)) / float64(time.Millisecond),
  })
+ if err != nil {
+ errs = multierr.Append(errs, err)
+ }
 
  e.sendMessageEvents(span, resourceAttrs)
  e.sendSpanLinks(span)
@@ -201,13 +203,16 @@ func (e *honeycombExporter) sendSpanLinks(span ptrace.Span) {
  l := links.At(i)
 
  ev := e.builder.NewEvent()
- ev.Add(link{
+ if err := ev.Add(link{
  TraceID: getHoneycombTraceID(span.TraceID()),
  ParentID: getHoneycombSpanID(span.SpanID()),
  LinkTraceID: getHoneycombTraceID(l.TraceID()),
  LinkSpanID: getHoneycombSpanID(l.SpanID()),
  AnnotationType: "link",
- })
+ }); err != nil {
+ e.onError(err)
+ }
+
  attrs := spanAttributesToMap(l.Attributes())
  for k, v := range attrs {
  ev.AddField(k, v)
@@ -244,13 +249,15 @@ func (e *honeycombExporter) sendMessageEvents(span ptrace.Span, resourceAttrs ma
  e.addSampleRate(ev, attrs)
 
  ev.Timestamp = ts
- ev.Add(spanEvent{
+ if err := ev.Add(spanEvent{
  Name: name,
  TraceID: getHoneycombTraceID(span.TraceID()),
  ParentID: getHoneycombSpanID(span.SpanID()),
  ParentName: span.Name(),
  AnnotationType: "span_event",
- })
+ }); err != nil {
+ e.onError(err)
+ }
  if err := ev.SendPresampled(); err != nil {
  e.onError(err)
  }

diff --git a/exporter/honeycombexporter/honeycomb_test.go b/exporter/honeycombexporter/honeycomb_test.go
@@ -11,8 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-
-// nolint:errcheck
 package honeycombexporter
 
 import (
@@ -64,7 +62,10 @@ func testingServer(callback func(data []honeycombData)) *httptest.Server {
  return
  }
  callback(data)
- rw.Write([]byte(`OK`))
+ if _, err = rw.Write([]byte(`OK`)); err != nil {
+ http.Error(rw, err.Error(), http.StatusInternalServerError)
+ return
+ }
  }))
 }
 
@@ -84,7 +85,7 @@ func testTracesExporter(td ptrace.Traces, t *testing.T, cfg *Config) []honeycomb
  ctx := context.Background()
  err = exporter.ConsumeTraces(ctx, td)
  require.NoError(t, err)
- exporter.Shutdown(context.Background())
+ require.NoError(t, exporter.Shutdown(context.Background()))
 
  return got
 }