Merge pull request #74 from StackVista/STAC-12893

STAC-12893: Fix rebranding to include all DD env vars

Author: hierynomus

packaging/apply_branding.sh

@@ -5,32 +5,32 @@
 export REPLACE_SCOPE="../config ../cmd ../checks"
 export REPLACE_MODE=-w # "-d"
 
-gofmt -l $REPLACE_MODE -r '"DD_HOSTNAME" -> "STS_HOSTNAME"'  $REPLACE_SCOPE
-gofmt -l $REPLACE_MODE -r '"DD_API_KEY" -> "STS_API_KEY"' $REPLACE_SCOPE
-gofmt -l $REPLACE_MODE -r '"DD_CUSTOM_SENSITIVE_WORDS" -> "STS_CUSTOM_SENSITIVE_WORDS"' $REPLACE_SCOPE
-gofmt -l $REPLACE_MODE -r '"DD_SCRUB_ARGS" -> "STS_SCRUB_ARGS"' $REPLACE_SCOPE
-gofmt -l $REPLACE_MODE -r '"DD_CUSTOM_SENSITIVE_WORDS" -> "STS_CUSTOM_SENSITIVE_WORDS"' $REPLACE_SCOPE
-gofmt -l $REPLACE_MODE -r '"DD_LOG_LEVEL" -> "STS_LOG_LEVEL"' $REPLACE_SCOPE
-gofmt -l $REPLACE_MODE -r '"DD_LOGS_STDOUT" -> "STS_LOGS_STDOUT"' $REPLACE_SCOPE
-gofmt -l $REPLACE_MODE -r '"DD_LOG_TO_CONSOLE" -> "STS_LOG_TO_CONSOLE"' $REPLACE_SCOPE
-gofmt -l $REPLACE_MODE -r '"DD_PROCESS_AGENT_ENABLED" -> "STS_PROCESS_AGENT_ENABLED"' $REPLACE_SCOPE
-gofmt -l $REPLACE_MODE -r '"DD_PROCESS_AGENT_URL" -> "STS_PROCESS_AGENT_URL"' $REPLACE_SCOPE
-gofmt -l $REPLACE_MODE -r '"DD_STRIP_PROCESS_ARGS" -> "STS_STRIP_PROCESS_ARGS"' $REPLACE_SCOPE
-gofmt -l $REPLACE_MODE -r '"DD_AGENT_PY" -> "STS_AGENT_PY"' $REPLACE_SCOPE
 gofmt -l $REPLACE_MODE -r '"DD_AGENT_PY_ENV" -> "STS_AGENT_PY_ENV"' $REPLACE_SCOPE
-gofmt -l $REPLACE_MODE -r '"DD_DOGSTATSD_PORT" -> "STS_DOGSTATSD_PORT"' $REPLACE_SCOPE
+gofmt -l $REPLACE_MODE -r '"DD_AGENT_PY" -> "STS_AGENT_PY"' $REPLACE_SCOPE
+gofmt -l $REPLACE_MODE -r '"DD_API_KEY" -> "STS_API_KEY"' $REPLACE_SCOPE
+gofmt -l $REPLACE_MODE -r '"DD_APM_ANALYZED_SPANS" -> "STS_APM_ANALYZED_SPANS"' $REPLACE_SCOPE
 gofmt -l $REPLACE_MODE -r '"DD_BIND_HOST" -> "STS_BIND_HOST"' $REPLACE_SCOPE
 gofmt -l $REPLACE_MODE -r '"DD_COLLECT_DOCKER_NETWORK" -> "STS_COLLECT_DOCKER_NETWORK"' $REPLACE_SCOPE
 gofmt -l $REPLACE_MODE -r '"DD_CONTAINER_BLACKLIST" -> "STS_CONTAINER_BLACKLIST"' $REPLACE_SCOPE
-gofmt -l $REPLACE_MODE -r '"DD_CONTAINER_WHITELIST" -> "STS_CONTAINER_WHITELIST"' $REPLACE_SCOPE
 gofmt -l $REPLACE_MODE -r '"DD_CONTAINER_CACHE_DURATION" -> "STS_CONTAINER_CACHE_DURATION"' $REPLACE_SCOPE
