fix(registry): instantiate factory for each invocation

internal/cmd/miniooni/main.go

@@ -232,7 +232,7 @@ func registerOONIRun(rootCmd *cobra.Command, globalOptions *Options) {
 
 // registerAllExperiments registers a subcommand for each experiment
 func registerAllExperiments(rootCmd *cobra.Command, globalOptions *Options) {
-	for name, factory := range registry.AllExperiments {
+	for name, ff := range registry.AllExperiments {
 		subCmd := &cobra.Command{
 			Use:   name,
 			Short: fmt.Sprintf("Runs the %s experiment", name),
@@ -243,6 +243,7 @@ func registerAllExperiments(rootCmd *cobra.Command, globalOptions *Options) {
 		}
 		rootCmd.AddCommand(subCmd)
 		flags := subCmd.Flags()
+		factory := ff()
 
 		switch factory.InputPolicy() {
 		case model.InputOrQueryBackend,

internal/registry/allexperiments.go

@@ -3,7 +3,7 @@ package registry
 import "sort"
 
 // Where we register all the available experiments.
-var AllExperiments = map[string]*Factory{}
+var AllExperiments = map[string]func() *Factory{}
 
 // ExperimentNames returns the name of all experiments
 func ExperimentNames() (names []string) {

internal/registry/dash.go

@@ -10,15 +10,17 @@ import (
 )
 
 func init() {
-	AllExperiments["dash"] = &Factory{
-		build: func(config interface{}) model.ExperimentMeasurer {
-			return dash.NewExperimentMeasurer(
-				*config.(*dash.Config),
-			)
-		},
-		config:           &dash.Config{},
-		enabledByDefault: true,
-		interruptible:    true,
-		inputPolicy:      model.InputNone,
+	AllExperiments["dash"] = func() *Factory {
+		return &Factory{
+			build: func(config interface{}) model.ExperimentMeasurer {
+				return dash.NewExperimentMeasurer(
+					*config.(*dash.Config),
+				)
+			},
+			config:           &dash.Config{},
+			enabledByDefault: true,
+			interruptible:    true,
+			inputPolicy:      model.InputNone,
+		}
 	}
 }

internal/registry/dnscheck.go

@@ -10,14 +10,16 @@ import (
 )
 
 func init() {
-	AllExperiments["dnscheck"] = &Factory{
-		build: func(config interface{}) model.ExperimentMeasurer {
-			return dnscheck.NewExperimentMeasurer(
-				*config.(*dnscheck.Config),
-			)
-		},
-		config:           &dnscheck.Config{},
-		enabledByDefault: true,
-		inputPolicy:      model.InputOrStaticDefault,
+	AllExperiments["dnscheck"] = func() *Factory {
+		return &Factory{
+			build: func(config interface{}) model.ExperimentMeasurer {
+				return dnscheck.NewExperimentMeasurer(
+					*config.(*dnscheck.Config),
+				)
+			},
+			config:           &dnscheck.Config{},
+			enabledByDefault: true,
+			inputPolicy:      model.InputOrStaticDefault,
+		}
 	}
 }

internal/registry/dnsping.go

@@ -10,14 +10,16 @@ import (
 )
 
 func init() {
-	AllExperiments["dnsping"] = &Factory{
-		build: func(config interface{}) model.ExperimentMeasurer {
-			return dnsping.NewExperimentMeasurer(
-				*config.(*dnsping.Config),
-			)
-		},
-		config:           &dnsping.Config{},
-		enabledByDefault: true,
-		inputPolicy:      model.InputOrStaticDefault,
+	AllExperiments["dnsping"] = func() *Factory {
+		return &Factory{
+			build: func(config interface{}) model.ExperimentMeasurer {
+				return dnsping.NewExperimentMeasurer(
+					*config.(*dnsping.Config),
+				)
+			},
+			config:           &dnsping.Config{},
+			enabledByDefault: true,
+			inputPolicy:      model.InputOrStaticDefault,
+		}
 	}
 }

internal/registry/dslxtutorial.go

@@ -10,13 +10,15 @@ import (
 )
 
 func init() {
-	AllExperiments["simple_sni"] = &Factory{
-		build: func(config interface{}) model.ExperimentMeasurer {
-			return chapter02.NewExperimentMeasurer(
-				*config.(*chapter02.Config),
-			)
-		},
-		config:      &chapter02.Config{},
-		inputPolicy: model.InputOrQueryBackend,
+	AllExperiments["simple_sni"] = func() *Factory {
+		return &Factory{
+			build: func(config interface{}) model.ExperimentMeasurer {
+				return chapter02.NewExperimentMeasurer(
+					*config.(*chapter02.Config),
+				)
+			},
+			config:      &chapter02.Config{},
+			inputPolicy: model.InputOrQueryBackend,
+		}
 	}
 }

internal/registry/echcheck.go

@@ -10,13 +10,15 @@ import (
 )
 
 func init() {
-	AllExperiments["echcheck"] = &Factory{
-		build: func(config interface{}) model.ExperimentMeasurer {
-			return echcheck.NewExperimentMeasurer(
-				*config.(*echcheck.Config),
-			)
-		},
-		config:      &echcheck.Config{},
-		inputPolicy: model.InputOptional,
+	AllExperiments["echcheck"] = func() *Factory {
+		return &Factory{
+			build: func(config interface{}) model.ExperimentMeasurer {
+				return echcheck.NewExperimentMeasurer(
+					*config.(*echcheck.Config),
+				)
+			},
+			config:      &echcheck.Config{},
+			inputPolicy: model.InputOptional,
+		}
 	}
 }

internal/registry/example.go

@@ -12,18 +12,20 @@ import (
 )
 
 func init() {
-	AllExperiments["example"] = &Factory{
-		build: func(config interface{}) model.ExperimentMeasurer {
-			return example.NewExperimentMeasurer(
-				*config.(*example.Config), "example",
-			)
-		},
-		config: &example.Config{
-			Message:   "Good day from the example experiment!",
-			SleepTime: int64(time.Second),
-		},
-		enabledByDefault: true,
-		interruptible:    true,
-		inputPolicy:      model.InputNone,
+	AllExperiments["example"] = func() *Factory {
+		return &Factory{
+			build: func(config interface{}) model.ExperimentMeasurer {
+				return example.NewExperimentMeasurer(
+					*config.(*example.Config), "example",
+				)
+			},
+			config: &example.Config{
+				Message:   "Good day from the example experiment!",
+				SleepTime: int64(time.Second),
+			},
+			enabledByDefault: true,
+			interruptible:    true,
+			inputPolicy:      model.InputNone,
+		}
 	}
 }

internal/registry/factory.go

@@ -213,7 +213,7 @@ func (b *Factory) fieldbyname(v interface{}, key string) (reflect.Value, error)
 	return field, nil
 }
 
-// NewExperimentMeasurer creates the experiment
+// NewExperimentMeasurer creates a new [model.ExperimentMeasurer] instance.
 func (b *Factory) NewExperimentMeasurer() model.ExperimentMeasurer {
 	return b.build(b.config)
 }
@@ -305,10 +305,11 @@ func NewFactory(name string, kvStore model.KeyValueStore, logger model.Logger) (
 	}
 
 	// Obtain the factory for the canonical name.
-	factory := AllExperiments[name]
-	if factory == nil {
+	ff := AllExperiments[name]
+	if ff == nil {
 		return nil, fmt.Errorf("%w: %s", ErrNoSuchExperiment, name)
 	}
+	factory := ff()
 
 	// Some experiments are not enabled by default. To enable them we use
 	// the cached check-in response or an environment variable.

internal/registry/fbmessenger.go

@@ -10,14 +10,16 @@ import (
 )
 
 func init() {
-	AllExperiments["facebook_messenger"] = &Factory{
-		build: func(config interface{}) model.ExperimentMeasurer {
-			return fbmessenger.NewExperimentMeasurer(
-				*config.(*fbmessenger.Config),
-			)
-		},
-		config:           &fbmessenger.Config{},
-		enabledByDefault: true,
-		inputPolicy:      model.InputNone,
+	AllExperiments["facebook_messenger"] = func() *Factory {
+		return &Factory{
+			build: func(config interface{}) model.ExperimentMeasurer {
+				return fbmessenger.NewExperimentMeasurer(
+					*config.(*fbmessenger.Config),
+				)
+			},
+			config:           &fbmessenger.Config{},
+			enabledByDefault: true,
+			inputPolicy:      model.InputNone,
+		}
 	}
 }

internal/registry/hhfm.go

@@ -10,14 +10,16 @@ import (
 )
 
 func init() {
-	AllExperiments["http_header_field_manipulation"] = &Factory{
-		build: func(config interface{}) model.ExperimentMeasurer {
-			return hhfm.NewExperimentMeasurer(
-				*config.(*hhfm.Config),
-			)
-		},
-		config:           &hhfm.Config{},
-		enabledByDefault: true,
-		inputPolicy:      model.InputNone,
+	AllExperiments["http_header_field_manipulation"] = func() *Factory {
+		return &Factory{
+			build: func(config interface{}) model.ExperimentMeasurer {
+				return hhfm.NewExperimentMeasurer(
+					*config.(*hhfm.Config),
+				)
+			},
+			config:           &hhfm.Config{},
+			enabledByDefault: true,
+			inputPolicy:      model.InputNone,
+		}
 	}
 }

internal/registry/hirl.go

@@ -10,14 +10,16 @@ import (
 )
 
 func init() {
-	AllExperiments["http_invalid_request_line"] = &Factory{
-		build: func(config interface{}) model.ExperimentMeasurer {
-			return hirl.NewExperimentMeasurer(
-				*config.(*hirl.Config),
-			)
-		},
-		config:           &hirl.Config{},
-		enabledByDefault: true,
-		inputPolicy:      model.InputNone,
+	AllExperiments["http_invalid_request_line"] = func() *Factory {
+		return &Factory{
+			build: func(config interface{}) model.ExperimentMeasurer {
+				return hirl.NewExperimentMeasurer(
+					*config.(*hirl.Config),
+				)
+			},
+			config:           &hirl.Config{},
+			enabledByDefault: true,
+			inputPolicy:      model.InputNone,
+		}
 	}
 }

internal/registry/httphostheader.go

@@ -10,14 +10,16 @@ import (
 )
 
 func init() {
-	AllExperiments["http_host_header"] = &Factory{
-		build: func(config interface{}) model.ExperimentMeasurer {
-			return httphostheader.NewExperimentMeasurer(
-				*config.(*httphostheader.Config),
-			)
-		},
-		config:           &httphostheader.Config{},
-		enabledByDefault: true,
-		inputPolicy:      model.InputOrQueryBackend,
+	AllExperiments["http_host_header"] = func() *Factory {
+		return &Factory{
+			build: func(config interface{}) model.ExperimentMeasurer {
+				return httphostheader.NewExperimentMeasurer(
+					*config.(*httphostheader.Config),
+				)
+			},
+			config:           &httphostheader.Config{},
+			enabledByDefault: true,
+			inputPolicy:      model.InputOrQueryBackend,
+		}
 	}
 }

internal/registry/ndt.go

@@ -10,15 +10,17 @@ import (
 )
 
 func init() {
-	AllExperiments["ndt"] = &Factory{
-		build: func(config interface{}) model.ExperimentMeasurer {
-			return ndt7.NewExperimentMeasurer(
-				*config.(*ndt7.Config),
-			)
-		},
-		config:           &ndt7.Config{},
-		enabledByDefault: true,
-		interruptible:    true,
-		inputPolicy:      model.InputNone,
+	AllExperiments["ndt"] = func() *Factory {
+		return &Factory{
+			build: func(config interface{}) model.ExperimentMeasurer {
+				return ndt7.NewExperimentMeasurer(
+					*config.(*ndt7.Config),
+				)
+			},
+			config:           &ndt7.Config{},
+			enabledByDefault: true,
+			interruptible:    true,
+			inputPolicy:      model.InputNone,
+		}
 	}
 }

internal/registry/portfiltering.go

@@ -10,15 +10,17 @@ import (
 )
 
 func init() {
-	AllExperiments["portfiltering"] = &Factory{
-		build: func(config any) model.ExperimentMeasurer {
-			return portfiltering.NewExperimentMeasurer(
-				config.(portfiltering.Config),
-			)
-		},
-		config:           portfiltering.Config{},
-		enabledByDefault: true,
-		interruptible:    false,
-		inputPolicy:      model.InputNone,
+	AllExperiments["portfiltering"] = func() *Factory {
+		return &Factory{
+			build: func(config any) model.ExperimentMeasurer {
+				return portfiltering.NewExperimentMeasurer(
+					config.(portfiltering.Config),
+				)
+			},
+			config:           portfiltering.Config{},
+			enabledByDefault: true,
+			interruptible:    false,
+			inputPolicy:      model.InputNone,
+		}
 	}
 }

internal/registry/psiphon.go

@@ -10,14 +10,16 @@ import (
 )
 
 func init() {
-	AllExperiments["psiphon"] = &Factory{
-		build: func(config interface{}) model.ExperimentMeasurer {
-			return psiphon.NewExperimentMeasurer(
-				*config.(*psiphon.Config),
-			)
-		},
-		config:           &psiphon.Config{},
-		enabledByDefault: true,
-		inputPolicy:      model.InputOptional,
+	AllExperiments["psiphon"] = func() *Factory {
+		return &Factory{
+			build: func(config interface{}) model.ExperimentMeasurer {
+				return psiphon.NewExperimentMeasurer(
+					*config.(*psiphon.Config),
+				)
+			},
+			config:           &psiphon.Config{},
+			enabledByDefault: true,
+			inputPolicy:      model.InputOptional,
+		}
 	}
 }