issue #3497 : Removed deprecated enabled flag from InMem telemetry config

Author: vish-k

conf/server/server_full.conf

@@ -831,8 +831,6 @@ plugins {
 #     ]
 
 #     InMem {
-#         # enabled: Enable this collector. This field is deprecated and will be removed in a future release. Default: false.
-#         # enabled = true
 #     }
 # }
 

doc/telemetry_config.md

@@ -54,11 +54,6 @@ You may use all, some, or none of the collectors. The following collectors suppo
 | `address`     | `string` | M3 address                                   |
 | `env`         | `string` | M3 environment, e.g. `production`, `staging` |
 
-### `In-Mem`
-
-| Configuration | Type   | Description                                                                                                                                                                    | Default |
-|---------------|--------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|
-| `enabled`     | `bool` | Enable this collector. This flag is deprecated and will be removed in a future release. To disable in-memory telemetry collection omit the InMem configuration block entirely. | `false` |
 
 Here is a sample configuration:
 

pkg/common/telemetry/config.go

@@ -49,7 +49,5 @@ type M3Config struct {
 }
 
 type InMem struct {
-	// TODO: remove in SPIRE 1.6.0
-	DeprecatedEnabled *bool    `hcl:"enabled"`
-	UnusedKeys        []string `hcl:",unusedKeys"`
+	UnusedKeys []string `hcl:",unusedKeys"`
 }

pkg/common/telemetry/inmem.go

@@ -32,11 +32,6 @@ func newInmemRunner(c *MetricsConfig) (sinkRunner, error) {
 	switch {
 	case inMem == nil:
 		return runner, nil
-	case inMem.DeprecatedEnabled != nil:
-		c.Logger.Warn("The enabled flag is deprecated in the InMem configuration and will be removed in a future release; omit the InMem block to disable in-memory telemetry")
-		if !*inMem.DeprecatedEnabled {
-			return runner, nil
-		}
 	}
 
 	if logger, ok := c.Logger.(interface{ Writer() *io.PipeWriter }); ok {

pkg/common/telemetry/inmem_test.go

@@ -11,8 +11,6 @@ import (
 )
 
 func TestInMem(t *testing.T) {
-	enabled := true
-	disabled := false
 
 	for _, tt := range []struct {
 		test               string
@@ -32,28 +30,6 @@ func TestInMem(t *testing.T) {
 			inMemConfig:   &InMem{},
 			expectEnabled: true,
 		},
-		{
-			test:          "enabled when InMem block declared and deprecated enabled flag set to true",
-			inMemConfig:   &InMem{DeprecatedEnabled: &enabled},
-			expectEnabled: true,
-			expectLogs: []spiretest.LogEntry{
-				{
-					Level:   logrus.WarnLevel,
-					Message: "The enabled flag is deprecated in the InMem configuration and will be removed in a future release; omit the InMem block to disable in-memory telemetry",
-				},
-			},
-		},
-		{
-			test:          "disabled when InMem block declared and deprecated enabled flag set to false",
-			inMemConfig:   &InMem{DeprecatedEnabled: &disabled},
-			expectEnabled: false,
-			expectLogs: []spiretest.LogEntry{
-				{
-					Level:   logrus.WarnLevel,
-					Message: "The enabled flag is deprecated in the InMem configuration and will be removed in a future release; omit the InMem block to disable in-memory telemetry",
-				},
-			},
-		},
 		{
 			test:               "disabled when unexpected logger passed",
 			inMemConfig:        &InMem{},