Revert "Rename extenstion to ddflareextension (#28390)"

This reverts commit 14a8524.

comp/README.md

@@ -383,9 +383,9 @@ Package configstore defines the otel agent configstore component.
 
 Package converter defines the otel agent converter component.
 
-### [comp/otelcol/ddflareextension](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension)
+### [comp/otelcol/extension](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/otelcol/extension)
 
-Package ddflareextension defines the OpenTelemetry Extension component.
+Package extension defines the OpenTelemetry Extension component.
 
 ### [comp/otelcol/logsagentpipeline](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline)
 

comp/otelcol/collector/impl-pipeline/flare_filler.go

@@ -23,7 +23,7 @@ import (
 	"github.com/gocolly/colly/v2"
 
 	flaretypes "github.com/DataDog/datadog-agent/comp/core/flare/types"
-	extension "github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def"
+	extension "github.com/DataDog/datadog-agent/comp/otelcol/extension/def"
 	"github.com/DataDog/datadog-agent/pkg/util/log"
 )
 

comp/otelcol/collector/impl/collector.go

@@ -28,7 +28,7 @@ import (
 	collectorcontrib "github.com/DataDog/datadog-agent/comp/otelcol/collector-contrib/def"
 	collector "github.com/DataDog/datadog-agent/comp/otelcol/collector/def"
 	configstore "github.com/DataDog/datadog-agent/comp/otelcol/configstore/def"
-	ddextension "github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/impl"
+	ddextension "github.com/DataDog/datadog-agent/comp/otelcol/extension/impl"
 	"github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline"
 	"github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/datadogexporter"
 	"github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/serializerexporter"

comp/otelcol/collector/impl/testdata/simple-dd/config-enhanced-result.yaml

@@ -3,7 +3,7 @@ exporters:
   datadog:
     api:
       fail_on_invalid_key: false
-      key: "[REDACTED]"
+      key: '[REDACTED]'
       site: datadoghq.com
     auth: null
     compression: ""
@@ -69,15 +69,15 @@ exporters:
     timeout: 15s
     tls:
       ca_file: ""
-      ca_pem: "[REDACTED]"
+      ca_pem: '[REDACTED]'
       cert_file: ""
-      cert_pem: "[REDACTED]"
+      cert_pem: '[REDACTED]'
       cipher_suites: []
       include_system_ca_certs_pool: false
       insecure: false
       insecure_skip_verify: false
       key_file: ""
-      key_pem: "[REDACTED]"
+      key_pem: '[REDACTED]'
       max_version: ""
       min_version: ""
       reload_interval: 0s
@@ -93,7 +93,7 @@ exporters:
       trace_buffer: 0
     write_buffer_size: 0
 extensions:
-  ddflare/dd-autoconfigured:
+  datadog/dd-autoconfigured:
     auth: null
     compression_algorithms: []
     configstore: {}
@@ -154,74 +154,74 @@ receivers:
         evaluation_interval: 1m
         scrape_interval: 1m
         scrape_protocols:
-          - OpenMetricsText1.0.0
-          - OpenMetricsText0.0.1
-          - PrometheusText0.0.4
+        - OpenMetricsText1.0.0
+        - OpenMetricsText0.0.1
+        - PrometheusText0.0.4
         scrape_timeout: 10s
       scrape_configs:
-        - enable_compression: true
-          enable_http2: true
-          follow_redirects: true
-          honor_timestamps: true
-          job_name: datadog-agent
-          metrics_path: /metrics
-          scheme: http
-          scrape_interval: 5s
-          scrape_protocols:
-            - OpenMetricsText1.0.0
-            - OpenMetricsText0.0.1
-            - PrometheusText0.0.4
-          scrape_timeout: 5s
-          static_configs:
-            - targets:
-                - 0.0.0.0:8888
-          track_timestamps_staleness: false
+      - enable_compression: true
+        enable_http2: true
+        follow_redirects: true
+        honor_timestamps: true
+        job_name: datadog-agent
+        metrics_path: /metrics
+        scheme: http
+        scrape_interval: 5s
+        scrape_protocols:
+        - OpenMetricsText1.0.0
+        - OpenMetricsText0.0.1
+        - PrometheusText0.0.4
+        scrape_timeout: 5s
+        static_configs:
+        - targets:
+          - 0.0.0.0:8888
+        track_timestamps_staleness: false
     report_extra_scrape_metrics: false
     start_time_metric_regex: ""
     target_allocator: null
     trim_metric_suffixes: false
     use_start_time_metric: false
 service:
   extensions:
-    - pprof/dd-autoconfigured
-    - zpages/dd-autoconfigured
-    - health_check/dd-autoconfigured
-    - ddflare/dd-autoconfigured
+  - pprof/dd-autoconfigured
+  - zpages/dd-autoconfigured
+  - health_check/dd-autoconfigured
+  - datadog/dd-autoconfigured
   pipelines:
     logs:
       exporters:
-        - datadog
+      - datadog
       processors:
-        - infraattributes/dd-autoconfigured
+      - infraattributes/dd-autoconfigured
       receivers:
-        - otlp
+      - otlp
     metrics:
       exporters:
-        - datadog
+      - datadog
       processors:
-        - infraattributes/dd-autoconfigured
+      - infraattributes/dd-autoconfigured
       receivers:
-        - otlp
-        - prometheus
+      - otlp
+      - prometheus
     traces:
       exporters:
-        - datadog
+      - datadog
       processors:
-        - infraattributes/dd-autoconfigured
+      - infraattributes/dd-autoconfigured
       receivers:
-        - otlp
+      - otlp
   telemetry:
     logs:
       development: false
       disable_caller: false
       disable_stacktrace: false
       encoding: console
       error_output_paths:
-        - stderr
+      - stderr
       initial_fields: {}
       level: info
       output_paths:
-        - stderr
+      - stderr
       sampling:
         enabled: true
         initial: 10

comp/otelcol/converter/impl/extensions.go

@@ -6,10 +6,7 @@
 // Package converterimpl provides the implementation of the otel-agent converter.
 package converterimpl
 
-import (
-	ddextension "github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/impl"
-	"go.opentelemetry.io/collector/confmap"
-)
+import "go.opentelemetry.io/collector/confmap"
 
 var (
 	// pprof
@@ -30,7 +27,7 @@ var (
 	healthCheckConfig       any
 
 	// datadog
-	datadogName         = ddextension.Type.String()
+	datadogName         = "datadog"
 	datadogEnhancedName = datadogName + "/" + ddAutoconfiguredSuffix
 	datadogConfig       any
 

comp/otelcol/converter/impl/go.mod

@@ -2,19 +2,10 @@ module github.com/DataDog/datadog-agent/comp/otelcol/converter/impl
 
 go 1.22.0
 
-replace (
-	github.com/DataDog/datadog-agent/comp/otelcol/collector-contrib/def => ../../collector-contrib/def/
-	github.com/DataDog/datadog-agent/comp/otelcol/collector-contrib/impl => ../../collector-contrib/impl/
-	github.com/DataDog/datadog-agent/comp/otelcol/configstore/def => ../../configstore/def/
-	github.com/DataDog/datadog-agent/comp/otelcol/configstore/impl => ../../configstore/impl/
-	github.com/DataDog/datadog-agent/comp/otelcol/converter/def => ../def
-	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def => ../../ddflareextension/def/
-	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/impl => ../../ddflareextension/impl/
-)
+replace github.com/DataDog/datadog-agent/comp/otelcol/converter/def => ../def
 
 require (
-	github.com/DataDog/datadog-agent/comp/otelcol/converter/def v0.0.0-00010101000000-000000000000
-	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/impl v0.0.0-00010101000000-000000000000
+	github.com/DataDog/datadog-agent/comp/otelcol/converter/def v0.56.0-rc.3
 	github.com/stretchr/testify v1.9.0
 	go.opentelemetry.io/collector/confmap v0.104.0
 	go.opentelemetry.io/collector/confmap/converter/expandconverter v0.104.0
@@ -23,104 +14,22 @@ require (
 	go.opentelemetry.io/collector/confmap/provider/httpprovider v0.104.0
 	go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.104.0
 	go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.104.0
-
 )
 
 require (
-	cloud.google.com/go/compute/metadata v0.3.0 // indirect
-	github.com/DataDog/datadog-agent/comp/otelcol/configstore/def v0.56.0-rc.3 // indirect
-	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def v0.0.0-00010101000000-000000000000 // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/knadh/koanf/maps v0.1.1 // indirect
 	github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
 	github.com/knadh/koanf/v2 v2.1.1 // indirect
-	github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
-	github.com/prometheus/client_golang v1.19.1 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.54.0 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/rs/cors v1.11.0 // indirect
-	github.com/shirou/gopsutil/v4 v4.24.5 // indirect
-	github.com/shoenig/go-m1cpu v0.1.6 // indirect
-	github.com/spf13/cobra v1.8.1 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/tklauser/go-sysconf v0.3.14 // indirect
-	github.com/tklauser/numcpus v0.8.0 // indirect
-	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	go.opencensus.io v0.24.0 // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	go.opentelemetry.io/collector v0.104.0 // indirect
-	go.opentelemetry.io/collector/component v0.104.0 // indirect
-	go.opentelemetry.io/collector/config/configauth v0.104.0 // indirect
-	go.opentelemetry.io/collector/config/configcompression v1.11.0 // indirect
-	go.opentelemetry.io/collector/config/confighttp v0.104.0 // indirect
-	go.opentelemetry.io/collector/config/configopaque v1.11.0 // indirect
-	go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect
-	go.opentelemetry.io/collector/config/configtls v0.104.0 // indirect
-	go.opentelemetry.io/collector/config/internal v0.104.0 // indirect
-	go.opentelemetry.io/collector/connector v0.104.0 // indirect
-	go.opentelemetry.io/collector/consumer v0.104.0 // indirect
-	go.opentelemetry.io/collector/exporter v0.104.0 // indirect
-	go.opentelemetry.io/collector/extension v0.104.0 // indirect
-	go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect
 	go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
-	go.opentelemetry.io/collector/otelcol v0.104.0 // indirect
-	go.opentelemetry.io/collector/pdata v1.11.0 // indirect
-	go.opentelemetry.io/collector/processor v0.104.0 // indirect
-	go.opentelemetry.io/collector/receiver v0.104.0 // indirect
-	go.opentelemetry.io/collector/semconv v0.104.0 // indirect
-	go.opentelemetry.io/collector/service v0.104.0 // indirect
-	go.opentelemetry.io/contrib/config v0.7.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
-	go.opentelemetry.io/contrib/propagators/b3 v1.27.0 // indirect
-	go.opentelemetry.io/otel v1.27.0 // indirect
-	go.opentelemetry.io/otel/bridge/opencensus v1.27.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect
-	go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect
-	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect
-	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect
-	go.opentelemetry.io/otel/metric v1.27.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.27.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect
-	go.opentelemetry.io/otel/trace v1.27.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.2.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
-	golang.org/x/net v0.28.0 // indirect
-	golang.org/x/sys v0.24.0 // indirect
-	golang.org/x/text v0.17.0 // indirect
-	gonum.org/v1/gonum v0.15.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240624140628-dc46fd24d27d // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d // indirect
-	google.golang.org/grpc v1.64.0 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )