update scrapers

exporter/datadogexporter/go.mod

@@ -362,7 +362,7 @@ require (
 	go.opentelemetry.io/collector/processor/processortest v0.114.1-0.20241130171227-c52d625647be // indirect
 	go.opentelemetry.io/collector/receiver/receiverprofiles v0.114.1-0.20241130171227-c52d625647be // indirect
 	go.opentelemetry.io/collector/receiver/receivertest v0.114.1-0.20241130171227-c52d625647be // indirect
-	go.opentelemetry.io/collector/scraper v0.114.0 // indirect
+	go.opentelemetry.io/collector/scraper v0.114.1-0.20241130171227-c52d625647be // indirect
 	go.opentelemetry.io/collector/service v0.114.1-0.20241130171227-c52d625647be // indirect
 	go.opentelemetry.io/contrib/bridges/otelzap v0.6.0 // indirect
 	go.opentelemetry.io/contrib/config v0.10.0 // indirect

internal/sqlquery/scraper.go

@@ -8,6 +8,7 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
+	"go.opentelemetry.io/collector/scraper"
 	"time"
 
 	"go.opentelemetry.io/collector/component"
@@ -37,7 +38,7 @@ type Scraper struct {
 	Db                 *sql.DB
 }
 
-var _ scraperhelper.Scraper = (*Scraper)(nil)
+var _ scraper.Metrics = (*Scraper)(nil)
 
 func NewScraper(id component.ID, query Query, scrapeCfg scraperhelper.ControllerConfig, logger *zap.Logger, telemetry TelemetryConfig, dbProviderFunc DbProviderFunc, clientProviderFunc ClientProviderFunc) *Scraper {
 	return &Scraper{
@@ -67,7 +68,7 @@ func (s *Scraper) Start(context.Context, component.Host) error {
 	return nil
 }
 
-func (s *Scraper) Scrape(ctx context.Context) (pmetric.Metrics, error) {
+func (s *Scraper) ScrapeMetrics(ctx context.Context) (pmetric.Metrics, error) {
 	out := pmetric.NewMetrics()
 	rows, err := s.Client.QueryRows(ctx)
 	if err != nil {

internal/sqlquery/scraper_test.go

@@ -35,7 +35,7 @@ func TestScraper_ClientErrorOnScrape(t *testing.T) {
 	scrpr := Scraper{
 		Client: client,
 	}
-	_, err := scrpr.Scrape(context.Background())
+	_, err := scrpr.ScrapeMetrics(context.Background())
 	require.Error(t, err)
 }
 
@@ -57,7 +57,7 @@ func TestScraper_RowToMetricErrorOnScrape_Float(t *testing.T) {
 			}},
 		},
 	}
-	_, err := scrpr.Scrape(context.Background())
+	_, err := scrpr.ScrapeMetrics(context.Background())
 	assert.Error(t, err)
 }
 
@@ -79,7 +79,7 @@ func TestScraper_RowToMetricErrorOnScrape_Int(t *testing.T) {
 			}},
 		},
 	}
-	_, err := scrpr.Scrape(context.Background())
+	_, err := scrpr.ScrapeMetrics(context.Background())
 	assert.Error(t, err)
 }
 
@@ -102,7 +102,7 @@ func TestScraper_RowToMetricMultiErrorsOnScrape(t *testing.T) {
 			}},
 		},
 	}
-	_, err := scrpr.Scrape(context.Background())
+	_, err := scrpr.ScrapeMetrics(context.Background())
 	assert.Error(t, err)
 }
 
@@ -135,7 +135,7 @@ func TestScraper_SingleRow_MultiMetrics(t *testing.T) {
 			},
 		},
 	}
-	metrics, err := scrpr.Scrape(context.Background())
+	metrics, err := scrpr.ScrapeMetrics(context.Background())
 	require.NoError(t, err)
 	rms := metrics.ResourceMetrics()
 	assert.Equal(t, 1, rms.Len())
@@ -204,7 +204,7 @@ func TestScraper_MultiRow(t *testing.T) {
 			},
 		},
 	}
