Configuration for tracing in sources

pkg/adapter/config.go

@@ -44,7 +44,8 @@ type EnvConfig struct {
 	// TracingConfigJson is a json string of tracing.Config.
 	// This is used to configure the tracing config, the config is stored in
 	// a config map inside the controllers namespace and copied here.
-	TracingConfigJson string `envconfig:"K_TRACING_CONFIG" required:"true"`
+	// Default is no-op.
+	TracingConfigJson string `envconfig:"K_TRACING_CONFIG"`
 }
 
 // EnvConfigAccessor defines accessors for the minimal

pkg/adapter/main.go

@@ -36,6 +36,7 @@ import (
 	"knative.dev/pkg/profiling"
 	"knative.dev/pkg/signals"
 	"knative.dev/pkg/source"
+
 	tracingconfig "knative.dev/pkg/tracing/config"
 
 	"knative.dev/eventing/pkg/kncloudevents"
@@ -119,7 +120,7 @@ func MainWithContext(ctx context.Context, component string, ector EnvConfigConst
 	// Retrieve tracing config
 	config, err := tracingconfig.JsonToTracingConfig(env.GetTracingConfigJson())
 	if err != nil {
-		logger.Warn("failed to create tracing options, using defaults", zap.Error(err))
+		logger.Warn("Tracing configuration is invalid, using the no-op default", zap.Error(err))
 	}
 	if err := tracing.SetupStaticPublishing(logger, component, config); err != nil {
 		// If tracing doesn't work, we will log an error, but allow the adapter

pkg/adapter/main_message_adapter.go

@@ -116,7 +116,7 @@ func MainMessageAdapterWithContext(ctx context.Context, component string, ector
 	// Retrieve tracing config
 	config, err := tracingconfig.JsonToTracingConfig(env.GetTracingConfigJson())
 	if err != nil {
-		logger.Warn("failed to create tracing options, using defaults", zap.Error(err))
+		logger.Warn("Tracing configuration is invalid, using the no-op default", zap.Error(err))
 	}
 	if err := tracing.SetupStaticPublishing(logger, component, config); err != nil {
 		// If tracing doesn't work, we will log an error, but allow the adapter

pkg/adapter/v2/config.go

@@ -65,7 +65,8 @@ type EnvConfig struct {
 	// TracingConfigJson is a json string of tracing.Config.
 	// This is used to configure the tracing config, the config is stored in
 	// a config map inside the controllers namespace and copied here.
-	TracingConfigJson string `envconfig:"K_TRACING_CONFIG" required:"true"`
+	// Default is no-op.
+	TracingConfigJson string `envconfig:"K_TRACING_CONFIG"`
 }
 
 // EnvConfigAccessor defines accessors for the minimal
@@ -89,7 +90,6 @@ type EnvConfigAccessor interface {
 	// Get the parsed logger.
 	GetLogger() *zap.SugaredLogger
 
-	// Setup tracing
 	SetupTracing(*zap.SugaredLogger) error
 
 	GetCloudEventOverrides() (*duckv1.CloudEventOverrides, error)
@@ -140,7 +140,7 @@ func (e *EnvConfig) GetName() string {
 func (e *EnvConfig) SetupTracing(logger *zap.SugaredLogger) error {
 	config, err := tracingconfig.JsonToTracingConfig(e.TracingConfigJson)
 	if err != nil {
-		logger.Error("Tracing configuration is invalid, using the no-op default", zap.Error(err))
+		logger.Warn("Tracing configuration is invalid, using the no-op default", zap.Error(err))
 	}
 	return tracing.SetupStaticPublishing(logger, e.Component, config)
 }

pkg/adapter/v2/main.go

@@ -92,7 +92,6 @@ func MainWithContext(ctx context.Context, component string, ector EnvConfigConst
 		logger.Error("error building statsreporter", zap.Error(err))
 	}
 
-	// Setup tracing
 	if err := env.SetupTracing(logger); err != nil {
 		// If tracing doesn't work, we will log an error, but allow the adapter
 		// to continue to start.

pkg/reconciler/apiserversource/apiserversource.go

@@ -38,7 +38,7 @@ import (
 	"knative.dev/pkg/metrics"
 	pkgreconciler "knative.dev/pkg/reconciler"
 	"knative.dev/pkg/resolver"
-	pkgtracingconfig "knative.dev/pkg/tracing/config"
+	tracingconfig "knative.dev/pkg/tracing/config"
 
 	"knative.dev/eventing/pkg/apis/sources/v1alpha2"
 	apiserversourcereconciler "knative.dev/eventing/pkg/client/injection/reconciler/sources/v1alpha2/apiserversource"
@@ -82,7 +82,7 @@ type Reconciler struct {
 	loggingContext context.Context
 	loggingConfig  *pkgLogging.Config
 	metricsConfig  *metrics.ExporterOptions
-	tracingCfg     *pkgtracingconfig.Config
+	tracingCfg     *tracingconfig.Config
 }
 
 var _ apiserversourcereconciler.Interface = (*Reconciler)(nil)
@@ -151,7 +151,7 @@ func (r *Reconciler) createReceiveAdapter(ctx context.Context, src *v1alpha2.Api
 		logging.FromContext(ctx).Error("error while converting metrics config to json", zap.Any("receiveAdapter", err))
 	}
 
-	tracingCfg, err := pkgtracingconfig.TracingConfigToJson(r.tracingCfg)
+	tracingCfg, err := tracingconfig.TracingConfigToJson(r.tracingCfg)
 	if err != nil {
 		logging.FromContext(ctx).Error("error while converting tracing config to json", zap.Any("receiveAdapter", err))
 	}
@@ -255,7 +255,7 @@ func (r *Reconciler) UpdateFromTracingConfigMap(cfg *corev1.ConfigMap) {
 		delete(cfg.Data, "_example")
 	}
 
-	tracingCfg, err := pkgtracingconfig.NewTracingConfigFromMap(cfg.Data)
+	tracingCfg, err := tracingconfig.NewTracingConfigFromMap(cfg.Data)
 	if err != nil {
 		logging.FromContext(r.loggingContext).Warn("failed to create tracing config from configmap", zap.String("cfg.Name", cfg.Name))
 		return

pkg/reconciler/apiserversource/controller.go

@@ -26,7 +26,7 @@ import (
 	"knative.dev/pkg/logging"
 	"knative.dev/pkg/metrics"
 	"knative.dev/pkg/resolver"
-	pkgtracingconfig "knative.dev/pkg/tracing/config"
+	tracingconfig "knative.dev/pkg/tracing/config"
 
 	"knative.dev/eventing/pkg/apis/sources/v1alpha1"
 
@@ -81,7 +81,7 @@ func NewController(
 
 	cmw.Watch(logging.ConfigMapName(), r.UpdateFromLoggingConfigMap)
 	cmw.Watch(metrics.ConfigMapName(), r.UpdateFromMetricsConfigMap)
-	cmw.Watch(pkgtracingconfig.ConfigName, r.UpdateFromTracingConfigMap)
+	cmw.Watch(tracingconfig.ConfigName, r.UpdateFromTracingConfigMap)
 
 	return impl
 }

pkg/reconciler/apiserversource/resources/receive_adapter.go

@@ -153,9 +153,9 @@ func makeEnv(args *ReceiveAdapterArgs) ([]corev1.EnvVar, error) {
 	}, {
 		Name:  "K_LOGGING_CONFIG",
 		Value: args.LoggingConfig,
+	}, {
+		Name:  "K_TRACING_CONFIG",
+		Value: args.TracingConfig,
 	},
-		{
-			Name:  "K_TRACING_CONFIG",
-			Value: args.TracingConfig,
-		}}, nil
+	}, nil
 }