[chore] [receiver/apache] Use type generated from metadata.yaml (open…

…-telemetry#21272)
zdelagrange · May 11, 2023 · fca3245 · fca3245
1 parent 538663c
commit fca3245
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/receiver/apachereceiver/config_test.go b/receiver/apachereceiver/config_test.go
@@ -22,6 +22,8 @@ import (
  "github.com/stretchr/testify/require"
  "go.opentelemetry.io/collector/component"
  "go.opentelemetry.io/collector/confmap/confmaptest"
+
+ "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver/internal/metadata"
 )
 
 func TestValidate(t *testing.T) {
@@ -97,7 +99,7 @@ func TestLoadConfig(t *testing.T) {
  factory := NewFactory()
  cfg := factory.CreateDefaultConfig()
 
- sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String())
+ sub, err := cm.Sub(component.NewIDWithName(metadata.Type, "").String())
  require.NoError(t, err)
  require.NoError(t, component.UnmarshalConfig(sub, cfg))
 

diff --git a/receiver/apachereceiver/documentation.md b/receiver/apachereceiver/documentation.md
@@ -1,6 +1,6 @@
 [comment]: <> (Code generated by mdatagen. DO NOT EDIT.)
 
-# apachereceiver
+# apache
 
 ## Default Metrics
 

diff --git a/receiver/apachereceiver/factory.go b/receiver/apachereceiver/factory.go
@@ -29,16 +29,14 @@ import (
 )
 
 const (
- typeStr = "apache"
-
  httpDefaultPort = "80"
  httpsDefaultPort = "443"
 )
 
 // NewFactory creates a factory for apache receiver.
 func NewFactory() receiver.Factory {
  return receiver.NewFactory(
- typeStr,
+ metadata.Type,
  createDefaultConfig,
  receiver.WithMetrics(createMetricsReceiver, metadata.MetricsStability))
 }
@@ -86,7 +84,7 @@ func createMetricsReceiver(
  }
 
  ns := newApacheScraper(params, cfg, serverName, port)
- scraper, err := scraperhelper.NewScraper(typeStr, ns.scrape, scraperhelper.WithStart(ns.start))
+ scraper, err := scraperhelper.NewScraper(metadata.Type, ns.scrape, scraperhelper.WithStart(ns.start))
  if err != nil {
  return nil, err
  }

diff --git a/receiver/apachereceiver/internal/metadata/generated_config.go b/receiver/apachereceiver/internal/metadata/generated_config.go
diff --git a/receiver/apachereceiver/internal/metadata/generated_status.go b/receiver/apachereceiver/internal/metadata/generated_status.go
diff --git a/receiver/apachereceiver/metadata.yaml b/receiver/apachereceiver/metadata.yaml
@@ -1,4 +1,4 @@
-type: apachereceiver
+type: apache
 
 status:
  class: receiver