-	metrics, err := scrpr.Scrape(context.Background())
+	metrics, err := scrpr.ScrapeMetrics(context.Background())
 	require.NoError(t, err)
 	ms := metrics.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics()
 	{
@@ -270,7 +270,7 @@ func TestScraper_MultiResults_DeltaSum(t *testing.T) {
 }
 
 func assertTransactionCount(t *testing.T, scrpr Scraper, expected int, agg pmetric.AggregationTemporality) {
-	metrics, err := scrpr.Scrape(context.Background())
+	metrics, err := scrpr.ScrapeMetrics(context.Background())
 	require.NoError(t, err)
 	metric := metrics.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(0)
 	assert.Equal(t, "transaction.count", metric.Name())
@@ -301,7 +301,7 @@ func TestScraper_Float(t *testing.T) {
 			}},
 		},
 	}
-	metrics, err := scrpr.Scrape(context.Background())
+	metrics, err := scrpr.ScrapeMetrics(context.Background())
 	require.NoError(t, err)
 	metric := metrics.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(0)
 	assert.Equal(t, 123.4, metric.Gauge().DataPoints().At(0).DoubleValue())
@@ -324,7 +324,7 @@ func TestScraper_DescriptionAndUnit(t *testing.T) {
 			}},
 		},
 	}
-	metrics, err := scrpr.Scrape(context.Background())
+	metrics, err := scrpr.ScrapeMetrics(context.Background())
 	require.NoError(t, err)
 	z := metrics.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(0)
 	assert.Equal(t, "my-unit", z.Unit())
@@ -346,7 +346,7 @@ func TestScraper_FakeDB_Warnings(t *testing.T) {
 			}},
 		},
 	}
-	_, err := scrpr.Scrape(context.Background())
+	_, err := scrpr.ScrapeMetrics(context.Background())
 	require.NoError(t, err)
 }
 
@@ -365,7 +365,7 @@ func TestScraper_FakeDB_MultiRows_Warnings(t *testing.T) {
 			}},
 		},
 	}
-	_, err := scrpr.Scrape(context.Background())
+	_, err := scrpr.ScrapeMetrics(context.Background())
 	// No error is expected because we're not actually asking for metrics from the
 	// NULL column. Instead the errors from the NULL reads should just log warnings.
 	assert.NoError(t, err)
@@ -393,7 +393,7 @@ func TestScraper_FakeDB_MultiRows_Error(t *testing.T) {
 			},
 		},
 	}
-	_, err := scrpr.Scrape(context.Background())
+	_, err := scrpr.ScrapeMetrics(context.Background())
 	// We expect an error here not directly because of the NULL values but because
 	// the column was also requested in Query.Metrics[1] but wasn't found. It's just
 	// a partial scrape error though so it shouldn't cause a Scraper shutdown.
@@ -424,7 +424,7 @@ func TestScraper_StartAndTSColumn(t *testing.T) {
 			}},
 		},
 	}
-	metrics, err := scrpr.Scrape(context.Background())
+	metrics, err := scrpr.ScrapeMetrics(context.Background())
 	require.NoError(t, err)
 	metric := metrics.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(0)
 	assert.Equal(t, pcommon.Timestamp(1682417791), metric.Sum().DataPoints().At(0).StartTimestamp())
@@ -453,7 +453,7 @@ func TestScraper_StartAndTS_ErrorOnColumnNotFound(t *testing.T) {
 			}},
 		},
 	}
-	_, err := scrpr.Scrape(context.Background())
+	_, err := scrpr.ScrapeMetrics(context.Background())
 	assert.Error(t, err)
 }
 
@@ -479,7 +479,7 @@ func TestScraper_CollectRowToMetricsErrors(t *testing.T) {
 			}},
 		},
 	}
-	_, err := scrpr.Scrape(context.Background())
+	_, err := scrpr.ScrapeMetrics(context.Background())
 	assert.ErrorContains(t, err, "rowToMetric: start_ts_column not found")
 	assert.ErrorContains(t, err, "rowToMetric: ts_column not found")
 	assert.ErrorContains(t, err, "rowToMetric: value_column 'mycol_na' not found in result set")
@@ -507,6 +507,6 @@ func TestScraper_StartAndTS_ErrorOnParse(t *testing.T) {
 			}},
 		},
 	}
-	_, err := scrpr.Scrape(context.Background())
+	_, err := scrpr.ScrapeMetrics(context.Background())
 	assert.Error(t, err)
 }