Remove extra trace facet "launch.resource_name"

model-engine/model_engine_server/api/batch_jobs_v1.py

@@ -7,7 +7,6 @@
     get_external_interfaces_read_only,
     verify_authentication,
 )
-from model_engine_server.common.datadog_utils import add_trace_resource_name
 from model_engine_server.common.dtos.batch_jobs import (
     CreateBatchJobV1Request,
     CreateBatchJobV1Response,
@@ -55,7 +54,6 @@ async def create_batch_job(
     """
     Runs a batch job.
     """
-    add_trace_resource_name("batch_jobs_post")
     logger.info(f"POST /batch-jobs with {request} for {auth}")
     try:
         use_case = CreateBatchJobV1UseCase(
@@ -85,7 +83,6 @@ async def get_batch_job(
     """
     Gets a batch job.
     """
-    add_trace_resource_name("batch_jobs_get")
     logger.info(f"GET /batch-jobs/{batch_job_id} for {auth}")
     try:
         use_case = GetBatchJobV1UseCase(batch_job_service=external_interfaces.batch_job_service)
@@ -107,7 +104,6 @@ async def update_batch_job(
     """
     Updates a batch job.
     """
-    add_trace_resource_name("batch_jobs_put")
     logger.info(f"PUT /batch-jobs/{batch_job_id} for {auth}")
     try:
         use_case = UpdateBatchJobV1UseCase(batch_job_service=external_interfaces.batch_job_service)
@@ -127,7 +123,6 @@ async def create_docker_image_batch_job(
     auth: User = Depends(verify_authentication),
     external_interfaces: ExternalInterfaces = Depends(get_external_interfaces),
 ) -> CreateDockerImageBatchJobV1Response:
-    add_trace_resource_name("batch_jobs_di_create")
     logger.info(f"POST /docker-image-batch-jobs with {request} for {auth}")
     try:
         use_case = CreateDockerImageBatchJobV1UseCase(
@@ -166,7 +161,6 @@ async def get_docker_image_batch_job(
     auth: User = Depends(verify_authentication),
     external_interfaces: ExternalInterfaces = Depends(get_external_interfaces_read_only),
 ) -> GetDockerImageBatchJobV1Response:
-    add_trace_resource_name("batch_jobs_di_get")
     logger.info(f"GET /docker-image-batch-jobs/{batch_job_id} for {auth}")
     try:
         use_case = GetDockerImageBatchJobV1UseCase(
@@ -191,7 +185,6 @@ async def list_docker_image_batch_jobs(
     """
     Lists docker image batch jobs spawned by trigger with given ID
     """
-    add_trace_resource_name("batch_jobs_di_get_trigger")
     logger.info(f"GET /docker-image-batch-jobs?trigger_id={trigger_id}")
     try:
         use_case = ListDockerImageBatchJobsV1UseCase(
@@ -212,7 +205,6 @@ async def update_docker_image_batch_job(
     auth: User = Depends(verify_authentication),
     external_interfaces: ExternalInterfaces = Depends(get_external_interfaces),
 ) -> UpdateDockerImageBatchJobV1Response:
-    add_trace_resource_name("batch_jobs_di_put")
     logger.info(f"PUT /docker-image-batch-jobs/{batch_job_id} with {request} for {auth}")
     try:
         use_case = UpdateDockerImageBatchJobV1UseCase(

model-engine/model_engine_server/api/docker_image_batch_job_bundles_v1.py

@@ -6,7 +6,6 @@
     get_external_interfaces,
     verify_authentication,
 )
-from model_engine_server.common.datadog_utils import add_trace_resource_name
 from model_engine_server.common.dtos.batch_jobs import (
     CreateDockerImageBatchJobBundleV1Request,
     CreateDockerImageBatchJobBundleV1Response,
@@ -44,7 +43,6 @@ async def create_docker_image_batch_job_bundle(
     """
     Creates a docker iamge batch job bundle
     """
-    add_trace_resource_name("docker_image_batch_job_bundle_post")
     logger.info(f"POST /docker-image-batch-job-bundles with {request} for {auth}")
     try:
         use_case = CreateDockerImageBatchJobBundleV1UseCase(
@@ -71,7 +69,6 @@ async def list_docker_image_batch_job_model_bundles(
     Lists docker image batch job bundles owned by current owner
 
     """
-    add_trace_resource_name("docker_image_batch_job_bundle_get")
     logger.info(
         f"GET /docker-image-batch-job-bundles?bundle_name={bundle_name}&order_by={order_by} for auth"
     )
@@ -90,7 +87,6 @@ async def get_latest_docker_image_batch_job_bundle(
     external_interfaces: ExternalInterfaces = Depends(get_external_interfaces),
 ) -> DockerImageBatchJobBundleV1Response:
     """Gets latest Docker Image Batch Job Bundle with given name owned by the current owner"""
-    add_trace_resource_name("docker_image_batch_job_bundle_latest_get")
     logger.info(f"GET /docker-image-batch-job-bundles/latest?bundle_name={bundle_name} for {auth}")
     try:
         use_case = GetLatestDockerImageBatchJobBundleByNameV1UseCase(
@@ -114,7 +110,6 @@ async def get_docker_image_batch_job_model_bundle(
     external_interfaces: ExternalInterfaces = Depends(get_external_interfaces),
 ) -> DockerImageBatchJobBundleV1Response:
     """Get details for a given DockerImageBatchJobBundle owned by the current owner"""
-    add_trace_resource_name("docker_image_batch_job_bundle_id_get")
     logger.info(
         f"GET /docker-image-batch-job-bundles/{docker_image_batch_job_bundle_id} for {auth}"
     )

model-engine/model_engine_server/api/files_v1.py

@@ -7,7 +7,6 @@
     get_external_interfaces_read_only,
     verify_authentication,
 )
-from model_engine_server.common.datadog_utils import add_trace_resource_name
 from model_engine_server.common.dtos.files import (
     DeleteFileResponse,
     GetFileContentResponse,
@@ -39,7 +38,6 @@ async def upload_file(
     auth: User = Depends(verify_authentication),
     external_interfaces: ExternalInterfaces = Depends(get_external_interfaces),
 ) -> UploadFileResponse:
-    add_trace_resource_name("files_upload")
     logger.info(f"POST /files with filename {file.filename} for {auth}")
     use_case = UploadFileUseCase(
         file_storage_gateway=external_interfaces.file_storage_gateway,
@@ -57,7 +55,6 @@ async def get_file(
     auth: User = Depends(verify_authentication),
     external_interfaces: ExternalInterfaces = Depends(get_external_interfaces_read_only),
 ) -> GetFileResponse:
-    add_trace_resource_name("files_get")
     logger.info(f"GET /files/{file_id} for {auth}")
     try:
         use_case = GetFileUseCase(
@@ -76,7 +73,6 @@ async def list_files(
     auth: User = Depends(verify_authentication),
     external_interfaces: ExternalInterfaces = Depends(get_external_interfaces_read_only),
 ) -> ListFilesResponse:
-    add_trace_resource_name("files_list")
     logger.info(f"GET /files for {auth}")
     use_case = ListFilesUseCase(
         file_storage_gateway=external_interfaces.file_storage_gateway,
@@ -90,7 +86,6 @@ async def delete_file(
     auth: User = Depends(verify_authentication),
     external_interfaces: ExternalInterfaces = Depends(get_external_interfaces),
 ) -> DeleteFileResponse:
-    add_trace_resource_name("files_delete")
     logger.info(f"DELETE /files/{file_id} for {auth}")
     try:
         use_case = DeleteFileUseCase(
@@ -113,7 +108,6 @@ async def get_file_content(
     """
     Describe the LLM Model endpoint with given name.
     """
-    add_trace_resource_name("files_content_get")
     logger.info(f"GET /files/{file_id}/content for {auth}")
     try:
         use_case = GetFileContentUseCase(

model-engine/model_engine_server/api/llms_v1.py

@@ -12,7 +12,6 @@
     get_external_interfaces_read_only,
     verify_authentication,
 )
-from model_engine_server.common.datadog_utils import add_trace_resource_name
 from model_engine_server.common.dtos.llms import (
     CancelFineTuneResponse,
     CompletionStreamV1Request,
@@ -133,7 +132,6 @@ async def create_model_endpoint(
     """
     Creates an LLM endpoint for the current user.
     """
-    add_trace_resource_name("llm_model_endpoints_post")
     logger.info(f"POST /llm/model-endpoints with {request} for {auth}")
     try:
         create_model_bundle_use_case = CreateModelBundleV2UseCase(
@@ -187,7 +185,6 @@ async def list_model_endpoints(
     """
     Lists the LLM model endpoints owned by the current owner, plus all public_inference LLMs.
     """
-    add_trace_resource_name("llm_model_endpoints_get")
     logger.info(f"GET /llm/model-endpoints?name={name}&order_by={order_by} for {auth}")
     use_case = ListLLMModelEndpointsV1UseCase(
         llm_model_endpoint_service=external_interfaces.llm_model_endpoint_service,
@@ -206,7 +203,6 @@ async def get_model_endpoint(
     """
     Describe the LLM Model endpoint with given name.
     """
-    add_trace_resource_name("llm_model_endpoints_name_get")
     logger.info(f"GET /llm/model-endpoints/{model_endpoint_name} for {auth}")
     try:
         use_case = GetLLMModelEndpointByNameV1UseCase(
@@ -230,7 +226,6 @@ async def create_completion_sync_task(
     """
     Runs a sync prompt completion on an LLM.
     """
-    add_trace_resource_name("llm_completion_sync_post")
     logger.info(
         f"POST /completion_sync with {request} to endpoint {model_endpoint_name} for {auth}"
     )
@@ -275,7 +270,6 @@ async def create_completion_stream_task(
     """
     Runs a stream prompt completion on an LLM.
     """
-    add_trace_resource_name("llm_completion_stream_post")
     logger.info(
         f"POST /completion_stream with {request} to endpoint {model_endpoint_name} for {auth}"
     )
@@ -311,7 +305,6 @@ async def create_fine_tune(
     auth: User = Depends(verify_authentication),
     external_interfaces: ExternalInterfaces = Depends(get_external_interfaces),
 ) -> CreateFineTuneResponse:
-    add_trace_resource_name("fine_tunes_create")
     logger.info(f"POST /fine-tunes with {request} for {auth}")
     try:
         use_case = CreateFineTuneV1UseCase(
@@ -340,7 +333,6 @@ async def get_fine_tune(
     auth: User = Depends(verify_authentication),
     external_interfaces: ExternalInterfaces = Depends(get_external_interfaces_read_only),
 ) -> GetFineTuneResponse:
-    add_trace_resource_name("fine_tunes_get")
     logger.info(f"GET /fine-tunes/{fine_tune_id} for {auth}")
     try:
         use_case = GetFineTuneV1UseCase(
@@ -359,7 +351,6 @@ async def list_fine_tunes(
     auth: User = Depends(verify_authentication),
     external_interfaces: ExternalInterfaces = Depends(get_external_interfaces_read_only),
 ) -> ListFineTunesResponse:
-    add_trace_resource_name("fine_tunes_list")
     logger.info(f"GET /fine-tunes for {auth}")
     use_case = ListFineTunesV1UseCase(
         llm_fine_tuning_service=external_interfaces.llm_fine_tuning_service,
@@ -373,7 +364,6 @@ async def cancel_fine_tune(
     auth: User = Depends(verify_authentication),
     external_interfaces: ExternalInterfaces = Depends(get_external_interfaces),
 ) -> CancelFineTuneResponse:
-    add_trace_resource_name("fine_tunes_cancel")
     logger.info(f"PUT /fine-tunes/{fine_tune_id}/cancel for {auth}")
     try:
         use_case = CancelFineTuneV1UseCase(
@@ -393,7 +383,6 @@ async def get_fine_tune_events(
     auth: User = Depends(verify_authentication),
     external_interfaces: ExternalInterfaces = Depends(get_external_interfaces_read_only),
 ) -> GetFineTuneEventsResponse:
-    add_trace_resource_name("fine_tunes_events_get")
     logger.info(f"GET /fine-tunes/{fine_tune_id}/events for {auth}")
     try:
         use_case = GetFineTuneEventsV1UseCase(
@@ -414,7 +403,6 @@ async def download_model_endpoint(
     auth: User = Depends(verify_authentication),
     external_interfaces: ExternalInterfaces = Depends(get_external_interfaces),
 ) -> ModelDownloadResponse:
-    add_trace_resource_name("model_endpoints_download")
     logger.info(f"POST /model-endpoints/download with {request} for {auth}")
     try:
         use_case = ModelDownloadV1UseCase(
@@ -438,7 +426,6 @@ async def delete_llm_model_endpoint(
     auth: User = Depends(verify_authentication),
     external_interfaces: ExternalInterfaces = Depends(get_external_interfaces),
 ) -> DeleteLLMEndpointResponse:
-    add_trace_resource_name("llm_model_endpoints_delete")
     logger.info(f"DELETE /model-endpoints/{model_endpoint_name} for {auth}")
     try:
         use_case = DeleteLLMEndpointByNameUseCase(

model-engine/model_engine_server/api/model_bundles_v1.py

@@ -9,7 +9,6 @@
     get_external_interfaces_read_only,
     verify_authentication,
 )
-from model_engine_server.common.datadog_utils import add_trace_resource_name
 from model_engine_server.common.dtos.model_bundles import (
     CloneModelBundleV1Request,
     CreateModelBundleV1Request,
@@ -48,7 +47,6 @@ async def create_model_bundle(
     Creates a ModelBundle for the current user.
     """
     logger.info(f"POST /model-bundles with {request} for {auth}")
-    add_trace_resource_name("model_bundles_post")
     try:
         use_case = CreateModelBundleV1UseCase(
             model_bundle_repository=external_interfaces.model_bundle_repository,
@@ -84,7 +82,6 @@ async def clone_model_bundle_with_changes(
     """
     Creates a ModelBundle by cloning an existing one and then applying changes on top.
     """
-    add_trace_resource_name("model_bundles_clone")
     try:
         use_case = CloneModelBundleV1UseCase(
             model_bundle_repository=external_interfaces.model_bundle_repository,
@@ -107,7 +104,6 @@ async def list_model_bundles(
     """
     Lists the ModelBundles owned by the current owner.
     """
-    add_trace_resource_name("model_bundles_get")
     logger.info(f"GET /model-bundles?model_name={model_name}&order_by={order_by} for {auth}")
     use_case = ListModelBundlesV1UseCase(
         model_bundle_repository=external_interfaces.model_bundle_repository
@@ -124,7 +120,6 @@ async def get_latest_model_bundle(
     """
     Gets the latest Model Bundle with the given name owned by the current owner.
     """
-    add_trace_resource_name("model_bundles_latest_get")
     logger.info(f"GET /model-bundles/latest?model_name={model_name} for {auth}")
     try:
         use_case = GetLatestModelBundleByNameV1UseCase(
@@ -149,7 +144,6 @@ async def get_model_bundle(
     """
     Gets the details for a given ModelBundle owned by the current owner.
     """
-    add_trace_resource_name("model_bundles_id_get")
     logger.info(f"GET /model-bundles/{model_bundle_id} for {auth}")
     try:
         use_case = GetModelBundleByIdV1UseCase(

model-engine/model_engine_server/api/model_bundles_v2.py

@@ -9,7 +9,6 @@
     get_external_interfaces_read_only,
     verify_authentication,
 )
-from model_engine_server.common.datadog_utils import add_trace_resource_name
 from model_engine_server.common.dtos.model_bundles import (
     CloneModelBundleV2Request,
     CreateModelBundleV2Request,
@@ -48,7 +47,6 @@ async def create_model_bundle(
     Creates a ModelBundle for the current user.
     """
     logger.info(f"POST /model-bundles with {request} for {auth}")
-    add_trace_resource_name("model_bundles_post")
     try:
         use_case = CreateModelBundleV2UseCase(
             model_bundle_repository=external_interfaces.model_bundle_repository,
@@ -84,7 +82,6 @@ async def clone_model_bundle_with_changes(
     """
     Creates a ModelBundle by cloning an existing one and then applying changes on top.
     """
-    add_trace_resource_name("model_bundles_clone")
     try:
         use_case = CloneModelBundleV2UseCase(
             model_bundle_repository=external_interfaces.model_bundle_repository,
@@ -107,7 +104,6 @@ async def list_model_bundles(
     """
     Lists the ModelBundles owned by the current owner.
     """
-    add_trace_resource_name("model_bundles_get")
     logger.info(f"GET /model-bundles?model_name={model_name}&order_by={order_by} for {auth}")
     use_case = ListModelBundlesV2UseCase(
         model_bundle_repository=external_interfaces.model_bundle_repository
@@ -124,7 +120,6 @@ async def get_latest_model_bundle(
     """
     Gets the latest Model Bundle with the given name owned by the current owner.
     """
-    add_trace_resource_name("model_bundles_latest_get")
     logger.info(f"GET /model-bundles/latest?model_name={model_name} for {auth}")
     try:
         use_case = GetLatestModelBundleByNameV2UseCase(
@@ -149,7 +144,6 @@ async def get_model_bundle(
     """
     Gets the details for a given ModelBundle owned by the current owner.
     """
-    add_trace_resource_name("model_bundles_id_get")
     logger.info(f"GET /model-bundles/{model_bundle_id} for {auth}")
     try:
         use_case = GetModelBundleByIdV2UseCase(

model-engine/model_engine_server/api/model_endpoints_v1.py

@@ -12,7 +12,6 @@
     get_external_interfaces_read_only,
     verify_authentication,
 )
-from model_engine_server.common.datadog_utils import add_trace_resource_name
 from model_engine_server.common.dtos.model_endpoints import (
     CreateModelEndpointV1Request,
     CreateModelEndpointV1Response,
@@ -57,7 +56,6 @@ async def create_model_endpoint(
     """
     Creates a Model for the current user.
     """
-    add_trace_resource_name("model_endpoints_post")
     logger.info(f"POST /model-endpoints with {request} for {auth}")
     try:
         use_case = CreateModelEndpointV1UseCase(
@@ -104,7 +102,6 @@ async def list_model_endpoints(
     """
     Lists the Models owned by the current owner.
     """
-    add_trace_resource_name("model_endpoints_get")
     logger.info(f"GET /model-endpoints?name={name}&order_by={order_by} for {auth}")
     use_case = ListModelEndpointsV1UseCase(
         model_endpoint_service=external_interfaces.model_endpoint_service,
@@ -123,7 +120,6 @@ async def get_model_endpoint(
     """
     Describe the Model endpoint with given ID.
     """
-    add_trace_resource_name("model_endpoints_id_get")
     logger.info(f"GET /model-endpoints/{model_endpoint_id} for {auth}")
     try:
         use_case = GetModelEndpointByIdV1UseCase(
@@ -149,7 +145,6 @@ async def update_model_endpoint(
     """
     Lists the Models owned by the current owner.
     """
-    add_trace_resource_name("model_endpoints_id_put")
     logger.info(f"PUT /model-endpoints/{model_endpoint_id} with {request} for {auth}")
     try:
         use_case = UpdateModelEndpointByIdV1UseCase(
@@ -192,7 +187,6 @@ async def delete_model_endpoint(
     """
     Lists the Models owned by the current owner.
     """
-    add_trace_resource_name("model_endpoints_id_delete")
     logger.info(f"DELETE /model-endpoints/{model_endpoint_id} for {auth}")
     try:
         use_case = DeleteModelEndpointByIdV1UseCase(