Move telemetry flags to the same file as config flags (open-telemetry…

…#4154)

Signed-off-by: Bogdan Drutu <[email protected]>

service/flags.go

@@ -19,15 +19,22 @@ import (
  "strings"
 
  "go.opentelemetry.io/collector/config/configtelemetry"
- "go.opentelemetry.io/collector/internal/collector/telemetry"
  "go.opentelemetry.io/collector/service/internal/telemetrylogs"
 )
 
 var (
- defaultConfig = ""
+ defaultMetricsAddr = ":8888"
+ defaultMetricsPrefix = "otelcol"
+ defaultAddInstanceID = true
+ defaultConfig = ""
 
+ // Command-line flag that control the configuration file.
  configFlag = &defaultConfig
  setFlag = new(stringArrayValue)
+ // Command-line flags that control publication of telemetry data.
+ metricsAddrPtr = &defaultMetricsAddr
+ metricsPrefixPtr = &defaultMetricsPrefix
+ addInstanceIDPtr = &defaultAddInstanceID
 )
 
 type stringArrayValue struct {
@@ -47,17 +54,36 @@ func flags() *flag.FlagSet {
  flagSet := new(flag.FlagSet)
  addFlagsFns := []func(*flag.FlagSet){
  configtelemetry.Flags,
- telemetry.Flags,
  telemetrylogs.Flags,
  }
  for _, addFlags := range addFlagsFns {
  addFlags(flagSet)
  }
+
+ // At least until we can use a generic, i.e.: OpenCensus, metrics exporter
+ // we default to Prometheus at port 8888, if not otherwise specified.
+ metricsAddrPtr = flagSet.String(
+ "metrics-addr",
+ defaultMetricsAddr,
+ "[address]:port for exposing collector telemetry.")
+
+ metricsPrefixPtr = flagSet.String(
+ "metrics-prefix",
+ defaultMetricsPrefix,
+ "Prefix to the metrics generated by the collector.")
+
+ addInstanceIDPtr = flagSet.Bool(
+ "add-instance-id",
+ defaultAddInstanceID,
+ "Flag to control the addition of 'service.instance.id' to the collector metrics.")
+
  configFlag = flagSet.String("config", defaultConfig, "Path to the config file")
+
  flagSet.Var(setFlag, "set",
  "Set arbitrary component config property. The component has to be defined in the config file and the flag"+
  " has a higher precedence. Array config properties are overridden and maps are joined, note that only a single"+
  " (first) array property can be set e.g. -set=processors.attributes.actions.key=some_key. Example --set=processors.batch.timeout=2s")
+
  return flagSet
 }
 
@@ -68,3 +94,15 @@ func getConfigFlag() string {
 func getSetFlag() []string {
  return setFlag.values
 }
+
+func getAddInstanceID() bool {
+ return *addInstanceIDPtr
+}
+
+func getMetricsAddr() string {
+ return *metricsAddrPtr
+}
+
+func getMetricsPrefix() string {
+ return *metricsPrefixPtr
+}

service/telemetry.go

@@ -34,7 +34,6 @@ import (
  "go.uber.org/zap"
 
  "go.opentelemetry.io/collector/config/configtelemetry"
- "go.opentelemetry.io/collector/internal/collector/telemetry"
  "go.opentelemetry.io/collector/internal/obsreportconfig"
  "go.opentelemetry.io/collector/internal/version"
  semconv "go.opentelemetry.io/collector/model/semconv/v1.5.0"
@@ -76,15 +75,15 @@ func (tel *colTelemetry) initOnce(asyncErrorChannel chan<- error, ballastSizeByt
  logger.Info("Setting up own telemetry...")
 
  level := configtelemetry.GetMetricsLevelFlagValue()
- metricsAddr := telemetry.GetMetricsAddr()
+ metricsAddr := getMetricsAddr()
 
  if level == configtelemetry.LevelNone || metricsAddr == "" {
  return nil
  }
 
  var instanceID string
 
- if telemetry.GetAddInstanceID() {
+ if getAddInstanceID() {
  instanceUUID, _ := uuid.NewRandom()
  instanceID = instanceUUID.String()
  }
@@ -151,12 +150,12 @@ func (tel *colTelemetry) initOpenCensus(level configtelemetry.Level, instanceID
 
  // Until we can use a generic metrics exporter, default to Prometheus.
  opts := prometheus.Options{
- Namespace: telemetry.GetMetricsPrefix(),
+ Namespace: getMetricsPrefix(),
  }
 
  opts.ConstLabels = make(map[string]string)
 
- if telemetry.GetAddInstanceID() {
+ if getAddInstanceID() {
  opts.ConstLabels[sanitizePrometheusKey(semconv.AttributeServiceInstanceID)] = instanceID
  }