Merge current v2.4 into master

2021-06-22 14:05:57 +02:00 · 2021-06-22 14:05:57 +02:00 · ce2e02b690
commit ce2e02b690
parent dca348359b 5dab09c42b
119 changed files with 4628 additions and 4165 deletions
--- a/pkg/anonymize/testdata/anonymized-dynamic-config.json
+++ b/pkg/anonymize/testdata/anonymized-dynamic-config.json
@ -190,7 +190,7 @@
        },
        "rateLimit": {
          "average": 42,
-          "period": 42,
+          "period": "42ns",
          "burst": 42,
          "sourceCriterion": {
            "ipStrategy": {
@ -306,7 +306,7 @@
        },
        "retry": {
          "attempts": 42,
-          "initialInterval": 42
+          "initialInterval": "42ns"
        },
        "contentType": {
          "autoDetect": true
@ -352,9 +352,9 @@
        ],
        "maxIdleConnsPerHost": 42,
        "forwardingTimeouts": {
-          "dialTimeout": 42,
-          "responseHeaderTimeout": 42,
-          "idleConnTimeout": 42
+          "dialTimeout": "42ns",
+          "responseHeaderTimeout": "42ns",
+          "idleConnTimeout": "42ns"
        }
      }
    }
@ -473,4 +473,4 @@
      }
    }
  }
-}
+}