resolve conflicts with master

exporter/prometheusremotewriteexporter/exporter.go

@@ -83,7 +83,7 @@ func (prwe *prwExporter) pushMetrics(ctx context.Context, md pdata.Metrics) (int
 	defer prwe.wg.Done()
 	select {
 	case <-prwe.closeChan:
-		return pdatautil.MetricCount(md), errors.Errorf("shutdown has been called")
+		return pdatautil.MetricCount(md), errors.New("shutdown has been called")
 	default:
 		tsMap := map[string]*prompb.TimeSeries{}
 		dropped := 0
@@ -119,7 +119,7 @@ func (prwe *prwExporter) pushMetrics(ctx context.Context, md pdata.Metrics) (int
 		}
 
 		if dropped != 0 {
-			return dropped, errors.Errorf(strings.Join(errs, "\n"))
+			return dropped, errors.New(strings.Join(errs, "\n"))
 		}
 
 		return 0, nil
@@ -137,7 +137,7 @@ func (prwe *prwExporter) handleScalarMetric(tsMap map[string]*prompb.TimeSeries,
 	// int points
 	case otlp.MetricDescriptor_MONOTONIC_INT64, otlp.MetricDescriptor_INT64:
 		if metric.Int64DataPoints == nil {
-			return errors.Errorf("nil data point field in metric" + metric.GetMetricDescriptor().Name)
+			return errors.New("nil data point field in metric" + metric.GetMetricDescriptor().Name)
 		}
 
 		for _, pt := range metric.Int64DataPoints {
@@ -158,7 +158,7 @@ func (prwe *prwExporter) handleScalarMetric(tsMap map[string]*prompb.TimeSeries,
 	// double points
 	case otlp.MetricDescriptor_MONOTONIC_DOUBLE, otlp.MetricDescriptor_DOUBLE:
 		if metric.DoubleDataPoints == nil {
-			return errors.Errorf("nil data point field in metric" + metric.GetMetricDescriptor().Name)
+			return errors.New("nil data point field in metric" + metric.GetMetricDescriptor().Name)
 		}
 		for _, pt := range metric.DoubleDataPoints {
 
@@ -175,7 +175,7 @@ func (prwe *prwExporter) handleScalarMetric(tsMap map[string]*prompb.TimeSeries,
 		return nil
 	}
 
-	return errors.Errorf("invalid metric type: wants int or double data points")
+	return errors.New("invalid metric type: wants int or double data points")
 }
 
 // export sends a Snappy-compressed WriteRequest containing TimeSeries to a remote write endpoint in order
@@ -222,7 +222,8 @@ func (prwe *prwExporter) export(ctx context.Context, tsMap map[string]*prompb.Ti
 		if scanner.Scan() {
 			line = scanner.Text()
 		}
-		return errors.Errorf("server returned HTTP status %s: %s", httpResp.Status, line)
+		errMsg := "server returned HTTP status " + httpResp.Status + ": " + line
+		return errors.New(errMsg)
 	}
 	return nil
 }