update otel collector version (#935)

* update go mod
nginx · Nov 29, 2024 · 53c3224 · 53c3224
1 parent ca1c468
commit 53c3224
Show file tree

Hide file tree

Showing 22 changed files with 701 additions and 1,119 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ The following packages need to be installed:
 ```
 git clone https://github.com/open-telemetry/opentelemetry-collector.git
 cd opentelemetry-collector
-git checkout v0.108.1
+git checkout v0.114.0
 cd cmd/mdatagen
 go install
 ```

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/internal/collector/factories.go b/internal/collector/factories.go
@@ -14,22 +14,10 @@ import (
 	"github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver"
 	"go.opentelemetry.io/collector/component"
@@ -119,23 +107,11 @@ func createProcessorFactories() (map[component.Type]processor.Factory, error) {
 	processorList := []processor.Factory{
 		attributesprocessor.NewFactory(),
 		batchprocessor.NewFactory(),
-		cumulativetodeltaprocessor.NewFactory(),
 		deltatorateprocessor.NewFactory(),
 		filterprocessor.NewFactory(),
-		groupbyattrsprocessor.NewFactory(),
-		groupbytraceprocessor.NewFactory(),
-		k8sattributesprocessor.NewFactory(),
 		memorylimiterprocessor.NewFactory(),
-		metricsgenerationprocessor.NewFactory(),
-		metricstransformprocessor.NewFactory(),
-		probabilisticsamplerprocessor.NewFactory(),
 		redactionprocessor.NewFactory(),
-		remotetapprocessor.NewFactory(),
-		resourcedetectionprocessor.NewFactory(),
 		resourceprocessor.NewFactory(),
-		routingprocessor.NewFactory(),
-		spanprocessor.NewFactory(),
-		tailsamplingprocessor.NewFactory(),
 		transformprocessor.NewFactory(),
 	}
 

diff --git a/internal/collector/factories_test.go b/internal/collector/factories_test.go
@@ -19,7 +19,7 @@ func TestOTelComponentFactoriesDefault(t *testing.T) {
 	assert.NotNil(t, factories, "factories should not be nil")
 
 	assert.Len(t, factories.Receivers, 4)
-	assert.Len(t, factories.Processors, 20)
+	assert.Len(t, factories.Processors, 8)
 	assert.Len(t, factories.Exporters, 4)
 	assert.Len(t, factories.Extensions, 3)
 	assert.Empty(t, factories.Connectors)

diff --git a/internal/collector/nginxossreceiver/factory.go b/internal/collector/nginxossreceiver/factory.go
@@ -44,15 +44,15 @@ func createMetricsReceiver(
 
 	ns := stubstatus.NewScraper(params, cfg)
 	scraperOpts := []scraperhelper.ScraperControllerOption{
-		scraperhelper.AddScraper(ns),
+		scraperhelper.AddScraperWithType(metadata.Type, ns),
 	}
 
 	if len(cfg.AccessLogs) > 0 {
 		nals, err := accesslog.NewScraper(params, cfg)
 		if err != nil {
 			logger.Errorf("Failed to initialize NGINX Access Log scraper: %s", err.Error())
 		} else {
-			scraperOpts = append(scraperOpts, scraperhelper.AddScraper(nals))
+			scraperOpts = append(scraperOpts, scraperhelper.AddScraperWithType(metadata.Type, nals))
 		}
 	}
 

diff --git a/internal/collector/nginxossreceiver/factory_test.go b/internal/collector/nginxossreceiver/factory_test.go
@@ -34,7 +34,7 @@ func TestValidConfig(t *testing.T) {
 
 func TestCreateMetricsReceiver(t *testing.T) {
 	factory := NewFactory()
-	metricsReceiver, err := factory.CreateMetricsReceiver(
+	metricsReceiver, err := factory.CreateMetrics(
 		context.Background(),
 		receivertest.NewNopSettings(),
 		&config.Config{

diff --git a/internal/collector/nginxossreceiver/generated_component_test.go b/internal/collector/nginxossreceiver/generated_component_test.go
diff --git a/internal/collector/nginxossreceiver/internal/metadata/generated_config_test.go b/internal/collector/nginxossreceiver/internal/metadata/generated_config_test.go
diff --git a/internal/collector/nginxossreceiver/internal/metadata/generated_metrics.go b/internal/collector/nginxossreceiver/internal/metadata/generated_metrics.go
diff --git a/internal/collector/nginxossreceiver/internal/metadata/generated_metrics_test.go b/internal/collector/nginxossreceiver/internal/metadata/generated_metrics_test.go
diff --git a/internal/collector/nginxossreceiver/internal/metadata/generated_resource_test.go b/internal/collector/nginxossreceiver/internal/metadata/generated_resource_test.go