-gofmt -l $REPLACE_MODE -r '"DD_PROCESS_AGENT_CONTAINER_SOURCE" -> "STS_PROCESS_AGENT_CONTAINER_SOURCE"' $REPLACE_SCOPE
-gofmt -l $REPLACE_MODE -r '"DD_NETWORK_TRACING_ENABLED" -> "STS_NETWORK_TRACING_ENABLED"' $REPLACE_SCOPE
+gofmt -l $REPLACE_MODE -r '"DD_CONTAINER_WHITELIST" -> "STS_CONTAINER_WHITELIST"' $REPLACE_SCOPE
+gofmt -l $REPLACE_MODE -r '"DD_CUSTOM_SENSITIVE_WORDS" -> "STS_CUSTOM_SENSITIVE_WORDS"' $REPLACE_SCOPE
+gofmt -l $REPLACE_MODE -r '"DD_DOGSTATSD_PORT" -> "STS_DOGSTATSD_PORT"' $REPLACE_SCOPE
+gofmt -l $REPLACE_MODE -r '"DD_HOSTNAME" -> "STS_HOSTNAME"'  $REPLACE_SCOPE
+gofmt -l $REPLACE_MODE -r '"DD_LOG_LEVEL" -> "STS_LOG_LEVEL"' $REPLACE_SCOPE
+gofmt -l $REPLACE_MODE -r '"DD_LOG_TO_CONSOLE" -> "STS_LOG_TO_CONSOLE"' $REPLACE_SCOPE
+gofmt -l $REPLACE_MODE -r '"DD_LOGS_STDOUT" -> "STS_LOGS_STDOUT"' $REPLACE_SCOPE
+gofmt -l $REPLACE_MODE -r '"DD_NETTRACER_SOCKET" -> "STS_NETTRACER_SOCKET"' $REPLACE_SCOPE
 gofmt -l $REPLACE_MODE -r '"DD_NETWORK_TRACING_ENABLED" -> "STS_NETWORK_TRACING_ENABLED"' $REPLACE_SCOPE
+gofmt -l $REPLACE_MODE -r '"DD_PROCESS_AGENT_CONTAINER_SOURCE" -> "STS_PROCESS_AGENT_CONTAINER_SOURCE"' $REPLACE_SCOPE
+gofmt -l $REPLACE_MODE -r '"DD_PROCESS_AGENT_ENABLED" -> "STS_PROCESS_AGENT_ENABLED"' $REPLACE_SCOPE
+gofmt -l $REPLACE_MODE -r '"DD_PROCESS_AGENT_URL is invalid: %s" -> "STS_PROCESS_AGENT_URL is invalid: %s"' $REPLACE_SCOPE
+gofmt -l $REPLACE_MODE -r '"DD_PROCESS_AGENT_URL" -> "STS_PROCESS_AGENT_URL"' $REPLACE_SCOPE
+gofmt -l $REPLACE_MODE -r '"DD_SCRUB_ARGS" -> "STS_SCRUB_ARGS"' $REPLACE_SCOPE
 gofmt -l $REPLACE_MODE -r '"DD_SITE" -> "STS_SITE"' $REPLACE_SCOPE
+gofmt -l $REPLACE_MODE -r '"DD_STRIP_PROCESS_ARGS" -> "STS_STRIP_PROCESS_ARGS"' $REPLACE_SCOPE
 gofmt -l $REPLACE_MODE -r '"DD_USE_LOCAL_NETWORK_TRACER" -> "STS_USE_LOCAL_NETWORK_TRACER"' $REPLACE_SCOPE
-gofmt -l $REPLACE_MODE -r '"DD_NETTRACER_SOCKET" -> "STS_NETTRACER_SOCKET"' $REPLACE_SCOPE
-gofmt -l $REPLACE_MODE -r '"DD_PROCESS_AGENT_URL is invalid: %s" -> "STS_PROCESS_AGENT_URL is invalid: %s"' $REPLACE_SCOPE
+gofmt -l $REPLACE_MODE -r '"DOCKER_DD_AGENT" -> "DOCKER_STS_AGENT"' $REPLACE_SCOPE
 
 # tests
 sed -i 's/DD_SITE/STS_SITE/g' ../config/config_test.go

stackstate-changelog.md

@@ -1,5 +1,11 @@
 # StackState Process Agent releases
 
+## 2.7.6
+
+**Bugfix**
+- Fix rebranding script to include `DOCKER_DD_AGENT` and `DD_APM_ANALYZED_SPANS`
+- When setting `STS_PROCESS_AGENT_ENABLED` do not disable container checks
+
 ## 2.7.5
 
 **Bugfix**