Skip to content

Commit 2603b9b

Browse files
edwardpark97edwardpark97
authored
Change DATADOG_TRACE_ENABLED to DD_TRACE_ENABLED (#350)
1 parent d2effdc commit 2603b9b

File tree

12 files changed

+53
-53
lines changed

12 files changed

+53
-53
lines changed

‎charts/model-engine/templates/_helpers.tpl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ podAffinity:
125125

126126
{{- define "modelEngine.baseServiceTemplateEnv" -}}
127127
env:
128-
- name: DATADOG_TRACE_ENABLED
129-
value: "${DATADOG_TRACE_ENABLED}"
128+
- name: DD_TRACE_ENABLED
129+
value: "${DD_TRACE_ENABLED}"
130130
- name: DD_REMOTE_CONFIGURATION_ENABLED
131131
value: "false"
132132
- name: DD_SERVICE
@@ -187,8 +187,8 @@ env:
187187

188188
{{- define "modelEngine.baseForwarderTemplateEnv" -}}
189189
env:
190-
- name: DATADOG_TRACE_ENABLED
191-
value: "${DATADOG_TRACE_ENABLED}"
190+
- name: DD_TRACE_ENABLED
191+
value: "${DD_TRACE_ENABLED}"
192192
- name: DD_REMOTE_CONFIGURATION_ENABLED
193193
value: "false"
194194
- name: DD_SERVICE
@@ -235,8 +235,8 @@ env:
235235

236236
{{- define "modelEngine.serviceEnvBase" }}
237237
env:
238-
- name: DATADOG_TRACE_ENABLED
239-
value: "{{ .Values.datadog_trace_enabled }}"
238+
- name: DD_TRACE_ENABLED
239+
value: "{{ .Values.dd_trace_enabled }}"
240240
- name: DD_REMOTE_CONFIGURATION_ENABLED
241241
value: "false"
242242
- name: DD_ENV

‎charts/model-engine/templates/service_config_map.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
"helm.sh/hook-weight": "-2"
1111
data:
1212
launch_service_config: |-
13-
datadog_trace_enabled: {{ .Values.datadog_trace_enabled | default false | quote }}
13+
dd_trace_enabled: {{ .Values.dd_trace_enabled | default false | quote }}
1414
{{- with .Values.config.values.launch }}
1515
{{- range $key, $value := . }}
1616
{{ $key }}: {{ $value | quote }}
@@ -38,7 +38,7 @@ metadata:
3838
"helm.sh/hook-weight": "-2"
3939
data:
4040
launch_service_config: |-
41-
datadog_trace_enabled: {{ .Values.datadog_trace_enabled | default false | quote }}
41+
dd_trace_enabled: {{ .Values.dd_trace_enabled | default false | quote }}
4242
{{- with .Values.config.values.launch }}
4343
{{- range $key, $value := . }}
4444
{{ $key }}: {{ $value | quote }}

‎charts/model-engine/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
datadog_trace_enabled: true
1+
dd_trace_enabled: true
22
spellbook:
33
enabled: false
44
redis:

‎charts/model-engine/values_circleci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ config:
141141
billing_queue_arn: none
142142
cache_redis_url: redis://redis-message-broker-master.default/15
143143
s3_file_llm_fine_tune_repository: "s3://$CIRCLECI_AWS_S3_BUCKET"
144-
datadog_trace_enabled: false
144+
dd_trace_enabled: false
145145
istio_enabled: true
146146
tgi_repository: "text-generation-inference"
147147
vllm_repository: "vllm"

‎charts/model-engine/values_sample.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ config:
118118
cache_redis_url: redis://llm-engine-prod-cache.use1.cache.amazonaws.com:6379/15
119119
# s3_file_llm_fine_tuning_job_repository [required] is the S3 URI for the S3 bucket/key that you wish to save fine-tuned assests
120120
s3_file_llm_fine_tuning_job_repository: "s3://llm-engine/llm-ft-job-repository"
121-
# datadog_trace_enabled specifies whether to enable datadog tracing, datadog must be installed in the cluster
122-
datadog_trace_enabled: false
121+
# dd_trace_enabled specifies whether to enable datadog tracing, datadog must be installed in the cluster
122+
dd_trace_enabled: false
123123

124124
# Asynchronous endpoints configs (coming soon)
125125
sqs_profile: default

‎docs/guides/self_hosting.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Below are the configurations to specify in the `values_sample.yaml` file.
114114
| config.values.llm_engine.endpoint_namespace | K8s namespace the endpoints will be created in | Yes |
115115
| config.values.llm_engine.cache_redis_url | The full url for the redis cluster you wish to connect | Yes |
116116
| config.values.llm_engine.s3_file_llm_fine_tuning_job_repository | The S3 URI for the S3 bucket/key that you wish to save fine-tuned assets | Yes |
117-
| config.values.datadog_trace_enabled | Whether to enable datadog tracing, datadog must be installed in the cluster | No |
117+
| config.values.dd_trace_enabled | Whether to enable datadog tracing, datadog must be installed in the cluster | No |
118118

119119
## Play With It
120120
Once `helm install` succeeds, you can forward port `5000` from a `llm-engine` pod and test sending requests to it.

‎model-engine/model_engine_server/common/config.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class HostedModelInferenceServiceConfig:
5353
s3_file_llm_fine_tune_repository: str
5454
hf_user_fine_tuned_weights_prefix: str
5555
istio_enabled: bool
56-
datadog_trace_enabled: bool
56+
dd_trace_enabled: bool
5757
tgi_repository: str
5858
vllm_repository: str
5959
lightllm_repository: str

‎model-engine/model_engine_server/infra/gateways/resources/k8s_endpoint_resource_delegate.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
# and where the user actually owns the files
6161
BASE_PATH_IN_ENDPOINT = "/app"
6262

63-
DATADOG_ENV_VAR = {"DATADOG_TRACE_ENABLED", "DD_SERVICE", "DD_ENV", "DD_VERSION", "DD_AGENT_HOST"}
63+
DATADOG_ENV_VAR = {"DD_TRACE_ENABLED", "DD_SERVICE", "DD_ENV", "DD_VERSION", "DD_AGENT_HOST"}
6464

6565
_lazy_load_kubernetes_clients = True
6666
_kubernetes_apps_api = None
@@ -237,7 +237,7 @@ def add_datadog_env_to_main_container(deployment_template: Dict[str, Any]) -> No
237237
user_container_envs.extend(
238238
[
239239
{
240-
"name": "DATADOG_TRACE_ENABLED",
240+
"name": "DD_TRACE_ENABLED",
241241
"value": "false" if CIRCLECI else "true",
242242
},
243243
{

‎model-engine/model_engine_server/infra/gateways/resources/k8s_resource_types.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class _BaseDeploymentArguments(_BaseEndpointArguments):
106106
PRIORITY: str
107107
IMAGE: str
108108
IMAGE_HASH: str
109-
DATADOG_TRACE_ENABLED: str
109+
DD_TRACE_ENABLED: str
110110
CPUS: str
111111
MEMORY: str
112112
STORAGE_DICT: DictStrStr
@@ -510,7 +510,7 @@ def get_endpoint_resource_arguments_from_request(
510510
# In Circle CI, we use Redis on localhost instead of SQS
511511
broker_name = BrokerName.SQS.value if not CIRCLECI else BrokerName.REDIS.value
512512
broker_type = BrokerType.SQS.value if not CIRCLECI else BrokerType.REDIS.value
513-
datadog_trace_enabled = hmi_config.datadog_trace_enabled
513+
dd_trace_enabled = hmi_config.dd_trace_enabled
514514
if broker_type == BrokerType.REDIS.value:
515515
sqs_queue_url = ""
516516

@@ -573,7 +573,7 @@ def get_endpoint_resource_arguments_from_request(
573573
PRIORITY=priority,
574574
IMAGE=request.image,
575575
IMAGE_HASH=image_hash,
576-
DATADOG_TRACE_ENABLED=datadog_trace_enabled,
576+
DD_TRACE_ENABLED=dd_trace_enabled,
577577
CPUS=str(build_endpoint_request.cpus),
578578
MEMORY=str(build_endpoint_request.memory),
579579
STORAGE_DICT=storage_dict,
@@ -621,7 +621,7 @@ def get_endpoint_resource_arguments_from_request(
621621
PRIORITY=priority,
622622
IMAGE=request.image,
623623
IMAGE_HASH=image_hash,
624-
DATADOG_TRACE_ENABLED=datadog_trace_enabled,
624+
DD_TRACE_ENABLED=dd_trace_enabled,
625625
CPUS=str(build_endpoint_request.cpus),
626626
MEMORY=str(build_endpoint_request.memory),
627627
STORAGE_DICT=storage_dict,
@@ -671,7 +671,7 @@ def get_endpoint_resource_arguments_from_request(
671671
PRIORITY=priority,
672672
IMAGE=request.image,
673673
IMAGE_HASH=image_hash,
674-
DATADOG_TRACE_ENABLED=datadog_trace_enabled,
674+
DD_TRACE_ENABLED=dd_trace_enabled,
675675
CPUS=str(build_endpoint_request.cpus),
676676
MEMORY=str(build_endpoint_request.memory),
677677
STORAGE_DICT=storage_dict,
@@ -716,7 +716,7 @@ def get_endpoint_resource_arguments_from_request(
716716
PRIORITY=priority,
717717
IMAGE=request.image,
718718
IMAGE_HASH=image_hash,
719-
DATADOG_TRACE_ENABLED=datadog_trace_enabled,
719+
DD_TRACE_ENABLED=dd_trace_enabled,
720720
CPUS=str(build_endpoint_request.cpus),
721721
MEMORY=str(build_endpoint_request.memory),
722722
STORAGE_DICT=storage_dict,
@@ -763,7 +763,7 @@ def get_endpoint_resource_arguments_from_request(
763763
PRIORITY=priority,
764764
IMAGE=request.image,
765765
IMAGE_HASH=image_hash,
766-
DATADOG_TRACE_ENABLED=datadog_trace_enabled,
766+
DD_TRACE_ENABLED=dd_trace_enabled,
767767
CPUS=str(build_endpoint_request.cpus),
768768
MEMORY=str(build_endpoint_request.memory),
769769
STORAGE_DICT=storage_dict,
@@ -807,7 +807,7 @@ def get_endpoint_resource_arguments_from_request(
807807
PRIORITY=priority,
808808
IMAGE=request.image,
809809
IMAGE_HASH=image_hash,
810-
DATADOG_TRACE_ENABLED=datadog_trace_enabled,
810+
DD_TRACE_ENABLED=dd_trace_enabled,
811811
CPUS=str(build_endpoint_request.cpus),
812812
MEMORY=str(build_endpoint_request.memory),
813813
STORAGE_DICT=storage_dict,
@@ -853,7 +853,7 @@ def get_endpoint_resource_arguments_from_request(
853853
PRIORITY=priority,
854854
IMAGE=request.image,
855855
IMAGE_HASH=image_hash,
856-
DATADOG_TRACE_ENABLED=datadog_trace_enabled,
856+
DD_TRACE_ENABLED=dd_trace_enabled,
857857
CPUS=str(build_endpoint_request.cpus),
858858
MEMORY=str(build_endpoint_request.memory),
859859
STORAGE_DICT=storage_dict,
@@ -909,7 +909,7 @@ def get_endpoint_resource_arguments_from_request(
909909
PRIORITY=priority,
910910
IMAGE=request.image,
911911
IMAGE_HASH=image_hash,
912-
DATADOG_TRACE_ENABLED=datadog_trace_enabled,
912+
DD_TRACE_ENABLED=dd_trace_enabled,
913913
CPUS=str(build_endpoint_request.cpus),
914914
MEMORY=str(build_endpoint_request.memory),
915915
STORAGE_DICT=storage_dict,
@@ -967,7 +967,7 @@ def get_endpoint_resource_arguments_from_request(
967967
PRIORITY=priority,
968968
IMAGE=request.image,
969969
IMAGE_HASH=image_hash,
970-
DATADOG_TRACE_ENABLED=datadog_trace_enabled,
970+
DD_TRACE_ENABLED=dd_trace_enabled,
971971
CPUS=str(build_endpoint_request.cpus),
972972
MEMORY=str(build_endpoint_request.memory),
973973
STORAGE_DICT=storage_dict,
@@ -1019,7 +1019,7 @@ def get_endpoint_resource_arguments_from_request(
10191019
PRIORITY=priority,
10201020
IMAGE=request.image,
10211021
IMAGE_HASH=image_hash,
1022-
DATADOG_TRACE_ENABLED=datadog_trace_enabled,
1022+
DD_TRACE_ENABLED=dd_trace_enabled,
10231023
CPUS=str(build_endpoint_request.cpus),
10241024
MEMORY=str(build_endpoint_request.memory),
10251025
STORAGE_DICT=storage_dict,

‎model-engine/model_engine_server/infra/gateways/resources/templates/service_template_config_map_circleci.yaml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ data:
128128
- --num-workers
129129
- "${PER_WORKER}"
130130
env:
131-
- name: DATADOG_TRACE_ENABLED
132-
value: "${DATADOG_TRACE_ENABLED}"
131+
- name: DD_TRACE_ENABLED
132+
value: "${DD_TRACE_ENABLED}"
133133
- name: DD_SERVICE
134134
value: "${ENDPOINT_NAME}"
135135
- name: DD_ENV
@@ -399,8 +399,8 @@ data:
399399
- --num-workers
400400
- "${PER_WORKER}"
401401
env:
402-
- name: DATADOG_TRACE_ENABLED
403-
value: "${DATADOG_TRACE_ENABLED}"
402+
- name: DD_TRACE_ENABLED
403+
value: "${DD_TRACE_ENABLED}"
404404
- name: DD_SERVICE
405405
value: "${ENDPOINT_NAME}"
406406
- name: DD_ENV
@@ -618,8 +618,8 @@ data:
618618
- --set
619619
- "forwarder.stream.healthcheck_route=${HEALTHCHECK_ROUTE}"
620620
env:
621-
- name: DATADOG_TRACE_ENABLED
622-
value: "${DATADOG_TRACE_ENABLED}"
621+
- name: DD_TRACE_ENABLED
622+
value: "${DD_TRACE_ENABLED}"
623623
- name: DD_SERVICE
624624
value: "${ENDPOINT_NAME}"
625625
- name: DD_ENV
@@ -886,8 +886,8 @@ data:
886886
- --set
887887
- "forwarder.stream.healthcheck_route=${HEALTHCHECK_ROUTE}"
888888
env:
889-
- name: DATADOG_TRACE_ENABLED
890-
value: "${DATADOG_TRACE_ENABLED}"
889+
- name: DD_TRACE_ENABLED
890+
value: "${DD_TRACE_ENABLED}"
891891
- name: DD_SERVICE
892892
value: "${ENDPOINT_NAME}"
893893
- name: DD_ENV
@@ -1112,8 +1112,8 @@ data:
11121112
- --set
11131113
- "forwarder.stream.healthcheck_route=${HEALTHCHECK_ROUTE}"
11141114
env:
1115-
- name: DATADOG_TRACE_ENABLED
1116-
value: "${DATADOG_TRACE_ENABLED}"
1115+
- name: DD_TRACE_ENABLED
1116+
value: "${DD_TRACE_ENABLED}"
11171117
- name: DD_SERVICE
11181118
value: "${ENDPOINT_NAME}"
11191119
- name: DD_ENV
@@ -1349,8 +1349,8 @@ data:
13491349
- --num-workers
13501350
- "${PER_WORKER}"
13511351
env:
1352-
- name: DATADOG_TRACE_ENABLED
1353-
value: "${DATADOG_TRACE_ENABLED}"
1352+
- name: DD_TRACE_ENABLED
1353+
value: "${DD_TRACE_ENABLED}"
13541354
- name: DD_SERVICE
13551355
value: "${ENDPOINT_NAME}"
13561356
- name: DD_ENV
@@ -1627,8 +1627,8 @@ data:
16271627
- --num-workers
16281628
- "${PER_WORKER}"
16291629
env:
1630-
- name: DATADOG_TRACE_ENABLED
1631-
value: "${DATADOG_TRACE_ENABLED}"
1630+
- name: DD_TRACE_ENABLED
1631+
value: "${DD_TRACE_ENABLED}"
16321632
- name: DD_SERVICE
16331633
value: "${ENDPOINT_NAME}"
16341634
- name: DD_ENV
@@ -1853,8 +1853,8 @@ data:
18531853
- --set
18541854
- "forwarder.stream.healthcheck_route=${HEALTHCHECK_ROUTE}"
18551855
env:
1856-
- name: DATADOG_TRACE_ENABLED
1857-
value: "${DATADOG_TRACE_ENABLED}"
1856+
- name: DD_TRACE_ENABLED
1857+
value: "${DD_TRACE_ENABLED}"
18581858
- name: DD_SERVICE
18591859
value: "${ENDPOINT_NAME}"
18601860
- name: DD_ENV
@@ -2128,8 +2128,8 @@ data:
21282128
- --set
21292129
- "forwarder.stream.healthcheck_route=${HEALTHCHECK_ROUTE}"
21302130
env:
2131-
- name: DATADOG_TRACE_ENABLED
2132-
value: "${DATADOG_TRACE_ENABLED}"
2131+
- name: DD_TRACE_ENABLED
2132+
value: "${DD_TRACE_ENABLED}"
21332133
- name: DD_SERVICE
21342134
value: "${ENDPOINT_NAME}"
21352135
- name: DD_ENV
@@ -2361,8 +2361,8 @@ data:
23612361
- --set
23622362
- "forwarder.stream.healthcheck_route=${HEALTHCHECK_ROUTE}"
23632363
env:
2364-
- name: DATADOG_TRACE_ENABLED
2365-
value: "${DATADOG_TRACE_ENABLED}"
2364+
- name: DD_TRACE_ENABLED
2365+
value: "${DD_TRACE_ENABLED}"
23662366
- name: DD_SERVICE
23672367
value: "${ENDPOINT_NAME}"
23682368
- name: DD_ENV
@@ -2810,7 +2810,7 @@ data:
28102810
env:
28112811
- name: DD_SERVICE
28122812
value: ${RESOURCE_NAME}
2813-
- name: DATADOG_TRACE_ENABLED
2813+
- name: DD_TRACE_ENABLED
28142814
value: "false"
28152815
- name: DD_ENV
28162816
value: circleci
@@ -2935,7 +2935,7 @@ data:
29352935
env:
29362936
- name: DD_SERVICE
29372937
value: ${RESOURCE_NAME}
2938-
- name: DATADOG_TRACE_ENABLED
2938+
- name: DD_TRACE_ENABLED
29392939
value: "false"
29402940
- name: DD_ENV
29412941
value: circleci
@@ -3081,7 +3081,7 @@ data:
30813081
env:
30823082
- name: DD_SERVICE
30833083
value: ${RESOURCE_NAME}
3084-
- name: DATADOG_TRACE_ENABLED
3084+
- name: DD_TRACE_ENABLED
30853085
value: "false"
30863086
- name: DD_ENV
30873087
value: circleci

0 commit comments

Comments
 (0)