From f4ed4952ea11cc073b0015baf17b559fbb2fd941 Mon Sep 17 00:00:00 2001
From: William Conti <william.conti@datadoghq.com>
Date: Wed, 13 Nov 2024 15:12:03 -0500
Subject: [PATCH 01/18] fix inferred base service

---
 ddtrace/settings/_inferred_base_service.py            |  4 +++-
 .../service_name/test_inferred_base_service.py        | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ddtrace/settings/_inferred_base_service.py b/ddtrace/settings/_inferred_base_service.py
index 091c5b5d2e9..4ca6d964a48 100644
--- a/ddtrace/settings/_inferred_base_service.py
+++ b/ddtrace/settings/_inferred_base_service.py
@@ -54,7 +54,9 @@ def detect(self, args: List[str]) -> Optional[ServiceMetadata]:
         module_flag = False
 
         for arg in args:
-            has_flag_prefix = arg.startswith("-")
+            # we support the --ddtrace option for pytest, and shouldn't skip the following arg 
+            # since it's usually the test location argument.
+            has_flag_prefix = arg.startswith("-") and not arg.startswith("--ddtrace")
             is_env_variable = "=" in arg
 
             should_skip_arg = prev_arg_is_flag or has_flag_prefix or is_env_variable
diff --git a/tests/internal/service_name/test_inferred_base_service.py b/tests/internal/service_name/test_inferred_base_service.py
index fa79d3ad785..1e9d40636e6 100644
--- a/tests/internal/service_name/test_inferred_base_service.py
+++ b/tests/internal/service_name/test_inferred_base_service.py
@@ -20,6 +20,9 @@ def mock_file_system():
         (base_path / "venv" / "bin" / "python3.11").mkdir(parents=True)
         (base_path / "venv" / "bin" / "gunicorn").mkdir(parents=True)
 
+        # add a test dir
+        (base_path / "tests" / "contrib" / "aiohttp").mkdir(parents=True)
+
         (base_path / "modules" / "m1" / "first" / "nice" / "package").mkdir(parents=True)
         (base_path / "modules" / "m2").mkdir(parents=True)
         (base_path / "modules" / "no" / "python_files").mkdir(parents=True)
@@ -41,6 +44,11 @@ def mock_file_system():
         (base_path / "apps" / "app2" / "cmd" / "run.py").touch()
         (base_path / "apps" / "app2" / "setup.py").touch()
 
+        (base_path / "tests" / "contrib" / "aiohttp" / "test.py").touch()
+        (base_path / "tests" / "contrib" / "aiohttp" / "__init__.py").touch()
+        (base_path / "tests" / "contrib" / "__init__.py").touch()
+        (base_path / "tests" / "__init__.py").touch()
+
         # Additional edge cases
         (base_path / "modules" / "no" / "python_files" / "here.txt").touch()  # Module with no subdirectories
         (base_path / "modules" / "m1" / "first" / "nice" / "package" / "not_a_python_file.txt").touch()
@@ -69,6 +77,9 @@ def mock_file_system():
         ("python3.12 apps/app2/cmd/run.py", "app2"),
         ("python -m m1.first.nice.package", "m1.first.nice.package"),
         ("python -m http.server 8000", "http.server"),
+        # pytest
+        ("pytest tests/contrib/aiohttp", "tests.contrib.aiohttp"),
+        ("pytest --ddtrace tests/contrib/aiohttp", "tests.contrib.aiohttp"),
     ],
 )
 def test_python_detector(cmd, expected, mock_file_system):

From 9f3a234abed499b17f287d6de283c350a3bc2fa4 Mon Sep 17 00:00:00 2001
From: William Conti <william.conti@datadoghq.com>
Date: Wed, 13 Nov 2024 16:07:52 -0500
Subject: [PATCH 02/18] fix tests

---
 ddtrace/contrib/internal/mako/patch.py        |   7 +-
 ddtrace/settings/_inferred_base_service.py    |   2 +-
 tests/contrib/flask/test_blueprint.py         |   4 +-
 tests/contrib/flask/test_errorhandler.py      |   2 +-
 tests/contrib/flask/test_views.py             |   2 +-
 tests/contrib/jinja2/test_jinja2.py           |   4 +-
 tests/contrib/logging/test_logging.py         |  10 +-
 tests/debugging/test_config.py                |   3 +-
 tests/integration/test_debug.py               |   2 +-
 .../test_remoteconfig_client_e2e.py           |   2 +-
 tests/llmobs/_utils.py                        |  16 +--
 ...cessor.test_appsec_span_tags_snapshot.json |   2 +-
 ...appsec_span_tags_snapshot_with_errors.json |   2 +-
 ...onfigure_service_name_split_by_domain.json |   4 +-
 ...ndering_snapshot_patched_server[True].json |   4 +-
 ...pic.test_anthropic.test_anthropic_llm.json |   2 +-
 ...ropic.test_anthropic_llm_create_image.json |   2 +-
 ...st_anthropic.test_anthropic_llm_error.json |   2 +-
 ...c.test_anthropic_llm_multiple_prompts.json |   2 +-
 ...lm_multiple_prompts_with_chat_history.json |   2 +-
 ...t_anthropic.test_anthropic_llm_stream.json |   2 +-
 ...opic.test_anthropic_llm_stream_helper.json |   2 +-
 ...ropic.test_anthropic_llm_stream_image.json |   2 +-
 ...st_anthropic.test_anthropic_llm_tools.json |   2 +-
 ...pic.test_anthropic_llm_tools_full_use.json |   4 +-
 ...t_anthropic_llm_tools_full_use_stream.json |   4 +-
 ...ropic.test_anthropic_llm_tools_stream.json |   2 +-
 ...est_anthropic_llm_tools_stream_helper.json |   2 +-
 ...test_anthropic_llm_unserializable_arg.json |   2 +-
 ....test_aredis.test_analytics_with_rate.json |   2 +-
 ...st_aredis.test_analytics_without_rate.json |   2 +-
 ...ontrib.aredis.test_aredis.test_basics.json |   2 +-
 ...redis.test_aredis.test_cmd_max_length.json |   2 +-
 ...full_command_in_resource_config[True].json |   6 +-
 ....aredis.test_aredis.test_long_command.json |   2 +-
 ...b.aredis.test_aredis.test_opentracing.json |   4 +-
 ...s.test_aredis.test_pipeline_immediate.json |   4 +-
 ...edis.test_aredis.test_pipeline_traced.json |   2 +-
 ...ntrib.aredis.test_aredis.test_unicode.json |   2 +-
 ..._appsec_snapshots.test_appsec_enabled.json |  52 ++++----
 ..._snapshots.test_appsec_enabled_attack.json |  54 ++++----
 ...pshots.test_request_ipblock_match_403.json |  52 ++++----
 ...s.test_request_ipblock_match_403_json.json |  52 ++++----
 ...hots.test_request_ipblock_nomatch_200.json |  52 ++++----
 ..._django_snapshots.test_404_exceptions.json |  62 ++++-----
 ...go_snapshots.test_404_exceptions_111x.json |  36 +++---
 ...est_django_snapshots.test_asgi_200_3x.json |  52 ++++----
 ...shots.test_asgi_200_traced_simple_app.json |   2 +-
 ...est_django_snapshots.test_asgi_500_3x.json |  62 ++++-----
 ...napshots.test_django_resource_handler.json |  58 ++++-----
 ...apshots.test_djangoq_dd_trace_methods.json |  58 ++++-----
 ...s.test_middleware_trace_callable_view.json |  52 ++++----
 ...t_middleware_trace_callable_view_111x.json |  32 ++---
 ...t_middleware_trace_partial_based_view.json |  52 ++++----
 ...dleware_trace_partial_based_view_111x.json |  32 ++---
 ...snapshots.test_psycopg2_query_default.json |   4 +-
 ...snapshots.test_psycopg3_query_default.json |   4 +-
 ...o_snapshots.test_safe_string_encoding.json |  66 +++++-----
 ...pshots.test_safe_string_encoding_111x.json |  42 +++---
 ...t_django_snapshots.test_streamed_file.json |  52 ++++----
 ..._snapshots.test_templates_disabled_3x.json |  56 ++++----
 ...o_snapshots.test_templates_enabled_3x.json |  58 ++++-----
 ...go_snapshots.test_urlpatterns_include.json |  52 ++++----
 ...test_django.test_django_hosts_request.json |  52 ++++----
 ...egration.test_fn_exception_no_retries.json |   2 +-
 ...t_integration.test_fn_retry_exception.json |   2 +-
 ...iq.test_integration.test_fn_task_send.json |   4 +-
 ...gration.test_fn_task_send_with_params.json |   4 +-
 ...est_integration.test_idempotent_patch.json |   4 +-
 ....test_integration.test_send_exception.json |   2 +-
 ...pi.test_fastapi.test_500_error_raised.json |   2 +-
 ...api.test_fastapi.test_background_task.json |   6 +-
 ...api.test_fastapi.test_subapp_snapshot.json |   6 +-
 ...est_fastapi.test_table_query_snapshot.json |   8 +-
 ...pi.test_fastapi.test_traced_websocket.json |   2 +-
 ...st_fastapi.test_tracing_in_middleware.json |   6 +-
 ...atch_403[flask_appsec_good_rules_env].json |   4 +-
 ..._403[flask_appsec_good_rules_env]_220.json |   4 +-
 ...403_json[flask_appsec_good_rules_env].json |   4 +-
 ...json[flask_appsec_good_rules_env]_220.json |   4 +-
 ..._osspawn[flask_appsec_good_rules_env].json |  24 ++--
 ...pawn[flask_appsec_good_rules_env]_220.json |  22 ++--
 ...ossystem[flask_appsec_good_rules_env].json |  22 ++--
 ...stem[flask_appsec_good_rules_env]_220.json |  20 +--
 ...enoshell[flask_appsec_good_rules_env].json |  26 ++--
 ...hell[flask_appsec_good_rules_env]_220.json |  24 ++--
 ...ateshell[flask_appsec_good_rules_env].json |  26 ++--
 ...hell[flask_appsec_good_rules_env]_220.json |  24 ++--
 ...200_json[flask_appsec_good_rules_env].json |  20 +--
 ...json[flask_appsec_good_rules_env]_220.json |  18 +--
 ...403_json[flask_appsec_good_rules_env].json |  24 ++--
 ...json[flask_appsec_good_rules_env]_220.json |  22 ++--
 ...hot.test_flask_200[flask_default_env].json |  20 +--
 ...test_flask_200[flask_default_env]_220.json |  18 +--
 ...est_flask_get_user[flask_default_env].json |  20 +--
 ...flask_get_user[flask_default_env]_220.json |  18 +--
 ....test_flask_stream[flask_default_env].json |  20 +--
 ...t_flask_stream[flask_default_env]_220.json |  18 +--
 ...e_generativeai.test_gemini_completion.json |   2 +-
 ...rativeai.test_gemini_completion_error.json |   2 +-
 ...rativeai.test_gemini_completion_image.json |   2 +-
 ...t_gemini_completion_multiple_messages.json |   2 +-
 ...ativeai.test_gemini_completion_stream.json |   2 +-
 ....test_gemini_completion_system_prompt.json |   2 +-
 ...ai.test_gemini_completion_tool_stream.json |   2 +-
 ...veai.test_gemini_tool_chat_completion.json |   4 +-
 ...erativeai.test_gemini_tool_completion.json |   2 +-
 ...ene.test_graphene.test_schema_execute.json |   8 +-
 ...ne.test_schema_execute_with_resolvers.json |  16 +--
 ..._graphene.test_schema_failing_execute.json |  10 +-
 ...rib.graphql.test_graphql.test_graphql.json |   8 +-
 ...aphql.test_graphql.test_graphql_error.json |   6 +-
 ....test_graphql_execute_with_middleware.json |  16 +--
 ...raphql_with_document_with_no_location.json |   4 +-
 ...hql.test_graphql_with_traced_resolver.json |  10 +-
 ...est_httpx.test_configure_service_name.json |   2 +-
 ...contrib.httpx.test_httpx.test_get_200.json |   2 +-
 ...contrib.httpx.test_httpx.test_get_500.json |   2 +-
 ...httpx.test_httpx.test_request_headers.json |   2 +-
 ..._unspecified_service_name_env_default.json |   2 +-
 ...tized_unspecified_service_name_env_v0.json |   2 +-
 ...httpx.test_httpx.test_split_by_domain.json |   2 +-
 ...px.test_httpx.test_trace_query_string.json |   2 +-
 ...ain.test_langchain.test_ai21_llm_sync.json |   2 +-
 ...n.test_langchain.test_cohere_llm_sync.json |   2 +-
 ...test_langchain.test_cohere_math_chain.json |   6 +-
 ...angchain.test_fake_embedding_document.json |   2 +-
 ...t_langchain.test_fake_embedding_query.json |   2 +-
 ...angchain.test_huggingfacehub_llm_sync.json |   2 +-
 ...langchain.test_openai_chat_model_call.json |   2 +-
 ...chain.test_openai_chat_model_generate.json |   2 +-
 ...n.test_openai_chat_model_sync_call_39.json |   2 +-
 ...chat_model_sync_call_langchain_openai.json |   2 +-
 ...st_openai_chat_model_sync_generate_39.json |   2 +-
 ...gchain.test_openai_embedding_document.json |   2 +-
 ...langchain.test_openai_embedding_query.json |   2 +-
 ....test_langchain.test_openai_llm_async.json |   2 +-
 ....test_langchain.test_openai_llm_error.json |   2 +-
 ...n.test_langchain.test_openai_llm_sync.json |   2 +-
 ...est_langchain.test_openai_llm_sync_39.json |   2 +-
 ...test_openai_llm_sync_multiple_prompts.json |   2 +-
 ...t_openai_llm_sync_multiple_prompts_39.json |   2 +-
 ...test_langchain.test_openai_math_chain.json |   6 +-
 ...angchain.test_openai_sequential_chain.json |   8 +-
 ...uential_chain_with_multiple_llm_async.json |  10 +-
 ...quential_chain_with_multiple_llm_sync.json |  10 +-
 ..._pinecone_vectorstore_retrieval_chain.json |  12 +-
 ...necone_vectorstore_retrieval_chain_39.json |  12 +-
 ...inecone_vectorstore_similarity_search.json |   4 +-
 ...angchain_community.test_ai21_llm_sync.json |   2 +-
 ...chain_community.test_base_tool_invoke.json |   2 +-
 ...l_invoke_non_json_serializable_config.json |   2 +-
 ...langchain_community.test_chain_invoke.json |   4 +-
 ...gchain_community.test_cohere_llm_sync.json |   2 +-
 ...nity.test_faiss_vectorstore_retrieval.json |   6 +-
 ...ommunity.test_fake_embedding_document.json |   2 +-
 ...n_community.test_fake_embedding_query.json |   2 +-
 ...ommunity.test_huggingfacehub_llm_sync.json |   2 +-
 ...unity.test_lcecl_chain_non_dict_input.json |   2 +-
 ...chain_community.test_lcel_chain_batch.json |   6 +-
 ...n_community.test_lcel_chain_batch_311.json |   6 +-
 ...community.test_lcel_chain_batch_async.json |   6 +-
 ...community.test_lcel_chain_complicated.json |   4 +-
 ...hain_community.test_lcel_chain_nested.json |   8 +-
 ...munity.test_lcel_chain_non_dict_input.json |   2 +-
 ...hain_community.test_lcel_chain_simple.json |   4 +-
 ...ommunity.test_lcel_chain_simple_async.json |   4 +-
 ...munity.test_lcel_with_tools_anthropic.json |   2 +-
 ...community.test_lcel_with_tools_openai.json |   2 +-
 ...ity.test_openai_chat_model_async_call.json |   2 +-
 ...test_openai_chat_model_async_generate.json |   2 +-
 ...chat_model_sync_call_langchain_openai.json |   2 +-
 ....test_openai_chat_model_sync_generate.json |   2 +-
 ...est_openai_chat_model_vision_generate.json |   2 +-
 ...community.test_openai_embedding_query.json |   2 +-
 ...chain_community.test_openai_llm_async.json |   2 +-
 ...chain_community.test_openai_llm_error.json |   2 +-
 ...gchain_community.test_openai_llm_sync.json |   2 +-
 ...test_openai_llm_sync_multiple_prompts.json |   2 +-
 ...hain_community.test_openai_math_chain.json |   6 +-
 ...ommunity.test_openai_math_chain_async.json |   6 +-
 ...ommunity.test_openai_sequential_chain.json |   8 +-
 ...uential_chain_with_multiple_llm_async.json |  10 +-
 ...quential_chain_with_multiple_llm_sync.json |  10 +-
 ..._pinecone_vectorstore_retrieval_chain.json |  12 +-
 ...inecone_vectorstore_similarity_search.json |   4 +-
 ...ngchain_community.test_streamed_chain.json |   4 +-
 ...angchain_community.test_streamed_chat.json |   2 +-
 ...nity.test_streamed_json_output_parser.json |   4 +-
 ...langchain_community.test_streamed_llm.json |   2 +-
 ...b.openai.test_openai.test_acompletion.json |   2 +-
 ...b.openai.test_openai.test_atranscribe.json |   2 +-
 ...ib.openai.test_openai.test_atranslate.json |   2 +-
 ...nai.test_azure_openai_chat_completion.json |   2 +-
 ...t_openai.test_azure_openai_completion.json |   2 +-
 ...st_openai.test_azure_openai_embedding.json |   2 +-
 ...enai.test_openai.test_chat_completion.json |   2 +-
 ...test_chat_completion_function_calling.json |   2 +-
 ...enai.test_chat_completion_image_input.json |   2 +-
 ...ib.openai.test_openai.test_completion.json |   2 +-
 ...ai.test_openai.test_create_moderation.json |   2 +-
 ...rib.openai.test_openai.test_embedding.json |   2 +-
 ....test_embedding_array_of_token_arrays.json |   2 +-
 ...st_openai.test_embedding_string_array.json |   2 +-
 ...est_openai.test_embedding_token_array.json |   2 +-
 ...b.openai.test_openai.test_file_create.json |   2 +-
 ...b.openai.test_openai.test_file_delete.json |   2 +-
 ...openai.test_openai.test_file_download.json |   2 +-
 ...rib.openai.test_openai.test_file_list.json |   2 +-
 ...openai.test_openai.test_file_retrieve.json |   2 +-
 ...t_openai.test_image_b64_json_response.json |   2 +-
 ....openai.test_openai.test_image_create.json |   2 +-
 ...ib.openai.test_openai.test_image_edit.json |   2 +-
 ...t_openai.test_image_edit_binary_input.json |   2 +-
 ...enai.test_openai.test_image_variation.json |   2 +-
 ...ontrib.openai.test_openai.test_misuse.json |   2 +-
 ....openai.test_openai.test_model_delete.json |   2 +-
 ...ib.openai.test_openai.test_model_list.json |   2 +-
 ...penai.test_openai.test_model_retrieve.json |   2 +-
 ...enai.test_span_finish_on_stream_error.json |   2 +-
 ...ib.openai.test_openai.test_transcribe.json |   2 +-
 ...rib.openai.test_openai.test_translate.json |   2 +-
 ...s.test_redis.test_analytics_with_rate.json |   2 +-
 ...est_redis.test_analytics_without_rate.json |   2 +-
 ....contrib.redis.test_redis.test_basics.json |   2 +-
 ...dis.test_redis.test_custom_cmd_length.json |   2 +-
 ...test_redis.test_custom_cmd_length_env.json |   2 +-
 ...test_env_user_specified_redis_service.json |   4 +-
 ....test_full_command_in_resource_config.json |   4 +-
 ...dis.test_full_command_in_resource_env.json |   4 +-
 ...ib.redis.test_redis.test_long_command.json |   2 +-
 ...b.redis.test_redis.test_meta_override.json |   2 +-
 ...rib.redis.test_redis.test_opentracing.json |   4 +-
 ...is.test_redis.test_pipeline_immediate.json |   4 +-
 ...redis.test_redis.test_pipeline_traced.json |   2 +-
 ...contrib.redis.test_redis.test_unicode.json |   2 +-
 ...test_redis_asyncio.test_basic_request.json |   2 +-
 ...s.test_redis_asyncio.test_client_name.json |   4 +-
 ...t_redis_asyncio.test_connection_error.json |   2 +-
 ...s_asyncio.test_decoding_non_utf8_args.json |   4 +-
 ....test_decoding_non_utf8_pipeline_args.json |   2 +-
 ....test_redis_asyncio.test_long_command.json |   2 +-
 ...is_asyncio.test_override_service_name.json |   6 +-
 ...dis.test_redis_asyncio.test_parenting.json |   6 +-
 ...rib.redis.test_redis_asyncio.test_pin.json |   2 +-
 ...st_redis_asyncio.test_pipeline_traced.json |   2 +-
 ...ne_traced_context_manager_transaction.json |   2 +-
 ...dis_asyncio.test_two_traced_pipelines.json |   6 +-
 ...st_redis_asyncio.test_unicode_request.json |   2 +-
 ...rediscluster.test.test_cmd_max_length.json |   4 +-
 ...full_command_in_resource_config[True].json |   8 +-
 ...ing_enabled_False_worker_service_None.json |   6 +-
 ..._worker_service_custom-worker-service.json |   2 +-
 ...cing_enabled_None_worker_service_None.json |   6 +-
 ..._worker_service_custom-worker-service.json |   2 +-
 ...rib.rq.test_rq.test_queue_failing_job.json |   4 +-
 ..._rq.test_queue_failing_job_pre_1_10_1.json |   4 +-
 ...rib.rq.test_rq.test_queue_pin_service.json |   6 +-
 ...ib.rq.test_rq.test_sync_queue_enqueue.json |   4 +-
 ...s.contrib.rq.test_rq.test_sync_worker.json |   6 +-
 ...st_rq.test_sync_worker_config_service.json |   6 +-
 ...est_rq.test_sync_worker_multiple_jobs.json |  18 +--
 ....test_rq.test_sync_worker_pin_service.json |   6 +-
 ...ntrib.rq.test_rq.test_sync_worker_ttl.json |   6 +-
 ...trib.rq.test_rq.test_worker_class_job.json |  12 +-
 ...ib.rq.test_rq.test_worker_failing_job.json |   6 +-
 ....test_snowflake.test_snowflake_commit.json |   2 +-
 ...ake.test_snowflake_executemany_insert.json |   2 +-
 ...est_snowflake.test_snowflake_fetchall.json |   2 +-
 ...test_snowflake_fetchall_multiple_rows.json |   2 +-
 ...est_snowflake.test_snowflake_fetchone.json |   2 +-
 ....test_snowflake_ot_executemany_insert.json |   4 +-
 ..._snowflake.test_snowflake_ot_fetchall.json |   4 +-
 ...t_snowflake_ot_fetchall_multiple_rows.json |   4 +-
 ..._snowflake.test_snowflake_ot_fetchone.json |   4 +-
 ...snowflake.test_snowflake_pin_override.json |   2 +-
 ...est_snowflake.test_snowflake_rollback.json |   2 +-
 ...lake.test_snowflake_settings_override.json |   2 +-
 ...e.test_starlette.test_background_task.json |   6 +-
 ...ette.test_subapp_nested_call_snapshot.json |   4 +-
 ...starlette.test_subapp_nested_snapshot.json |   6 +-
 ...e.test_starlette.test_subapp_snapshot.json |   4 +-
 ...st_starlette.test_subapp_two_snapshot.json |   4 +-
 ...t_starlette.test_table_query_snapshot.json |   8 +-
 ....test_urllib3_connectionpool_snapshot.json |   2 +-
 ...ib3.test_urllib3_poolmanager_snapshot.json |   2 +-
 ...tests.contrib.wsgi.test_wsgi.test_200.json |   8 +-
 ...s.contrib.wsgi.test_wsgi.test_500_py3.json |   4 +-
 ...i.test_base_exception_in_wsgi_app_py3.json |   4 +-
 ...s.contrib.wsgi.test_wsgi.test_chunked.json |   8 +-
 ..._wsgi.test_distributed_tracing_nested.json |  16 +--
 ....test_generator_exit_ignored_snapshot.json |   8 +-
 ...i.test_stop_iteration_in_wsgi_app_py3.json |   8 +-
 ...i.test_wsgi.test_wsgi_base_middleware.json |   6 +-
 ...st_wsgi.test_wsgi_base_middleware_500.json |   4 +-
 ...est_yaaredis.test_analytics_with_rate.json |   2 +-
 ..._yaaredis.test_analytics_without_rate.json |   2 +-
 ...ib.yaaredis.test_yaaredis.test_basics.json |   2 +-
 ...dis.test_yaaredis.test_cmd_max_length.json |   2 +-
 ...full_command_in_resource_config[True].json |   6 +-
 ...redis.test_yaaredis.test_long_command.json |   2 +-
 ...aredis.test_yaaredis.test_opentracing.json |   4 +-
 ...test_yaaredis.test_pipeline_immediate.json |   4 +-
 ...is.test_yaaredis.test_pipeline_traced.json |   2 +-
 ...b.yaaredis.test_yaaredis.test_unicode.json |   2 +-
 ...st_integration_snapshots.test_filters.json |   4 +-
 ...ration_snapshots.test_multiple_traces.json |   8 +-
 ...t_integration_snapshots.test_sampling.json |  28 ++--
 ...metrics_generates_no_error_logs[v0.4].json |   2 +-
 ...metrics_generates_no_error_logs[v0.5].json |   2 +-
 ...apshots.test_single_trace_single_span.json |   2 +-
 ...ion_snapshots.test_synchronous_writer.json |   8 +-
 ...ace_with_wrong_metrics_types_not_sent.json |   2 +-
 ...t_tracer_trace_across_multiple_popens.json |   6 +-
 ...pshots.test_tracer_trace_across_popen.json |   4 +-
 ...tracetagsprocessor_only_adds_new_tags.json |   2 +-
 ..._sampling.test_agent_sample_rate_keep.json |   4 +-
 ...ampling.test_agent_sample_rate_reject.json |   4 +-
 ...ion.test_sampling_decision_downstream.json |   2 +-
 ...on.test_trace_tags_multispan[tracer0].json |   8 +-
 ...on.test_trace_tags_multispan[tracer1].json |   8 +-
 ...on.test_trace_tags_multispan[tracer2].json |   8 +-
 ...n.test_trace_stats.test_measured_span.json |  80 ++++++------
 ...t_trace_stats.test_sampling_rate[0.0].json |  20 +--
 ...t_trace_stats.test_sampling_rate[1.0].json |  20 +--
 ..._single_span_sampling[sampling_rule0].json |   2 +-
 ..._single_span_sampling[sampling_rule1].json |   4 +-
 ...ration.test_trace_stats.test_stats_30.json |  60 ++++-----
 ...ion.test_trace_stats.test_stats_aggrs.json |  14 +-
 ...on.test_trace_stats.test_stats_errors.json |  60 ++++-----
 ...ation.test_trace_stats.test_top_level.json | 120 +++++++++---------
 tests/tracer/test_tracer.py                   |  16 +--
 332 files changed, 1505 insertions(+), 1503 deletions(-)

diff --git a/ddtrace/contrib/internal/mako/patch.py b/ddtrace/contrib/internal/mako/patch.py
index 6c9c11dc8f2..7db3b2e47df 100644
--- a/ddtrace/contrib/internal/mako/patch.py
+++ b/ddtrace/contrib/internal/mako/patch.py
@@ -4,6 +4,7 @@
 
 from ddtrace import config
 from ddtrace.constants import SPAN_MEASURED_KEY
+from ddtrace.contrib.trace_utils import int_service
 from ddtrace.contrib.trace_utils import unwrap as _u
 from ddtrace.contrib.trace_utils import wrap as _w
 from ddtrace.ext import SpanTypes
@@ -26,7 +27,7 @@ def patch():
         return
     mako.__datadog_patch = True
 
-    Pin(service=config.service or schematize_service_name("mako")).onto(Template)
+    Pin().onto(Template)
 
     _w(mako, "template.Template.render", _wrap_render)
     _w(mako, "template.Template.render_unicode", _wrap_render)
@@ -57,7 +58,9 @@ def _wrap_render(wrapped, instance, args, kwargs):
         template_name = getattr(instance, "filename", None)
     template_name = template_name or DEFAULT_TEMPLATE_NAME
 
-    with pin.tracer.trace(func_name(wrapped), pin.service, span_type=SpanTypes.TEMPLATE) as span:
+    with pin.tracer.trace(
+        func_name(wrapped), int_service(pin, config.mako, schematize_service_name("mako")), span_type=SpanTypes.TEMPLATE
+    ) as span:
         span.set_tag_str(COMPONENT, "mako")
 
         span.set_tag(SPAN_MEASURED_KEY)
diff --git a/ddtrace/settings/_inferred_base_service.py b/ddtrace/settings/_inferred_base_service.py
index 4ca6d964a48..a7d01c09dd8 100644
--- a/ddtrace/settings/_inferred_base_service.py
+++ b/ddtrace/settings/_inferred_base_service.py
@@ -54,7 +54,7 @@ def detect(self, args: List[str]) -> Optional[ServiceMetadata]:
         module_flag = False
 
         for arg in args:
-            # we support the --ddtrace option for pytest, and shouldn't skip the following arg 
+            # we support the --ddtrace option for pytest, and shouldn't skip the following arg
             # since it's usually the test location argument.
             has_flag_prefix = arg.startswith("-") and not arg.startswith("--ddtrace")
             is_env_variable = "=" in arg
diff --git a/tests/contrib/flask/test_blueprint.py b/tests/contrib/flask/test_blueprint.py
index efc18ae54e9..93b6c2d7ffc 100644
--- a/tests/contrib/flask/test_blueprint.py
+++ b/tests/contrib/flask/test_blueprint.py
@@ -104,7 +104,7 @@ def test():
         self.assertEqual(span.name, "bp.test")
         self.assertEqual(span.resource, "/")
         self.assertNotEqual(span.parent_id, 0)
-        self.assertEqual(span.get_tags(), {"component": "flask", "_dd.base_service": ""})
+        self.assertEqual(span.get_tags(), {"component": "flask", "_dd.base_service": "tests.contrib.flask"})
 
     def test_blueprint_request_pin_override(self):
         """
@@ -132,7 +132,7 @@ def test():
         self.assertEqual(span.name, "bp.test")
         self.assertEqual(span.resource, "/")
         self.assertNotEqual(span.parent_id, 0)
-        self.assertEqual(span.get_tags(), {"component": "flask", "_dd.base_service": ""})
+        self.assertEqual(span.get_tags(), {"component": "flask", "_dd.base_service": "tests.contrib.flask"})
 
     def test_blueprint_request_pin_disabled(self):
         """
diff --git a/tests/contrib/flask/test_errorhandler.py b/tests/contrib/flask/test_errorhandler.py
index a966ca9396e..8a2a91019e5 100644
--- a/tests/contrib/flask/test_errorhandler.py
+++ b/tests/contrib/flask/test_errorhandler.py
@@ -6,7 +6,7 @@
 from . import BaseFlaskTestCase
 
 
-EXPECTED_METADATA = {"component": "flask", "_dd.base_service": ""}
+EXPECTED_METADATA = {"component": "flask", "_dd.base_service": "tests.contrib.flask"}
 
 
 class FlaskErrorhandlerTestCase(BaseFlaskTestCase):
diff --git a/tests/contrib/flask/test_views.py b/tests/contrib/flask/test_views.py
index eee95b75565..eee9858223e 100644
--- a/tests/contrib/flask/test_views.py
+++ b/tests/contrib/flask/test_views.py
@@ -10,7 +10,7 @@
 
 base_exception_name = "builtins.Exception"
 
-EXPECTED_METADATA = {"component": "flask", "_dd.base_service": ""}
+EXPECTED_METADATA = {"component": "flask", "_dd.base_service": "tests.contrib.flask"}
 
 
 class FlaskViewTestCase(BaseFlaskTestCase):
diff --git a/tests/contrib/jinja2/test_jinja2.py b/tests/contrib/jinja2/test_jinja2.py
index e5a53c3481a..770681fd501 100644
--- a/tests/contrib/jinja2/test_jinja2.py
+++ b/tests/contrib/jinja2/test_jinja2.py
@@ -42,7 +42,7 @@ def test_render_inline_template(self):
         assert len(spans) == 2
 
         for span in spans:
-            assert span.service is None
+            assert span.service == "tests.contrib.jinja2"
             assert span.span_type == "template"
             assert span.get_tag("jinja2.template_name") == "<memory>"
             assert span.get_tag("component") == "jinja2"
@@ -61,7 +61,7 @@ def test_generate_inline_template(self):
         assert len(spans) == 2
 
         for span in spans:
-            assert span.service is None
+            assert span.service == "tests.contrib.jinja2"
             assert span.span_type == "template"
             assert span.get_tag("jinja2.template_name") == "<memory>"
             assert span.get_tag("component") == "jinja2"
diff --git a/tests/contrib/logging/test_logging.py b/tests/contrib/logging/test_logging.py
index 627d333110e..1b3fadc5263 100644
--- a/tests/contrib/logging/test_logging.py
+++ b/tests/contrib/logging/test_logging.py
@@ -237,7 +237,8 @@ def func():
 
             lines = output.splitlines()
             assert (
-                "Hello! [dd.service= dd.env= dd.version= dd.trace_id={:032x} dd.span_id={}]".format(
+                "Hello! [dd.service=tests.contrib.logging dd.env= dd.version= \
+                    dd.trace_id={:032x} dd.span_id={}]".format(
                     span.trace_id, span.span_id
                 )
                 == lines[0]
@@ -266,10 +267,9 @@ def test_log_strformat_style_format(self):
             with self.tracer.trace("test.logging") as span:
                 record = logger.makeRecord("name", "INFO", "func", 534, "Manual log record", (), None)
                 log = formatter.format(record)
-                expected = (
-                    "Manual log record [dd.service= dd.env= dd.version= dd.trace_id={:032x} dd.span_id={}]".format(
-                        span.trace_id, span.span_id
-                    )
+                expected = "Manual log record [dd.service=tests.contrib.logging dd.env= dd.version= \
+                    dd.trace_id={:032x} dd.span_id={}]".format(
+                    span.trace_id, span.span_id
                 )
                 assert log == expected
 
diff --git a/tests/debugging/test_config.py b/tests/debugging/test_config.py
index 49ca4966d65..2d1c04267ed 100644
--- a/tests/debugging/test_config.py
+++ b/tests/debugging/test_config.py
@@ -3,7 +3,6 @@
 import pytest
 
 from ddtrace.internal.agent import get_trace_url
-from ddtrace.internal.utils.config import get_application_name
 from ddtrace.internal.utils.formats import parse_tags_str
 from ddtrace.settings.dynamic_instrumentation import DynamicInstrumentationConfig
 from ddtrace.version import get_version
@@ -49,7 +48,7 @@ def test_snapshot_intake_url():
 
 
 def test_service_name():
-    assert DynamicInstrumentationConfig().service_name == get_application_name()
+    assert DynamicInstrumentationConfig().service_name == "tests.debugging"
 
     with debugger_config(DD_SERVICE="test-service") as config:
         assert config.service_name == "test-service"
diff --git a/tests/integration/test_debug.py b/tests/integration/test_debug.py
index 18018c3e854..e699db36d6b 100644
--- a/tests/integration/test_debug.py
+++ b/tests/integration/test_debug.py
@@ -94,7 +94,7 @@ def test_standard_tags():
     assert f.get("tracer_enabled") is True
     assert f.get("sampler_type") == "DatadogSampler"
     assert f.get("priority_sampler_type") == "N/A"
-    assert f.get("service") == ""
+    assert f.get("service") == "tests.integration"
     assert f.get("dd_version") == ""
     assert f.get("debug") is False
     assert f.get("enabled_cli") is False
diff --git a/tests/internal/remoteconfig/test_remoteconfig_client_e2e.py b/tests/internal/remoteconfig/test_remoteconfig_client_e2e.py
index 39e84c288a4..0ac532c100b 100644
--- a/tests/internal/remoteconfig/test_remoteconfig_client_e2e.py
+++ b/tests/internal/remoteconfig/test_remoteconfig_client_e2e.py
@@ -41,7 +41,7 @@ def _expected_payload(
                 "runtime_id": runtime.get_runtime_id(),
                 "language": "python",
                 "tracer_version": _pep440_to_semver(),
-                "service": None,
+                "service": 'tests.internal',
                 "extra_services": [],
                 "env": None,
                 "app_version": None,
diff --git a/tests/llmobs/_utils.py b/tests/llmobs/_utils.py
index fb48d15431b..91403a421df 100644
--- a/tests/llmobs/_utils.py
+++ b/tests/llmobs/_utils.py
@@ -34,7 +34,7 @@ def _expected_llmobs_tags(span, error=None, tags=None, session_id=None):
     expected_tags = [
         "version:{}".format(tags.get("version", "")),
         "env:{}".format(tags.get("env", "")),
-        "service:{}".format(tags.get("service", "")),
+        "service:{}".format(tags.get("service", "tests.llmobs")),
         "source:integration",
         "ml_app:{}".format(tags.get("ml_app", "unnamed-ml-app")),
         "ddtrace.version:{}".format(ddtrace.__version__),
@@ -268,7 +268,7 @@ def _completion_event():
         "parent_id": "",
         "session_id": "98765432101",
         "name": "completion_span",
-        "tags": ["version:", "env:", "service:", "source:integration"],
+        "tags": ["version:", "env:", "service:tests.llmobs", "source:integration"],
         "start_ns": 1707763310981223236,
         "duration": 12345678900,
         "error": 0,
@@ -299,7 +299,7 @@ def _chat_completion_event():
         "parent_id": "",
         "session_id": "98765432102",
         "name": "chat_completion_span",
-        "tags": ["version:", "env:", "service:", "source:integration"],
+        "tags": ["version:", "env:", "service:tests.llmobs", "source:integration"],
         "start_ns": 1707763310981223936,
         "duration": 12345678900,
         "error": 0,
@@ -337,7 +337,7 @@ def _large_event():
         "parent_id": "",
         "session_id": "98765432103",
         "name": "large_span",
-        "tags": ["version:", "env:", "service:", "source:integration"],
+        "tags": ["version:", "env:", "service:tests.llmobs", "source:integration"],
         "start_ns": 1707763310981223936,
         "duration": 12345678900,
         "error": 0,
@@ -375,7 +375,7 @@ def _oversized_llm_event():
         "parent_id": "",
         "session_id": "98765432104",
         "name": "oversized_llm_event",
-        "tags": ["version:", "env:", "service:", "source:integration"],
+        "tags": ["version:", "env:", "service:tests.llmobs", "source:integration"],
         "start_ns": 1707763310981223936,
         "duration": 12345678900,
         "error": 0,
@@ -413,7 +413,7 @@ def _oversized_workflow_event():
         "parent_id": "",
         "session_id": "98765432105",
         "name": "oversized_workflow_event",
-        "tags": ["version:", "env:", "service:", "source:integration"],
+        "tags": ["version:", "env:", "service:tests.llmobs", "source:integration"],
         "start_ns": 1707763310981223936,
         "duration": 12345678900,
         "error": 0,
@@ -433,7 +433,7 @@ def _oversized_retrieval_event():
         "parent_id": "",
         "session_id": "98765432106",
         "name": "oversized_retrieval_event",
-        "tags": ["version:", "env:", "service:", "source:integration"],
+        "tags": ["version:", "env:", "service:tests.llmobs", "source:integration"],
         "start_ns": 1707763310981223936,
         "duration": 12345678900,
         "error": 0,
@@ -450,7 +450,7 @@ def expected_ragas_trace_tags():
     return [
         "version:",
         "env:",
-        "service:",
+        "service:tests.llmobs",
         "source:integration",
         "ml_app:dd-ragas-unnamed-ml-app",
         "ddtrace.version:{}".format(ddtrace.__version__),
diff --git a/tests/snapshots/tests.appsec.appsec.test_processor.test_appsec_span_tags_snapshot.json b/tests/snapshots/tests.appsec.appsec.test_processor.test_appsec_span_tags_snapshot.json
index 86780e6d037..3137305e022 100644
--- a/tests/snapshots/tests.appsec.appsec.test_processor.test_appsec_span_tags_snapshot.json
+++ b/tests/snapshots/tests.appsec.appsec.test_processor.test_appsec_span_tags_snapshot.json
@@ -11,7 +11,7 @@
       "_dd.appsec.event_rules.version": "1.13.2",
       "_dd.appsec.json": "{\"triggers\":[\n  {\n    \"rule\": {\n      \"id\": \"nfd-000-006\",\n      \"name\": \"Detect failed attempt to fetch sensitive files\",\n      \"tags\": {\n        \"capec\": \"1000/118/169\",\n        \"category\": \"attack_attempt\",\n        \"confidence\": \"1\",\n        \"cwe\": \"200\",\n        \"type\": \"security_scanner\"\n      }\n    },\n    \"rule_matches\": [\n      {\n        \"operator\": \"match_regex\",\n        \"operator_value\": \"^404$\",\n        \"parameters\": [\n          {\n            \"address\": \"server.response.status\",\n            \"highlight\": [\n              \"404\"\n            ],\n            \"key_path\": [],\n            \"value\": \"404\"\n          }\n        ]\n      },\n      {\n        \"operator\": \"match_regex\",\n        \"operator_value\": \"\\\\.(cgi|bat|dll|exe|key|cert|crt|pem|der|pkcs|pkcs|pkcs[0-9]*|nsf|jsa|war|java|class|vb|vba|so|git|svn|hg|cvs)([^a-zA-Z0-9_]|$)\",\n        \"parameters\": [\n          {\n            \"address\": \"server.request.uri.raw\",\n            \"highlight\": [\n              \".git\"\n            ],\n            \"key_path\": [],\n            \"value\": \"/.git\"\n          }\n        ]\n      }\n    ]\n  }\n]}",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.appsec.appsec",
       "_dd.origin": "appsec",
       "_dd.p.appsec": "1",
       "_dd.p.dm": "-5",
diff --git a/tests/snapshots/tests.appsec.appsec.test_processor.test_appsec_span_tags_snapshot_with_errors.json b/tests/snapshots/tests.appsec.appsec.test_processor.test_appsec_span_tags_snapshot_with_errors.json
index 10e49c59b12..def21246eeb 100644
--- a/tests/snapshots/tests.appsec.appsec.test_processor.test_appsec_span_tags_snapshot_with_errors.json
+++ b/tests/snapshots/tests.appsec.appsec.test_processor.test_appsec_span_tags_snapshot_with_errors.json
@@ -11,7 +11,7 @@
       "_dd.appsec.event_rules.errors": "{\"missing key 'conditions'\": [\"crs-913-110\"], \"missing key 'tags'\": [\"crs-942-100\"]}",
       "_dd.appsec.event_rules.version": "5.5.5",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.appsec.appsec",
       "_dd.p.dm": "-0",
       "_dd.runtime_family": "python",
       "http.status_code": "404",
diff --git a/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_configure_service_name_split_by_domain.json b/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_configure_service_name_split_by_domain.json
index 41584231ab8..efead94df1c 100644
--- a/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_configure_service_name_split_by_domain.json
+++ b/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_configure_service_name_split_by_domain.json
@@ -9,7 +9,7 @@
     "type": "http",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.aiohttp",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6583754d00000000",
       "component": "aiohttp_client",
@@ -41,7 +41,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.aiohttp",
          "_dd.p.tid": "6583754d00000000",
          "component": "aiohttp"
        },
diff --git a/tests/snapshots/tests.contrib.aiohttp_jinja2.test_aiohttp_jinja2.test_template_rendering_snapshot_patched_server[True].json b/tests/snapshots/tests.contrib.aiohttp_jinja2.test_aiohttp_jinja2.test_template_rendering_snapshot_patched_server[True].json
index 9b3b89eadac..e7091a55a3d 100644
--- a/tests/snapshots/tests.contrib.aiohttp_jinja2.test_aiohttp_jinja2.test_template_rendering_snapshot_patched_server[True].json
+++ b/tests/snapshots/tests.contrib.aiohttp_jinja2.test_aiohttp_jinja2.test_template_rendering_snapshot_patched_server[True].json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.aiohttp_jinja2",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "aiohttp",
@@ -42,7 +42,7 @@
        "type": "template",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.aiohttp_jinja2",
          "_dd.p.tid": "654a694400000000",
          "aiohttp.template": "/template.jinja2",
          "component": "aiohttp_jinja2"
diff --git a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm.json b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm.json
index ecb97a7f031..dd9e9d1fcce 100644
--- a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm.json
+++ b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "anthropic.request",
-    "service": "",
+    "service": "tests.contrib.anthropic",
     "resource": "Messages.create",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_create_image.json b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_create_image.json
index f519f68b9a6..8fd97b4e689 100644
--- a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_create_image.json
+++ b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_create_image.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "anthropic.request",
-    "service": "",
+    "service": "tests.contrib.anthropic",
     "resource": "Messages.create",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_error.json b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_error.json
index 89b9759808c..4b6cae0a44f 100644
--- a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_error.json
+++ b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_error.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "anthropic.request",
-    "service": "",
+    "service": "tests.contrib.anthropic",
     "resource": "Messages.create",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_multiple_prompts.json b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_multiple_prompts.json
index aebc2405be8..b7a44201a28 100644
--- a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_multiple_prompts.json
+++ b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_multiple_prompts.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "anthropic.request",
-    "service": "",
+    "service": "tests.contrib.anthropic",
     "resource": "Messages.create",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_multiple_prompts_with_chat_history.json b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_multiple_prompts_with_chat_history.json
index b2cebc0475a..996c8fbe4e3 100644
--- a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_multiple_prompts_with_chat_history.json
+++ b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_multiple_prompts_with_chat_history.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "anthropic.request",
-    "service": "",
+    "service": "tests.contrib.anthropic",
     "resource": "Messages.create",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_stream.json b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_stream.json
index 2a0c370ddcf..640b54e63c0 100644
--- a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_stream.json
+++ b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_stream.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "anthropic.request",
-    "service": "",
+    "service": "tests.contrib.anthropic",
     "resource": "Messages.create",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_stream_helper.json b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_stream_helper.json
index da73b6cbde3..6ec03a36ca7 100644
--- a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_stream_helper.json
+++ b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_stream_helper.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "anthropic.request",
-    "service": "",
+    "service": "tests.contrib.anthropic",
     "resource": "Messages.stream",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_stream_image.json b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_stream_image.json
index 47fb207abdf..da78521c60d 100644
--- a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_stream_image.json
+++ b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_stream_image.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "anthropic.request",
-    "service": "",
+    "service": "tests.contrib.anthropic",
     "resource": "Messages.create",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_tools.json b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_tools.json
index 0116cee4321..da752962101 100644
--- a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_tools.json
+++ b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_tools.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "anthropic.request",
-    "service": "",
+    "service": "tests.contrib.anthropic",
     "resource": "Messages.create",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_tools_full_use.json b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_tools_full_use.json
index abc48a69302..3aeeba536e7 100644
--- a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_tools_full_use.json
+++ b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_tools_full_use.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "anthropic.request",
-    "service": "",
+    "service": "tests.contrib.anthropic",
     "resource": "Messages.create",
     "trace_id": 0,
     "span_id": 1,
@@ -50,7 +50,7 @@
 [
   {
     "name": "anthropic.request",
-    "service": "",
+    "service": "tests.contrib.anthropic",
     "resource": "Messages.create",
     "trace_id": 1,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_tools_full_use_stream.json b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_tools_full_use_stream.json
index d5a327d13ba..f351098308e 100644
--- a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_tools_full_use_stream.json
+++ b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_tools_full_use_stream.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "anthropic.request",
-    "service": "",
+    "service": "tests.contrib.anthropic",
     "resource": "AsyncMessages.stream",
     "trace_id": 0,
     "span_id": 1,
@@ -43,7 +43,7 @@
 [
   {
     "name": "anthropic.request",
-    "service": "",
+    "service": "tests.contrib.anthropic",
     "resource": "AsyncMessages.create",
     "trace_id": 1,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_tools_stream.json b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_tools_stream.json
index d6fe5ae1a23..f0708e6700e 100644
--- a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_tools_stream.json
+++ b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_tools_stream.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "anthropic.request",
-    "service": "",
+    "service": "tests.contrib.anthropic",
     "resource": "AsyncMessages.create",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_tools_stream_helper.json b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_tools_stream_helper.json
index 4cc640e5e36..43c4f9d53da 100644
--- a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_tools_stream_helper.json
+++ b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_tools_stream_helper.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "anthropic.request",
-    "service": "",
+    "service": "tests.contrib.anthropic",
     "resource": "AsyncMessages.stream",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_unserializable_arg.json b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_unserializable_arg.json
index ae744a6ed0c..db9da915001 100644
--- a/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_unserializable_arg.json
+++ b/tests/snapshots/tests.contrib.anthropic.test_anthropic.test_anthropic_llm_unserializable_arg.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "anthropic.request",
-    "service": "",
+    "service": "tests.contrib.anthropic",
     "resource": "Messages.create",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.aredis.test_aredis.test_analytics_with_rate.json b/tests/snapshots/tests.contrib.aredis.test_aredis.test_analytics_with_rate.json
index 16adeb87a19..d870b797213 100644
--- a/tests/snapshots/tests.contrib.aredis.test_aredis.test_analytics_with_rate.json
+++ b/tests/snapshots/tests.contrib.aredis.test_aredis.test_analytics_with_rate.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.aredis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "aredis",
diff --git a/tests/snapshots/tests.contrib.aredis.test_aredis.test_analytics_without_rate.json b/tests/snapshots/tests.contrib.aredis.test_aredis.test_analytics_without_rate.json
index 391ca34cfda..fd592f2416e 100644
--- a/tests/snapshots/tests.contrib.aredis.test_aredis.test_analytics_without_rate.json
+++ b/tests/snapshots/tests.contrib.aredis.test_aredis.test_analytics_without_rate.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.aredis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "aredis",
diff --git a/tests/snapshots/tests.contrib.aredis.test_aredis.test_basics.json b/tests/snapshots/tests.contrib.aredis.test_aredis.test_basics.json
index 2f71c1d7be0..f1f88c60a6d 100644
--- a/tests/snapshots/tests.contrib.aredis.test_aredis.test_basics.json
+++ b/tests/snapshots/tests.contrib.aredis.test_aredis.test_basics.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.aredis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "aredis",
diff --git a/tests/snapshots/tests.contrib.aredis.test_aredis.test_cmd_max_length.json b/tests/snapshots/tests.contrib.aredis.test_aredis.test_cmd_max_length.json
index 82443d557ee..d1172267de5 100644
--- a/tests/snapshots/tests.contrib.aredis.test_aredis.test_cmd_max_length.json
+++ b/tests/snapshots/tests.contrib.aredis.test_aredis.test_cmd_max_length.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.aredis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "aredis",
diff --git a/tests/snapshots/tests.contrib.aredis.test_aredis.test_full_command_in_resource_config[True].json b/tests/snapshots/tests.contrib.aredis.test_aredis.test_full_command_in_resource_config[True].json
index 3bd221c8f74..fe6369a2954 100644
--- a/tests/snapshots/tests.contrib.aredis.test_aredis.test_full_command_in_resource_config[True].json
+++ b/tests/snapshots/tests.contrib.aredis.test_aredis.test_full_command_in_resource_config[True].json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.aredis",
       "_dd.p.dm": "-0",
       "language": "python",
       "runtime-id": "9ac61da02efc4632a954063a29231b49"
@@ -33,7 +33,7 @@
        "type": "redis",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.aredis",
          "component": "aredis",
          "db.system": "redis",
          "out.host": "localhost",
@@ -62,7 +62,7 @@
        "type": "redis",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.aredis",
          "component": "aredis",
          "db.system": "redis",
          "out.host": "localhost",
diff --git a/tests/snapshots/tests.contrib.aredis.test_aredis.test_long_command.json b/tests/snapshots/tests.contrib.aredis.test_aredis.test_long_command.json
index cbcd14bcbd6..7b66b1ee6fa 100644
--- a/tests/snapshots/tests.contrib.aredis.test_aredis.test_long_command.json
+++ b/tests/snapshots/tests.contrib.aredis.test_aredis.test_long_command.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.aredis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "aredis",
diff --git a/tests/snapshots/tests.contrib.aredis.test_aredis.test_opentracing.json b/tests/snapshots/tests.contrib.aredis.test_aredis.test_opentracing.json
index 9cf2faf87cf..4b92f11d92e 100644
--- a/tests/snapshots/tests.contrib.aredis.test_aredis.test_opentracing.json
+++ b/tests/snapshots/tests.contrib.aredis.test_aredis.test_opentracing.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.aredis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "language": "python",
@@ -34,7 +34,7 @@
        "type": "redis",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.aredis",
          "_dd.p.tid": "654a694400000000",
          "component": "aredis",
          "db.system": "redis",
diff --git a/tests/snapshots/tests.contrib.aredis.test_aredis.test_pipeline_immediate.json b/tests/snapshots/tests.contrib.aredis.test_aredis.test_pipeline_immediate.json
index d6a00258957..dd4ddb4f17a 100644
--- a/tests/snapshots/tests.contrib.aredis.test_aredis.test_pipeline_immediate.json
+++ b/tests/snapshots/tests.contrib.aredis.test_aredis.test_pipeline_immediate.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.aredis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "aredis",
@@ -45,7 +45,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.aredis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "aredis",
diff --git a/tests/snapshots/tests.contrib.aredis.test_aredis.test_pipeline_traced.json b/tests/snapshots/tests.contrib.aredis.test_aredis.test_pipeline_traced.json
index 39c23b4b2dd..fa796968608 100644
--- a/tests/snapshots/tests.contrib.aredis.test_aredis.test_pipeline_traced.json
+++ b/tests/snapshots/tests.contrib.aredis.test_aredis.test_pipeline_traced.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.aredis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "aredis",
diff --git a/tests/snapshots/tests.contrib.aredis.test_aredis.test_unicode.json b/tests/snapshots/tests.contrib.aredis.test_aredis.test_unicode.json
index 718ff1c8599..fc3dffe9e5c 100644
--- a/tests/snapshots/tests.contrib.aredis.test_aredis.test_unicode.json
+++ b/tests/snapshots/tests.contrib.aredis.test_aredis.test_unicode.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.aredis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "aredis",
diff --git a/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_appsec_enabled.json b/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_appsec_enabled.json
index b1a8a8b0bd4..29e22f260a6 100644
--- a/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_appsec_enabled.json
+++ b/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_appsec_enabled.json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "1.13.2",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -64,7 +64,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -81,7 +81,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -98,7 +98,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -115,7 +115,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -132,7 +132,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -149,7 +149,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -166,7 +166,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -183,7 +183,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -200,7 +200,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -217,7 +217,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -234,7 +234,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -251,7 +251,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -268,7 +268,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -285,7 +285,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -302,7 +302,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -319,7 +319,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -336,7 +336,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -353,7 +353,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -370,7 +370,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -387,7 +387,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -404,7 +404,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -421,7 +421,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -438,7 +438,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -455,7 +455,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -472,7 +472,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_appsec_enabled_attack.json b/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_appsec_enabled_attack.json
index 2da6e3029aa..0ca0dba4fab 100644
--- a/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_appsec_enabled_attack.json
+++ b/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_appsec_enabled_attack.json
@@ -12,7 +12,7 @@
       "_dd.appsec.event_rules.version": "1.13.2",
       "_dd.appsec.json": "{\"triggers\":[\n  {\n    \"rule\": {\n      \"id\": \"nfd-000-006\",\n      \"name\": \"Detect failed attempt to fetch sensitive files\",\n      \"tags\": {\n        \"capec\": \"1000/118/169\",\n        \"category\": \"attack_attempt\",\n        \"confidence\": \"1\",\n        \"cwe\": \"200\",\n        \"type\": \"security_scanner\"\n      }\n    },\n    \"rule_matches\": [\n      {\n        \"operator\": \"match_regex\",\n        \"operator_value\": \"^404$\",\n        \"parameters\": [\n          {\n            \"address\": \"server.response.status\",\n            \"highlight\": [\n              \"404\"\n            ],\n            \"key_path\": [],\n            \"value\": \"404\"\n          }\n        ]\n      },\n      {\n        \"operator\": \"match_regex\",\n        \"operator_value\": \"\\\\.(cgi|bat|dll|exe|key|cert|crt|pem|der|pkcs|pkcs|pkcs[0-9]*|nsf|jsa|war|java|class|vb|vba|so|git|svn|hg|cvs)([^a-zA-Z0-9_]|$)\",\n        \"parameters\": [\n          {\n            \"address\": \"server.request.uri.raw\",\n            \"highlight\": [\n              \".git\"\n            ],\n            \"key_path\": [],\n            \"value\": \"/.git\"\n          }\n        ]\n      }\n    ]\n  }\n]}",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.origin": "appsec",
       "_dd.p.appsec": "1",
       "_dd.p.dm": "-5",
@@ -67,7 +67,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -84,7 +84,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -101,7 +101,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -118,7 +118,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -135,7 +135,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -152,7 +152,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -169,7 +169,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -186,7 +186,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -203,7 +203,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -220,7 +220,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -237,7 +237,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -254,7 +254,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -271,7 +271,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -288,7 +288,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -305,7 +305,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -322,7 +322,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -339,7 +339,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -356,7 +356,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -373,7 +373,7 @@
                                      "type": "template",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django",
                                        "django.template.engine.class": "django.template.engine.Engine"
@@ -391,7 +391,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -408,7 +408,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -425,7 +425,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -442,7 +442,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -459,7 +459,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -476,7 +476,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -493,7 +493,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_match_403.json b/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_match_403.json
index 91b403fd793..eb5abdce029 100644
--- a/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_match_403.json
+++ b/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_match_403.json
@@ -12,7 +12,7 @@
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.json": "{\"triggers\":[{\"rule\":{\"id\":\"blk-001-001\",\"name\":\"Block IP addresses\",\"on_match\":[\"block\"],\"tags\":{\"category\":\"blocking\",\"type\":\"ip_addresses\"}},\"rule_matches\":[{\"operator\":\"ip_match\",\"operator_value\":\"\",\"parameters\":[{\"address\":\"http.client_ip\",\"key_path\":[],\"value\":\"8.8.4.4\",\"highlight\":[\"8.8.4.4\"]}]}],\"span_id\":10192376353237234254}]}",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.origin": "appsec",
       "_dd.p.appsec": "1",
       "_dd.p.dm": "-5",
@@ -71,7 +71,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "component": "django"
        },
        "duration": 1442334,
@@ -87,7 +87,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "component": "django"
           },
           "duration": 17708,
@@ -103,7 +103,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "component": "django"
           },
           "duration": 1352459,
@@ -119,7 +119,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "component": "django"
              },
              "duration": 20292,
@@ -135,7 +135,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "component": "django"
              },
              "duration": 1262750,
@@ -151,7 +151,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "component": "django"
                 },
                 "duration": 9667,
@@ -167,7 +167,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "component": "django"
                 },
                 "duration": 1197125,
@@ -183,7 +183,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "component": "django"
                    },
                    "duration": 14417,
@@ -199,7 +199,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "component": "django"
                    },
                    "duration": 1148541,
@@ -215,7 +215,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "component": "django"
                       },
                       "duration": 27500,
@@ -231,7 +231,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "component": "django"
                       },
                       "duration": 1061375,
@@ -247,7 +247,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "component": "django"
                          },
                          "duration": 1010541,
@@ -263,7 +263,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "component": "django"
                             },
                             "duration": 7667,
@@ -279,7 +279,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "component": "django"
                             },
                             "duration": 925750,
@@ -295,7 +295,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django",
                                  "component": "django"
                                },
                                "duration": 903000,
@@ -311,7 +311,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django",
                                     "component": "django"
                                   },
                                   "duration": 876708,
@@ -327,7 +327,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "component": "django"
                                      },
                                      "duration": 18209,
@@ -343,7 +343,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "component": "django"
                                      },
                                      "duration": 12708,
@@ -359,7 +359,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "component": "django"
                                      },
                                      "duration": 36042,
@@ -375,7 +375,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "component": "django"
                             },
                             "duration": 20375,
@@ -391,7 +391,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "component": "django"
                          },
                          "duration": 11875,
@@ -407,7 +407,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "component": "django"
                       },
                       "duration": 8375,
@@ -423,7 +423,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "component": "django"
                 },
                 "duration": 7958,
@@ -439,7 +439,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "component": "django"
              },
              "duration": 9583,
@@ -455,7 +455,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "component": "django"
           },
           "duration": 9708,
diff --git a/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_match_403_json.json b/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_match_403_json.json
index 80badf55332..f25dd8b7733 100644
--- a/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_match_403_json.json
+++ b/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_match_403_json.json
@@ -12,7 +12,7 @@
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.json": "{\"triggers\":[{\"rule\":{\"id\":\"blk-001-001\",\"name\":\"Block IP addresses\",\"on_match\":[\"block\"],\"tags\":{\"category\":\"blocking\",\"type\":\"ip_addresses\"}},\"rule_matches\":[{\"operator\":\"ip_match\",\"operator_value\":\"\",\"parameters\":[{\"address\":\"http.client_ip\",\"key_path\":[],\"value\":\"8.8.4.4\",\"highlight\":[\"8.8.4.4\"]}]}],\"span_id\":865087550764298227}]}",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.origin": "appsec",
       "_dd.p.appsec": "1",
       "_dd.p.dm": "-5",
@@ -71,7 +71,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "component": "django"
        },
        "duration": 1500333,
@@ -87,7 +87,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "component": "django"
           },
           "duration": 19375,
@@ -103,7 +103,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "component": "django"
           },
           "duration": 1402584,
@@ -119,7 +119,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "component": "django"
              },
              "duration": 20750,
@@ -135,7 +135,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "component": "django"
              },
              "duration": 1316375,
@@ -151,7 +151,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "component": "django"
                 },
                 "duration": 9625,
@@ -167,7 +167,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "component": "django"
                 },
                 "duration": 1250041,
@@ -183,7 +183,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "component": "django"
                    },
                    "duration": 9416,
@@ -199,7 +199,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "component": "django"
                    },
                    "duration": 1207291,
@@ -215,7 +215,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "component": "django"
                       },
                       "duration": 25334,
@@ -231,7 +231,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "component": "django"
                       },
                       "duration": 1122667,
@@ -247,7 +247,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "component": "django"
                          },
                          "duration": 1072125,
@@ -263,7 +263,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "component": "django"
                             },
                             "duration": 7500,
@@ -279,7 +279,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "component": "django"
                             },
                             "duration": 987375,
@@ -295,7 +295,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django",
                                  "component": "django"
                                },
                                "duration": 964541,
@@ -311,7 +311,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django",
                                     "component": "django"
                                   },
                                   "duration": 937292,
@@ -327,7 +327,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "component": "django"
                                      },
                                      "duration": 17042,
@@ -343,7 +343,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "component": "django"
                                      },
                                      "duration": 18958,
@@ -359,7 +359,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "component": "django"
                                      },
                                      "duration": 34958,
@@ -375,7 +375,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "component": "django"
                             },
                             "duration": 21625,
@@ -391,7 +391,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "component": "django"
                          },
                          "duration": 12458,
@@ -407,7 +407,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "component": "django"
                       },
                       "duration": 9250,
@@ -423,7 +423,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "component": "django"
                 },
                 "duration": 7625,
@@ -439,7 +439,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "component": "django"
              },
              "duration": 9709,
@@ -455,7 +455,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "component": "django"
           },
           "duration": 9916,
diff --git a/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_nomatch_200.json b/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_nomatch_200.json
index bc4695d1779..85a0cd8fe0e 100644
--- a/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_nomatch_200.json
+++ b/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_nomatch_200.json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -64,7 +64,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -81,7 +81,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -98,7 +98,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -115,7 +115,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -132,7 +132,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -149,7 +149,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -166,7 +166,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -183,7 +183,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -200,7 +200,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -217,7 +217,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -234,7 +234,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -251,7 +251,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -268,7 +268,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -285,7 +285,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -302,7 +302,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -319,7 +319,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -336,7 +336,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -353,7 +353,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -370,7 +370,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -387,7 +387,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -404,7 +404,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -421,7 +421,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -438,7 +438,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -455,7 +455,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -472,7 +472,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_404_exceptions.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_404_exceptions.json
index 70a370b0d35..f64347ea749 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_404_exceptions.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_404_exceptions.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -45,7 +45,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -62,7 +62,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -79,7 +79,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -96,7 +96,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -113,7 +113,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -130,7 +130,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -147,7 +147,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -164,7 +164,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -181,7 +181,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -198,7 +198,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -215,7 +215,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -232,7 +232,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -249,7 +249,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -266,7 +266,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -283,7 +283,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -300,7 +300,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -317,7 +317,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -334,7 +334,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -351,7 +351,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -368,7 +368,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -385,7 +385,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -402,7 +402,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -419,7 +419,7 @@
                                      "type": "template",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django",
                                        "django.template.engine.class": "django.template.engine.Engine"
@@ -437,7 +437,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -454,7 +454,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -471,7 +471,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -488,7 +488,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -505,7 +505,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -522,7 +522,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -539,7 +539,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_404_exceptions_111x.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_404_exceptions_111x.json
index 7e4f138ed68..daf7c67ae09 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_404_exceptions_111x.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_404_exceptions_111x.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -43,7 +43,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -60,7 +60,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -77,7 +77,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -94,7 +94,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -111,7 +111,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -128,7 +128,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -145,7 +145,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -162,7 +162,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -179,7 +179,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -196,7 +196,7 @@
        "type": "template",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django",
          "django.template.engine.class": "django.template.engine.Engine"
@@ -214,7 +214,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -231,7 +231,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -248,7 +248,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -265,7 +265,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -282,7 +282,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -299,7 +299,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -316,7 +316,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_200_3x.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_200_3x.json
index 1edc55d43d2..221ca76d069 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_200_3x.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_200_3x.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "asgi.version": "3.0",
@@ -48,7 +48,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -65,7 +65,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -82,7 +82,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -99,7 +99,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -116,7 +116,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -133,7 +133,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -150,7 +150,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -167,7 +167,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -184,7 +184,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -201,7 +201,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -218,7 +218,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -235,7 +235,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -252,7 +252,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -269,7 +269,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -286,7 +286,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -303,7 +303,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -320,7 +320,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -337,7 +337,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -354,7 +354,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -371,7 +371,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -388,7 +388,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -405,7 +405,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -422,7 +422,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -439,7 +439,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -456,7 +456,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_200_traced_simple_app.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_200_traced_simple_app.json
index b4825a86440..a50dc0c8a25 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_200_traced_simple_app.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_200_traced_simple_app.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "asgi.request",
-    "service": "",
+    "service": "tests.contrib.django",
     "resource": "GET /traced-simple-asgi-app/",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_500_3x.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_500_3x.json
index 94b4654ac80..795b28c62ab 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_500_3x.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_500_3x.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "asgi.version": "3.0",
@@ -48,7 +48,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -65,7 +65,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -82,7 +82,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -99,7 +99,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -116,7 +116,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -133,7 +133,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -150,7 +150,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -167,7 +167,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -184,7 +184,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -201,7 +201,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -218,7 +218,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -235,7 +235,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -252,7 +252,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -269,7 +269,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -286,7 +286,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -303,7 +303,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -320,7 +320,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -337,7 +337,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -354,7 +354,7 @@
                                      "type": "",
                                      "error": 1,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django",
                                        "error.message": "Error 500",
@@ -374,7 +374,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -391,7 +391,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -408,7 +408,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -425,7 +425,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -442,7 +442,7 @@
                                      "type": "template",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django",
                                        "django.template.engine.class": "django.template.engine.Engine"
@@ -460,7 +460,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -477,7 +477,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -494,7 +494,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -511,7 +511,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -528,7 +528,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -545,7 +545,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_django_resource_handler.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_django_resource_handler.json
index dcf893a28ad..2625c6ae45b 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_django_resource_handler.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_django_resource_handler.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "asgi.version": "3.0",
@@ -48,7 +48,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -65,7 +65,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -82,7 +82,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -99,7 +99,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -116,7 +116,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -133,7 +133,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -150,7 +150,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -167,7 +167,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -184,7 +184,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -201,7 +201,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -218,7 +218,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -235,7 +235,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -252,7 +252,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -269,7 +269,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -286,7 +286,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -303,7 +303,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -320,7 +320,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -337,7 +337,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -354,7 +354,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -371,7 +371,7 @@
                                         "type": "",
                                         "error": 0,
                                         "meta": {
-                                          "_dd.base_service": "",
+                                          "_dd.base_service": "tests.contrib.django",
                                           "_dd.p.tid": "654a694400000000",
                                           "component": "django"
                                         },
@@ -388,7 +388,7 @@
                                         "type": "",
                                         "error": 0,
                                         "meta": {
-                                          "_dd.base_service": "",
+                                          "_dd.base_service": "tests.contrib.django",
                                           "_dd.p.tid": "654a694400000000",
                                           "component": "django"
                                         },
@@ -405,7 +405,7 @@
                                            "type": "",
                                            "error": 0,
                                            "meta": {
-                                             "_dd.base_service": "",
+                                             "_dd.base_service": "tests.contrib.django",
                                              "_dd.p.tid": "654a694400000000",
                                              "component": "django"
                                            },
@@ -422,7 +422,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -439,7 +439,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -456,7 +456,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -473,7 +473,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -490,7 +490,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -507,7 +507,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_djangoq_dd_trace_methods.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_djangoq_dd_trace_methods.json
index 5573087ddff..e71b2825d07 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_djangoq_dd_trace_methods.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_djangoq_dd_trace_methods.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "65d4d02000000000",
       "asgi.version": "3.0",
@@ -48,7 +48,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "component": "django"
        },
        "duration": 2079917,
@@ -64,7 +64,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "component": "django"
           },
           "duration": 24625,
@@ -80,7 +80,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "component": "django"
           },
           "duration": 1929375,
@@ -96,7 +96,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "component": "django"
              },
              "duration": 25250,
@@ -112,7 +112,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "component": "django"
              },
              "duration": 1804584,
@@ -128,7 +128,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "component": "django"
                 },
                 "duration": 14583,
@@ -144,7 +144,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "component": "django"
                 },
                 "duration": 1697792,
@@ -160,7 +160,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "component": "django"
                    },
                    "duration": 14667,
@@ -176,7 +176,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "component": "django"
                    },
                    "duration": 1626792,
@@ -192,7 +192,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "component": "django"
                       },
                       "duration": 32833,
@@ -208,7 +208,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "component": "django"
                       },
                       "duration": 1495291,
@@ -224,7 +224,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "component": "django"
                          },
                          "duration": 1418083,
@@ -240,7 +240,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "component": "django"
                             },
                             "duration": 12208,
@@ -256,7 +256,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "component": "django"
                             },
                             "duration": 1290417,
@@ -272,7 +272,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django",
                                  "component": "django"
                                },
                                "duration": 1254209,
@@ -288,7 +288,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django",
                                     "component": "django"
                                   },
                                   "duration": 1211291,
@@ -304,7 +304,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "component": "django"
                                      },
                                      "duration": 25584,
@@ -320,7 +320,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "component": "django"
                                      },
                                      "duration": 21625,
@@ -336,7 +336,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "component": "django"
                                      },
                                      "duration": 167208,
@@ -352,7 +352,7 @@
                                         "type": "",
                                         "error": 0,
                                         "meta": {
-                                          "_dd.base_service": "",
+                                          "_dd.base_service": "tests.contrib.django",
                                           "component": "django"
                                         },
                                         "duration": 18083,
@@ -368,7 +368,7 @@
                                         "type": "",
                                         "error": 0,
                                         "meta": {
-                                          "_dd.base_service": "",
+                                          "_dd.base_service": "tests.contrib.django",
                                           "component": "django"
                                         },
                                         "duration": 76709,
@@ -384,7 +384,7 @@
                                            "type": "",
                                            "error": 0,
                                            "meta": {
-                                             "_dd.base_service": "",
+                                             "_dd.base_service": "tests.contrib.django",
                                              "component": "django"
                                            },
                                            "duration": 34166,
@@ -400,7 +400,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "component": "django"
                             },
                             "duration": 27042,
@@ -416,7 +416,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "component": "django"
                          },
                          "duration": 18084,
@@ -432,7 +432,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "component": "django"
                       },
                       "duration": 14708,
@@ -448,7 +448,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "component": "django"
                 },
                 "duration": 12334,
@@ -464,7 +464,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "component": "django"
              },
              "duration": 16834,
@@ -480,7 +480,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "component": "django"
           },
           "duration": 29750,
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_callable_view.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_callable_view.json
index b464ea62a78..a498faffa93 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_callable_view.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_callable_view.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -45,7 +45,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -62,7 +62,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -79,7 +79,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -96,7 +96,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -113,7 +113,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -130,7 +130,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -147,7 +147,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -164,7 +164,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -181,7 +181,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -198,7 +198,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -215,7 +215,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -232,7 +232,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -249,7 +249,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -266,7 +266,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -283,7 +283,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -300,7 +300,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -317,7 +317,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -334,7 +334,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -351,7 +351,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -368,7 +368,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -385,7 +385,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -402,7 +402,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -419,7 +419,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -436,7 +436,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -453,7 +453,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_callable_view_111x.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_callable_view_111x.json
index 68c8a7323e7..4d6b9f46a4f 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_callable_view_111x.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_callable_view_111x.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -44,7 +44,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -61,7 +61,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -78,7 +78,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -95,7 +95,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -112,7 +112,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -129,7 +129,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -146,7 +146,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -163,7 +163,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -180,7 +180,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -197,7 +197,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -214,7 +214,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -231,7 +231,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -248,7 +248,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -265,7 +265,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -282,7 +282,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_partial_based_view.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_partial_based_view.json
index 9b21d7f1b84..8b56757961b 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_partial_based_view.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_partial_based_view.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -45,7 +45,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -62,7 +62,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -79,7 +79,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -96,7 +96,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -113,7 +113,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -130,7 +130,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -147,7 +147,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -164,7 +164,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -181,7 +181,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -198,7 +198,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -215,7 +215,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -232,7 +232,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -249,7 +249,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -266,7 +266,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -283,7 +283,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -300,7 +300,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -317,7 +317,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -334,7 +334,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -351,7 +351,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -368,7 +368,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -385,7 +385,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -402,7 +402,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -419,7 +419,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -436,7 +436,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -453,7 +453,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_partial_based_view_111x.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_partial_based_view_111x.json
index 12cce6feb5d..537f3a3694b 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_partial_based_view_111x.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_partial_based_view_111x.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -44,7 +44,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -61,7 +61,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -78,7 +78,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -95,7 +95,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -112,7 +112,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -129,7 +129,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -146,7 +146,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -163,7 +163,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -180,7 +180,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -197,7 +197,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -214,7 +214,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -231,7 +231,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -248,7 +248,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -265,7 +265,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -282,7 +282,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_psycopg2_query_default.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_psycopg2_query_default.json
index de9cdf41eb5..49506db455e 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_psycopg2_query_default.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_psycopg2_query_default.json
@@ -9,7 +9,7 @@
     "type": "sql",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django-postgres",
@@ -40,7 +40,7 @@
        "type": "sql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "psycopg",
          "db.application": "None",
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_psycopg3_query_default.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_psycopg3_query_default.json
index c0d50873757..5edf1999e64 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_psycopg3_query_default.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_psycopg3_query_default.json
@@ -9,7 +9,7 @@
     "type": "sql",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django-postgres",
@@ -40,7 +40,7 @@
        "type": "sql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "psycopg",
          "db.application": "None",
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_safe_string_encoding.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_safe_string_encoding.json
index ab628f0b202..9403c178210 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_safe_string_encoding.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_safe_string_encoding.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -47,7 +47,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -64,7 +64,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -81,7 +81,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -98,7 +98,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -115,7 +115,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -132,7 +132,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -149,7 +149,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -166,7 +166,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -183,7 +183,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -200,7 +200,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -217,7 +217,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -234,7 +234,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -251,7 +251,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -268,7 +268,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -285,7 +285,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -302,7 +302,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -319,7 +319,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -336,7 +336,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -353,7 +353,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -370,7 +370,7 @@
                                         "type": "",
                                         "error": 0,
                                         "meta": {
-                                          "_dd.base_service": "",
+                                          "_dd.base_service": "tests.contrib.django",
                                           "_dd.p.tid": "654a694400000000",
                                           "component": "django"
                                         },
@@ -387,7 +387,7 @@
                                         "type": "",
                                         "error": 0,
                                         "meta": {
-                                          "_dd.base_service": "",
+                                          "_dd.base_service": "tests.contrib.django",
                                           "_dd.p.tid": "654a694400000000",
                                           "component": "django"
                                         },
@@ -404,7 +404,7 @@
                                            "type": "",
                                            "error": 0,
                                            "meta": {
-                                             "_dd.base_service": "",
+                                             "_dd.base_service": "tests.contrib.django",
                                              "_dd.p.tid": "654a694400000000",
                                              "component": "django"
                                            },
@@ -421,7 +421,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -438,7 +438,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -455,7 +455,7 @@
                                         "type": "template",
                                         "error": 0,
                                         "meta": {
-                                          "_dd.base_service": "",
+                                          "_dd.base_service": "tests.contrib.django",
                                           "_dd.p.tid": "654a694400000000",
                                           "component": "django",
                                           "django.template.engine.class": "django.template.engine.Engine",
@@ -474,7 +474,7 @@
                                            "type": "cache",
                                            "error": 0,
                                            "meta": {
-                                             "_dd.base_service": "",
+                                             "_dd.base_service": "tests.contrib.django",
                                              "_dd.p.tid": "654a694400000000",
                                              "component": "django",
                                              "django.cache.backend": "django.core.cache.backends.locmem.LocMemCache",
@@ -496,7 +496,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -513,7 +513,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -530,7 +530,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -547,7 +547,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -564,7 +564,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -581,7 +581,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_safe_string_encoding_111x.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_safe_string_encoding_111x.json
index 88ad21bea48..557ed4e48eb 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_safe_string_encoding_111x.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_safe_string_encoding_111x.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -46,7 +46,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -63,7 +63,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -80,7 +80,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -97,7 +97,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -114,7 +114,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -131,7 +131,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -148,7 +148,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -165,7 +165,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -182,7 +182,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -199,7 +199,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -216,7 +216,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -233,7 +233,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -250,7 +250,7 @@
           "type": "template",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django",
             "django.template.engine.class": "django.template.engine.Engine",
@@ -269,7 +269,7 @@
              "type": "cache",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django",
                "django.cache.backend": "django.core.cache.backends.locmem.LocMemCache",
@@ -291,7 +291,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -308,7 +308,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -325,7 +325,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -342,7 +342,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -359,7 +359,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -376,7 +376,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_streamed_file.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_streamed_file.json
index 60f30925b91..2f9439b715c 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_streamed_file.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_streamed_file.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "component": "django",
       "django.request.class": "django.core.handlers.wsgi.WSGIRequest",
@@ -44,7 +44,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "component": "django"
        },
        "duration": 12018000,
@@ -60,7 +60,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "component": "django"
           },
           "duration": 322000,
@@ -76,7 +76,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "component": "django"
           },
           "duration": 11563000,
@@ -92,7 +92,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "component": "django"
              },
              "duration": 270000,
@@ -108,7 +108,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "component": "django"
              },
              "duration": 11198000,
@@ -124,7 +124,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "component": "django"
                 },
                 "duration": 26000,
@@ -140,7 +140,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "component": "django"
                 },
                 "duration": 11081000,
@@ -156,7 +156,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "component": "django"
                    },
                    "duration": 22000,
@@ -172,7 +172,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "component": "django"
                    },
                    "duration": 11006000,
@@ -188,7 +188,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "component": "django"
                       },
                       "duration": 1586000,
@@ -204,7 +204,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "component": "django"
                       },
                       "duration": 9328000,
@@ -220,7 +220,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "component": "django"
                          },
                          "duration": 9248000,
@@ -236,7 +236,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "component": "django"
                             },
                             "duration": 16000,
@@ -252,7 +252,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "component": "django"
                             },
                             "duration": 9130000,
@@ -268,7 +268,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django",
                                  "component": "django"
                                },
                                "duration": 9096000,
@@ -284,7 +284,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django",
                                     "component": "django"
                                   },
                                   "duration": 9045000,
@@ -300,7 +300,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "component": "django"
                                      },
                                      "duration": 33000,
@@ -316,7 +316,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "component": "django"
                                      },
                                      "duration": 18000,
@@ -332,7 +332,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "component": "django"
                                      },
                                      "duration": 299000,
@@ -348,7 +348,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "component": "django"
                             },
                             "duration": 27000,
@@ -364,7 +364,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "component": "django"
                          },
                          "duration": 23000,
@@ -380,7 +380,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "component": "django"
                       },
                       "duration": 15000,
@@ -396,7 +396,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "component": "django"
                 },
                 "duration": 15000,
@@ -412,7 +412,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "component": "django"
              },
              "duration": 15000,
@@ -428,7 +428,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "component": "django"
           },
           "duration": 21000,
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_templates_disabled_3x.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_templates_disabled_3x.json
index 6a2ab060e21..e915b02eff2 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_templates_disabled_3x.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_templates_disabled_3x.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "asgi.version": "3.0",
@@ -49,7 +49,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -66,7 +66,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -83,7 +83,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -100,7 +100,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -117,7 +117,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -134,7 +134,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -151,7 +151,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -168,7 +168,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -185,7 +185,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -202,7 +202,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -219,7 +219,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -236,7 +236,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -253,7 +253,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -270,7 +270,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -287,7 +287,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -304,7 +304,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -321,7 +321,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -338,7 +338,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -355,7 +355,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -372,7 +372,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -389,7 +389,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -406,7 +406,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -423,7 +423,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -440,7 +440,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -457,7 +457,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -474,7 +474,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -491,7 +491,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_templates_enabled_3x.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_templates_enabled_3x.json
index 6dfc1708861..dabe241f4ff 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_templates_enabled_3x.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_templates_enabled_3x.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "asgi.version": "3.0",
@@ -49,7 +49,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -66,7 +66,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -83,7 +83,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -100,7 +100,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -117,7 +117,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -134,7 +134,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -151,7 +151,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -168,7 +168,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -185,7 +185,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -202,7 +202,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -219,7 +219,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -236,7 +236,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -253,7 +253,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -270,7 +270,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -287,7 +287,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -304,7 +304,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -321,7 +321,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -338,7 +338,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -355,7 +355,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -372,7 +372,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -389,7 +389,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -406,7 +406,7 @@
                                         "type": "template",
                                         "error": 0,
                                         "meta": {
-                                          "_dd.base_service": "",
+                                          "_dd.base_service": "tests.contrib.django",
                                           "_dd.p.tid": "654a694400000000",
                                           "component": "django",
                                           "django.template.engine.class": "django.template.engine.Engine",
@@ -425,7 +425,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -442,7 +442,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -459,7 +459,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -476,7 +476,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -493,7 +493,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -510,7 +510,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_urlpatterns_include.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_urlpatterns_include.json
index 934b404a020..6042a5e0565 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_urlpatterns_include.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_urlpatterns_include.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -45,7 +45,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -62,7 +62,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -79,7 +79,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -96,7 +96,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -113,7 +113,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -130,7 +130,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -147,7 +147,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -164,7 +164,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -181,7 +181,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -198,7 +198,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -215,7 +215,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -232,7 +232,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -249,7 +249,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -266,7 +266,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -283,7 +283,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -300,7 +300,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -317,7 +317,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -334,7 +334,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -351,7 +351,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -368,7 +368,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -385,7 +385,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -402,7 +402,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -419,7 +419,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -436,7 +436,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -453,7 +453,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django_hosts.test_django.test_django_hosts_request.json b/tests/snapshots/tests.contrib.django_hosts.test_django.test_django_hosts_request.json
index 2c7ed914879..6b09581b66f 100644
--- a/tests/snapshots/tests.contrib.django_hosts.test_django.test_django_hosts_request.json
+++ b/tests/snapshots/tests.contrib.django_hosts.test_django.test_django_hosts_request.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django_hosts",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -45,7 +45,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django_hosts",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -62,7 +62,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django_hosts",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -79,7 +79,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django_hosts",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -96,7 +96,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django_hosts",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -113,7 +113,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django_hosts",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -130,7 +130,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django_hosts",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -147,7 +147,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django_hosts",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -164,7 +164,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django_hosts",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -181,7 +181,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django_hosts",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -198,7 +198,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django_hosts",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -215,7 +215,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django_hosts",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -232,7 +232,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django_hosts",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -249,7 +249,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django_hosts",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -266,7 +266,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django_hosts",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -283,7 +283,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django_hosts",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -300,7 +300,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django_hosts",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -317,7 +317,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django_hosts",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -334,7 +334,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django_hosts",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -351,7 +351,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django_hosts",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -368,7 +368,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django_hosts",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -385,7 +385,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django_hosts",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -402,7 +402,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django_hosts",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -419,7 +419,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django_hosts",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -436,7 +436,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django_hosts",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -453,7 +453,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django_hosts",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
diff --git a/tests/snapshots/tests.contrib.dramatiq.test_integration.test_fn_exception_no_retries.json b/tests/snapshots/tests.contrib.dramatiq.test_integration.test_fn_exception_no_retries.json
index 0e9c3c07864..b02973135c5 100644
--- a/tests/snapshots/tests.contrib.dramatiq.test_integration.test_fn_exception_no_retries.json
+++ b/tests/snapshots/tests.contrib.dramatiq.test_integration.test_fn_exception_no_retries.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "dramatiq.Actor.send_with_options",
-    "service": "",
+    "service": "tests.contrib.dramatiq",
     "resource": "dramatiq.Actor.send_with_options",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.dramatiq.test_integration.test_fn_retry_exception.json b/tests/snapshots/tests.contrib.dramatiq.test_integration.test_fn_retry_exception.json
index e9ad60ba4d6..218eadca619 100644
--- a/tests/snapshots/tests.contrib.dramatiq.test_integration.test_fn_retry_exception.json
+++ b/tests/snapshots/tests.contrib.dramatiq.test_integration.test_fn_retry_exception.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "dramatiq.Actor.send_with_options",
-    "service": "",
+    "service": "tests.contrib.dramatiq",
     "resource": "dramatiq.Actor.send_with_options",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.dramatiq.test_integration.test_fn_task_send.json b/tests/snapshots/tests.contrib.dramatiq.test_integration.test_fn_task_send.json
index de42bb216c7..6194693147c 100644
--- a/tests/snapshots/tests.contrib.dramatiq.test_integration.test_fn_task_send.json
+++ b/tests/snapshots/tests.contrib.dramatiq.test_integration.test_fn_task_send.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "dramatiq.Actor.send_with_options",
-    "service": "",
+    "service": "tests.contrib.dramatiq",
     "resource": "dramatiq.Actor.send_with_options",
     "trace_id": 0,
     "span_id": 1,
@@ -29,7 +29,7 @@
 [
   {
     "name": "dramatiq.Actor.send_with_options",
-    "service": "",
+    "service": "tests.contrib.dramatiq",
     "resource": "dramatiq.Actor.send_with_options",
     "trace_id": 1,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.dramatiq.test_integration.test_fn_task_send_with_params.json b/tests/snapshots/tests.contrib.dramatiq.test_integration.test_fn_task_send_with_params.json
index b037c6fad91..d13031cf5a2 100644
--- a/tests/snapshots/tests.contrib.dramatiq.test_integration.test_fn_task_send_with_params.json
+++ b/tests/snapshots/tests.contrib.dramatiq.test_integration.test_fn_task_send_with_params.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "dramatiq.Actor.send_with_options",
-    "service": "",
+    "service": "tests.contrib.dramatiq",
     "resource": "dramatiq.Actor.send_with_options",
     "trace_id": 0,
     "span_id": 1,
@@ -29,7 +29,7 @@
 [
   {
     "name": "dramatiq.Actor.send_with_options",
-    "service": "",
+    "service": "tests.contrib.dramatiq",
     "resource": "dramatiq.Actor.send_with_options",
     "trace_id": 1,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.dramatiq.test_integration.test_idempotent_patch.json b/tests/snapshots/tests.contrib.dramatiq.test_integration.test_idempotent_patch.json
index 2b7521b6891..cec8a33847a 100644
--- a/tests/snapshots/tests.contrib.dramatiq.test_integration.test_idempotent_patch.json
+++ b/tests/snapshots/tests.contrib.dramatiq.test_integration.test_idempotent_patch.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "dramatiq.Actor.send_with_options",
-    "service": "",
+    "service": "tests.contrib.dramatiq",
     "resource": "dramatiq.Actor.send_with_options",
     "trace_id": 0,
     "span_id": 1,
@@ -29,7 +29,7 @@
 [
   {
     "name": "dramatiq.Actor.send_with_options",
-    "service": "",
+    "service": "tests.contrib.dramatiq",
     "resource": "dramatiq.Actor.send_with_options",
     "trace_id": 1,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.dramatiq.test_integration.test_send_exception.json b/tests/snapshots/tests.contrib.dramatiq.test_integration.test_send_exception.json
index 399807aa151..aaa0b2dc805 100644
--- a/tests/snapshots/tests.contrib.dramatiq.test_integration.test_send_exception.json
+++ b/tests/snapshots/tests.contrib.dramatiq.test_integration.test_send_exception.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "dramatiq.Actor.send_with_options",
-    "service": "",
+    "service": "tests.contrib.dramatiq",
     "resource": "dramatiq.Actor.send_with_options",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_500_error_raised.json b/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_500_error_raised.json
index e7d9bb89c7d..af5fc72a446 100644
--- a/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_500_error_raised.json
+++ b/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_500_error_raised.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.fastapi",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "65e2cd9000000000",
       "component": "fastapi",
diff --git a/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_background_task.json b/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_background_task.json
index 5d4317b43dc..e4e3064ed10 100644
--- a/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_background_task.json
+++ b/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_background_task.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "fastapi.background_task",
-    "service": "",
+    "service": "tests.contrib.fastapi",
     "resource": "custom_task",
     "trace_id": 0,
     "span_id": 1,
@@ -35,7 +35,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.fastapi",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "65e2cd8b00000000",
       "component": "fastapi",
@@ -68,7 +68,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.contrib.fastapi"
        },
        "duration": 22000,
        "start": 1709362571921182000
diff --git a/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_subapp_snapshot.json b/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_subapp_snapshot.json
index 815f6a3af22..e95db1a3ec4 100644
--- a/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_subapp_snapshot.json
+++ b/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_subapp_snapshot.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.fastapi",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "65e2cd9000000000",
       "component": "fastapi",
@@ -42,7 +42,7 @@
        "type": "web",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.fastapi",
          "component": "fastapi",
          "http.method": "GET",
          "http.status_code": "200",
@@ -64,7 +64,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": ""
+            "_dd.base_service": "tests.contrib.fastapi"
           },
           "duration": 42000,
           "start": 1709362576025776000
diff --git a/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_table_query_snapshot.json b/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_table_query_snapshot.json
index b600c36f367..cc0e71600d8 100644
--- a/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_table_query_snapshot.json
+++ b/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_table_query_snapshot.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.fastapi",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "65e2cd9000000000",
       "component": "fastapi",
@@ -42,7 +42,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.contrib.fastapi"
        },
        "duration": 83000,
        "start": 1709362576062154000
@@ -58,7 +58,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.fastapi",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "65e2cd9000000000",
       "component": "fastapi",
@@ -91,7 +91,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.contrib.fastapi"
        },
        "duration": 62000,
        "start": 1709362576063633000
diff --git a/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_traced_websocket.json b/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_traced_websocket.json
index 061a28b6714..1c4314562c3 100644
--- a/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_traced_websocket.json
+++ b/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_traced_websocket.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.fastapi",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "65e2cd9800000000",
       "component": "fastapi",
diff --git a/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_tracing_in_middleware.json b/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_tracing_in_middleware.json
index 3c89495367a..406894e83f8 100644
--- a/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_tracing_in_middleware.json
+++ b/tests/snapshots/tests.contrib.fastapi.test_fastapi.test_tracing_in_middleware.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.fastapi",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "65e2cd9000000000",
       "component": "fastapi",
@@ -42,7 +42,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.contrib.fastapi"
        },
        "duration": 359000,
        "start": 1709362576043450000
@@ -57,7 +57,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": ""
+            "_dd.base_service": "tests.contrib.fastapi"
           },
           "duration": 25000,
           "start": 1709362576043632000
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403[flask_appsec_good_rules_env].json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403[flask_appsec_good_rules_env].json
index 28cc19763ff..92df6ded21b 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403[flask_appsec_good_rules_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403[flask_appsec_good_rules_env].json
@@ -12,7 +12,7 @@
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.json": "{\"triggers\":[\n  {\n    \"rule\": {\n      \"id\": \"blk-001-001\",\n      \"name\": \"Block IP addresses\",\n      \"on_match\": [\n        \"block\"\n      ],\n      \"tags\": {\n        \"category\": \"blocking\",\n        \"type\": \"ip_addresses\"\n      }\n    },\n    \"rule_matches\": [\n      {\n        \"operator\": \"ip_match\",\n        \"operator_value\": \"\",\n        \"parameters\": [\n          {\n            \"address\": \"http.client_ip\",\n            \"highlight\": [\n              \"8.8.4.4\"\n            ],\n            \"key_path\": [],\n            \"value\": \"8.8.4.4\"\n          }\n        ]\n      }\n    ]\n  }\n]}",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.origin": "appsec",
       "_dd.p.appsec": "1",
       "_dd.p.dm": "-5",
@@ -59,7 +59,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403[flask_appsec_good_rules_env]_220.json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403[flask_appsec_good_rules_env]_220.json
index cb9c1ce72de..e35bc2daf09 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403[flask_appsec_good_rules_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403[flask_appsec_good_rules_env]_220.json
@@ -12,7 +12,7 @@
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.json": "{\"triggers\":[\n  {\n    \"rule\": {\n      \"id\": \"blk-001-001\",\n      \"name\": \"Block IP addresses\",\n      \"on_match\": [\n        \"block\"\n      ],\n      \"tags\": {\n        \"category\": \"blocking\",\n        \"type\": \"ip_addresses\"\n      }\n    },\n    \"rule_matches\": [\n      {\n        \"operator\": \"ip_match\",\n        \"operator_value\": \"\",\n        \"parameters\": [\n          {\n            \"address\": \"http.client_ip\",\n            \"highlight\": [\n              \"8.8.4.4\"\n            ],\n            \"key_path\": [],\n            \"value\": \"8.8.4.4\"\n          }\n        ]\n      }\n    ]\n  }\n]}",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.origin": "appsec",
       "_dd.p.appsec": "1",
       "_dd.p.dm": "-5",
@@ -59,7 +59,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403_json[flask_appsec_good_rules_env].json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403_json[flask_appsec_good_rules_env].json
index 7dbeab81e7a..700d10dbad3 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403_json[flask_appsec_good_rules_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403_json[flask_appsec_good_rules_env].json
@@ -12,7 +12,7 @@
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.json": "{\"triggers\":[\n  {\n    \"rule\": {\n      \"id\": \"blk-001-001\",\n      \"name\": \"Block IP addresses\",\n      \"on_match\": [\n        \"block\"\n      ],\n      \"tags\": {\n        \"category\": \"blocking\",\n        \"type\": \"ip_addresses\"\n      }\n    },\n    \"rule_matches\": [\n      {\n        \"operator\": \"ip_match\",\n        \"operator_value\": \"\",\n        \"parameters\": [\n          {\n            \"address\": \"http.client_ip\",\n            \"highlight\": [\n              \"8.8.4.4\"\n            ],\n            \"key_path\": [],\n            \"value\": \"8.8.4.4\"\n          }\n        ]\n      }\n    ]\n  }\n]}",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.origin": "appsec",
       "_dd.p.appsec": "1",
       "_dd.p.dm": "-5",
@@ -59,7 +59,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403_json[flask_appsec_good_rules_env]_220.json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403_json[flask_appsec_good_rules_env]_220.json
index eb86dfdf683..35da84cd59f 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403_json[flask_appsec_good_rules_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403_json[flask_appsec_good_rules_env]_220.json
@@ -12,7 +12,7 @@
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.json": "{\"triggers\":[\n  {\n    \"rule\": {\n      \"id\": \"blk-001-001\",\n      \"name\": \"Block IP addresses\",\n      \"on_match\": [\n        \"block\"\n      ],\n      \"tags\": {\n        \"category\": \"blocking\",\n        \"type\": \"ip_addresses\"\n      }\n    },\n    \"rule_matches\": [\n      {\n        \"operator\": \"ip_match\",\n        \"operator_value\": \"\",\n        \"parameters\": [\n          {\n            \"address\": \"http.client_ip\",\n            \"highlight\": [\n              \"8.8.4.4\"\n            ],\n            \"key_path\": [],\n            \"value\": \"8.8.4.4\"\n          }\n        ]\n      }\n    ]\n  }\n]}",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.origin": "appsec",
       "_dd.p.appsec": "1",
       "_dd.p.dm": "-5",
@@ -59,7 +59,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_osspawn[flask_appsec_good_rules_env].json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_osspawn[flask_appsec_good_rules_env].json
index 94d43de577b..2b05a92f606 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_osspawn[flask_appsec_good_rules_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_osspawn[flask_appsec_good_rules_env].json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -57,7 +57,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "run_osspawn",
@@ -76,7 +76,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -93,7 +93,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -110,7 +110,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -127,7 +127,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.flask",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -144,7 +144,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.flask",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exec": "['/bin/ls', '-l', '/']",
                   "cmd.exit_code": "0",
@@ -163,7 +163,7 @@
                    "type": "system",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.flask",
                      "_dd.p.tid": "654a694400000000",
                      "cmd.exec": "['os.fork']",
                      "component": "os"
@@ -181,7 +181,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -198,7 +198,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -215,7 +215,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -232,7 +232,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_osspawn[flask_appsec_good_rules_env]_220.json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_osspawn[flask_appsec_good_rules_env]_220.json
index 481dab6544d..0b00faf3bc8 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_osspawn[flask_appsec_good_rules_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_osspawn[flask_appsec_good_rules_env]_220.json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -57,7 +57,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "run_osspawn",
@@ -76,7 +76,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -93,7 +93,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -110,7 +110,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.flask",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -127,7 +127,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.flask",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exec": "['/bin/ls', '-l', '/']",
                   "cmd.exit_code": "0",
@@ -146,7 +146,7 @@
                    "type": "system",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.flask",
                      "_dd.p.tid": "654a694400000000",
                      "cmd.exec": "['os.fork']",
                      "component": "os"
@@ -164,7 +164,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -181,7 +181,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -198,7 +198,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -215,7 +215,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_ossystem[flask_appsec_good_rules_env].json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_ossystem[flask_appsec_good_rules_env].json
index f0d79286696..19733e736c2 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_ossystem[flask_appsec_good_rules_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_ossystem[flask_appsec_good_rules_env].json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -57,7 +57,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "run_ossystem",
@@ -76,7 +76,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -93,7 +93,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -110,7 +110,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -127,7 +127,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.flask",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -144,7 +144,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.flask",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exit_code": "0",
                   "cmd.shell": "dir -li /",
@@ -163,7 +163,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -180,7 +180,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -197,7 +197,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -214,7 +214,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_ossystem[flask_appsec_good_rules_env]_220.json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_ossystem[flask_appsec_good_rules_env]_220.json
index 3ea6ae304d8..a0aafddd68a 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_ossystem[flask_appsec_good_rules_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_ossystem[flask_appsec_good_rules_env]_220.json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -57,7 +57,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "run_ossystem",
@@ -76,7 +76,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -93,7 +93,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -110,7 +110,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.flask",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -127,7 +127,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.flask",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exit_code": "0",
                   "cmd.shell": "dir -li /",
@@ -146,7 +146,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -163,7 +163,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -180,7 +180,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -197,7 +197,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicatenoshell[flask_appsec_good_rules_env].json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicatenoshell[flask_appsec_good_rules_env].json
index 5cc68d6a6bb..114ae3ada51 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicatenoshell[flask_appsec_good_rules_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicatenoshell[flask_appsec_good_rules_env].json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -57,7 +57,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "run_subcommunicatenoshell",
@@ -76,7 +76,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -93,7 +93,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -110,7 +110,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -127,7 +127,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.flask",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -144,7 +144,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.flask",
                   "_dd.p.tid": "654a694400000000"
                 },
                 "duration": 97250,
@@ -160,7 +160,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.flask",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exec": "['dir', '-li', '/']",
                   "cmd.exit_code": "0",
@@ -179,7 +179,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.flask",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exec": "['dir', '-li', '/']",
                   "cmd.exit_code": "0",
@@ -198,7 +198,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -215,7 +215,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -232,7 +232,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -249,7 +249,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicatenoshell[flask_appsec_good_rules_env]_220.json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicatenoshell[flask_appsec_good_rules_env]_220.json
index d37bbd839d7..7aac0d5f8e7 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicatenoshell[flask_appsec_good_rules_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicatenoshell[flask_appsec_good_rules_env]_220.json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -57,7 +57,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "run_subcommunicatenoshell",
@@ -76,7 +76,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -93,7 +93,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -110,7 +110,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.flask",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -127,7 +127,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.flask",
                   "_dd.p.tid": "654a694400000000"
                 },
                 "duration": 45166,
@@ -143,7 +143,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.flask",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exec": "['dir', '-li', '/']",
                   "cmd.exit_code": "0",
@@ -162,7 +162,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.flask",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exec": "['dir', '-li', '/']",
                   "cmd.exit_code": "0",
@@ -181,7 +181,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -198,7 +198,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -215,7 +215,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -232,7 +232,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicateshell[flask_appsec_good_rules_env].json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicateshell[flask_appsec_good_rules_env].json
index 5b23316cb90..0a7ab19a27d 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicateshell[flask_appsec_good_rules_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicateshell[flask_appsec_good_rules_env].json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -57,7 +57,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "run_subcommunicateshell",
@@ -76,7 +76,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -93,7 +93,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -110,7 +110,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -127,7 +127,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.flask",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -144,7 +144,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.flask",
                   "_dd.p.tid": "654a694400000000"
                 },
                 "duration": 49291,
@@ -160,7 +160,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.flask",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exit_code": "0",
                   "cmd.shell": "dir -li /",
@@ -179,7 +179,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.flask",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exit_code": "0",
                   "cmd.shell": "dir -li /",
@@ -198,7 +198,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -215,7 +215,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -232,7 +232,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -249,7 +249,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicateshell[flask_appsec_good_rules_env]_220.json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicateshell[flask_appsec_good_rules_env]_220.json
index ba344ea3ce4..5a1cdf81f3a 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicateshell[flask_appsec_good_rules_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicateshell[flask_appsec_good_rules_env]_220.json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -57,7 +57,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "run_subcommunicateshell",
@@ -76,7 +76,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -93,7 +93,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -110,7 +110,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.flask",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -127,7 +127,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.flask",
                   "_dd.p.tid": "654a694400000000"
                 },
                 "duration": 43667,
@@ -143,7 +143,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.flask",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exit_code": "0",
                   "cmd.shell": "dir -li /",
@@ -162,7 +162,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.flask",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exit_code": "0",
                   "cmd.shell": "dir -li /",
@@ -181,7 +181,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -198,7 +198,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -215,7 +215,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -232,7 +232,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_200_json[flask_appsec_good_rules_env].json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_200_json[flask_appsec_good_rules_env].json
index d7a371db853..33ffd67de3c 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_200_json[flask_appsec_good_rules_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_200_json[flask_appsec_good_rules_env].json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -58,7 +58,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "checkuser",
@@ -78,7 +78,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -95,7 +95,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -112,7 +112,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -129,7 +129,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.flask",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -146,7 +146,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -163,7 +163,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -180,7 +180,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -197,7 +197,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_200_json[flask_appsec_good_rules_env]_220.json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_200_json[flask_appsec_good_rules_env]_220.json
index eb1c40a7939..fff05279887 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_200_json[flask_appsec_good_rules_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_200_json[flask_appsec_good_rules_env]_220.json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -58,7 +58,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "checkuser",
@@ -78,7 +78,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -95,7 +95,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -112,7 +112,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.flask",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -129,7 +129,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -146,7 +146,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -163,7 +163,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -180,7 +180,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_403_json[flask_appsec_good_rules_env].json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_403_json[flask_appsec_good_rules_env].json
index 345427444ea..7eccd9ee5a1 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_403_json[flask_appsec_good_rules_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_403_json[flask_appsec_good_rules_env].json
@@ -12,7 +12,7 @@
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.json": "{\"triggers\":[\n  {\n    \"rule\": {\n      \"id\": \"blk-001-002\",\n      \"name\": \"Block User Addresses\",\n      \"on_match\": [\n        \"block\"\n      ],\n      \"tags\": {\n        \"category\": \"security_response\",\n        \"type\": \"block_user\"\n      }\n    },\n    \"rule_matches\": [\n      {\n        \"operator\": \"exact_match\",\n        \"operator_value\": \"\",\n        \"parameters\": [\n          {\n            \"address\": \"usr.id\",\n            \"highlight\": [\n              \"123456\"\n            ],\n            \"key_path\": [],\n            \"value\": \"123456\"\n          }\n        ]\n      }\n    ]\n  }\n]}",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.origin": "appsec",
       "_dd.p.appsec": "1",
       "_dd.p.dm": "-5",
@@ -69,7 +69,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "checkuser",
@@ -90,7 +90,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -107,7 +107,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -124,7 +124,7 @@
           "type": "",
           "error": 1,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask",
             "error.message": "??? Unknown Error: None",
@@ -146,7 +146,7 @@
              "type": "",
              "error": 1,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.flask",
                "_dd.p.tid": "654a694400000000",
                "component": "flask",
                "error.message": "??? Unknown Error: None",
@@ -166,7 +166,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -183,7 +183,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.flask",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -200,7 +200,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -217,7 +217,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -234,7 +234,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -251,7 +251,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_403_json[flask_appsec_good_rules_env]_220.json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_403_json[flask_appsec_good_rules_env]_220.json
index 2aa7846ca97..104b7f4cbc0 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_403_json[flask_appsec_good_rules_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_403_json[flask_appsec_good_rules_env]_220.json
@@ -12,7 +12,7 @@
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.json": "{\"triggers\":[\n  {\n    \"rule\": {\n      \"id\": \"blk-001-002\",\n      \"name\": \"Block User Addresses\",\n      \"on_match\": [\n        \"block\"\n      ],\n      \"tags\": {\n        \"category\": \"security_response\",\n        \"type\": \"block_user\"\n      }\n    },\n    \"rule_matches\": [\n      {\n        \"operator\": \"exact_match\",\n        \"operator_value\": \"\",\n        \"parameters\": [\n          {\n            \"address\": \"usr.id\",\n            \"highlight\": [\n              \"123456\"\n            ],\n            \"key_path\": [],\n            \"value\": \"123456\"\n          }\n        ]\n      }\n    ]\n  }\n]}",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.origin": "appsec",
       "_dd.p.appsec": "1",
       "_dd.p.dm": "-5",
@@ -69,7 +69,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "checkuser",
@@ -90,7 +90,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -107,7 +107,7 @@
           "type": "",
           "error": 1,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask",
             "error.message": "??? Unknown Error: None",
@@ -129,7 +129,7 @@
              "type": "",
              "error": 1,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.flask",
                "_dd.p.tid": "654a694400000000",
                "component": "flask",
                "error.message": "??? Unknown Error: None",
@@ -149,7 +149,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -166,7 +166,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.flask",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -183,7 +183,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -200,7 +200,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -217,7 +217,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -234,7 +234,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_200[flask_default_env].json b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_200[flask_default_env].json
index b8be5f39f15..46be5c5b2c7 100644
--- a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_200[flask_default_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_200[flask_default_env].json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "flask",
@@ -45,7 +45,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "index",
@@ -64,7 +64,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -81,7 +81,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -98,7 +98,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -115,7 +115,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.flask",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -132,7 +132,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -149,7 +149,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -166,7 +166,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -183,7 +183,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_200[flask_default_env]_220.json b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_200[flask_default_env]_220.json
index c3e356e2360..b5ecd559b16 100644
--- a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_200[flask_default_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_200[flask_default_env]_220.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "flask",
@@ -45,7 +45,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "index",
@@ -64,7 +64,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -81,7 +81,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -98,7 +98,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.flask",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -115,7 +115,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -132,7 +132,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -149,7 +149,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -166,7 +166,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_get_user[flask_default_env].json b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_get_user[flask_default_env].json
index a78c18caea0..cd37fb6ba5d 100644
--- a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_get_user[flask_default_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_get_user[flask_default_env].json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "flask",
@@ -51,7 +51,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "identify",
@@ -70,7 +70,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -87,7 +87,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -104,7 +104,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -121,7 +121,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.flask",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -138,7 +138,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -155,7 +155,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -172,7 +172,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -189,7 +189,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_get_user[flask_default_env]_220.json b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_get_user[flask_default_env]_220.json
index f5b34ff18f2..93e35934a67 100644
--- a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_get_user[flask_default_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_get_user[flask_default_env]_220.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "flask",
@@ -51,7 +51,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "identify",
@@ -70,7 +70,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -87,7 +87,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -104,7 +104,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.flask",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -121,7 +121,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -138,7 +138,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -155,7 +155,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -172,7 +172,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_stream[flask_default_env].json b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_stream[flask_default_env].json
index 9f0c3c9cc1b..7e3e90c55e4 100644
--- a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_stream[flask_default_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_stream[flask_default_env].json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "flask",
@@ -45,7 +45,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "hello",
@@ -64,7 +64,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -81,7 +81,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -98,7 +98,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -115,7 +115,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.flask",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -132,7 +132,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -149,7 +149,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -166,7 +166,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -183,7 +183,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_stream[flask_default_env]_220.json b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_stream[flask_default_env]_220.json
index ae4afc69839..d4b1ea90a8e 100644
--- a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_stream[flask_default_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_stream[flask_default_env]_220.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.flask",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "flask",
@@ -45,7 +45,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "hello",
@@ -64,7 +64,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -81,7 +81,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -98,7 +98,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.flask",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -115,7 +115,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -132,7 +132,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -149,7 +149,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.flask",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -166,7 +166,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.flask",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion.json b/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion.json
index a5ffadb4664..77d45d722ad 100644
--- a/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion.json
+++ b/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "gemini.request",
-    "service": "",
+    "service": "tests.contrib.google_generativeai",
     "resource": "GenerativeModel.generate_content",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_error.json b/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_error.json
index 2425346e4aa..0a3fdeb85ae 100644
--- a/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_error.json
+++ b/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_error.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "gemini.request",
-    "service": "",
+    "service": "tests.contrib.google_generativeai",
     "resource": "GenerativeModel.generate_content",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_image.json b/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_image.json
index b1617104501..8455611610a 100644
--- a/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_image.json
+++ b/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_image.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "gemini.request",
-    "service": "",
+    "service": "tests.contrib.google_generativeai",
     "resource": "GenerativeModel.generate_content",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_multiple_messages.json b/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_multiple_messages.json
index 87fa8ebed7f..6401fe476d4 100644
--- a/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_multiple_messages.json
+++ b/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_multiple_messages.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "gemini.request",
-    "service": "",
+    "service": "tests.contrib.google_generativeai",
     "resource": "GenerativeModel.generate_content",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_stream.json b/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_stream.json
index 73bab941858..785f7ba0877 100644
--- a/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_stream.json
+++ b/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_stream.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "gemini.request",
-    "service": "",
+    "service": "tests.contrib.google_generativeai",
     "resource": "GenerativeModel.generate_content",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_system_prompt.json b/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_system_prompt.json
index b9d97a50a97..d53aa9fc4f2 100644
--- a/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_system_prompt.json
+++ b/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_system_prompt.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "gemini.request",
-    "service": "",
+    "service": "tests.contrib.google_generativeai",
     "resource": "GenerativeModel.generate_content",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_tool_stream.json b/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_tool_stream.json
index 7871efb1fa1..9acb8b94f64 100644
--- a/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_tool_stream.json
+++ b/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_completion_tool_stream.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "gemini.request",
-    "service": "",
+    "service": "tests.contrib.google_generativeai",
     "resource": "GenerativeModel.generate_content",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_tool_chat_completion.json b/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_tool_chat_completion.json
index 08754d32b29..6cec8d60a43 100644
--- a/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_tool_chat_completion.json
+++ b/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_tool_chat_completion.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "gemini.request",
-    "service": "",
+    "service": "tests.contrib.google_generativeai",
     "resource": "GenerativeModel.generate_content",
     "trace_id": 0,
     "span_id": 1,
@@ -40,7 +40,7 @@
 [
   {
     "name": "gemini.request",
-    "service": "",
+    "service": "tests.contrib.google_generativeai",
     "resource": "GenerativeModel.generate_content",
     "trace_id": 1,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_tool_completion.json b/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_tool_completion.json
index f8ca90ac9f5..fdb4115a8bf 100644
--- a/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_tool_completion.json
+++ b/tests/snapshots/tests.contrib.google_generativeai.test_google_generativeai.test_gemini_tool_completion.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "gemini.request",
-    "service": "",
+    "service": "tests.contrib.google_generativeai",
     "resource": "GenerativeModel.generate_content",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.graphene.test_graphene.test_schema_execute.json b/tests/snapshots/tests.contrib.graphene.test_graphene.test_schema_execute.json
index d03344331bb..cbaef2543cd 100644
--- a/tests/snapshots/tests.contrib.graphene.test_graphene.test_schema_execute.json
+++ b/tests/snapshots/tests.contrib.graphene.test_graphene.test_schema_execute.json
@@ -9,7 +9,7 @@
     "type": "graphql",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.graphene",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "graphql",
@@ -36,7 +36,7 @@
        "type": "graphql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.graphene",
          "_dd.p.tid": "654a694400000000",
          "component": "graphql",
          "graphql.source": "{ patron { id name age } }"
@@ -54,7 +54,7 @@
        "type": "graphql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.graphene",
          "_dd.p.tid": "654a694400000000",
          "component": "graphql",
          "graphql.source": "{ patron { id name age } }"
@@ -72,7 +72,7 @@
        "type": "graphql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.graphene",
          "_dd.p.tid": "654a694400000000",
          "component": "graphql",
          "graphql.operation.type": "query",
diff --git a/tests/snapshots/tests.contrib.graphene.test_graphene.test_schema_execute_with_resolvers.json b/tests/snapshots/tests.contrib.graphene.test_graphene.test_schema_execute_with_resolvers.json
index 6e7e61b084b..a3b1795df9e 100644
--- a/tests/snapshots/tests.contrib.graphene.test_graphene.test_schema_execute_with_resolvers.json
+++ b/tests/snapshots/tests.contrib.graphene.test_graphene.test_schema_execute_with_resolvers.json
@@ -9,7 +9,7 @@
     "type": "graphql",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.graphene",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "graphql",
@@ -36,7 +36,7 @@
        "type": "graphql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.graphene",
          "_dd.p.tid": "654a694400000000",
          "component": "graphql",
          "graphql.source": "{ patron { id name age } }"
@@ -54,7 +54,7 @@
        "type": "graphql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.graphene",
          "_dd.p.tid": "654a694400000000",
          "component": "graphql",
          "graphql.source": "{ patron { id name age } }"
@@ -72,7 +72,7 @@
        "type": "graphql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.graphene",
          "_dd.p.tid": "654a694400000000",
          "component": "graphql",
          "graphql.operation.type": "query",
@@ -94,7 +94,7 @@
           "type": "graphql",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.graphene",
             "_dd.p.tid": "654a694400000000",
             "component": "graphql"
           },
@@ -111,7 +111,7 @@
           "type": "graphql",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.graphene",
             "_dd.p.tid": "654a694400000000",
             "component": "graphql"
           },
@@ -128,7 +128,7 @@
           "type": "graphql",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.graphene",
             "_dd.p.tid": "654a694400000000",
             "component": "graphql"
           },
@@ -145,7 +145,7 @@
           "type": "graphql",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.graphene",
             "_dd.p.tid": "654a694400000000",
             "component": "graphql"
           },
diff --git a/tests/snapshots/tests.contrib.graphene.test_graphene.test_schema_failing_execute.json b/tests/snapshots/tests.contrib.graphene.test_graphene.test_schema_failing_execute.json
index cb8a1d00f22..6be615d9a44 100644
--- a/tests/snapshots/tests.contrib.graphene.test_graphene.test_schema_failing_execute.json
+++ b/tests/snapshots/tests.contrib.graphene.test_graphene.test_schema_failing_execute.json
@@ -9,7 +9,7 @@
     "type": "graphql",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.graphene",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "graphql",
@@ -38,7 +38,7 @@
        "type": "graphql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.graphene",
          "_dd.p.tid": "654a694400000000",
          "component": "graphql",
          "graphql.source": "{ patron { id name age } }"
@@ -56,7 +56,7 @@
        "type": "graphql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.graphene",
          "_dd.p.tid": "654a694400000000",
          "component": "graphql",
          "graphql.source": "{ patron { id name age } }"
@@ -74,7 +74,7 @@
        "type": "graphql",
        "error": 1,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.graphene",
          "_dd.p.tid": "654a694400000000",
          "component": "graphql",
          "error.message": "exception was raised in a graphene query\n\nGraphQL request:3:7\n2 |     {\n3 |       patron {\n  |       ^\n4 |         id",
@@ -98,7 +98,7 @@
           "type": "graphql",
           "error": 1,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.graphene",
             "_dd.p.tid": "654a694400000000",
             "component": "graphql",
             "error.message": "exception was raised in a graphene query",
diff --git a/tests/snapshots/tests.contrib.graphql.test_graphql.test_graphql.json b/tests/snapshots/tests.contrib.graphql.test_graphql.test_graphql.json
index e2045fbe853..baa635e0d9c 100644
--- a/tests/snapshots/tests.contrib.graphql.test_graphql.test_graphql.json
+++ b/tests/snapshots/tests.contrib.graphql.test_graphql.test_graphql.json
@@ -9,7 +9,7 @@
     "type": "graphql",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.graphql",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "graphql",
@@ -36,7 +36,7 @@
        "type": "graphql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.graphql",
          "_dd.p.tid": "654a694400000000",
          "component": "graphql",
          "graphql.source": "query HELLO { hello }"
@@ -54,7 +54,7 @@
        "type": "graphql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.graphql",
          "_dd.p.tid": "654a694400000000",
          "component": "graphql",
          "graphql.source": "query HELLO { hello }"
@@ -72,7 +72,7 @@
        "type": "graphql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.graphql",
          "_dd.p.tid": "654a694400000000",
          "component": "graphql",
          "graphql.operation.name": "HELLO",
diff --git a/tests/snapshots/tests.contrib.graphql.test_graphql.test_graphql_error.json b/tests/snapshots/tests.contrib.graphql.test_graphql.test_graphql_error.json
index 017439c394b..4b95ed96c9e 100644
--- a/tests/snapshots/tests.contrib.graphql.test_graphql.test_graphql_error.json
+++ b/tests/snapshots/tests.contrib.graphql.test_graphql.test_graphql_error.json
@@ -9,7 +9,7 @@
     "type": "graphql",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.graphql",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "graphql",
@@ -38,7 +38,7 @@
        "type": "graphql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.graphql",
          "_dd.p.tid": "654a694400000000",
          "component": "graphql",
          "graphql.source": "{ invalid_schema }"
@@ -56,7 +56,7 @@
        "type": "graphql",
        "error": 1,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.graphql",
          "_dd.p.tid": "654a694400000000",
          "component": "graphql",
          "error.message": "Cannot query field 'invalid_schema' on type 'RootQueryType'.\n\nGraphQL request:1:3\n1 | { invalid_schema }\n  |   ^",
diff --git a/tests/snapshots/tests.contrib.graphql.test_graphql.test_graphql_execute_with_middleware.json b/tests/snapshots/tests.contrib.graphql.test_graphql.test_graphql_execute_with_middleware.json
index 7c55b884995..cbc434788b5 100644
--- a/tests/snapshots/tests.contrib.graphql.test_graphql.test_graphql_execute_with_middleware.json
+++ b/tests/snapshots/tests.contrib.graphql.test_graphql.test_graphql_execute_with_middleware.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "test-execute-instrumentation",
-    "service": "",
+    "service": "tests.contrib.graphql",
     "resource": "test-execute-instrumentation",
     "trace_id": 0,
     "span_id": 1,
@@ -33,7 +33,7 @@
        "type": "graphql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.graphql",
          "_dd.p.tid": "654a694400000000",
          "component": "graphql",
          "graphql.source": "query HELLO { hello }"
@@ -54,7 +54,7 @@
        "type": "graphql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.graphql",
          "_dd.p.tid": "654a694400000000",
          "component": "graphql",
          "graphql.operation.name": "HELLO",
@@ -78,7 +78,7 @@
           "type": "graphql",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.graphql",
             "_dd.p.tid": "654a694400000000",
             "component": "graphql"
           },
@@ -95,7 +95,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.graphql",
                "_dd.p.tid": "654a694400000000"
              },
              "duration": 16708,
@@ -111,7 +111,7 @@
        "type": "graphql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.graphql",
          "_dd.p.tid": "654a694400000000",
          "component": "graphql",
          "graphql.operation.name": "HELLO",
@@ -135,7 +135,7 @@
           "type": "graphql",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.graphql",
             "_dd.p.tid": "654a694400000000",
             "component": "graphql"
           },
@@ -152,7 +152,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.graphql",
                "_dd.p.tid": "654a694400000000"
              },
              "duration": 14000,
diff --git a/tests/snapshots/tests.contrib.graphql.test_graphql.test_graphql_with_document_with_no_location.json b/tests/snapshots/tests.contrib.graphql.test_graphql.test_graphql_with_document_with_no_location.json
index 17ff8b63348..6f959c9ec10 100644
--- a/tests/snapshots/tests.contrib.graphql.test_graphql.test_graphql_with_document_with_no_location.json
+++ b/tests/snapshots/tests.contrib.graphql.test_graphql.test_graphql_with_document_with_no_location.json
@@ -9,7 +9,7 @@
     "type": "graphql",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.graphql",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "graphql",
@@ -37,7 +37,7 @@
     "type": "graphql",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.graphql",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "graphql",
diff --git a/tests/snapshots/tests.contrib.graphql.test_graphql.test_graphql_with_traced_resolver.json b/tests/snapshots/tests.contrib.graphql.test_graphql.test_graphql_with_traced_resolver.json
index d2a5ce07045..775adc1a204 100644
--- a/tests/snapshots/tests.contrib.graphql.test_graphql.test_graphql_with_traced_resolver.json
+++ b/tests/snapshots/tests.contrib.graphql.test_graphql.test_graphql_with_traced_resolver.json
@@ -9,7 +9,7 @@
     "type": "graphql",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.graphql",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "graphql",
@@ -36,7 +36,7 @@
        "type": "graphql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.graphql",
          "_dd.p.tid": "654a694400000000",
          "component": "graphql",
          "graphql.source": "query HELLO { hello }"
@@ -54,7 +54,7 @@
        "type": "graphql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.graphql",
          "_dd.p.tid": "654a694400000000",
          "component": "graphql",
          "graphql.source": "query HELLO { hello }"
@@ -72,7 +72,7 @@
        "type": "graphql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.graphql",
          "_dd.p.tid": "654a694400000000",
          "component": "graphql",
          "graphql.operation.name": "HELLO",
@@ -95,7 +95,7 @@
           "type": "graphql",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.graphql",
             "_dd.p.tid": "654a694400000000",
             "component": "graphql"
           },
diff --git a/tests/snapshots/tests.contrib.httpx.test_httpx.test_configure_service_name.json b/tests/snapshots/tests.contrib.httpx.test_httpx.test_configure_service_name.json
index 37bd00c8130..8ad8d04c329 100644
--- a/tests/snapshots/tests.contrib.httpx.test_httpx.test_configure_service_name.json
+++ b/tests/snapshots/tests.contrib.httpx.test_httpx.test_configure_service_name.json
@@ -9,7 +9,7 @@
     "type": "http",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.httpx",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "httpx",
diff --git a/tests/snapshots/tests.contrib.httpx.test_httpx.test_get_200.json b/tests/snapshots/tests.contrib.httpx.test_httpx.test_get_200.json
index 3ec1faacc54..ff5fd8ca143 100644
--- a/tests/snapshots/tests.contrib.httpx.test_httpx.test_get_200.json
+++ b/tests/snapshots/tests.contrib.httpx.test_httpx.test_get_200.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "http.request",
-    "service": "",
+    "service": "tests.contrib.httpx",
     "resource": "http.request",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.httpx.test_httpx.test_get_500.json b/tests/snapshots/tests.contrib.httpx.test_httpx.test_get_500.json
index 51d5c64bd45..9ae35ed08a3 100644
--- a/tests/snapshots/tests.contrib.httpx.test_httpx.test_get_500.json
+++ b/tests/snapshots/tests.contrib.httpx.test_httpx.test_get_500.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "http.request",
-    "service": "",
+    "service": "tests.contrib.httpx",
     "resource": "http.request",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.httpx.test_httpx.test_request_headers.json b/tests/snapshots/tests.contrib.httpx.test_httpx.test_request_headers.json
index e74e0c4d10c..f92f444d143 100644
--- a/tests/snapshots/tests.contrib.httpx.test_httpx.test_request_headers.json
+++ b/tests/snapshots/tests.contrib.httpx.test_httpx.test_request_headers.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "http.request",
-    "service": "",
+    "service": "tests.contrib.httpx",
     "resource": "http.request",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.httpx.test_httpx.test_schematized_unspecified_service_name_env_default.json b/tests/snapshots/tests.contrib.httpx.test_httpx.test_schematized_unspecified_service_name_env_default.json
index 285fc0ffc9f..14d13084d1d 100644
--- a/tests/snapshots/tests.contrib.httpx.test_httpx.test_schematized_unspecified_service_name_env_default.json
+++ b/tests/snapshots/tests.contrib.httpx.test_httpx.test_schematized_unspecified_service_name_env_default.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "http.request",
-    "service": "",
+    "service": "tests.contrib.httpx",
     "resource": "http.request",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.httpx.test_httpx.test_schematized_unspecified_service_name_env_v0.json b/tests/snapshots/tests.contrib.httpx.test_httpx.test_schematized_unspecified_service_name_env_v0.json
index 428727ef8fa..4f8be41c9e1 100644
--- a/tests/snapshots/tests.contrib.httpx.test_httpx.test_schematized_unspecified_service_name_env_v0.json
+++ b/tests/snapshots/tests.contrib.httpx.test_httpx.test_schematized_unspecified_service_name_env_v0.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "http.request",
-    "service": "",
+    "service": "tests.contrib.httpx",
     "resource": "http.request",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.httpx.test_httpx.test_split_by_domain.json b/tests/snapshots/tests.contrib.httpx.test_httpx.test_split_by_domain.json
index 9eb4acbc1cb..3b933ab6f5a 100644
--- a/tests/snapshots/tests.contrib.httpx.test_httpx.test_split_by_domain.json
+++ b/tests/snapshots/tests.contrib.httpx.test_httpx.test_split_by_domain.json
@@ -9,7 +9,7 @@
     "type": "http",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.httpx",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "httpx",
diff --git a/tests/snapshots/tests.contrib.httpx.test_httpx.test_trace_query_string.json b/tests/snapshots/tests.contrib.httpx.test_httpx.test_trace_query_string.json
index db98c4fe671..939a7dba7fd 100644
--- a/tests/snapshots/tests.contrib.httpx.test_httpx.test_trace_query_string.json
+++ b/tests/snapshots/tests.contrib.httpx.test_httpx.test_trace_query_string.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "http.request",
-    "service": "",
+    "service": "tests.contrib.httpx",
     "resource": "http.request",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_ai21_llm_sync.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_ai21_llm_sync.json
index bf906812d09..f874cb0c997 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_ai21_llm_sync.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_ai21_llm_sync.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.llms.ai21.AI21",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_cohere_llm_sync.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_cohere_llm_sync.json
index 505a4cb27e7..50ac99f6b80 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_cohere_llm_sync.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_cohere_llm_sync.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.llms.cohere.Cohere",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_cohere_math_chain.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_cohere_math_chain.json
index 5b53ed64739..955b01e825d 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_cohere_math_chain.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_cohere_math_chain.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.chains.llm_math.base.LLMMathChain",
     "trace_id": 0,
     "span_id": 1,
@@ -31,7 +31,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.chains.llm.LLMChain",
        "trace_id": 0,
        "span_id": 2,
@@ -55,7 +55,7 @@
      },
         {
           "name": "langchain.request",
-          "service": "",
+          "service": "tests.contrib.langchain",
           "resource": "langchain.llms.cohere.Cohere",
           "trace_id": 0,
           "span_id": 3,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_fake_embedding_document.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_fake_embedding_document.json
index 1ce0f7e4f17..59dbbd54fd8 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_fake_embedding_document.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_fake_embedding_document.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.embeddings.fake.FakeEmbeddings",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_fake_embedding_query.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_fake_embedding_query.json
index 006f390a3bb..27094157302 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_fake_embedding_query.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_fake_embedding_query.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.embeddings.fake.FakeEmbeddings",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_huggingfacehub_llm_sync.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_huggingfacehub_llm_sync.json
index d4d41d43de1..5161352b053 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_huggingfacehub_llm_sync.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_huggingfacehub_llm_sync.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.llms.huggingface_hub.HuggingFaceHub",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_call.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_call.json
index 8e1eb81bcf8..0eda22db2e6 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_call.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_call.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.chat_models.openai.ChatOpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_generate.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_generate.json
index d6e29571d9c..d577c723a89 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_generate.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_generate.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.chat_models.openai.ChatOpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_sync_call_39.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_sync_call_39.json
index 7b877ddca21..8e1db682c34 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_sync_call_39.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_sync_call_39.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.chat_models.openai.ChatOpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_sync_call_langchain_openai.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_sync_call_langchain_openai.json
index ecb0e57af40..97f062deee8 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_sync_call_langchain_openai.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_sync_call_langchain_openai.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_openai.chat_models.base.ChatOpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_sync_generate_39.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_sync_generate_39.json
index 7fca1b92ae6..9e3586dbdf8 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_sync_generate_39.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_sync_generate_39.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.chat_models.openai.ChatOpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_embedding_document.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_embedding_document.json
index 663eb0e5a46..498fb90b0ed 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_embedding_document.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_embedding_document.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.embeddings.openai.OpenAIEmbeddings",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_embedding_query.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_embedding_query.json
index 27f8ea6fb32..0223a8f96ac 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_embedding_query.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_embedding_query.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.embeddings.openai.OpenAIEmbeddings",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_async.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_async.json
index 9da602d3fb8..bd3e6e31b97 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_async.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_async.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.llms.openai.OpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_error.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_error.json
index f8f49aa691e..36a22643a49 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_error.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_error.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.llms.openai.OpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_sync.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_sync.json
index 27868b6a1df..7cd8ad9bb80 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_sync.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_sync.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.llms.openai.OpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_sync_39.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_sync_39.json
index ffb67d28c21..58564950a4a 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_sync_39.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_sync_39.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.llms.openai.OpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_sync_multiple_prompts.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_sync_multiple_prompts.json
index e93917cc2aa..438d48c7ad2 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_sync_multiple_prompts.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_sync_multiple_prompts.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.llms.openai.OpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_sync_multiple_prompts_39.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_sync_multiple_prompts_39.json
index d899bf71bb0..c9671dc85bb 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_sync_multiple_prompts_39.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_sync_multiple_prompts_39.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.llms.openai.OpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_math_chain.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_math_chain.json
index 8e4fee66411..fa869bf353d 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_math_chain.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_math_chain.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.chains.llm_math.base.LLMMathChain",
     "trace_id": 0,
     "span_id": 1,
@@ -35,7 +35,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.chains.llm.LLMChain",
        "trace_id": 0,
        "span_id": 2,
@@ -63,7 +63,7 @@
      },
         {
           "name": "langchain.request",
-          "service": "",
+          "service": "tests.contrib.langchain",
           "resource": "langchain.llms.openai.OpenAI",
           "trace_id": 0,
           "span_id": 3,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_sequential_chain.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_sequential_chain.json
index 0756d047202..444430e4efb 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_sequential_chain.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_sequential_chain.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.chains.sequential.SequentialChain",
     "trace_id": 0,
     "span_id": 1,
@@ -36,7 +36,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.chains.transform.TransformChain",
        "trace_id": 0,
        "span_id": 2,
@@ -57,7 +57,7 @@
      },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.chains.llm.LLMChain",
        "trace_id": 0,
        "span_id": 3,
@@ -84,7 +84,7 @@
      },
         {
           "name": "langchain.request",
-          "service": "",
+          "service": "tests.contrib.langchain",
           "resource": "langchain.llms.openai.OpenAI",
           "trace_id": 0,
           "span_id": 4,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_sequential_chain_with_multiple_llm_async.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_sequential_chain_with_multiple_llm_async.json
index 7d6414734a6..d46dff4d757 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_sequential_chain_with_multiple_llm_async.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_sequential_chain_with_multiple_llm_async.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.chains.sequential.SequentialChain",
     "trace_id": 0,
     "span_id": 1,
@@ -34,7 +34,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.chains.llm.LLMChain",
        "trace_id": 0,
        "span_id": 2,
@@ -59,7 +59,7 @@
      },
         {
           "name": "langchain.request",
-          "service": "",
+          "service": "tests.contrib.langchain",
           "resource": "langchain.llms.openai.OpenAI",
           "trace_id": 0,
           "span_id": 4,
@@ -96,7 +96,7 @@
         },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.chains.llm.LLMChain",
        "trace_id": 0,
        "span_id": 3,
@@ -122,7 +122,7 @@
      },
         {
           "name": "langchain.request",
-          "service": "",
+          "service": "tests.contrib.langchain",
           "resource": "langchain.llms.openai.OpenAI",
           "trace_id": 0,
           "span_id": 5,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_sequential_chain_with_multiple_llm_sync.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_sequential_chain_with_multiple_llm_sync.json
index 013ded4304a..b9b5ef33eee 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_sequential_chain_with_multiple_llm_sync.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_sequential_chain_with_multiple_llm_sync.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.chains.sequential.SequentialChain",
     "trace_id": 0,
     "span_id": 1,
@@ -34,7 +34,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.chains.llm.LLMChain",
        "trace_id": 0,
        "span_id": 2,
@@ -59,7 +59,7 @@
      },
         {
           "name": "langchain.request",
-          "service": "",
+          "service": "tests.contrib.langchain",
           "resource": "langchain.llms.openai.OpenAI",
           "trace_id": 0,
           "span_id": 4,
@@ -96,7 +96,7 @@
         },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.chains.llm.LLMChain",
        "trace_id": 0,
        "span_id": 3,
@@ -122,7 +122,7 @@
      },
         {
           "name": "langchain.request",
-          "service": "",
+          "service": "tests.contrib.langchain",
           "resource": "langchain.llms.openai.OpenAI",
           "trace_id": 0,
           "span_id": 5,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_pinecone_vectorstore_retrieval_chain.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_pinecone_vectorstore_retrieval_chain.json
index 6d4384a0708..c37a59fa5c9 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_pinecone_vectorstore_retrieval_chain.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_pinecone_vectorstore_retrieval_chain.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.chains.qa_with_sources.retrieval.RetrievalQAWithSourcesChain",
     "trace_id": 0,
     "span_id": 1,
@@ -35,7 +35,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.vectorstores.pinecone.Pinecone",
        "trace_id": 0,
        "span_id": 2,
@@ -80,7 +80,7 @@
      },
         {
           "name": "langchain.request",
-          "service": "",
+          "service": "tests.contrib.langchain",
           "resource": "langchain.embeddings.openai.OpenAIEmbeddings",
           "trace_id": 0,
           "span_id": 4,
@@ -104,7 +104,7 @@
         },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.chains.combine_documents.stuff.StuffDocumentsChain",
        "trace_id": 0,
        "span_id": 3,
@@ -131,7 +131,7 @@
      },
         {
           "name": "langchain.request",
-          "service": "",
+          "service": "tests.contrib.langchain",
           "resource": "langchain.chains.llm.LLMChain",
           "trace_id": 0,
           "span_id": 5,
@@ -159,7 +159,7 @@
         },
            {
              "name": "langchain.request",
-             "service": "",
+             "service": "tests.contrib.langchain",
              "resource": "langchain.llms.openai.OpenAI",
              "trace_id": 0,
              "span_id": 6,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_pinecone_vectorstore_retrieval_chain_39.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_pinecone_vectorstore_retrieval_chain_39.json
index 2355aaf2ffe..e2e365bd57d 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_pinecone_vectorstore_retrieval_chain_39.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_pinecone_vectorstore_retrieval_chain_39.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.chains.qa_with_sources.retrieval.RetrievalQAWithSourcesChain",
     "trace_id": 0,
     "span_id": 1,
@@ -35,7 +35,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.vectorstores.pinecone.Pinecone",
        "trace_id": 0,
        "span_id": 2,
@@ -81,7 +81,7 @@
      },
         {
           "name": "langchain.request",
-          "service": "",
+          "service": "tests.contrib.langchain",
           "resource": "langchain.embeddings.openai.OpenAIEmbeddings",
           "trace_id": 0,
           "span_id": 4,
@@ -106,7 +106,7 @@
         },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.chains.combine_documents.stuff.StuffDocumentsChain",
        "trace_id": 0,
        "span_id": 3,
@@ -134,7 +134,7 @@
      },
         {
           "name": "langchain.request",
-          "service": "",
+          "service": "tests.contrib.langchain",
           "resource": "langchain.chains.llm.LLMChain",
           "trace_id": 0,
           "span_id": 5,
@@ -163,7 +163,7 @@
         },
            {
              "name": "langchain.request",
-             "service": "",
+             "service": "tests.contrib.langchain",
              "resource": "langchain.llms.openai.OpenAI",
              "trace_id": 0,
              "span_id": 6,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain.test_pinecone_vectorstore_similarity_search.json b/tests/snapshots/tests.contrib.langchain.test_langchain.test_pinecone_vectorstore_similarity_search.json
index d3c21b1a5c7..e2707a9ea5b 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain.test_pinecone_vectorstore_similarity_search.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain.test_pinecone_vectorstore_similarity_search.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.vectorstores.pinecone.Pinecone",
     "trace_id": 0,
     "span_id": 1,
@@ -40,7 +40,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.embeddings.openai.OpenAIEmbeddings",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_ai21_llm_sync.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_ai21_llm_sync.json
index 82442f9abb2..b23b73d1409 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_ai21_llm_sync.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_ai21_llm_sync.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_community.llms.ai21.AI21",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_base_tool_invoke.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_base_tool_invoke.json
index 97bcba2d7ee..2b7ff2241e9 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_base_tool_invoke.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_base_tool_invoke.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "Circumference calculator",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_base_tool_invoke_non_json_serializable_config.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_base_tool_invoke_non_json_serializable_config.json
index b679d4b785b..4ac7e76b583 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_base_tool_invoke_non_json_serializable_config.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_base_tool_invoke_non_json_serializable_config.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "Circumference calculator",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_chain_invoke.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_chain_invoke.json
index c16c796a6a5..b8e1c37819a 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_chain_invoke.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_chain_invoke.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.chains.llm.LLMChain",
     "trace_id": 0,
     "span_id": 1,
@@ -35,7 +35,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain_openai.llms.base.OpenAI",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_cohere_llm_sync.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_cohere_llm_sync.json
index 85d36538d03..4abd4ac9c43 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_cohere_llm_sync.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_cohere_llm_sync.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_cohere.llms.Cohere",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_faiss_vectorstore_retrieval.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_faiss_vectorstore_retrieval.json
index 477574379a9..aaad5aeb7a9 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_faiss_vectorstore_retrieval.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_faiss_vectorstore_retrieval.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_openai.embeddings.base.OpenAIEmbeddings",
     "trace_id": 0,
     "span_id": 1,
@@ -34,7 +34,7 @@
 [
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_community.vectorstores.faiss.FAISS",
     "trace_id": 1,
     "span_id": 1,
@@ -65,7 +65,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain_openai.embeddings.base.OpenAIEmbeddings",
        "trace_id": 1,
        "span_id": 2,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_fake_embedding_document.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_fake_embedding_document.json
index 3a8fae94add..b0ba4091fa4 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_fake_embedding_document.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_fake_embedding_document.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_community.embeddings.fake.FakeEmbeddings",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_fake_embedding_query.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_fake_embedding_query.json
index 24dd06fcb3c..95fa195d2ea 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_fake_embedding_query.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_fake_embedding_query.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_community.embeddings.fake.FakeEmbeddings",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_huggingfacehub_llm_sync.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_huggingfacehub_llm_sync.json
index 492dd89e7e5..43a52f7f154 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_huggingfacehub_llm_sync.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_huggingfacehub_llm_sync.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_community.llms.huggingface_endpoint.HuggingFaceEndpoint",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcecl_chain_non_dict_input.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcecl_chain_non_dict_input.json
index 18396e9bd81..2a25652e285 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcecl_chain_non_dict_input.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcecl_chain_non_dict_input.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_core.runnables.base.RunnableSequence",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_batch.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_batch.json
index 857933bfe5b..3031a3d2804 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_batch.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_batch.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_core.runnables.base.RunnableSequence",
     "trace_id": 0,
     "span_id": 1,
@@ -35,7 +35,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain_openai.chat_models.base.ChatOpenAI",
        "trace_id": 0,
        "span_id": 2,
@@ -69,7 +69,7 @@
      },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain_openai.chat_models.base.ChatOpenAI",
        "trace_id": 0,
        "span_id": 3,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_batch_311.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_batch_311.json
index 51ea2464138..5ff0e2d7bd8 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_batch_311.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_batch_311.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_core.runnables.base.RunnableSequence",
     "trace_id": 0,
     "span_id": 1,
@@ -35,7 +35,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain_openai.chat_models.base.ChatOpenAI",
        "trace_id": 0,
        "span_id": 2,
@@ -69,7 +69,7 @@
      },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain_openai.chat_models.base.ChatOpenAI",
        "trace_id": 0,
        "span_id": 3,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_batch_async.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_batch_async.json
index ef507135c57..c43504bac7a 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_batch_async.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_batch_async.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_core.runnables.base.RunnableSequence",
     "trace_id": 0,
     "span_id": 1,
@@ -35,7 +35,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain_openai.chat_models.base.ChatOpenAI",
        "trace_id": 0,
        "span_id": 2,
@@ -69,7 +69,7 @@
      },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain_openai.chat_models.base.ChatOpenAI",
        "trace_id": 0,
        "span_id": 3,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_complicated.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_complicated.json
index 33a3ecfd937..26386ef066b 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_complicated.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_complicated.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_core.runnables.base.RunnableSequence",
     "trace_id": 0,
     "span_id": 1,
@@ -34,7 +34,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain_openai.chat_models.base.ChatOpenAI",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_nested.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_nested.json
index fbd812e6e50..3262cea3b96 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_nested.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_nested.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_core.runnables.base.RunnableSequence",
     "trace_id": 0,
     "span_id": 1,
@@ -34,7 +34,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain_core.runnables.base.RunnableSequence",
        "trace_id": 0,
        "span_id": 2,
@@ -59,7 +59,7 @@
      },
         {
           "name": "langchain.request",
-          "service": "",
+          "service": "tests.contrib.langchain",
           "resource": "langchain_openai.chat_models.base.ChatOpenAI",
           "trace_id": 0,
           "span_id": 4,
@@ -94,7 +94,7 @@
         },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain_openai.chat_models.base.ChatOpenAI",
        "trace_id": 0,
        "span_id": 3,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_non_dict_input.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_non_dict_input.json
index 8e3c081fcf1..dcc77d8a33c 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_non_dict_input.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_non_dict_input.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_core.runnables.base.RunnableSequence",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_simple.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_simple.json
index f05b8fe397e..305bd4e751f 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_simple.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_simple.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_core.runnables.base.RunnableSequence",
     "trace_id": 0,
     "span_id": 1,
@@ -33,7 +33,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain_openai.llms.base.OpenAI",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_simple_async.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_simple_async.json
index 336b92e2785..ce966306e68 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_simple_async.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_chain_simple_async.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_core.runnables.base.RunnableSequence",
     "trace_id": 0,
     "span_id": 1,
@@ -33,7 +33,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain_openai.llms.base.OpenAI",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_with_tools_anthropic.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_with_tools_anthropic.json
index e4af1719557..2ac2dcc75f1 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_with_tools_anthropic.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_with_tools_anthropic.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_anthropic.chat_models.ChatAnthropic",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_with_tools_openai.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_with_tools_openai.json
index 4db685e0fca..3e6131fdcb8 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_with_tools_openai.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_lcel_with_tools_openai.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_openai.chat_models.base.ChatOpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_chat_model_async_call.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_chat_model_async_call.json
index 6749e91a80c..a748cbecd51 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_chat_model_async_call.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_chat_model_async_call.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_openai.chat_models.base.ChatOpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_chat_model_async_generate.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_chat_model_async_generate.json
index 99ad139c6cf..5088caae82a 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_chat_model_async_generate.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_chat_model_async_generate.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_openai.chat_models.base.ChatOpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_chat_model_sync_call_langchain_openai.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_chat_model_sync_call_langchain_openai.json
index 79833a0cb80..269a94e6705 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_chat_model_sync_call_langchain_openai.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_chat_model_sync_call_langchain_openai.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_openai.chat_models.base.ChatOpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_chat_model_sync_generate.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_chat_model_sync_generate.json
index 3b53614b898..96529bb8b3d 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_chat_model_sync_generate.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_chat_model_sync_generate.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_openai.chat_models.base.ChatOpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_chat_model_vision_generate.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_chat_model_vision_generate.json
index f4cc580bb7e..89f6dcb9251 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_chat_model_vision_generate.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_chat_model_vision_generate.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_openai.chat_models.base.ChatOpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_embedding_query.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_embedding_query.json
index 8568c2f1cde..924c715454f 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_embedding_query.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_embedding_query.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_openai.embeddings.base.OpenAIEmbeddings",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_llm_async.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_llm_async.json
index 64e58d2e178..c82822de607 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_llm_async.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_llm_async.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_openai.llms.base.OpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_llm_error.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_llm_error.json
index dbfb7994df4..31df1b37550 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_llm_error.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_llm_error.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_openai.llms.base.OpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_llm_sync.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_llm_sync.json
index 43e1f9c4131..1460467119b 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_llm_sync.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_llm_sync.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_openai.llms.base.OpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_llm_sync_multiple_prompts.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_llm_sync_multiple_prompts.json
index 31db3686d54..317a7ab5f21 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_llm_sync_multiple_prompts.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_llm_sync_multiple_prompts.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_openai.llms.base.OpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_math_chain.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_math_chain.json
index 3331d8497be..666916702e0 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_math_chain.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_math_chain.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.chains.llm_math.base.LLMMathChain",
     "trace_id": 0,
     "span_id": 1,
@@ -35,7 +35,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.chains.llm.LLMChain",
        "trace_id": 0,
        "span_id": 2,
@@ -63,7 +63,7 @@
      },
         {
           "name": "langchain.request",
-          "service": "",
+          "service": "tests.contrib.langchain",
           "resource": "langchain_openai.llms.base.OpenAI",
           "trace_id": 0,
           "span_id": 3,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_math_chain_async.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_math_chain_async.json
index fd1711bdfc2..76129c4bc3e 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_math_chain_async.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_math_chain_async.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.chains.llm_math.base.LLMMathChain",
     "trace_id": 0,
     "span_id": 1,
@@ -35,7 +35,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.chains.llm.LLMChain",
        "trace_id": 0,
        "span_id": 2,
@@ -63,7 +63,7 @@
      },
         {
           "name": "langchain.request",
-          "service": "",
+          "service": "tests.contrib.langchain",
           "resource": "langchain_openai.llms.base.OpenAI",
           "trace_id": 0,
           "span_id": 3,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_sequential_chain.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_sequential_chain.json
index 8f3e44e2b7b..9ed77b47f8a 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_sequential_chain.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_sequential_chain.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.chains.sequential.SequentialChain",
     "trace_id": 0,
     "span_id": 1,
@@ -36,7 +36,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.chains.transform.TransformChain",
        "trace_id": 0,
        "span_id": 2,
@@ -57,7 +57,7 @@
      },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.chains.llm.LLMChain",
        "trace_id": 0,
        "span_id": 3,
@@ -84,7 +84,7 @@
      },
         {
           "name": "langchain.request",
-          "service": "",
+          "service": "tests.contrib.langchain",
           "resource": "langchain_openai.llms.base.OpenAI",
           "trace_id": 0,
           "span_id": 4,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_sequential_chain_with_multiple_llm_async.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_sequential_chain_with_multiple_llm_async.json
index 251d83ad5e4..77d4bba6755 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_sequential_chain_with_multiple_llm_async.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_sequential_chain_with_multiple_llm_async.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.chains.sequential.SequentialChain",
     "trace_id": 0,
     "span_id": 1,
@@ -34,7 +34,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.chains.llm.LLMChain",
        "trace_id": 0,
        "span_id": 2,
@@ -59,7 +59,7 @@
      },
         {
           "name": "langchain.request",
-          "service": "",
+          "service": "tests.contrib.langchain",
           "resource": "langchain_openai.llms.base.OpenAI",
           "trace_id": 0,
           "span_id": 4,
@@ -95,7 +95,7 @@
         },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.chains.llm.LLMChain",
        "trace_id": 0,
        "span_id": 3,
@@ -121,7 +121,7 @@
      },
         {
           "name": "langchain.request",
-          "service": "",
+          "service": "tests.contrib.langchain",
           "resource": "langchain_openai.llms.base.OpenAI",
           "trace_id": 0,
           "span_id": 5,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_sequential_chain_with_multiple_llm_sync.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_sequential_chain_with_multiple_llm_sync.json
index c86641ee612..ba77f275645 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_sequential_chain_with_multiple_llm_sync.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_openai_sequential_chain_with_multiple_llm_sync.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.chains.sequential.SequentialChain",
     "trace_id": 0,
     "span_id": 1,
@@ -34,7 +34,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.chains.llm.LLMChain",
        "trace_id": 0,
        "span_id": 2,
@@ -59,7 +59,7 @@
      },
         {
           "name": "langchain.request",
-          "service": "",
+          "service": "tests.contrib.langchain",
           "resource": "langchain_openai.llms.base.OpenAI",
           "trace_id": 0,
           "span_id": 4,
@@ -97,7 +97,7 @@
         },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.chains.llm.LLMChain",
        "trace_id": 0,
        "span_id": 3,
@@ -123,7 +123,7 @@
      },
         {
           "name": "langchain.request",
-          "service": "",
+          "service": "tests.contrib.langchain",
           "resource": "langchain_openai.llms.base.OpenAI",
           "trace_id": 0,
           "span_id": 5,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_pinecone_vectorstore_retrieval_chain.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_pinecone_vectorstore_retrieval_chain.json
index 89d991a2c3e..e7aa94842af 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_pinecone_vectorstore_retrieval_chain.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_pinecone_vectorstore_retrieval_chain.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain.chains.qa_with_sources.retrieval.RetrievalQAWithSourcesChain",
     "trace_id": 0,
     "span_id": 1,
@@ -35,7 +35,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain_pinecone.vectorstores.PineconeVectorStore",
        "trace_id": 0,
        "span_id": 2,
@@ -59,7 +59,7 @@
      },
         {
           "name": "langchain.request",
-          "service": "",
+          "service": "tests.contrib.langchain",
           "resource": "langchain_openai.embeddings.base.OpenAIEmbeddings",
           "trace_id": 0,
           "span_id": 4,
@@ -83,7 +83,7 @@
         },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain.chains.combine_documents.stuff.StuffDocumentsChain",
        "trace_id": 0,
        "span_id": 3,
@@ -110,7 +110,7 @@
      },
         {
           "name": "langchain.request",
-          "service": "",
+          "service": "tests.contrib.langchain",
           "resource": "langchain.chains.llm.LLMChain",
           "trace_id": 0,
           "span_id": 5,
@@ -138,7 +138,7 @@
         },
            {
              "name": "langchain.request",
-             "service": "",
+             "service": "tests.contrib.langchain",
              "resource": "langchain_openai.llms.base.OpenAI",
              "trace_id": 0,
              "span_id": 6,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_pinecone_vectorstore_similarity_search.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_pinecone_vectorstore_similarity_search.json
index 6f2cc59f0e6..22a66a8c0a7 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_pinecone_vectorstore_similarity_search.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_pinecone_vectorstore_similarity_search.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_pinecone.vectorstores.PineconeVectorStore",
     "trace_id": 0,
     "span_id": 1,
@@ -37,7 +37,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain_openai.embeddings.base.OpenAIEmbeddings",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_streamed_chain.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_streamed_chain.json
index ad34fcb3343..adec02f3eee 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_streamed_chain.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_streamed_chain.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_core.runnables.base.RunnableSequence",
     "trace_id": 0,
     "span_id": 1,
@@ -30,7 +30,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain_openai.chat_models.base.ChatOpenAI",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_streamed_chat.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_streamed_chat.json
index abec415263d..7705ec0697e 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_streamed_chat.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_streamed_chat.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_openai.chat_models.base.ChatOpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_streamed_json_output_parser.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_streamed_json_output_parser.json
index 9a840eea4bb..6e763167ca7 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_streamed_json_output_parser.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_streamed_json_output_parser.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_core.runnables.base.RunnableSequence",
     "trace_id": 0,
     "span_id": 1,
@@ -31,7 +31,7 @@
   },
      {
        "name": "langchain.request",
-       "service": "",
+       "service": "tests.contrib.langchain",
        "resource": "langchain_openai.chat_models.base.ChatOpenAI",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_streamed_llm.json b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_streamed_llm.json
index 8b5043f37c4..6a34bbed9fc 100644
--- a/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_streamed_llm.json
+++ b/tests/snapshots/tests.contrib.langchain.test_langchain_community.test_streamed_llm.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "langchain.request",
-    "service": "",
+    "service": "tests.contrib.langchain",
     "resource": "langchain_openai.llms.base.OpenAI",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_acompletion.json b/tests/snapshots/tests.contrib.openai.test_openai.test_acompletion.json
index d983e2c374d..3a0cd66dbbf 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_acompletion.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_acompletion.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createCompletion",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_atranscribe.json b/tests/snapshots/tests.contrib.openai.test_openai.test_atranscribe.json
index 873aee1ecd6..97dee08bbab 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_atranscribe.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_atranscribe.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createTranscription",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_atranslate.json b/tests/snapshots/tests.contrib.openai.test_openai.test_atranslate.json
index afee69163ee..c1f2c038888 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_atranslate.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_atranslate.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createTranslation",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_azure_openai_chat_completion.json b/tests/snapshots/tests.contrib.openai.test_openai.test_azure_openai_chat_completion.json
index af77738c642..8257b41b636 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_azure_openai_chat_completion.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_azure_openai_chat_completion.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createChatCompletion",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_azure_openai_completion.json b/tests/snapshots/tests.contrib.openai.test_openai.test_azure_openai_completion.json
index 3160badff25..01fc0431380 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_azure_openai_completion.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_azure_openai_completion.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createCompletion",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_azure_openai_embedding.json b/tests/snapshots/tests.contrib.openai.test_openai.test_azure_openai_embedding.json
index fc939b11a8d..d1d4b6b5f5b 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_azure_openai_embedding.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_azure_openai_embedding.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createEmbedding",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_chat_completion.json b/tests/snapshots/tests.contrib.openai.test_openai.test_chat_completion.json
index 591d8982557..adb2bece666 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_chat_completion.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_chat_completion.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createChatCompletion",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_chat_completion_function_calling.json b/tests/snapshots/tests.contrib.openai.test_openai.test_chat_completion_function_calling.json
index c2cfc390c32..701f349187f 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_chat_completion_function_calling.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_chat_completion_function_calling.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createChatCompletion",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_chat_completion_image_input.json b/tests/snapshots/tests.contrib.openai.test_openai.test_chat_completion_image_input.json
index 226430c2843..8f969030564 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_chat_completion_image_input.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_chat_completion_image_input.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createChatCompletion",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_completion.json b/tests/snapshots/tests.contrib.openai.test_openai.test_completion.json
index b95432dc631..67f7aa1574e 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_completion.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_completion.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createCompletion",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_create_moderation.json b/tests/snapshots/tests.contrib.openai.test_openai.test_create_moderation.json
index 01cef45d03f..38c145f1814 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_create_moderation.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_create_moderation.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createModeration",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_embedding.json b/tests/snapshots/tests.contrib.openai.test_openai.test_embedding.json
index c388904e1d8..1309915df99 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_embedding.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_embedding.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createEmbedding",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_embedding_array_of_token_arrays.json b/tests/snapshots/tests.contrib.openai.test_openai.test_embedding_array_of_token_arrays.json
index 4fb2d8e39e2..60584a2a1f9 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_embedding_array_of_token_arrays.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_embedding_array_of_token_arrays.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createEmbedding",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_embedding_string_array.json b/tests/snapshots/tests.contrib.openai.test_openai.test_embedding_string_array.json
index a5dbc00d42c..f9c427d1884 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_embedding_string_array.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_embedding_string_array.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createEmbedding",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_embedding_token_array.json b/tests/snapshots/tests.contrib.openai.test_openai.test_embedding_token_array.json
index d73df1c6ec5..914f1a5863f 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_embedding_token_array.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_embedding_token_array.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createEmbedding",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_file_create.json b/tests/snapshots/tests.contrib.openai.test_openai.test_file_create.json
index 8e39c713021..838851052ea 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_file_create.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_file_create.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createFile",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_file_delete.json b/tests/snapshots/tests.contrib.openai.test_openai.test_file_delete.json
index ffd4e393cdd..de2826cdba9 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_file_delete.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_file_delete.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "deleteFile",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_file_download.json b/tests/snapshots/tests.contrib.openai.test_openai.test_file_download.json
index fe79532f5bd..9cd8b318614 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_file_download.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_file_download.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "downloadFile",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_file_list.json b/tests/snapshots/tests.contrib.openai.test_openai.test_file_list.json
index dfe2df6603d..6da8b126d9a 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_file_list.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_file_list.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "listFiles",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_file_retrieve.json b/tests/snapshots/tests.contrib.openai.test_openai.test_file_retrieve.json
index dcb15d5aec8..baab55a111e 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_file_retrieve.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_file_retrieve.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "retrieveFile",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_image_b64_json_response.json b/tests/snapshots/tests.contrib.openai.test_openai.test_image_b64_json_response.json
index 04a0e4dae29..cf8112be568 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_image_b64_json_response.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_image_b64_json_response.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createImage",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_image_create.json b/tests/snapshots/tests.contrib.openai.test_openai.test_image_create.json
index 6a3d28969c5..10c57ccbc3e 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_image_create.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_image_create.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createImage",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_image_edit.json b/tests/snapshots/tests.contrib.openai.test_openai.test_image_edit.json
index 3cec4aa01d1..4fe6fe9ccb0 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_image_edit.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_image_edit.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createImageEdit",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_image_edit_binary_input.json b/tests/snapshots/tests.contrib.openai.test_openai.test_image_edit_binary_input.json
index 1de20f38d5d..9ad4da73f6d 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_image_edit_binary_input.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_image_edit_binary_input.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createImageEdit",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_image_variation.json b/tests/snapshots/tests.contrib.openai.test_openai.test_image_variation.json
index 47457b22e70..1ea80ab609b 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_image_variation.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_image_variation.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createImageVariation",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_misuse.json b/tests/snapshots/tests.contrib.openai.test_openai.test_misuse.json
index 95b53b2c322..67dc45e3d3f 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_misuse.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_misuse.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createCompletion",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_model_delete.json b/tests/snapshots/tests.contrib.openai.test_openai.test_model_delete.json
index f6cdde2fcaa..c58eff9626a 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_model_delete.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_model_delete.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "deleteModel",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_model_list.json b/tests/snapshots/tests.contrib.openai.test_openai.test_model_list.json
index 8079ba3d1f7..6c1decd8122 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_model_list.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_model_list.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "listModels",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_model_retrieve.json b/tests/snapshots/tests.contrib.openai.test_openai.test_model_retrieve.json
index 955153a3a5e..37061e9695d 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_model_retrieve.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_model_retrieve.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "retrieveModel",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_span_finish_on_stream_error.json b/tests/snapshots/tests.contrib.openai.test_openai.test_span_finish_on_stream_error.json
index 08d74257629..d35ad5e0491 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_span_finish_on_stream_error.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_span_finish_on_stream_error.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createCompletion",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_transcribe.json b/tests/snapshots/tests.contrib.openai.test_openai.test_transcribe.json
index 8c09f1f3a92..bdfe0d0f946 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_transcribe.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_transcribe.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createTranscription",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.openai.test_openai.test_translate.json b/tests/snapshots/tests.contrib.openai.test_openai.test_translate.json
index d81cb52a7a4..2582c536ed1 100644
--- a/tests/snapshots/tests.contrib.openai.test_openai.test_translate.json
+++ b/tests/snapshots/tests.contrib.openai.test_openai.test_translate.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "openai.request",
-    "service": "",
+    "service": "tests.contrib.openai",
     "resource": "createTranslation",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.redis.test_redis.test_analytics_with_rate.json b/tests/snapshots/tests.contrib.redis.test_redis.test_analytics_with_rate.json
index e0d741fc6e1..507d5002670 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis.test_analytics_with_rate.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis.test_analytics_with_rate.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis.test_analytics_without_rate.json b/tests/snapshots/tests.contrib.redis.test_redis.test_analytics_without_rate.json
index 68929687b86..318db41f310 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis.test_analytics_without_rate.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis.test_analytics_without_rate.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis.test_basics.json b/tests/snapshots/tests.contrib.redis.test_redis.test_basics.json
index 16c51025235..42bf669a591 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis.test_basics.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis.test_basics.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis.test_custom_cmd_length.json b/tests/snapshots/tests.contrib.redis.test_redis.test_custom_cmd_length.json
index ba9b3c6dfea..f95bbfdb9fe 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis.test_custom_cmd_length.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis.test_custom_cmd_length.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis.test_custom_cmd_length_env.json b/tests/snapshots/tests.contrib.redis.test_redis.test_custom_cmd_length_env.json
index fd04e286162..81eb0086a63 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis.test_custom_cmd_length_env.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis.test_custom_cmd_length_env.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis.test_env_user_specified_redis_service.json b/tests/snapshots/tests.contrib.redis.test_redis.test_env_user_specified_redis_service.json
index 203e4018e45..6dceb23b029 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis.test_env_user_specified_redis_service.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis.test_env_user_specified_redis_service.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
@@ -46,7 +46,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis.test_full_command_in_resource_config.json b/tests/snapshots/tests.contrib.redis.test_redis.test_full_command_in_resource_config.json
index 26ae24e24fe..3945ec53e47 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis.test_full_command_in_resource_config.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis.test_full_command_in_resource_config.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "component": "redis",
       "db.system": "redis",
@@ -45,7 +45,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "component": "redis",
       "db.system": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis.test_full_command_in_resource_env.json b/tests/snapshots/tests.contrib.redis.test_redis.test_full_command_in_resource_env.json
index 6864d38d52e..e5e77a81431 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis.test_full_command_in_resource_env.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis.test_full_command_in_resource_env.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "component": "redis",
       "db.system": "redis",
@@ -45,7 +45,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "component": "redis",
       "db.system": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis.test_long_command.json b/tests/snapshots/tests.contrib.redis.test_redis.test_long_command.json
index d9e119864a8..2b9a2d93ca5 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis.test_long_command.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis.test_long_command.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis.test_meta_override.json b/tests/snapshots/tests.contrib.redis.test_redis.test_meta_override.json
index 8d3c54c7fe8..eabb712796a 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis.test_meta_override.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis.test_meta_override.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "cheese": "camembert",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis.test_opentracing.json b/tests/snapshots/tests.contrib.redis.test_redis.test_opentracing.json
index a2bc5c958bd..ae77229102b 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis.test_opentracing.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis.test_opentracing.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "language": "python",
@@ -34,7 +34,7 @@
        "type": "redis",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.redis",
          "_dd.p.tid": "654a694400000000",
          "component": "redis",
          "db.system": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis.test_pipeline_immediate.json b/tests/snapshots/tests.contrib.redis.test_redis.test_pipeline_immediate.json
index 35bad2a6661..47a77c9ad97 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis.test_pipeline_immediate.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis.test_pipeline_immediate.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
@@ -45,7 +45,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis.test_pipeline_traced.json b/tests/snapshots/tests.contrib.redis.test_redis.test_pipeline_traced.json
index a41acb5bacd..63d13253398 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis.test_pipeline_traced.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis.test_pipeline_traced.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis.test_unicode.json b/tests/snapshots/tests.contrib.redis.test_redis.test_unicode.json
index 4ccf8c37b46..be749df1f83 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis.test_unicode.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis.test_unicode.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_basic_request.json b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_basic_request.json
index 29ed7b2aeb0..901a9dddbfb 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_basic_request.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_basic_request.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_client_name.json b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_client_name.json
index 740bd5bbc3c..7b9b4cad0f8 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_client_name.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_client_name.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "language": "python",
@@ -34,7 +34,7 @@
        "type": "redis",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.redis",
          "_dd.p.tid": "654a694400000000",
          "component": "redis",
          "db.system": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_connection_error.json b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_connection_error.json
index 8a72c250fa8..7638a9b0bcf 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_connection_error.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_connection_error.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_decoding_non_utf8_args.json b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_decoding_non_utf8_args.json
index 15f64755506..39bf76ff553 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_decoding_non_utf8_args.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_decoding_non_utf8_args.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
@@ -45,7 +45,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_decoding_non_utf8_pipeline_args.json b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_decoding_non_utf8_pipeline_args.json
index a41375fd6fd..49021ad9afc 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_decoding_non_utf8_pipeline_args.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_decoding_non_utf8_pipeline_args.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_long_command.json b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_long_command.json
index 9d7631383d6..469b4598779 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_long_command.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_long_command.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_override_service_name.json b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_override_service_name.json
index 18b72d0f62e..8c88fdecf5b 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_override_service_name.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_override_service_name.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
@@ -46,7 +46,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
@@ -82,7 +82,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_parenting.json b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_parenting.json
index 64d8b47217c..c6f4987c1e7 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_parenting.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_parenting.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "language": "python",
@@ -34,7 +34,7 @@
        "type": "redis",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.redis",
          "_dd.p.tid": "654a694400000000",
          "component": "redis",
          "db.system": "redis",
@@ -63,7 +63,7 @@
        "type": "redis",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.redis",
          "_dd.p.tid": "654a694400000000",
          "component": "redis",
          "db.system": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_pin.json b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_pin.json
index 386f375aa10..38f0e0278df 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_pin.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_pin.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_pipeline_traced.json b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_pipeline_traced.json
index 3cfa402d49c..3c086af26c8 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_pipeline_traced.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_pipeline_traced.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_pipeline_traced_context_manager_transaction.json b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_pipeline_traced_context_manager_transaction.json
index 202b64f7858..2ff168bc8c8 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_pipeline_traced_context_manager_transaction.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_pipeline_traced_context_manager_transaction.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_two_traced_pipelines.json b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_two_traced_pipelines.json
index 86f35296e3c..3e00f7e5126 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_two_traced_pipelines.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_two_traced_pipelines.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "language": "python",
@@ -34,7 +34,7 @@
        "type": "redis",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.redis",
          "_dd.p.tid": "654a694400000000",
          "component": "redis",
          "db.system": "redis",
@@ -63,7 +63,7 @@
        "type": "redis",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.redis",
          "_dd.p.tid": "654a694400000000",
          "component": "redis",
          "db.system": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_unicode_request.json b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_unicode_request.json
index d7681407836..3baeb5a8cf3 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_unicode_request.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis_asyncio.test_unicode_request.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.redis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.rediscluster.test.test_cmd_max_length.json b/tests/snapshots/tests.contrib.rediscluster.test.test_cmd_max_length.json
index 7685a200b72..85907ea82f6 100644
--- a/tests/snapshots/tests.contrib.rediscluster.test.test_cmd_max_length.json
+++ b/tests/snapshots/tests.contrib.rediscluster.test.test_cmd_max_length.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rediscluster",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rediscluster",
@@ -41,7 +41,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rediscluster",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rediscluster",
diff --git a/tests/snapshots/tests.contrib.rediscluster.test.test_full_command_in_resource_config[True].json b/tests/snapshots/tests.contrib.rediscluster.test.test_full_command_in_resource_config[True].json
index 8f6d830336a..7fbe026f26c 100644
--- a/tests/snapshots/tests.contrib.rediscluster.test.test_full_command_in_resource_config[True].json
+++ b/tests/snapshots/tests.contrib.rediscluster.test.test_full_command_in_resource_config[True].json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rediscluster",
       "_dd.p.dm": "-0",
       "component": "rediscluster",
       "db.system": "redis",
@@ -40,7 +40,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rediscluster",
       "_dd.p.dm": "-0",
       "language": "python",
       "runtime-id": "1e05369c917e47d6a0c31264f74a62b3"
@@ -64,7 +64,7 @@
        "type": "redis",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.rediscluster",
          "component": "rediscluster",
          "db.system": "redis",
          "redis.raw_command": "GET put_key_in_resource",
@@ -89,7 +89,7 @@
        "type": "redis",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.rediscluster",
          "component": "rediscluster",
          "db.system": "redis",
          "redis.raw_command": "SET pipeline-cmd1 1\nSET pipeline-cmd2 2",
diff --git a/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_False_worker_service_None.json b/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_False_worker_service_None.json
index a2f2bcda6e5..77e0316ae05 100644
--- a/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_False_worker_service_None.json
+++ b/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_False_worker_service_None.json
@@ -9,7 +9,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
@@ -39,7 +39,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.rq",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
          "job.id": "962dfa1e-4a5b-4d95-8edf-3444887c737a"
@@ -58,7 +58,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
diff --git a/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_False_worker_service_custom-worker-service.json b/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_False_worker_service_custom-worker-service.json
index 3f7d666759d..b690a6a7d8a 100644
--- a/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_False_worker_service_custom-worker-service.json
+++ b/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_False_worker_service_custom-worker-service.json
@@ -56,7 +56,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
diff --git a/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_None_worker_service_None.json b/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_None_worker_service_None.json
index 51d35c2b586..1d8383fe582 100644
--- a/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_None_worker_service_None.json
+++ b/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_None_worker_service_None.json
@@ -9,7 +9,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
@@ -39,7 +39,7 @@
        "type": "worker",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.rq",
          "_dd.p.dm": "-0",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
@@ -71,7 +71,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.rq",
             "_dd.p.tid": "654a694400000000",
             "component": "rq",
             "job.id": "5e7a8f08-e011-4ebb-8cab-3ebbd30e089e"
diff --git a/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_None_worker_service_custom-worker-service.json b/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_None_worker_service_custom-worker-service.json
index 17b558203dc..a8aaf123f38 100644
--- a/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_None_worker_service_custom-worker-service.json
+++ b/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_None_worker_service_custom-worker-service.json
@@ -9,7 +9,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
diff --git a/tests/snapshots/tests.contrib.rq.test_rq.test_queue_failing_job.json b/tests/snapshots/tests.contrib.rq.test_rq.test_queue_failing_job.json
index 5a261478aba..9c4c5a894b7 100644
--- a/tests/snapshots/tests.contrib.rq.test_rq.test_queue_failing_job.json
+++ b/tests/snapshots/tests.contrib.rq.test_rq.test_queue_failing_job.json
@@ -9,7 +9,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
@@ -39,7 +39,7 @@
        "type": "",
        "error": 1,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.rq",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
          "error.message": "error",
diff --git a/tests/snapshots/tests.contrib.rq.test_rq.test_queue_failing_job_pre_1_10_1.json b/tests/snapshots/tests.contrib.rq.test_rq.test_queue_failing_job_pre_1_10_1.json
index 439e6e95653..032b1ee2c44 100644
--- a/tests/snapshots/tests.contrib.rq.test_rq.test_queue_failing_job_pre_1_10_1.json
+++ b/tests/snapshots/tests.contrib.rq.test_rq.test_queue_failing_job_pre_1_10_1.json
@@ -9,7 +9,7 @@
     "type": "worker",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
@@ -42,7 +42,7 @@
        "type": "",
        "error": 1,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.rq",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
          "error.message": "error",
diff --git a/tests/snapshots/tests.contrib.rq.test_rq.test_queue_pin_service.json b/tests/snapshots/tests.contrib.rq.test_rq.test_queue_pin_service.json
index f05fd85c425..a99105d6bf8 100644
--- a/tests/snapshots/tests.contrib.rq.test_rq.test_queue_pin_service.json
+++ b/tests/snapshots/tests.contrib.rq.test_rq.test_queue_pin_service.json
@@ -9,7 +9,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
@@ -39,7 +39,7 @@
        "type": "worker",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.rq",
          "_dd.p.dm": "-0",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
@@ -71,7 +71,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.rq",
             "_dd.p.tid": "654a694400000000",
             "component": "rq",
             "job.id": "3e9522f8-6632-4237-b4ce-43187fe4d82e"
diff --git a/tests/snapshots/tests.contrib.rq.test_rq.test_sync_queue_enqueue.json b/tests/snapshots/tests.contrib.rq.test_rq.test_sync_queue_enqueue.json
index 4cdc0ac3471..c34d7729425 100644
--- a/tests/snapshots/tests.contrib.rq.test_rq.test_sync_queue_enqueue.json
+++ b/tests/snapshots/tests.contrib.rq.test_rq.test_sync_queue_enqueue.json
@@ -9,7 +9,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
@@ -39,7 +39,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.rq",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
          "job.id": "53d8bd79-f439-4b6e-b111-89d75b915bcd"
diff --git a/tests/snapshots/tests.contrib.rq.test_rq.test_sync_worker.json b/tests/snapshots/tests.contrib.rq.test_rq.test_sync_worker.json
index f27bcfaf75e..fef7f4c4523 100644
--- a/tests/snapshots/tests.contrib.rq.test_rq.test_sync_worker.json
+++ b/tests/snapshots/tests.contrib.rq.test_rq.test_sync_worker.json
@@ -9,7 +9,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
@@ -39,7 +39,7 @@
        "type": "worker",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.rq",
          "_dd.p.dm": "-0",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
@@ -71,7 +71,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.rq",
             "_dd.p.tid": "654a694400000000",
             "component": "rq",
             "job.id": "30c861b5-640d-4d34-aed4-f4a5270723f1"
diff --git a/tests/snapshots/tests.contrib.rq.test_rq.test_sync_worker_config_service.json b/tests/snapshots/tests.contrib.rq.test_rq.test_sync_worker_config_service.json
index 3bc1936f422..bfbc6993f4e 100644
--- a/tests/snapshots/tests.contrib.rq.test_rq.test_sync_worker_config_service.json
+++ b/tests/snapshots/tests.contrib.rq.test_rq.test_sync_worker_config_service.json
@@ -9,7 +9,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
@@ -39,7 +39,7 @@
        "type": "worker",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.rq",
          "_dd.p.dm": "-0",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
@@ -71,7 +71,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.rq",
             "_dd.p.tid": "654a694400000000",
             "component": "rq",
             "job.id": "97f1d8cc-a944-48c9-a71f-2f1f316d0a19"
diff --git a/tests/snapshots/tests.contrib.rq.test_rq.test_sync_worker_multiple_jobs.json b/tests/snapshots/tests.contrib.rq.test_rq.test_sync_worker_multiple_jobs.json
index 267d3a539bc..acfbe56c677 100644
--- a/tests/snapshots/tests.contrib.rq.test_rq.test_sync_worker_multiple_jobs.json
+++ b/tests/snapshots/tests.contrib.rq.test_rq.test_sync_worker_multiple_jobs.json
@@ -9,7 +9,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
@@ -39,7 +39,7 @@
        "type": "worker",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.rq",
          "_dd.p.dm": "-0",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
@@ -71,7 +71,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.rq",
             "_dd.p.tid": "654a694400000000",
             "component": "rq",
             "job.id": "45ed1c2f-0e79-4a7a-9ca6-2d124eb0d43b"
@@ -90,7 +90,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
@@ -120,7 +120,7 @@
        "type": "worker",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.rq",
          "_dd.p.dm": "-0",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
@@ -152,7 +152,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.rq",
             "_dd.p.tid": "654a694400000000",
             "component": "rq",
             "job.id": "0d125a3e-a0b7-4fc1-bff0-96c4bd7e9d09"
@@ -171,7 +171,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
@@ -201,7 +201,7 @@
        "type": "worker",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.rq",
          "_dd.p.dm": "-0",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
@@ -233,7 +233,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.rq",
             "_dd.p.tid": "654a694400000000",
             "component": "rq",
             "job.id": "136e8c75-89b9-4c73-9894-ed1b61420ab0"
diff --git a/tests/snapshots/tests.contrib.rq.test_rq.test_sync_worker_pin_service.json b/tests/snapshots/tests.contrib.rq.test_rq.test_sync_worker_pin_service.json
index 63652273884..30918a04bf5 100644
--- a/tests/snapshots/tests.contrib.rq.test_rq.test_sync_worker_pin_service.json
+++ b/tests/snapshots/tests.contrib.rq.test_rq.test_sync_worker_pin_service.json
@@ -9,7 +9,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
@@ -39,7 +39,7 @@
        "type": "worker",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.rq",
          "_dd.p.dm": "-0",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
@@ -71,7 +71,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.rq",
             "_dd.p.tid": "654a694400000000",
             "component": "rq",
             "job.id": "18261607-4d5c-4b8a-a745-5af5f5093ac2"
diff --git a/tests/snapshots/tests.contrib.rq.test_rq.test_sync_worker_ttl.json b/tests/snapshots/tests.contrib.rq.test_rq.test_sync_worker_ttl.json
index 6a764de8aa9..0426fb379ac 100644
--- a/tests/snapshots/tests.contrib.rq.test_rq.test_sync_worker_ttl.json
+++ b/tests/snapshots/tests.contrib.rq.test_rq.test_sync_worker_ttl.json
@@ -9,7 +9,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
@@ -39,7 +39,7 @@
        "type": "worker",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.rq",
          "_dd.p.dm": "-0",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
@@ -71,7 +71,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.rq",
             "_dd.p.tid": "654a694400000000",
             "component": "rq",
             "job.id": "30c861b5-640d-4d34-aed4-f4a5270723f1"
diff --git a/tests/snapshots/tests.contrib.rq.test_rq.test_worker_class_job.json b/tests/snapshots/tests.contrib.rq.test_rq.test_worker_class_job.json
index e18b47c0984..ca71d2b7755 100644
--- a/tests/snapshots/tests.contrib.rq.test_rq.test_worker_class_job.json
+++ b/tests/snapshots/tests.contrib.rq.test_rq.test_worker_class_job.json
@@ -9,7 +9,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
@@ -39,7 +39,7 @@
        "type": "worker",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.rq",
          "_dd.p.dm": "-0",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
@@ -71,7 +71,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.rq",
             "_dd.p.tid": "654a694400000000",
             "component": "rq",
             "job.id": "163cbef5-7bef-4712-b7f6-3312801605ec"
@@ -90,7 +90,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
@@ -120,7 +120,7 @@
        "type": "worker",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.rq",
          "_dd.p.dm": "-0",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
@@ -152,7 +152,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.rq",
             "_dd.p.tid": "654a694400000000",
             "component": "rq",
             "job.id": "b46b05f7-e418-4cb7-afa8-de25d42ba0bb"
diff --git a/tests/snapshots/tests.contrib.rq.test_rq.test_worker_failing_job.json b/tests/snapshots/tests.contrib.rq.test_rq.test_worker_failing_job.json
index faa2bcbb7ca..6f1d62170f1 100644
--- a/tests/snapshots/tests.contrib.rq.test_rq.test_worker_failing_job.json
+++ b/tests/snapshots/tests.contrib.rq.test_rq.test_worker_failing_job.json
@@ -9,7 +9,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
@@ -39,7 +39,7 @@
        "type": "worker",
        "error": 1,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.rq",
          "_dd.p.dm": "-0",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
@@ -71,7 +71,7 @@
           "type": "",
           "error": 1,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.rq",
             "_dd.p.tid": "654a694400000000",
             "component": "rq",
             "error.message": "error",
diff --git a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_commit.json b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_commit.json
index 29fb4d09482..c9c36bcab42 100644
--- a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_commit.json
+++ b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_commit.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.snowflake",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "66b2767800000000",
       "component": "snowflake",
diff --git a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_executemany_insert.json b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_executemany_insert.json
index 5b8458925cd..cd6b31e3eab 100644
--- a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_executemany_insert.json
+++ b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_executemany_insert.json
@@ -9,7 +9,7 @@
     "type": "sql",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.snowflake",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "66b2767500000000",
       "component": "snowflake",
diff --git a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_fetchall.json b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_fetchall.json
index a09a4d12fc3..608e2fafb20 100644
--- a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_fetchall.json
+++ b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_fetchall.json
@@ -9,7 +9,7 @@
     "type": "sql",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.snowflake",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "66b2767800000000",
       "component": "snowflake",
diff --git a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_fetchall_multiple_rows.json b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_fetchall_multiple_rows.json
index c097df9375a..4da8ed175f3 100644
--- a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_fetchall_multiple_rows.json
+++ b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_fetchall_multiple_rows.json
@@ -9,7 +9,7 @@
     "type": "sql",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.snowflake",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "66b2767b00000000",
       "component": "snowflake",
diff --git a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_fetchone.json b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_fetchone.json
index 06c288e73d4..0cacbba1380 100644
--- a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_fetchone.json
+++ b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_fetchone.json
@@ -9,7 +9,7 @@
     "type": "sql",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.snowflake",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "66b2767000000000",
       "component": "snowflake",
diff --git a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_ot_executemany_insert.json b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_ot_executemany_insert.json
index d8c7393950e..47895b06fe0 100644
--- a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_ot_executemany_insert.json
+++ b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_ot_executemany_insert.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.snowflake",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "66b2767100000000",
       "language": "python",
@@ -34,7 +34,7 @@
        "type": "sql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.snowflake",
          "component": "snowflake",
          "db.application": "PythonConnector",
          "db.name": "mock-db-name",
diff --git a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_ot_fetchall.json b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_ot_fetchall.json
index bfbed86cb5b..c4987aef6a2 100644
--- a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_ot_fetchall.json
+++ b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_ot_fetchall.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.snowflake",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "66b2766300000000",
       "language": "python",
@@ -34,7 +34,7 @@
        "type": "sql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.snowflake",
          "component": "snowflake",
          "db.application": "PythonConnector",
          "db.name": "mock-db-name",
diff --git a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_ot_fetchall_multiple_rows.json b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_ot_fetchall_multiple_rows.json
index 19ad2e8ad3d..8b0b222996c 100644
--- a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_ot_fetchall_multiple_rows.json
+++ b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_ot_fetchall_multiple_rows.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.snowflake",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "66b2766c00000000",
       "language": "python",
@@ -34,7 +34,7 @@
        "type": "sql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.snowflake",
          "component": "snowflake",
          "db.application": "PythonConnector",
          "db.name": "mock-db-name",
diff --git a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_ot_fetchone.json b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_ot_fetchone.json
index da0ee12cd12..7d5129de97d 100644
--- a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_ot_fetchone.json
+++ b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_ot_fetchone.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.snowflake",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "66b2767300000000",
       "language": "python",
@@ -34,7 +34,7 @@
        "type": "sql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.snowflake",
          "component": "snowflake",
          "db.application": "PythonConnector",
          "db.name": "mock-db-name",
diff --git a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_pin_override.json b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_pin_override.json
index 6500664fa8a..5a7866739c9 100644
--- a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_pin_override.json
+++ b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_pin_override.json
@@ -9,7 +9,7 @@
     "type": "sql",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.snowflake",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "66b2766f00000000",
       "component": "snowflake",
diff --git a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_rollback.json b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_rollback.json
index c5bc31b0218..53f55bfedc3 100644
--- a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_rollback.json
+++ b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_rollback.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.snowflake",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "66b2766f00000000",
       "component": "snowflake",
diff --git a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_settings_override.json b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_settings_override.json
index 4c172099945..df5d48b97da 100644
--- a/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_settings_override.json
+++ b/tests/snapshots/tests.contrib.snowflake.test_snowflake.test_snowflake_settings_override.json
@@ -9,7 +9,7 @@
     "type": "sql",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.snowflake",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "66b2767b00000000",
       "component": "snowflake",
diff --git a/tests/snapshots/tests.contrib.starlette.test_starlette.test_background_task.json b/tests/snapshots/tests.contrib.starlette.test_starlette.test_background_task.json
index 3c6cdd64d99..094c5aaf0c2 100644
--- a/tests/snapshots/tests.contrib.starlette.test_starlette.test_background_task.json
+++ b/tests/snapshots/tests.contrib.starlette.test_starlette.test_background_task.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "starlette.background_task",
-    "service": "",
+    "service": "tests.contrib.starlette",
     "resource": "<unknown>",
     "trace_id": 0,
     "span_id": 1,
@@ -27,7 +27,7 @@
 [
   {
     "name": "starlette.background_task",
-    "service": "",
+    "service": "tests.contrib.starlette",
     "resource": "custom_task",
     "trace_id": 1,
     "span_id": 1,
@@ -61,7 +61,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.starlette",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "660a332700000000",
       "component": "starlette",
diff --git a/tests/snapshots/tests.contrib.starlette.test_starlette.test_subapp_nested_call_snapshot.json b/tests/snapshots/tests.contrib.starlette.test_starlette.test_subapp_nested_call_snapshot.json
index 7c806c4b8dc..351d70ca476 100644
--- a/tests/snapshots/tests.contrib.starlette.test_starlette.test_subapp_nested_call_snapshot.json
+++ b/tests/snapshots/tests.contrib.starlette.test_starlette.test_subapp_nested_call_snapshot.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.starlette",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "65e89a3b00000000",
       "component": "starlette",
@@ -42,7 +42,7 @@
        "type": "web",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.starlette",
          "component": "starlette",
          "http.method": "GET",
          "http.status_code": "200",
diff --git a/tests/snapshots/tests.contrib.starlette.test_starlette.test_subapp_nested_snapshot.json b/tests/snapshots/tests.contrib.starlette.test_starlette.test_subapp_nested_snapshot.json
index ffd8fc2acd0..dfbd5ba0a38 100644
--- a/tests/snapshots/tests.contrib.starlette.test_starlette.test_subapp_nested_snapshot.json
+++ b/tests/snapshots/tests.contrib.starlette.test_starlette.test_subapp_nested_snapshot.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.starlette",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "65e89a3b00000000",
       "component": "starlette",
@@ -42,7 +42,7 @@
        "type": "web",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.starlette",
          "component": "starlette",
          "http.method": "GET",
          "http.status_code": "200",
@@ -64,7 +64,7 @@
           "type": "web",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.starlette",
             "component": "starlette",
             "http.method": "GET",
             "http.status_code": "200",
diff --git a/tests/snapshots/tests.contrib.starlette.test_starlette.test_subapp_snapshot.json b/tests/snapshots/tests.contrib.starlette.test_starlette.test_subapp_snapshot.json
index aaa58931046..e280fecbc98 100644
--- a/tests/snapshots/tests.contrib.starlette.test_starlette.test_subapp_snapshot.json
+++ b/tests/snapshots/tests.contrib.starlette.test_starlette.test_subapp_snapshot.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.starlette",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "65e7e27300000000",
       "component": "starlette",
@@ -42,7 +42,7 @@
        "type": "web",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.starlette",
          "component": "starlette",
          "http.method": "GET",
          "http.status_code": "200",
diff --git a/tests/snapshots/tests.contrib.starlette.test_starlette.test_subapp_two_snapshot.json b/tests/snapshots/tests.contrib.starlette.test_starlette.test_subapp_two_snapshot.json
index 9e0d429ef81..0b2d37a54c9 100644
--- a/tests/snapshots/tests.contrib.starlette.test_starlette.test_subapp_two_snapshot.json
+++ b/tests/snapshots/tests.contrib.starlette.test_starlette.test_subapp_two_snapshot.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.starlette",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "65e89a3b00000000",
       "component": "starlette",
@@ -42,7 +42,7 @@
        "type": "web",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.starlette",
          "component": "starlette",
          "http.method": "GET",
          "http.status_code": "200",
diff --git a/tests/snapshots/tests.contrib.starlette.test_starlette.test_table_query_snapshot.json b/tests/snapshots/tests.contrib.starlette.test_starlette.test_table_query_snapshot.json
index 44a6e417729..f78c5ac20d5 100644
--- a/tests/snapshots/tests.contrib.starlette.test_starlette.test_table_query_snapshot.json
+++ b/tests/snapshots/tests.contrib.starlette.test_starlette.test_table_query_snapshot.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.starlette",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "65e7e27f00000000",
       "component": "starlette",
@@ -42,7 +42,7 @@
        "type": "sql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.starlette",
          "component": "sqlalchemy",
          "span.kind": "client",
          "sql.db": "test.db"
@@ -66,7 +66,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.starlette",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "65e7e27f00000000",
       "component": "starlette",
@@ -99,7 +99,7 @@
        "type": "sql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.starlette",
          "component": "sqlalchemy",
          "span.kind": "client",
          "sql.db": "test.db"
diff --git a/tests/snapshots/tests.contrib.urllib3.test_urllib3.test_urllib3_connectionpool_snapshot.json b/tests/snapshots/tests.contrib.urllib3.test_urllib3.test_urllib3_connectionpool_snapshot.json
index 2a39102770a..668f22df563 100644
--- a/tests/snapshots/tests.contrib.urllib3.test_urllib3.test_urllib3_connectionpool_snapshot.json
+++ b/tests/snapshots/tests.contrib.urllib3.test_urllib3.test_urllib3_connectionpool_snapshot.json
@@ -9,7 +9,7 @@
     "type": "http",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.urllib3",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "urllib3",
diff --git a/tests/snapshots/tests.contrib.urllib3.test_urllib3.test_urllib3_poolmanager_snapshot.json b/tests/snapshots/tests.contrib.urllib3.test_urllib3.test_urllib3_poolmanager_snapshot.json
index 705d7a2012b..0ca0c11e758 100644
--- a/tests/snapshots/tests.contrib.urllib3.test_urllib3.test_urllib3_poolmanager_snapshot.json
+++ b/tests/snapshots/tests.contrib.urllib3.test_urllib3.test_urllib3_poolmanager_snapshot.json
@@ -9,7 +9,7 @@
     "type": "http",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.urllib3",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "urllib3",
diff --git a/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_200.json b/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_200.json
index f56eed9bf93..86420a3087d 100644
--- a/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_200.json
+++ b/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_200.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.wsgi",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "wsgi",
@@ -40,7 +40,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.wsgi",
          "_dd.p.tid": "654a694400000000",
          "component": "wsgi"
        },
@@ -57,7 +57,7 @@
           "type": "web",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.wsgi",
             "_dd.p.tid": "654a694400000000",
             "component": "wsgi",
             "span.kind": "server"
@@ -75,7 +75,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.wsgi",
          "_dd.p.tid": "654a694400000000",
          "component": "wsgi",
          "result_class": "list"
diff --git a/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_500_py3.json b/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_500_py3.json
index 82c004d41c6..cdd953ec1c8 100644
--- a/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_500_py3.json
+++ b/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_500_py3.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.wsgi",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "wsgi",
@@ -41,7 +41,7 @@
        "type": "",
        "error": 1,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.wsgi",
          "_dd.p.tid": "654a694400000000",
          "component": "wsgi",
          "error.message": "Oops!",
diff --git a/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_base_exception_in_wsgi_app_py3.json b/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_base_exception_in_wsgi_app_py3.json
index 78f8f558369..a4e84cedbde 100644
--- a/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_base_exception_in_wsgi_app_py3.json
+++ b/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_base_exception_in_wsgi_app_py3.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.wsgi",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "wsgi",
@@ -41,7 +41,7 @@
        "type": "",
        "error": 1,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.wsgi",
          "_dd.p.tid": "654a694400000000",
          "component": "wsgi",
          "error.message": "base exception raised in wsgi app",
diff --git a/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_chunked.json b/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_chunked.json
index 4f76b1e8a37..43346418dc0 100644
--- a/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_chunked.json
+++ b/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_chunked.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.wsgi",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "wsgi",
@@ -40,7 +40,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.wsgi",
          "_dd.p.tid": "654a694400000000",
          "component": "wsgi"
        },
@@ -57,7 +57,7 @@
           "type": "web",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.wsgi",
             "_dd.p.tid": "654a694400000000",
             "component": "wsgi",
             "span.kind": "server"
@@ -75,7 +75,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.wsgi",
          "_dd.p.tid": "654a694400000000",
          "component": "wsgi",
          "result_class": "generator"
diff --git a/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_distributed_tracing_nested.json b/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_distributed_tracing_nested.json
index 4c8ea687e12..0da573649c6 100644
--- a/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_distributed_tracing_nested.json
+++ b/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_distributed_tracing_nested.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.wsgi",
       "_dd.p.dm": "-3",
       "_dd.p.tid": "654a694400000000",
       "component": "wsgi",
@@ -40,7 +40,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.wsgi",
          "_dd.p.tid": "654a694400000000",
          "component": "wsgi"
        },
@@ -57,7 +57,7 @@
           "type": "web",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.wsgi",
             "_dd.p.tid": "654a694400000000",
             "component": "wsgi",
             "http.method": "GET",
@@ -79,7 +79,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.wsgi",
                "_dd.p.tid": "654a694400000000",
                "component": "wsgi"
              },
@@ -96,7 +96,7 @@
                 "type": "web",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.wsgi",
                   "_dd.p.tid": "654a694400000000",
                   "component": "wsgi",
                   "span.kind": "server"
@@ -114,7 +114,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.wsgi",
                "_dd.p.tid": "654a694400000000",
                "component": "wsgi",
                "result_class": "list"
@@ -132,7 +132,7 @@
           "type": "web",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.wsgi",
             "_dd.p.tid": "654a694400000000",
             "component": "wsgi",
             "span.kind": "server"
@@ -150,7 +150,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.wsgi",
          "_dd.p.tid": "654a694400000000",
          "component": "wsgi",
          "result_class": "list_iterator"
diff --git a/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_generator_exit_ignored_snapshot.json b/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_generator_exit_ignored_snapshot.json
index 30b37a48911..2fde4a9eafb 100644
--- a/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_generator_exit_ignored_snapshot.json
+++ b/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_generator_exit_ignored_snapshot.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.wsgi",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "wsgi",
@@ -40,7 +40,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.wsgi",
          "_dd.p.tid": "654a694400000000",
          "component": "wsgi"
        },
@@ -57,7 +57,7 @@
           "type": "web",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.wsgi",
             "_dd.p.tid": "654a694400000000",
             "component": "wsgi",
             "span.kind": "server"
@@ -75,7 +75,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.wsgi",
          "_dd.p.tid": "654a694400000000",
          "component": "wsgi",
          "result_class": "generator"
diff --git a/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_stop_iteration_in_wsgi_app_py3.json b/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_stop_iteration_in_wsgi_app_py3.json
index ff654d99340..fe385a3de0c 100644
--- a/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_stop_iteration_in_wsgi_app_py3.json
+++ b/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_stop_iteration_in_wsgi_app_py3.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.wsgi",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "669187f500000000",
       "component": "wsgi",
@@ -40,7 +40,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.wsgi",
          "component": "wsgi"
        },
        "duration": 2339998959,
@@ -56,7 +56,7 @@
           "type": "web",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.wsgi",
             "component": "wsgi",
             "span.kind": "server"
           },
@@ -73,7 +73,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.wsgi",
          "component": "wsgi",
          "result_class": "tuple"
        },
diff --git a/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_wsgi_base_middleware.json b/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_wsgi_base_middleware.json
index b75f82d3369..163351f1966 100644
--- a/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_wsgi_base_middleware.json
+++ b/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_wsgi_base_middleware.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.wsgi",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "wsgi",
@@ -39,7 +39,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.wsgi",
          "_dd.p.tid": "654a694400000000",
          "app_tag": "app test tag set",
          "component": "wsgi"
@@ -60,7 +60,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.wsgi",
          "_dd.p.tid": "654a694400000000",
          "component": "wsgi",
          "response_tag": "resp test tag set"
diff --git a/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_wsgi_base_middleware_500.json b/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_wsgi_base_middleware_500.json
index f0c1a4859d5..2bb31c12926 100644
--- a/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_wsgi_base_middleware_500.json
+++ b/tests/snapshots/tests.contrib.wsgi.test_wsgi.test_wsgi_base_middleware_500.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.wsgi",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "wsgi",
@@ -41,7 +41,7 @@
        "type": "",
        "error": 1,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.wsgi",
          "_dd.p.tid": "654a694400000000",
          "component": "wsgi",
          "error.message": "Oops!",
diff --git a/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_analytics_with_rate.json b/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_analytics_with_rate.json
index b6d51f33694..2a94b63ab1c 100644
--- a/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_analytics_with_rate.json
+++ b/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_analytics_with_rate.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.yaaredis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "yaaredis",
diff --git a/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_analytics_without_rate.json b/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_analytics_without_rate.json
index 85f43c3383a..40703c30619 100644
--- a/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_analytics_without_rate.json
+++ b/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_analytics_without_rate.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.yaaredis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "yaaredis",
diff --git a/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_basics.json b/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_basics.json
index 286ad8836b6..64a0dc8fcee 100644
--- a/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_basics.json
+++ b/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_basics.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.yaaredis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "yaaredis",
diff --git a/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_cmd_max_length.json b/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_cmd_max_length.json
index 2540fedeaf2..b39a54205e8 100644
--- a/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_cmd_max_length.json
+++ b/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_cmd_max_length.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.yaaredis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "yaaredis",
diff --git a/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_full_command_in_resource_config[True].json b/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_full_command_in_resource_config[True].json
index cfd6b2c0cfe..f453d45ceb2 100644
--- a/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_full_command_in_resource_config[True].json
+++ b/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_full_command_in_resource_config[True].json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.yaaredis",
       "_dd.p.dm": "-0",
       "language": "python",
       "runtime-id": "8684af00a9414982b4794ddcadcd26ec"
@@ -33,7 +33,7 @@
        "type": "redis",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.yaaredis",
          "component": "yaaredis",
          "db.system": "redis",
          "out.host": "localhost",
@@ -62,7 +62,7 @@
        "type": "redis",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.yaaredis",
          "component": "yaaredis",
          "db.system": "redis",
          "out.host": "localhost",
diff --git a/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_long_command.json b/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_long_command.json
index 19d289698fc..c21f8fc51f5 100644
--- a/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_long_command.json
+++ b/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_long_command.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.yaaredis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "yaaredis",
diff --git a/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_opentracing.json b/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_opentracing.json
index 35acd5ad51e..ccee94088be 100644
--- a/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_opentracing.json
+++ b/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_opentracing.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.yaaredis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "language": "python",
@@ -34,7 +34,7 @@
        "type": "redis",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.yaaredis",
          "_dd.p.tid": "654a694400000000",
          "component": "yaaredis",
          "db.system": "redis",
diff --git a/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_pipeline_immediate.json b/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_pipeline_immediate.json
index 96b4e6cdda3..d8843f3ac0c 100644
--- a/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_pipeline_immediate.json
+++ b/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_pipeline_immediate.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.yaaredis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "yaaredis",
@@ -45,7 +45,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.yaaredis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "yaaredis",
diff --git a/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_pipeline_traced.json b/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_pipeline_traced.json
index d3127d2679e..945d5fc508d 100644
--- a/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_pipeline_traced.json
+++ b/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_pipeline_traced.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.yaaredis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "yaaredis",
diff --git a/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_unicode.json b/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_unicode.json
index d07afc4bcc1..cb687c7f283 100644
--- a/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_unicode.json
+++ b/tests/snapshots/tests.contrib.yaaredis.test_yaaredis.test_unicode.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.yaaredis",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "yaaredis",
diff --git a/tests/snapshots/tests.integration.test_integration_snapshots.test_filters.json b/tests/snapshots/tests.integration.test_integration_snapshots.test_filters.json
index 2f2b21e5790..f49585f9318 100644
--- a/tests/snapshots/tests.integration.test_integration_snapshots.test_filters.json
+++ b/tests/snapshots/tests.integration.test_integration_snapshots.test_filters.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "root",
-    "service": "",
+    "service": "tests.integration",
     "resource": "root",
     "trace_id": 0,
     "span_id": 1,
@@ -25,7 +25,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/tests.integration.test_integration_snapshots.test_multiple_traces.json b/tests/snapshots/tests.integration.test_integration_snapshots.test_multiple_traces.json
index 4e89e4062db..bb0773bf02d 100644
--- a/tests/snapshots/tests.integration.test_integration_snapshots.test_multiple_traces.json
+++ b/tests/snapshots/tests.integration.test_integration_snapshots.test_multiple_traces.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "k": "v",
       "language": "python",
@@ -37,7 +37,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "duration": 8792,
        "start": 1692900308663749377
@@ -53,7 +53,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "k": "v",
       "language": "python",
@@ -81,7 +81,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "duration": 7417,
        "start": 1692900308664070169
diff --git a/tests/snapshots/tests.integration.test_integration_snapshots.test_sampling.json b/tests/snapshots/tests.integration.test_integration_snapshots.test_sampling.json
index 901aafe1056..f50ea82b9fa 100644
--- a/tests/snapshots/tests.integration.test_integration_snapshots.test_sampling.json
+++ b/tests/snapshots/tests.integration.test_integration_snapshots.test_sampling.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "trace7",
-    "service": "",
+    "service": "tests.integration",
     "resource": "trace7",
     "trace_id": 0,
     "span_id": 1,
@@ -25,7 +25,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 0,
        "span_id": 2,
@@ -38,7 +38,7 @@
 [
   {
     "name": "trace6",
-    "service": "",
+    "service": "tests.integration",
     "resource": "trace6",
     "trace_id": 1,
     "span_id": 1,
@@ -61,7 +61,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 1,
        "span_id": 2,
@@ -74,7 +74,7 @@
 [
   {
     "name": "trace5",
-    "service": "",
+    "service": "tests.integration",
     "resource": "trace5",
     "trace_id": 2,
     "span_id": 1,
@@ -97,7 +97,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 2,
        "span_id": 2,
@@ -110,7 +110,7 @@
 [
   {
     "name": "trace4",
-    "service": "",
+    "service": "tests.integration",
     "resource": "trace4",
     "trace_id": 3,
     "span_id": 1,
@@ -134,7 +134,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 3,
        "span_id": 2,
@@ -147,7 +147,7 @@
 [
   {
     "name": "trace3",
-    "service": "",
+    "service": "tests.integration",
     "resource": "trace3",
     "trace_id": 4,
     "span_id": 1,
@@ -170,7 +170,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 4,
        "span_id": 2,
@@ -183,7 +183,7 @@
 [
   {
     "name": "trace2",
-    "service": "",
+    "service": "tests.integration",
     "resource": "trace2",
     "trace_id": 5,
     "span_id": 1,
@@ -207,7 +207,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 5,
        "span_id": 2,
@@ -220,7 +220,7 @@
 [
   {
     "name": "trace1",
-    "service": "",
+    "service": "tests.integration",
     "resource": "trace1",
     "trace_id": 6,
     "span_id": 1,
@@ -243,7 +243,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 6,
        "span_id": 2,
diff --git a/tests/snapshots/tests.integration.test_integration_snapshots.test_setting_span_tags_and_metrics_generates_no_error_logs[v0.4].json b/tests/snapshots/tests.integration.test_integration_snapshots.test_setting_span_tags_and_metrics_generates_no_error_logs[v0.4].json
index db260b1f3f6..c2378c88bb2 100644
--- a/tests/snapshots/tests.integration.test_integration_snapshots.test_setting_span_tags_and_metrics_generates_no_error_logs[v0.4].json
+++ b/tests/snapshots/tests.integration.test_integration_snapshots.test_setting_span_tags_and_metrics_generates_no_error_logs[v0.4].json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "env": "my-env",
       "language": "python",
diff --git a/tests/snapshots/tests.integration.test_integration_snapshots.test_setting_span_tags_and_metrics_generates_no_error_logs[v0.5].json b/tests/snapshots/tests.integration.test_integration_snapshots.test_setting_span_tags_and_metrics_generates_no_error_logs[v0.5].json
index 3741b20568a..f857abb3309 100644
--- a/tests/snapshots/tests.integration.test_integration_snapshots.test_setting_span_tags_and_metrics_generates_no_error_logs[v0.5].json
+++ b/tests/snapshots/tests.integration.test_integration_snapshots.test_setting_span_tags_and_metrics_generates_no_error_logs[v0.5].json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "env": "my-env",
       "language": "python",
diff --git a/tests/snapshots/tests.integration.test_integration_snapshots.test_single_trace_single_span.json b/tests/snapshots/tests.integration.test_integration_snapshots.test_single_trace_single_span.json
index 24e492df21a..6488442669c 100644
--- a/tests/snapshots/tests.integration.test_integration_snapshots.test_single_trace_single_span.json
+++ b/tests/snapshots/tests.integration.test_integration_snapshots.test_single_trace_single_span.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "k": "v",
       "language": "python",
diff --git a/tests/snapshots/tests.integration.test_integration_snapshots.test_synchronous_writer.json b/tests/snapshots/tests.integration.test_integration_snapshots.test_synchronous_writer.json
index 7ad0c78c24d..aa2c70ace7c 100644
--- a/tests/snapshots/tests.integration.test_integration_snapshots.test_synchronous_writer.json
+++ b/tests/snapshots/tests.integration.test_integration_snapshots.test_synchronous_writer.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "language": "python",
       "runtime-id": "f335963d0a054add88871c4f52e100e1"
@@ -33,7 +33,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "duration": 8584,
        "start": 1692900308688433877
@@ -49,7 +49,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "language": "python",
       "runtime-id": "f335963d0a054add88871c4f52e100e1"
@@ -73,7 +73,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "duration": 15167,
        "start": 1692900308687627002
diff --git a/tests/snapshots/tests.integration.test_integration_snapshots.test_trace_with_wrong_metrics_types_not_sent.json b/tests/snapshots/tests.integration.test_integration_snapshots.test_trace_with_wrong_metrics_types_not_sent.json
index ee8853d06f9..a1a67aeefc8 100644
--- a/tests/snapshots/tests.integration.test_integration_snapshots.test_trace_with_wrong_metrics_types_not_sent.json
+++ b/tests/snapshots/tests.integration.test_integration_snapshots.test_trace_with_wrong_metrics_types_not_sent.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.integration.test_integration_snapshots.test_tracer_trace_across_multiple_popens.json b/tests/snapshots/tests.integration.test_integration_snapshots.test_tracer_trace_across_multiple_popens.json
index d5e493b67fc..1ce299d01d1 100644
--- a/tests/snapshots/tests.integration.test_integration_snapshots.test_tracer_trace_across_multiple_popens.json
+++ b/tests/snapshots/tests.integration.test_integration_snapshots.test_tracer_trace_across_multiple_popens.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 0,
     "span_id": 1,
@@ -24,7 +24,7 @@
   },
      {
        "name": "child1",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child1",
        "trace_id": 0,
        "span_id": 2,
@@ -46,7 +46,7 @@
      },
         {
           "name": "child2",
-          "service": "",
+          "service": "tests.integration",
           "resource": "child2",
           "trace_id": 0,
           "span_id": 3,
diff --git a/tests/snapshots/tests.integration.test_integration_snapshots.test_tracer_trace_across_popen.json b/tests/snapshots/tests.integration.test_integration_snapshots.test_tracer_trace_across_popen.json
index 6e843abd8f1..1fa4c547739 100644
--- a/tests/snapshots/tests.integration.test_integration_snapshots.test_tracer_trace_across_popen.json
+++ b/tests/snapshots/tests.integration.test_integration_snapshots.test_tracer_trace_across_popen.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 0,
     "span_id": 1,
@@ -24,7 +24,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/tests.integration.test_integration_snapshots.test_tracetagsprocessor_only_adds_new_tags.json b/tests/snapshots/tests.integration.test_integration_snapshots.test_tracetagsprocessor_only_adds_new_tags.json
index c87d41556e5..9298b2342cd 100644
--- a/tests/snapshots/tests.integration.test_integration_snapshots.test_tracetagsprocessor_only_adds_new_tags.json
+++ b/tests/snapshots/tests.integration.test_integration_snapshots.test_tracetagsprocessor_only_adds_new_tags.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "web.request",
-    "service": "",
+    "service": "tests.integration",
     "resource": "web.request",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.integration.test_priority_sampling.test_agent_sample_rate_keep.json b/tests/snapshots/tests.integration.test_priority_sampling.test_agent_sample_rate_keep.json
index a4a3d341c57..1ae5c51e702 100644
--- a/tests/snapshots/tests.integration.test_priority_sampling.test_agent_sample_rate_keep.json
+++ b/tests/snapshots/tests.integration.test_priority_sampling.test_agent_sample_rate_keep.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-1",
       "_dd.p.tid": "656a1a2b00000000",
       "language": "python",
@@ -28,7 +28,7 @@
 [
   {
     "name": "",
-    "service": "",
+    "service": "tests.integration",
     "resource": "",
     "trace_id": 1,
     "span_id": 1,
diff --git a/tests/snapshots/tests.integration.test_priority_sampling.test_agent_sample_rate_reject.json b/tests/snapshots/tests.integration.test_priority_sampling.test_agent_sample_rate_reject.json
index f58f225bd30..7629d46ca12 100644
--- a/tests/snapshots/tests.integration.test_priority_sampling.test_agent_sample_rate_reject.json
+++ b/tests/snapshots/tests.integration.test_priority_sampling.test_agent_sample_rate_reject.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-1",
       "_dd.p.tid": "656a1a2b00000000",
       "language": "python",
@@ -28,7 +28,7 @@
 [
   {
     "name": "",
-    "service": "",
+    "service": "tests.integration",
     "resource": "",
     "trace_id": 1,
     "span_id": 1,
diff --git a/tests/snapshots/tests.integration.test_propagation.test_sampling_decision_downstream.json b/tests/snapshots/tests.integration.test_propagation.test_sampling_decision_downstream.json
index 67ad90cc0d7..53773d8d0c5 100644
--- a/tests/snapshots/tests.integration.test_propagation.test_sampling_decision_downstream.json
+++ b/tests/snapshots/tests.integration.test_propagation.test_sampling_decision_downstream.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-4",
       "language": "python",
       "runtime-id": "f335963d0a054add88871c4f52e100e1"
diff --git a/tests/snapshots/tests.integration.test_propagation.test_trace_tags_multispan[tracer0].json b/tests/snapshots/tests.integration.test_propagation.test_trace_tags_multispan[tracer0].json
index bf1e2519d6d..562690cecef 100644
--- a/tests/snapshots/tests.integration.test_propagation.test_trace_tags_multispan[tracer0].json
+++ b/tests/snapshots/tests.integration.test_propagation.test_trace_tags_multispan[tracer0].json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "p",
-    "service": "",
+    "service": "tests.integration",
     "resource": "p",
     "trace_id": 0,
     "span_id": 1,
@@ -25,7 +25,7 @@
   },
      {
        "name": "c1",
-       "service": "",
+       "service": "tests.integration",
        "resource": "c1",
        "trace_id": 0,
        "span_id": 2,
@@ -40,7 +40,7 @@
      },
      {
        "name": "c2",
-       "service": "",
+       "service": "tests.integration",
        "resource": "c2",
        "trace_id": 0,
        "span_id": 3,
@@ -55,7 +55,7 @@
      },
         {
           "name": "gc",
-          "service": "",
+          "service": "tests.integration",
           "resource": "gc",
           "trace_id": 0,
           "span_id": 4,
diff --git a/tests/snapshots/tests.integration.test_propagation.test_trace_tags_multispan[tracer1].json b/tests/snapshots/tests.integration.test_propagation.test_trace_tags_multispan[tracer1].json
index 945373e125f..7aab49428ec 100644
--- a/tests/snapshots/tests.integration.test_propagation.test_trace_tags_multispan[tracer1].json
+++ b/tests/snapshots/tests.integration.test_propagation.test_trace_tags_multispan[tracer1].json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "p",
-    "service": "",
+    "service": "tests.integration",
     "resource": "p",
     "trace_id": 0,
     "span_id": 1,
@@ -25,7 +25,7 @@
   },
      {
        "name": "c1",
-       "service": "",
+       "service": "tests.integration",
        "resource": "c1",
        "trace_id": 0,
        "span_id": 2,
@@ -40,7 +40,7 @@
      },
      {
        "name": "c2",
-       "service": "",
+       "service": "tests.integration",
        "resource": "c2",
        "trace_id": 0,
        "span_id": 3,
@@ -55,7 +55,7 @@
      },
         {
           "name": "gc",
-          "service": "",
+          "service": "tests.integration",
           "resource": "gc",
           "trace_id": 0,
           "span_id": 4,
diff --git a/tests/snapshots/tests.integration.test_propagation.test_trace_tags_multispan[tracer2].json b/tests/snapshots/tests.integration.test_propagation.test_trace_tags_multispan[tracer2].json
index 5f4d7c356cf..43e3251e6e8 100644
--- a/tests/snapshots/tests.integration.test_propagation.test_trace_tags_multispan[tracer2].json
+++ b/tests/snapshots/tests.integration.test_propagation.test_trace_tags_multispan[tracer2].json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "p",
-    "service": "",
+    "service": "tests.integration",
     "resource": "p",
     "trace_id": 0,
     "span_id": 1,
@@ -26,7 +26,7 @@
   },
      {
        "name": "c1",
-       "service": "",
+       "service": "tests.integration",
        "resource": "c1",
        "trace_id": 0,
        "span_id": 2,
@@ -48,7 +48,7 @@
      },
      {
        "name": "c2",
-       "service": "",
+       "service": "tests.integration",
        "resource": "c2",
        "trace_id": 0,
        "span_id": 3,
@@ -63,7 +63,7 @@
      },
         {
           "name": "gc",
-          "service": "",
+          "service": "tests.integration",
           "resource": "gc",
           "trace_id": 0,
           "span_id": 4,
diff --git a/tests/snapshots/tests.integration.test_trace_stats.test_measured_span.json b/tests/snapshots/tests.integration.test_trace_stats.test_measured_span.json
index 1be565f7b17..70166db7303 100644
--- a/tests/snapshots/tests.integration.test_trace_stats.test_measured_span.json
+++ b/tests/snapshots/tests.integration.test_trace_stats.test_measured_span.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 0,
     "span_id": 1,
@@ -25,7 +25,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 0,
        "span_id": 2,
@@ -38,7 +38,7 @@
 [
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 1,
     "span_id": 1,
@@ -62,7 +62,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 1,
        "span_id": 2,
@@ -75,7 +75,7 @@
 [
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 2,
     "span_id": 1,
@@ -99,7 +99,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 2,
        "span_id": 2,
@@ -112,7 +112,7 @@
 [
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 3,
     "span_id": 1,
@@ -136,7 +136,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 3,
        "span_id": 2,
@@ -149,7 +149,7 @@
 [
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 4,
     "span_id": 1,
@@ -173,7 +173,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 4,
        "span_id": 2,
@@ -186,7 +186,7 @@
 [
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 5,
     "span_id": 1,
@@ -210,7 +210,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 5,
        "span_id": 2,
@@ -223,7 +223,7 @@
 [
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 6,
     "span_id": 1,
@@ -247,7 +247,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 6,
        "span_id": 2,
@@ -260,7 +260,7 @@
 [
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 7,
     "span_id": 1,
@@ -284,7 +284,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 7,
        "span_id": 2,
@@ -297,7 +297,7 @@
 [
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 8,
     "span_id": 1,
@@ -321,7 +321,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 8,
        "span_id": 2,
@@ -334,7 +334,7 @@
 [
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 9,
     "span_id": 1,
@@ -358,7 +358,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 9,
        "span_id": 2,
@@ -371,7 +371,7 @@
 [
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 10,
     "span_id": 1,
@@ -395,7 +395,7 @@
   },
      {
        "name": "child_stats",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child_stats",
        "trace_id": 10,
        "span_id": 2,
@@ -411,7 +411,7 @@
 [
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 11,
     "span_id": 1,
@@ -435,7 +435,7 @@
   },
      {
        "name": "child_stats",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child_stats",
        "trace_id": 11,
        "span_id": 2,
@@ -451,7 +451,7 @@
 [
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 12,
     "span_id": 1,
@@ -475,7 +475,7 @@
   },
      {
        "name": "child_stats",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child_stats",
        "trace_id": 12,
        "span_id": 2,
@@ -491,7 +491,7 @@
 [
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 13,
     "span_id": 1,
@@ -515,7 +515,7 @@
   },
      {
        "name": "child_stats",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child_stats",
        "trace_id": 13,
        "span_id": 2,
@@ -531,7 +531,7 @@
 [
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 14,
     "span_id": 1,
@@ -555,7 +555,7 @@
   },
      {
        "name": "child_stats",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child_stats",
        "trace_id": 14,
        "span_id": 2,
@@ -571,7 +571,7 @@
 [
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 15,
     "span_id": 1,
@@ -595,7 +595,7 @@
   },
      {
        "name": "child_stats",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child_stats",
        "trace_id": 15,
        "span_id": 2,
@@ -611,7 +611,7 @@
 [
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 16,
     "span_id": 1,
@@ -635,7 +635,7 @@
   },
      {
        "name": "child_stats",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child_stats",
        "trace_id": 16,
        "span_id": 2,
@@ -651,7 +651,7 @@
 [
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 17,
     "span_id": 1,
@@ -675,7 +675,7 @@
   },
      {
        "name": "child_stats",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child_stats",
        "trace_id": 17,
        "span_id": 2,
@@ -691,7 +691,7 @@
 [
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 18,
     "span_id": 1,
@@ -715,7 +715,7 @@
   },
      {
        "name": "child_stats",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child_stats",
        "trace_id": 18,
        "span_id": 2,
@@ -731,7 +731,7 @@
 [
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.integration",
     "resource": "parent",
     "trace_id": 19,
     "span_id": 1,
@@ -755,7 +755,7 @@
   },
      {
        "name": "child_stats",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child_stats",
        "trace_id": 19,
        "span_id": 2,
diff --git a/tests/snapshots/tests.integration.test_trace_stats.test_sampling_rate[0.0].json b/tests/snapshots/tests.integration.test_trace_stats.test_sampling_rate[0.0].json
index 07e5f223227..bf83155098c 100644
--- a/tests/snapshots/tests.integration.test_trace_stats.test_sampling_rate[0.0].json
+++ b/tests/snapshots/tests.integration.test_trace_stats.test_sampling_rate[0.0].json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "operation",
-    "service": "",
+    "service": "tests.integration",
     "resource": "operation",
     "trace_id": 0,
     "span_id": 1,
@@ -26,7 +26,7 @@
 [
   {
     "name": "operation",
-    "service": "",
+    "service": "tests.integration",
     "resource": "operation",
     "trace_id": 1,
     "span_id": 1,
@@ -51,7 +51,7 @@
 [
   {
     "name": "operation",
-    "service": "",
+    "service": "tests.integration",
     "resource": "operation",
     "trace_id": 2,
     "span_id": 1,
@@ -76,7 +76,7 @@
 [
   {
     "name": "operation",
-    "service": "",
+    "service": "tests.integration",
     "resource": "operation",
     "trace_id": 3,
     "span_id": 1,
@@ -101,7 +101,7 @@
 [
   {
     "name": "operation",
-    "service": "",
+    "service": "tests.integration",
     "resource": "operation",
     "trace_id": 4,
     "span_id": 1,
@@ -126,7 +126,7 @@
 [
   {
     "name": "operation",
-    "service": "",
+    "service": "tests.integration",
     "resource": "operation",
     "trace_id": 5,
     "span_id": 1,
@@ -151,7 +151,7 @@
 [
   {
     "name": "operation",
-    "service": "",
+    "service": "tests.integration",
     "resource": "operation",
     "trace_id": 6,
     "span_id": 1,
@@ -176,7 +176,7 @@
 [
   {
     "name": "operation",
-    "service": "",
+    "service": "tests.integration",
     "resource": "operation",
     "trace_id": 7,
     "span_id": 1,
@@ -201,7 +201,7 @@
 [
   {
     "name": "operation",
-    "service": "",
+    "service": "tests.integration",
     "resource": "operation",
     "trace_id": 8,
     "span_id": 1,
@@ -226,7 +226,7 @@
 [
   {
     "name": "operation",
-    "service": "",
+    "service": "tests.integration",
     "resource": "operation",
     "trace_id": 9,
     "span_id": 1,
diff --git a/tests/snapshots/tests.integration.test_trace_stats.test_sampling_rate[1.0].json b/tests/snapshots/tests.integration.test_trace_stats.test_sampling_rate[1.0].json
index a09577cfe72..6e3752bf36f 100644
--- a/tests/snapshots/tests.integration.test_trace_stats.test_sampling_rate[1.0].json
+++ b/tests/snapshots/tests.integration.test_trace_stats.test_sampling_rate[1.0].json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "operation",
-    "service": "",
+    "service": "tests.integration",
     "resource": "operation",
     "trace_id": 0,
     "span_id": 1,
@@ -26,7 +26,7 @@
 [
   {
     "name": "operation",
-    "service": "",
+    "service": "tests.integration",
     "resource": "operation",
     "trace_id": 1,
     "span_id": 1,
@@ -51,7 +51,7 @@
 [
   {
     "name": "operation",
-    "service": "",
+    "service": "tests.integration",
     "resource": "operation",
     "trace_id": 2,
     "span_id": 1,
@@ -76,7 +76,7 @@
 [
   {
     "name": "operation",
-    "service": "",
+    "service": "tests.integration",
     "resource": "operation",
     "trace_id": 3,
     "span_id": 1,
@@ -101,7 +101,7 @@
 [
   {
     "name": "operation",
-    "service": "",
+    "service": "tests.integration",
     "resource": "operation",
     "trace_id": 4,
     "span_id": 1,
@@ -126,7 +126,7 @@
 [
   {
     "name": "operation",
-    "service": "",
+    "service": "tests.integration",
     "resource": "operation",
     "trace_id": 5,
     "span_id": 1,
@@ -151,7 +151,7 @@
 [
   {
     "name": "operation",
-    "service": "",
+    "service": "tests.integration",
     "resource": "operation",
     "trace_id": 6,
     "span_id": 1,
@@ -176,7 +176,7 @@
 [
   {
     "name": "operation",
-    "service": "",
+    "service": "tests.integration",
     "resource": "operation",
     "trace_id": 7,
     "span_id": 1,
@@ -201,7 +201,7 @@
 [
   {
     "name": "operation",
-    "service": "",
+    "service": "tests.integration",
     "resource": "operation",
     "trace_id": 8,
     "span_id": 1,
@@ -226,7 +226,7 @@
 [
   {
     "name": "operation",
-    "service": "",
+    "service": "tests.integration",
     "resource": "operation",
     "trace_id": 9,
     "span_id": 1,
diff --git a/tests/snapshots/tests.integration.test_trace_stats.test_single_span_sampling[sampling_rule0].json b/tests/snapshots/tests.integration.test_trace_stats.test_single_span_sampling[sampling_rule0].json
index 7240f479af5..b9c35e6d695 100644
--- a/tests/snapshots/tests.integration.test_trace_stats.test_single_span_sampling[sampling_rule0].json
+++ b/tests/snapshots/tests.integration.test_trace_stats.test_single_span_sampling[sampling_rule0].json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-3",
       "_dd.p.tid": "6670641f00000000",
       "language": "python"
diff --git a/tests/snapshots/tests.integration.test_trace_stats.test_single_span_sampling[sampling_rule1].json b/tests/snapshots/tests.integration.test_trace_stats.test_single_span_sampling[sampling_rule1].json
index bdc1f15cc14..03e452b328f 100644
--- a/tests/snapshots/tests.integration.test_trace_stats.test_single_span_sampling[sampling_rule1].json
+++ b/tests/snapshots/tests.integration.test_trace_stats.test_single_span_sampling[sampling_rule1].json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-3",
       "_dd.p.tid": "6670641f00000000",
       "language": "python",
@@ -36,7 +36,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.span_sampling.mechanism": 8
diff --git a/tests/snapshots/tests.integration.test_trace_stats.test_stats_30.json b/tests/snapshots/tests.integration.test_trace_stats.test_stats_30.json
index e827959fb2e..94a2569d67a 100644
--- a/tests/snapshots/tests.integration.test_trace_stats.test_stats_30.json
+++ b/tests/snapshots/tests.integration.test_trace_stats.test_stats_30.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -35,7 +35,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -61,7 +61,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -87,7 +87,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -113,7 +113,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -139,7 +139,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -165,7 +165,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -191,7 +191,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -217,7 +217,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -243,7 +243,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -269,7 +269,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -295,7 +295,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -321,7 +321,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -347,7 +347,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -373,7 +373,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -399,7 +399,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -425,7 +425,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -451,7 +451,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -477,7 +477,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -503,7 +503,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -529,7 +529,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -555,7 +555,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -581,7 +581,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -607,7 +607,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -633,7 +633,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -659,7 +659,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -685,7 +685,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -711,7 +711,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -737,7 +737,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
@@ -763,7 +763,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670647500000000",
       "language": "python",
diff --git a/tests/snapshots/tests.integration.test_trace_stats.test_stats_aggrs.json b/tests/snapshots/tests.integration.test_trace_stats.test_stats_aggrs.json
index d2c1a1622a4..ddb0bb4a3af 100644
--- a/tests/snapshots/tests.integration.test_trace_stats.test_stats_aggrs.json
+++ b/tests/snapshots/tests.integration.test_trace_stats.test_stats_aggrs.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670642000000000",
       "language": "python",
@@ -35,7 +35,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.origin": "synthetics",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670642000000000",
@@ -62,7 +62,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670642000000000",
       "http.status_code": "200",
@@ -89,7 +89,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670642000000000",
       "language": "python",
@@ -115,7 +115,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670642000000000",
       "language": "python",
@@ -141,7 +141,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670642000000000",
       "language": "python",
@@ -167,7 +167,7 @@
     "type": "db",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670642000000000",
       "language": "python",
diff --git a/tests/snapshots/tests.integration.test_trace_stats.test_stats_errors.json b/tests/snapshots/tests.integration.test_trace_stats.test_stats_errors.json
index e1003ff394b..67b72fd6317 100644
--- a/tests/snapshots/tests.integration.test_trace_stats.test_stats_errors.json
+++ b/tests/snapshots/tests.integration.test_trace_stats.test_stats_errors.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -35,7 +35,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -61,7 +61,7 @@
     "type": "",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -87,7 +87,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -113,7 +113,7 @@
     "type": "",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -139,7 +139,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -165,7 +165,7 @@
     "type": "",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -191,7 +191,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -217,7 +217,7 @@
     "type": "",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -243,7 +243,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -269,7 +269,7 @@
     "type": "",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -295,7 +295,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -321,7 +321,7 @@
     "type": "",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -347,7 +347,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -373,7 +373,7 @@
     "type": "",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -399,7 +399,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -425,7 +425,7 @@
     "type": "",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -451,7 +451,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -477,7 +477,7 @@
     "type": "",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -503,7 +503,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -529,7 +529,7 @@
     "type": "",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -555,7 +555,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -581,7 +581,7 @@
     "type": "",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -607,7 +607,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -633,7 +633,7 @@
     "type": "",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -659,7 +659,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -685,7 +685,7 @@
     "type": "",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -711,7 +711,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -737,7 +737,7 @@
     "type": "",
     "error": 1,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
@@ -763,7 +763,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670649800000000",
       "language": "python",
diff --git a/tests/snapshots/tests.integration.test_trace_stats.test_top_level.json b/tests/snapshots/tests.integration.test_trace_stats.test_top_level.json
index 7bb8372cf33..92b45c7b5b1 100644
--- a/tests/snapshots/tests.integration.test_trace_stats.test_top_level.json
+++ b/tests/snapshots/tests.integration.test_trace_stats.test_top_level.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -34,7 +34,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -53,7 +53,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -78,7 +78,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -97,7 +97,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -122,7 +122,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -141,7 +141,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -166,7 +166,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -185,7 +185,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -210,7 +210,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -229,7 +229,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -254,7 +254,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -273,7 +273,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -298,7 +298,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -317,7 +317,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -342,7 +342,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -361,7 +361,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -386,7 +386,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -405,7 +405,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -430,7 +430,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -449,7 +449,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -474,7 +474,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -493,7 +493,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -518,7 +518,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -537,7 +537,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -562,7 +562,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -581,7 +581,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -606,7 +606,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -625,7 +625,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -650,7 +650,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -669,7 +669,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -694,7 +694,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -713,7 +713,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -738,7 +738,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -757,7 +757,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -782,7 +782,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -801,7 +801,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -826,7 +826,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -845,7 +845,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -870,7 +870,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -889,7 +889,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -914,7 +914,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -933,7 +933,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -958,7 +958,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -977,7 +977,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -1002,7 +1002,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -1021,7 +1021,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -1046,7 +1046,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -1065,7 +1065,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -1090,7 +1090,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -1109,7 +1109,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -1134,7 +1134,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -1153,7 +1153,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -1178,7 +1178,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -1197,7 +1197,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -1222,7 +1222,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -1241,7 +1241,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -1266,7 +1266,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
@@ -1285,7 +1285,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "6670655700000000",
       "language": "python",
@@ -1310,7 +1310,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": ""
+         "_dd.base_service": "tests.integration"
        },
        "metrics": {
          "_dd.top_level": 1
diff --git a/tests/tracer/test_tracer.py b/tests/tracer/test_tracer.py
index 29daae4fb09..d8afffca463 100644
--- a/tests/tracer/test_tracer.py
+++ b/tests/tracer/test_tracer.py
@@ -61,7 +61,7 @@ def test_tracer_vars(self):
         span.finish()
 
         span = self.trace("a")
-        span.assert_matches(name="a", service=None, resource="a", span_type=None)
+        span.assert_matches(name="a", service='tests.tracer', resource="a", span_type=None)
         span.finish()
 
     def test_tracer(self):
@@ -400,7 +400,7 @@ def test_start_span_optional(self):
 
     def test_start_span_service_default(self):
         span = self.start_span("")
-        span.assert_matches(service=None)
+        span.assert_matches(service='tests.tracer')
         span.finish()
 
     def test_start_span_service_from_parent(self):
@@ -466,23 +466,23 @@ def test_start_child_from_context(self):
         )
 
     def test_adding_services(self):
-        assert self.tracer._services == set()
+        assert self.tracer._services == set('tests.tracer')
         with self.start_span("root", service="one") as root:
-            assert self.tracer._services == set(["one"])
+            assert self.tracer._services == set(["one", "tests.tracer"])
             with self.start_span("child", service="two", child_of=root):
                 pass
-        assert self.tracer._services == set(["one", "two"])
+        assert self.tracer._services == set(["one", "two", "tests.tracer"])
 
     @run_in_subprocess(env_overrides=dict(DD_SERVICE_MAPPING="two:three"))
     def test_adding_mapped_services(self):
-        assert self.tracer._services == set()
+        assert self.tracer._services == set('tests.tracer')
         with self.start_span("root", service="one") as root:
-            assert self.tracer._services == set(["one"])
+            assert self.tracer._services == set(["one", "tests.tracer"])
 
             # service "two" gets remapped to "three"
             with self.start_span("child", service="two", child_of=root):
                 pass
-        assert self.tracer._services == set(["one", "three"])
+        assert self.tracer._services == set(["one", "three", "tests.tracer"])
 
     def test_configure_dogstatsd_url_host_port(self):
         tracer = Tracer()

From c0fd25b69471bf3147b7dafd14be7cdd525b419c Mon Sep 17 00:00:00 2001
From: William Conti <william.conti@datadoghq.com>
Date: Wed, 13 Nov 2024 16:53:41 -0500
Subject: [PATCH 03/18] more fixes

---
 .../anthropic/test_anthropic_llmobs.py        | 28 ++++-----
 .../test_google_generativeai_llmobs.py        | 36 ++++++------
 tests/contrib/httplib/test_httplib.py         | 22 +++----
 tests/contrib/httpx/test_httpx.py             |  2 +-
 tests/contrib/httpx/test_httpx_pre_0_11.py    |  2 +-
 tests/contrib/jinja2/test_jinja2.py           |  2 +-
 .../langchain/test_langchain_community.py     |  8 +--
 tests/contrib/openai/test_openai_v0.py        | 12 ++--
 tests/contrib/openai/test_openai_v1.py        | 18 +++---
 .../test_remoteconfig_client_e2e.py           |  2 +-
 tests/llmobs/_utils.py                        |  8 +--
 tests/llmobs/test_llmobs_trace_processor.py   |  4 +-
 ...pling_float_special_case_do_not_match.json |  2 +-
 ...ampling_float_special_case_match_star.json |  2 +-
 ...est_extended_sampling_glob_multi_rule.json |  2 +-
 .../test_extended_sampling_resource.json      |  4 +-
 .../test_extended_sampling_tags.json          |  4 +-
 ..._extended_sampling_tags_and_name_glob.json |  8 +--
 ...t_extended_sampling_tags_and_resource.json |  8 +--
 ...ended_sampling_tags_and_resource_glob.json |  8 +--
 ...tended_sampling_tags_and_service_glob.json |  8 +--
 .../test_extended_sampling_tags_glob.json     |  4 +-
 ...ling_tags_glob_insensitive_case_match.json |  4 +-
 .../test_extended_sampling_w_None.json        |  6 +-
 .../test_extended_sampling_w_None_meta.json   |  6 +-
 .../test_extended_sampling_w_metrics.json     |  6 +-
 .../test_extended_sampling_w_tags_none.json   |  6 +-
 ...t_sampling_with_default_sample_rate_1.json |  4 +-
 ...default_sample_rate_1_and_manual_drop.json |  4 +-
 ...default_sample_rate_1_and_manual_keep.json |  4 +-
 ...with_default_sample_rate_1_and_rule_0.json |  4 +-
 ...with_default_sample_rate_1_and_rule_1.json |  4 +-
 ...ampling_with_default_sample_rate_tiny.json |  4 +-
 .../test_sampling_with_defaults.json          |  4 +-
 .../test_sampling_with_rate_limit_3.json      |  4 +-
 ...ling_with_rate_sampler_with_tiny_rate.json |  4 +-
 ...g_with_sample_rate_1_and_rate_limit_0.json |  4 +-
 ...le_rate_1_and_rate_limit_3_and_rule_0.json |  4 +-
 ...st_appsec_body_no_collection_snapshot.json |  2 +-
 ...appsec_cookies_no_collection_snapshot.json |  2 +-
 ...nja2.test_template_rendering_snapshot.json |  2 +-
 ...t_template_rendering_snapshot[pyloop].json |  2 +-
 ...apshots.test_djangoq_dd_trace_methods.json | 58 +++++++++----------
 ...atch_403[flask_appsec_good_rules_env].json |  4 +-
 ..._403[flask_appsec_good_rules_env]_220.json |  4 +-
 ...403_json[flask_appsec_good_rules_env].json |  4 +-
 ...json[flask_appsec_good_rules_env]_220.json |  4 +-
 ..._osspawn[flask_appsec_good_rules_env].json | 24 ++++----
 ...pawn[flask_appsec_good_rules_env]_220.json | 22 +++----
 ...ossystem[flask_appsec_good_rules_env].json | 22 +++----
 ...stem[flask_appsec_good_rules_env]_220.json | 20 +++----
 ...enoshell[flask_appsec_good_rules_env].json | 26 ++++-----
 ...hell[flask_appsec_good_rules_env]_220.json | 24 ++++----
 ...ateshell[flask_appsec_good_rules_env].json | 26 ++++-----
 ...hell[flask_appsec_good_rules_env]_220.json | 24 ++++----
 ...200_json[flask_appsec_good_rules_env].json | 20 +++----
 ...json[flask_appsec_good_rules_env]_220.json | 18 +++---
 ...403_json[flask_appsec_good_rules_env].json | 24 ++++----
 ...json[flask_appsec_good_rules_env]_220.json | 22 +++----
 ...hot.test_flask_200[flask_default_env].json | 20 +++----
 ...test_flask_200[flask_default_env]_220.json | 18 +++---
 ...est_flask_get_user[flask_default_env].json | 20 +++----
 ...flask_get_user[flask_default_env]_220.json | 18 +++---
 ....test_flask_stream[flask_default_env].json | 20 +++----
 ...t_flask_stream[flask_default_env]_220.json | 18 +++---
 ...test_redis.test_custom_cmd_length_env.json |  2 +-
 ...test_env_user_specified_redis_service.json |  4 +-
 ...dis.test_full_command_in_resource_env.json |  4 +-
 ...ing_enabled_False_worker_service_None.json |  6 +-
 ...cing_enabled_None_worker_service_None.json |  6 +-
 tests/tracer/runtime/test_runtime_metrics.py  |  2 +-
 tests/tracer/test_settings.py                 |  4 +-
 tests/tracer/test_tracer.py                   | 12 ++--
 73 files changed, 385 insertions(+), 389 deletions(-)

diff --git a/tests/contrib/anthropic/test_anthropic_llmobs.py b/tests/contrib/anthropic/test_anthropic_llmobs.py
index f39641b0811..f286a890209 100644
--- a/tests/contrib/anthropic/test_anthropic_llmobs.py
+++ b/tests/contrib/anthropic/test_anthropic_llmobs.py
@@ -68,7 +68,7 @@ def test_completion(self, anthropic, ddtrace_global_config, mock_llmobs_writer,
                 output_messages=[{"content": 'THE BEST-SELLING BOOK OF ALL TIME IS "DON', "role": "assistant"}],
                 metadata={"temperature": 0.8, "max_tokens": 15.0},
                 token_metrics={"input_tokens": 32, "output_tokens": 15, "total_tokens": 47},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.anthropic"},
             )
         )
 
@@ -113,7 +113,7 @@ def test_error(self, anthropic, ddtrace_global_config, mock_llmobs_writer, mock_
                         error_message=span.get_tag("error.message"),
                         error_stack=span.get_tag("error.stack"),
                         metadata={"temperature": 0.8, "max_tokens": 15.0},
-                        tags={"ml_app": "<ml-app-name>"},
+                        tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.anthropic"},
                     )
                 )
 
@@ -142,7 +142,7 @@ def test_error_unserializable_arg(
             error_message=span.get_tag("error.message"),
             error_stack=span.get_tag("error.stack"),
             metadata={"temperature": 0.8, "max_tokens": mock.ANY},
-            tags={"ml_app": "<ml-app-name>"},
+            tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.anthropic"},
         )
         mock_llmobs_writer.enqueue.assert_called_with(expected_span)
         actual_span = mock_llmobs_writer.enqueue.call_args[0][0]
@@ -196,7 +196,7 @@ def test_stream(self, anthropic, ddtrace_global_config, mock_llmobs_writer, mock
                     ],
                     metadata={"temperature": 0.8, "max_tokens": 15.0},
                     token_metrics={"input_tokens": 27, "output_tokens": 15, "total_tokens": 42},
-                    tags={"ml_app": "<ml-app-name>"},
+                    tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.anthropic"},
                 )
             )
 
@@ -253,7 +253,7 @@ def test_stream_helper(self, anthropic, ddtrace_global_config, mock_llmobs_write
                     ],
                     metadata={"temperature": 0.8, "max_tokens": 15.0},
                     token_metrics={"input_tokens": 27, "output_tokens": 15, "total_tokens": 42},
-                    tags={"ml_app": "<ml-app-name>"},
+                    tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.anthropic"},
                 )
             )
 
@@ -308,7 +308,7 @@ def test_image(self, anthropic, ddtrace_global_config, mock_llmobs_writer, mock_
                     ],
                     metadata={"temperature": 0.8, "max_tokens": 15.0},
                     token_metrics={"input_tokens": 246, "output_tokens": 15, "total_tokens": 261},
-                    tags={"ml_app": "<ml-app-name>"},
+                    tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.anthropic"},
                 )
             )
 
@@ -350,7 +350,7 @@ def test_tools_sync(self, anthropic, ddtrace_global_config, mock_llmobs_writer,
                 ],
                 metadata={"max_tokens": 200.0},
                 token_metrics={"input_tokens": 599, "output_tokens": 152, "total_tokens": 751},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.anthropic"},
             )
         )
 
@@ -403,7 +403,7 @@ def test_tools_sync(self, anthropic, ddtrace_global_config, mock_llmobs_writer,
                 ],
                 metadata={"max_tokens": 500.0},
                 token_metrics={"input_tokens": 768, "output_tokens": 29, "total_tokens": 797},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.anthropic"},
             )
         )
 
@@ -446,7 +446,7 @@ async def test_tools_async(self, anthropic, ddtrace_global_config, mock_llmobs_w
                 ],
                 metadata={"max_tokens": 200.0},
                 token_metrics={"input_tokens": 599, "output_tokens": 152, "total_tokens": 751},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.anthropic"},
             )
         )
 
@@ -499,7 +499,7 @@ async def test_tools_async(self, anthropic, ddtrace_global_config, mock_llmobs_w
                 ],
                 metadata={"max_tokens": 500.0},
                 token_metrics={"input_tokens": 768, "output_tokens": 29, "total_tokens": 797},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.anthropic"},
             )
         )
 
@@ -559,7 +559,7 @@ def test_tools_sync_stream(self, anthropic, ddtrace_global_config, mock_llmobs_w
                 ],
                 metadata={"max_tokens": 200.0},
                 token_metrics={"input_tokens": 599, "output_tokens": 135, "total_tokens": 734},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.anthropic"},
             )
         )
 
@@ -609,7 +609,7 @@ def test_tools_sync_stream(self, anthropic, ddtrace_global_config, mock_llmobs_w
                 ],
                 metadata={"max_tokens": 500.0},
                 token_metrics={"input_tokens": 762, "output_tokens": 33, "total_tokens": 795},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.anthropic"},
             )
         )
 
@@ -664,7 +664,7 @@ async def test_tools_async_stream_helper(
                 ],
                 metadata={"max_tokens": 200.0},
                 token_metrics={"input_tokens": 599, "output_tokens": 146, "total_tokens": 745},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.anthropic"},
             )
         )
 
@@ -719,6 +719,6 @@ async def test_tools_async_stream_helper(
                 ],
                 metadata={"max_tokens": 500.0},
                 token_metrics={"input_tokens": 762, "output_tokens": 18, "total_tokens": 780},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.anthropic"},
             )
         )
diff --git a/tests/contrib/google_generativeai/test_google_generativeai_llmobs.py b/tests/contrib/google_generativeai/test_google_generativeai_llmobs.py
index c897383f3fc..0daaf01d098 100644
--- a/tests/contrib/google_generativeai/test_google_generativeai_llmobs.py
+++ b/tests/contrib/google_generativeai/test_google_generativeai_llmobs.py
@@ -42,7 +42,7 @@ def test_completion(self, genai, ddtrace_global_config, mock_llmobs_writer, mock
             ],
             metadata={"temperature": 1.0, "max_output_tokens": 35},
             token_metrics={"input_tokens": 12, "output_tokens": 30, "total_tokens": 42},
-            tags={"ml_app": "<ml-app-name>"},
+            tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.google_generativeai"},
         )
         mock_llmobs_writer.enqueue.assert_called_with(expected_llmobs_span_event)
 
@@ -67,7 +67,7 @@ async def test_completion_async(
             ],
             metadata={"temperature": 1.0, "max_output_tokens": 35},
             token_metrics={"input_tokens": 12, "output_tokens": 30, "total_tokens": 42},
-            tags={"ml_app": "<ml-app-name>"},
+            tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.google_generativeai"},
         )
         mock_llmobs_writer.enqueue.assert_called_with(expected_llmobs_span_event)
 
@@ -95,7 +95,7 @@ def test_completion_error(self, genai, ddtrace_global_config, mock_llmobs_writer
                 error_message=span.get_tag("error.message"),
                 error_stack=span.get_tag("error.stack"),
                 metadata={"temperature": 1.0, "max_output_tokens": 35},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.google_generativeai"},
             )
         )
 
@@ -127,7 +127,7 @@ async def test_completion_error_async(
                 error_message=span.get_tag("error.message"),
                 error_stack=span.get_tag("error.stack"),
                 metadata={"temperature": 1.0, "max_output_tokens": 35},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.google_generativeai"},
             )
         )
 
@@ -160,7 +160,7 @@ def test_completion_multiple_messages(
             ],
             metadata={"temperature": 1.0, "max_output_tokens": 35},
             token_metrics={"input_tokens": 24, "output_tokens": 35, "total_tokens": 59},
-            tags={"ml_app": "<ml-app-name>"},
+            tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.google_generativeai"},
         )
         mock_llmobs_writer.enqueue.assert_called_with(expected_llmobs_span_event)
 
@@ -193,7 +193,7 @@ async def test_completion_multiple_messages_async(
             ],
             metadata={"temperature": 1.0, "max_output_tokens": 35},
             token_metrics={"input_tokens": 24, "output_tokens": 35, "total_tokens": 59},
-            tags={"ml_app": "<ml-app-name>"},
+            tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.google_generativeai"},
         )
         mock_llmobs_writer.enqueue.assert_called_with(expected_llmobs_span_event)
 
@@ -226,7 +226,7 @@ def test_chat_completion(self, genai, ddtrace_global_config, mock_llmobs_writer,
             ],
             metadata={"temperature": 1.0, "max_output_tokens": 35},
             token_metrics={"input_tokens": 24, "output_tokens": 35, "total_tokens": 59},
-            tags={"ml_app": "<ml-app-name>"},
+            tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.google_generativeai"},
         )
         mock_llmobs_writer.enqueue.assert_called_with(expected_llmobs_span_event)
 
@@ -261,7 +261,7 @@ async def test_chat_completion_async(
             ],
             metadata={"temperature": 1.0, "max_output_tokens": 35},
             token_metrics={"input_tokens": 24, "output_tokens": 35, "total_tokens": 59},
-            tags={"ml_app": "<ml-app-name>"},
+            tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.google_generativeai"},
         )
         mock_llmobs_writer.enqueue.assert_called_with(expected_llmobs_span_event)
 
@@ -296,7 +296,7 @@ def test_completion_system_prompt(self, genai, ddtrace_global_config, mock_llmob
             ],
             metadata={"temperature": 1.0, "max_output_tokens": 50},
             token_metrics={"input_tokens": 29, "output_tokens": 45, "total_tokens": 74},
-            tags={"ml_app": "<ml-app-name>"},
+            tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.google_generativeai"},
         )
         mock_llmobs_writer.enqueue.assert_called_with(expected_llmobs_span_event)
 
@@ -333,7 +333,7 @@ async def test_completion_system_prompt_async(
             ],
             metadata={"temperature": 1.0, "max_output_tokens": 50},
             token_metrics={"input_tokens": 29, "output_tokens": 45, "total_tokens": 74},
-            tags={"ml_app": "<ml-app-name>"},
+            tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.google_generativeai"},
         )
         mock_llmobs_writer.enqueue.assert_called_with(expected_llmobs_span_event)
 
@@ -361,7 +361,7 @@ def test_completion_stream(self, genai, ddtrace_global_config, mock_llmobs_write
             ],
             metadata={"temperature": 1.0, "max_output_tokens": 60},
             token_metrics={"input_tokens": 6, "output_tokens": 52, "total_tokens": 58},
-            tags={"ml_app": "<ml-app-name>"},
+            tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.google_generativeai"},
         )
         mock_llmobs_writer.enqueue.assert_called_with(expected_llmobs_span_event)
 
@@ -391,7 +391,7 @@ async def test_completion_stream_async(
             ],
             metadata={"temperature": 1.0, "max_output_tokens": 60},
             token_metrics={"input_tokens": 6, "output_tokens": 52, "total_tokens": 58},
-            tags={"ml_app": "<ml-app-name>"},
+            tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.google_generativeai"},
         )
         mock_llmobs_writer.enqueue.assert_called_with(expected_llmobs_span_event)
 
@@ -425,7 +425,7 @@ def test_completion_tool_call(self, genai, ddtrace_global_config, mock_llmobs_wr
             ],
             metadata={"temperature": 1.0, "max_output_tokens": 30},
             token_metrics={"input_tokens": 150, "output_tokens": 25, "total_tokens": 175},
-            tags={"ml_app": "<ml-app-name>"},
+            tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.google_generativeai"},
         )
         mock_llmobs_writer.enqueue.assert_called_with(expected_llmobs_span_event)
 
@@ -461,7 +461,7 @@ async def test_completion_tool_call_async(
             ],
             metadata={"temperature": 1.0, "max_output_tokens": 30},
             token_metrics={"input_tokens": 150, "output_tokens": 25, "total_tokens": 175},
-            tags={"ml_app": "<ml-app-name>"},
+            tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.google_generativeai"},
         )
         mock_llmobs_writer.enqueue.assert_called_with(expected_llmobs_span_event)
 
@@ -502,7 +502,7 @@ def test_gemini_completion_tool_stream(
             ],
             metadata={"temperature": 1.0, "max_output_tokens": 30},
             token_metrics={"input_tokens": 150, "output_tokens": 25, "total_tokens": 175},
-            tags={"ml_app": "<ml-app-name>"},
+            tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.google_generativeai"},
         )
         mock_llmobs_writer.enqueue.assert_called_with(expected_llmobs_span_event)
 
@@ -543,7 +543,7 @@ async def test_gemini_completion_tool_stream_async(
             ],
             metadata={"temperature": 1.0, "max_output_tokens": 30},
             token_metrics={"input_tokens": 150, "output_tokens": 25, "total_tokens": 175},
-            tags={"ml_app": "<ml-app-name>"},
+            tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.google_generativeai"},
         )
         mock_llmobs_writer.enqueue.assert_called_with(expected_llmobs_span_event)
 
@@ -569,7 +569,7 @@ def test_gemini_completion_image(self, genai, ddtrace_global_config, mock_llmobs
             output_messages=[{"content": "57 100 900 911", "role": "model"}],
             metadata={"temperature": 1.0, "max_output_tokens": 30},
             token_metrics={"input_tokens": 277, "output_tokens": 14, "total_tokens": 291},
-            tags={"ml_app": "<ml-app-name>"},
+            tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.google_generativeai"},
         )
         mock_llmobs_writer.enqueue.assert_called_with(expected_llmobs_span_event)
 
@@ -597,6 +597,6 @@ async def test_gemini_completion_image_async(
             output_messages=[{"content": "57 100 900 911", "role": "model"}],
             metadata={"temperature": 1.0, "max_output_tokens": 30},
             token_metrics={"input_tokens": 277, "output_tokens": 14, "total_tokens": 291},
-            tags={"ml_app": "<ml-app-name>"},
+            tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.google_generativeai"},
         )
         mock_llmobs_writer.enqueue.assert_called_with(expected_llmobs_span_event)
diff --git a/tests/contrib/httplib/test_httplib.py b/tests/contrib/httplib/test_httplib.py
index 0ee762df61a..edc888ad3eb 100644
--- a/tests/contrib/httplib/test_httplib.py
+++ b/tests/contrib/httplib/test_httplib.py
@@ -167,7 +167,7 @@ def test_httplib_request_get_request(self, query_string=""):
         span = spans[0]
         self.assert_is_not_measured(span)
         self.assertEqual(span.span_type, "http")
-        self.assertIsNone(span.service)
+        self.assertEqual(span.service, "tests.contrib.httplib")
         self.assertEqual(span.name, self.SPAN_NAME)
         self.assertEqual(span.error, 0)
         assert span.get_tag("http.method") == "GET"
@@ -216,7 +216,7 @@ def test_httplib_request_get_request_https(self):
         span = spans[0]
         self.assert_is_not_measured(span)
         self.assertEqual(span.span_type, "http")
-        self.assertIsNone(span.service)
+        self.assertEqual(span.service, "tests.contrib.httplib")
         self.assertEqual(span.name, self.SPAN_NAME)
         self.assertEqual(span.error, 0)
         assert span.get_tag("http.method") == "GET"
@@ -244,7 +244,7 @@ def test_httplib_request_post_request(self):
         span = spans[0]
         self.assert_is_not_measured(span)
         self.assertEqual(span.span_type, "http")
-        self.assertIsNone(span.service)
+        self.assertEqual(span.service, "tests.contrib.httplib")
         self.assertEqual(span.name, self.SPAN_NAME)
         self.assertEqual(span.error, 0)
         assert span.get_tag("http.method") == "POST"
@@ -272,7 +272,7 @@ def test_httplib_request_get_request_query_string(self):
         span = spans[0]
         self.assert_is_not_measured(span)
         self.assertEqual(span.span_type, "http")
-        self.assertIsNone(span.service)
+        self.assertEqual(span.service, "tests.contrib.httplib")
         self.assertEqual(span.name, self.SPAN_NAME)
         self.assertEqual(span.error, 0)
         assert span.get_tag("http.method") == "GET"
@@ -305,7 +305,7 @@ def test_httplib_request_500_request(self):
         span = spans[0]
         self.assert_is_not_measured(span)
         self.assertEqual(span.span_type, "http")
-        self.assertIsNone(span.service)
+        self.assertEqual(span.service, "tests.contrib.httplib")
         self.assertEqual(span.name, self.SPAN_NAME)
         self.assertEqual(span.error, 1)
         self.assertEqual(span.get_tag("http.method"), "GET")
@@ -338,7 +338,7 @@ def test_httplib_request_non_200_request(self):
         span = spans[0]
         self.assert_is_not_measured(span)
         self.assertEqual(span.span_type, "http")
-        self.assertIsNone(span.service)
+        self.assertEqual(span.service, "tests.contrib.httplib")
         self.assertEqual(span.name, self.SPAN_NAME)
         self.assertEqual(span.error, 0)
         self.assertEqual(span.get_tag("http.method"), "GET")
@@ -426,7 +426,7 @@ def test_urllib_request(self):
         span = spans[0]
         self.assert_is_not_measured(span)
         self.assertEqual(span.span_type, "http")
-        self.assertIsNone(span.service)
+        self.assertEqual(span.service, "tests.contrib.httplib")
         self.assertEqual(span.name, self.SPAN_NAME)
         self.assertEqual(span.error, 0)
         self.assertEqual(span.get_tag("http.method"), "GET")
@@ -462,7 +462,7 @@ def test_urllib_request_https(self):
         span = spans[0]
         self.assert_is_not_measured(span)
         self.assertEqual(span.span_type, "http")
-        self.assertIsNone(span.service)
+        self.assertEqual(span.service, "tests.contrib.httplib")
         self.assertEqual(span.name, self.SPAN_NAME)
         self.assertEqual(span.error, 0)
         self.assertEqual(span.get_tag("http.method"), "GET")
@@ -491,7 +491,7 @@ def test_urllib_request_object(self):
         span = spans[0]
         self.assert_is_not_measured(span)
         self.assertEqual(span.span_type, "http")
-        self.assertIsNone(span.service)
+        self.assertEqual(span.service, "tests.contrib.httplib")
         self.assertEqual(span.name, self.SPAN_NAME)
         self.assertEqual(span.error, 0)
         self.assertEqual(span.get_tag("http.method"), "GET")
@@ -519,7 +519,7 @@ def test_urllib_request_opener(self):
         span = spans[0]
         self.assert_is_not_measured(span)
         self.assertEqual(span.span_type, "http")
-        self.assertIsNone(span.service)
+        self.assertEqual(span.service, "tests.contrib.httplib")
         self.assertEqual(span.name, self.SPAN_NAME)
         self.assertEqual(span.error, 0)
         self.assertEqual(span.get_tag("http.method"), "GET")
@@ -571,7 +571,7 @@ def test_httplib_bad_url(self):
         span = spans[0]
         self.assert_is_not_measured(span)
         self.assertEqual(span.span_type, "http")
-        self.assertIsNone(span.service)
+        self.assertEqual(span.service, "tests.contrib.httplib")
         self.assertEqual(span.name, self.SPAN_NAME)
         self.assertEqual(span.error, 1)
         self.assertEqual(span.get_tag("http.method"), "GET")
diff --git a/tests/contrib/httpx/test_httpx.py b/tests/contrib/httpx/test_httpx.py
index 8e2de98f592..43841d73f23 100644
--- a/tests/contrib/httpx/test_httpx.py
+++ b/tests/contrib/httpx/test_httpx.py
@@ -136,7 +136,7 @@ def assert_spans(test_spans, service):
 
     resp = httpx.get(url, headers=DEFAULT_HEADERS)
     assert resp.status_code == 200
-    assert_spans(test_spans, service=None)
+    assert_spans(test_spans, service="tests.contrib.httpx")
 
     resp = client.get(url, headers=DEFAULT_HEADERS)
     assert resp.status_code == 200
diff --git a/tests/contrib/httpx/test_httpx_pre_0_11.py b/tests/contrib/httpx/test_httpx_pre_0_11.py
index d5f85f9ce68..ed4a70e047d 100644
--- a/tests/contrib/httpx/test_httpx_pre_0_11.py
+++ b/tests/contrib/httpx/test_httpx_pre_0_11.py
@@ -120,7 +120,7 @@ def assert_spans(test_spans, service):
 
     resp = await httpx.get(url, headers=DEFAULT_HEADERS)
     assert resp.status_code == 200
-    assert_spans(test_spans, service=None)
+    assert_spans(test_spans, service="tests.contrib.httpx")
 
     resp = await client.get(url, headers=DEFAULT_HEADERS)
     assert resp.status_code == 200
diff --git a/tests/contrib/jinja2/test_jinja2.py b/tests/contrib/jinja2/test_jinja2.py
index 770681fd501..fe675ffd9b3 100644
--- a/tests/contrib/jinja2/test_jinja2.py
+++ b/tests/contrib/jinja2/test_jinja2.py
@@ -110,7 +110,7 @@ def test_file_template(self):
 
         for span in spans:
             assert span.span_type == "template"
-            assert span.service is None
+            assert span.service == "tests.contrib.jinja2"
 
         # templates.html extends base.html
         def get_def(s):
diff --git a/tests/contrib/langchain/test_langchain_community.py b/tests/contrib/langchain/test_langchain_community.py
index 6a95b08027d..739d33852bc 100644
--- a/tests/contrib/langchain/test_langchain_community.py
+++ b/tests/contrib/langchain/test_langchain_community.py
@@ -157,7 +157,7 @@ def test_openai_llm_metrics(
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.langchain",
         "langchain.request.provider:openai",
         "langchain.request.model:gpt-3.5-turbo-instruct",
         "langchain.request.type:llm",
@@ -309,7 +309,7 @@ def test_chat_model_metrics(
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.langchain",
         "langchain.request.provider:openai",
         "langchain.request.model:gpt-3.5-turbo",
         "langchain.request.type:chat_model",
@@ -414,7 +414,7 @@ def test_openai_embedding_metrics(langchain_openai, request_vcr, mock_metrics, m
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.langchain",
         "langchain.request.provider:openai",
         "langchain.request.model:text-embedding-ada-002",
         "langchain.request.type:embedding",
@@ -823,7 +823,7 @@ def test_vectorstore_similarity_search_metrics(langchain_openai, request_vcr, mo
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.langchain",
         "langchain.request.provider:pineconevectorstore",
         "langchain.request.model:",
         "langchain.request.type:similarity_search",
diff --git a/tests/contrib/openai/test_openai_v0.py b/tests/contrib/openai/test_openai_v0.py
index 1bbb8400179..c3e5127f4a4 100644
--- a/tests/contrib/openai/test_openai_v0.py
+++ b/tests/contrib/openai/test_openai_v0.py
@@ -149,7 +149,7 @@ def test_completion(
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.openai",
         "openai.request.model:ada",
         "model:ada",
         "openai.request.endpoint:/v1/completions",
@@ -219,7 +219,7 @@ async def test_acompletion(
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.openai",
         "openai.request.model:curie",
         "model:curie",
         "openai.request.endpoint:/v1/completions",
@@ -1286,7 +1286,7 @@ def test_completion_stream(openai, openai_vcr, mock_metrics, mock_tracer):
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.openai",
         "openai.request.model:ada",
         "model:ada",
         "openai.request.endpoint:/v1/completions",
@@ -1327,7 +1327,7 @@ async def test_completion_async_stream(openai, openai_vcr, mock_metrics, mock_tr
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.openai",
         "openai.request.model:ada",
         "model:ada",
         "openai.request.endpoint:/v1/completions",
@@ -1375,7 +1375,7 @@ def test_chat_completion_stream(openai, openai_vcr, mock_metrics, snapshot_trace
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.openai",
         "openai.request.model:gpt-3.5-turbo",
         "model:gpt-3.5-turbo",
         "openai.request.endpoint:/v1/chat/completions",
@@ -1426,7 +1426,7 @@ async def test_chat_completion_async_stream(openai, openai_vcr, mock_metrics, sn
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.openai",
         "openai.request.model:gpt-3.5-turbo",
         "model:gpt-3.5-turbo",
         "openai.request.endpoint:/v1/chat/completions",
diff --git a/tests/contrib/openai/test_openai_v1.py b/tests/contrib/openai/test_openai_v1.py
index c6598e4d9e5..2972ed64114 100644
--- a/tests/contrib/openai/test_openai_v1.py
+++ b/tests/contrib/openai/test_openai_v1.py
@@ -166,7 +166,7 @@ def test_completion(
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.openai",
         "openai.request.model:ada",
         "model:ada",
         "openai.request.endpoint:/v1/completions",
@@ -236,7 +236,7 @@ async def test_acompletion(
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.openai",
         "openai.request.model:curie",
         "model:curie",
         "openai.request.endpoint:/v1/completions",
@@ -942,7 +942,7 @@ def test_completion_stream(openai, openai_vcr, mock_metrics, mock_tracer):
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.openai",
         "openai.request.model:ada",
         "model:ada",
         "openai.request.endpoint:/v1/completions",
@@ -981,7 +981,7 @@ async def test_completion_async_stream(openai, openai_vcr, mock_metrics, mock_tr
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.openai",
         "openai.request.model:ada",
         "model:ada",
         "openai.request.endpoint:/v1/completions",
@@ -1024,7 +1024,7 @@ def test_completion_stream_context_manager(openai, openai_vcr, mock_metrics, moc
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.openai",
         "openai.request.model:ada",
         "model:ada",
         "openai.request.endpoint:/v1/completions",
@@ -1071,7 +1071,7 @@ def test_chat_completion_stream(openai, openai_vcr, mock_metrics, snapshot_trace
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.openai",
         "openai.request.model:gpt-3.5-turbo",
         "model:gpt-3.5-turbo",
         "openai.request.endpoint:/v1/chat/completions",
@@ -1120,7 +1120,7 @@ async def test_chat_completion_async_stream(openai, openai_vcr, mock_metrics, sn
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.openai",
         "openai.request.model:gpt-3.5-turbo",
         "model:gpt-3.5-turbo",
         "openai.request.endpoint:/v1/chat/completions",
@@ -1170,7 +1170,7 @@ def test_chat_completion_stream_tokens(openai, openai_vcr, mock_metrics, snapsho
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.openai",
         "openai.request.model:gpt-3.5-turbo",
         "model:gpt-3.5-turbo",
         "openai.request.endpoint:/v1/chat/completions",
@@ -1223,7 +1223,7 @@ async def test_chat_completion_async_stream_context_manager(openai, openai_vcr,
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.openai",
         "openai.request.model:gpt-3.5-turbo",
         "model:gpt-3.5-turbo",
         "openai.request.endpoint:/v1/chat/completions",
diff --git a/tests/internal/remoteconfig/test_remoteconfig_client_e2e.py b/tests/internal/remoteconfig/test_remoteconfig_client_e2e.py
index 0ac532c100b..20bb2d8fba0 100644
--- a/tests/internal/remoteconfig/test_remoteconfig_client_e2e.py
+++ b/tests/internal/remoteconfig/test_remoteconfig_client_e2e.py
@@ -41,7 +41,7 @@ def _expected_payload(
                 "runtime_id": runtime.get_runtime_id(),
                 "language": "python",
                 "tracer_version": _pep440_to_semver(),
-                "service": 'tests.internal',
+                "service": "tests.internal",
                 "extra_services": [],
                 "env": None,
                 "app_version": None,
diff --git a/tests/llmobs/_utils.py b/tests/llmobs/_utils.py
index 91403a421df..d39e69808fb 100644
--- a/tests/llmobs/_utils.py
+++ b/tests/llmobs/_utils.py
@@ -178,13 +178,7 @@ def _expected_llmobs_non_llm_span_event(
 
 
 def _llmobs_base_span_event(
-    span,
-    span_kind,
-    tags=None,
-    session_id=None,
-    error=None,
-    error_message=None,
-    error_stack=None,
+    span, span_kind, tags=None, session_id=None, error=None, error_message=None, error_stack=None
 ):
     span_event = {
         "trace_id": "{:x}".format(span.trace_id),
diff --git a/tests/llmobs/test_llmobs_trace_processor.py b/tests/llmobs/test_llmobs_trace_processor.py
index bfbb17cdd52..e816cd1742a 100644
--- a/tests/llmobs/test_llmobs_trace_processor.py
+++ b/tests/llmobs/test_llmobs_trace_processor.py
@@ -71,7 +71,9 @@ def test_processor_creates_llmobs_span_event():
         trace = [root_llm_span]
         trace_filter.process_trace(trace)
     assert mock_llmobs_span_writer.enqueue.call_count == 1
-    mock_llmobs_span_writer.assert_has_calls([mock.call.enqueue(_expected_llmobs_llm_span_event(root_llm_span, "llm"))])
+    mock_llmobs_span_writer.assert_has_calls(
+        [mock.call.enqueue(_expected_llmobs_llm_span_event(root_llm_span, "llm", tags={"service": ""}))]
+    )
 
 
 def test_processor_only_creates_llmobs_span_event():
diff --git a/tests/snapshots/test_extended_sampling_float_special_case_do_not_match.json b/tests/snapshots/test_extended_sampling_float_special_case_do_not_match.json
index 8fe12f17645..3cd67abe1cc 100644
--- a/tests/snapshots/test_extended_sampling_float_special_case_do_not_match.json
+++ b/tests/snapshots/test_extended_sampling_float_special_case_do_not_match.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "should_send",
-    "service": "",
+    "service": "tests.integration",
     "resource": "should_send",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/test_extended_sampling_float_special_case_match_star.json b/tests/snapshots/test_extended_sampling_float_special_case_match_star.json
index 3e39035636d..e619d6b013f 100644
--- a/tests/snapshots/test_extended_sampling_float_special_case_match_star.json
+++ b/tests/snapshots/test_extended_sampling_float_special_case_match_star.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "should_send",
-    "service": "",
+    "service": "tests.integration",
     "resource": "should_send",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/test_extended_sampling_glob_multi_rule.json b/tests/snapshots/test_extended_sampling_glob_multi_rule.json
index 0535ab93778..36dbf58ae54 100644
--- a/tests/snapshots/test_extended_sampling_glob_multi_rule.json
+++ b/tests/snapshots/test_extended_sampling_glob_multi_rule.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-3",
       "_dd.p.tid": "65cd344600000000",
       "language": "python",
diff --git a/tests/snapshots/test_extended_sampling_resource.json b/tests/snapshots/test_extended_sampling_resource.json
index f3f8f9b5014..d0f1034dda2 100644
--- a/tests/snapshots/test_extended_sampling_resource.json
+++ b/tests/snapshots/test_extended_sampling_resource.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "should_not_send",
-    "service": "",
+    "service": "tests.integration",
     "resource": "mycoolre$ource",
     "trace_id": 0,
     "span_id": 1,
@@ -26,7 +26,7 @@
 [
   {
     "name": "should_send",
-    "service": "",
+    "service": "tests.integration",
     "resource": "something else",
     "trace_id": 1,
     "span_id": 1,
diff --git a/tests/snapshots/test_extended_sampling_tags.json b/tests/snapshots/test_extended_sampling_tags.json
index 4e6ad4e6840..da960c62d23 100644
--- a/tests/snapshots/test_extended_sampling_tags.json
+++ b/tests/snapshots/test_extended_sampling_tags.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "should_not_send",
-    "service": "",
+    "service": "tests.integration",
     "resource": "should_not_send",
     "trace_id": 0,
     "span_id": 1,
@@ -27,7 +27,7 @@
 [
   {
     "name": "should_send",
-    "service": "",
+    "service": "tests.integration",
     "resource": "should_send",
     "trace_id": 1,
     "span_id": 1,
diff --git a/tests/snapshots/test_extended_sampling_tags_and_name_glob.json b/tests/snapshots/test_extended_sampling_tags_and_name_glob.json
index 290c22b972a..611407e3a38 100644
--- a/tests/snapshots/test_extended_sampling_tags_and_name_glob.json
+++ b/tests/snapshots/test_extended_sampling_tags_and_name_glob.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "mycoolname",
-    "service": "",
+    "service": "tests.integration",
     "resource": "mycoolname",
     "trace_id": 0,
     "span_id": 1,
@@ -27,7 +27,7 @@
 [
   {
     "name": "should_send1",
-    "service": "",
+    "service": "tests.integration",
     "resource": "should_send1",
     "trace_id": 1,
     "span_id": 1,
@@ -53,7 +53,7 @@
 [
   {
     "name": "should_send2",
-    "service": "",
+    "service": "tests.integration",
     "resource": "banana",
     "trace_id": 2,
     "span_id": 1,
@@ -79,7 +79,7 @@
 [
   {
     "name": "mycoolname",
-    "service": "",
+    "service": "tests.integration",
     "resource": "mycoolname",
     "trace_id": 3,
     "span_id": 1,
diff --git a/tests/snapshots/test_extended_sampling_tags_and_resource.json b/tests/snapshots/test_extended_sampling_tags_and_resource.json
index 55e7e74bce4..252d257da44 100644
--- a/tests/snapshots/test_extended_sampling_tags_and_resource.json
+++ b/tests/snapshots/test_extended_sampling_tags_and_resource.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "should_not_send",
-    "service": "",
+    "service": "tests.integration",
     "resource": "mycoolre$ource",
     "trace_id": 0,
     "span_id": 1,
@@ -27,7 +27,7 @@
 [
   {
     "name": "should_send1",
-    "service": "",
+    "service": "tests.integration",
     "resource": "should_send1",
     "trace_id": 1,
     "span_id": 1,
@@ -52,7 +52,7 @@
 [
   {
     "name": "should_send2",
-    "service": "",
+    "service": "tests.integration",
     "resource": "banana",
     "trace_id": 2,
     "span_id": 1,
@@ -77,7 +77,7 @@
 [
   {
     "name": "should_send3",
-    "service": "",
+    "service": "tests.integration",
     "resource": "mycoolre$ource",
     "trace_id": 3,
     "span_id": 1,
diff --git a/tests/snapshots/test_extended_sampling_tags_and_resource_glob.json b/tests/snapshots/test_extended_sampling_tags_and_resource_glob.json
index a5d4bfec689..552a68dc586 100644
--- a/tests/snapshots/test_extended_sampling_tags_and_resource_glob.json
+++ b/tests/snapshots/test_extended_sampling_tags_and_resource_glob.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "should_send3",
-    "service": "",
+    "service": "tests.integration",
     "resource": "mycoolre$ource",
     "trace_id": 0,
     "span_id": 1,
@@ -27,7 +27,7 @@
 [
   {
     "name": "should_send1",
-    "service": "",
+    "service": "tests.integration",
     "resource": "should_send1",
     "trace_id": 1,
     "span_id": 1,
@@ -53,7 +53,7 @@
 [
   {
     "name": "should_send2",
-    "service": "",
+    "service": "tests.integration",
     "resource": "banana",
     "trace_id": 2,
     "span_id": 1,
@@ -79,7 +79,7 @@
 [
   {
     "name": "should_not_send",
-    "service": "",
+    "service": "tests.integration",
     "resource": "mycoolre$ource",
     "trace_id": 3,
     "span_id": 1,
diff --git a/tests/snapshots/test_extended_sampling_tags_and_service_glob.json b/tests/snapshots/test_extended_sampling_tags_and_service_glob.json
index f5441f9f7f5..c8d2ed839f5 100644
--- a/tests/snapshots/test_extended_sampling_tags_and_service_glob.json
+++ b/tests/snapshots/test_extended_sampling_tags_and_service_glob.json
@@ -9,7 +9,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "65cbae1700000000",
       "banana": "True",
@@ -28,7 +28,7 @@
 [
   {
     "name": "should_send1",
-    "service": "",
+    "service": "tests.integration",
     "resource": "should_send1",
     "trace_id": 1,
     "span_id": 1,
@@ -54,7 +54,7 @@
 [
   {
     "name": "should_send2",
-    "service": "",
+    "service": "tests.integration",
     "resource": "banana",
     "trace_id": 2,
     "span_id": 1,
@@ -88,7 +88,7 @@
     "type": "",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.integration",
       "_dd.p.dm": "-3",
       "_dd.p.tid": "65cbae1700000000",
       "language": "python",
diff --git a/tests/snapshots/test_extended_sampling_tags_glob.json b/tests/snapshots/test_extended_sampling_tags_glob.json
index 67c282c5c64..294a062b219 100644
--- a/tests/snapshots/test_extended_sampling_tags_glob.json
+++ b/tests/snapshots/test_extended_sampling_tags_glob.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "should_not_send",
-    "service": "",
+    "service": "tests.integration",
     "resource": "should_not_send",
     "trace_id": 0,
     "span_id": 1,
@@ -27,7 +27,7 @@
 [
   {
     "name": "should_send",
-    "service": "",
+    "service": "tests.integration",
     "resource": "should_send",
     "trace_id": 1,
     "span_id": 1,
diff --git a/tests/snapshots/test_extended_sampling_tags_glob_insensitive_case_match.json b/tests/snapshots/test_extended_sampling_tags_glob_insensitive_case_match.json
index e7218ad60df..fe2d1d2e6af 100644
--- a/tests/snapshots/test_extended_sampling_tags_glob_insensitive_case_match.json
+++ b/tests/snapshots/test_extended_sampling_tags_glob_insensitive_case_match.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "should_not_send",
-    "service": "",
+    "service": "tests.integration",
     "resource": "bananA",
     "trace_id": 0,
     "span_id": 1,
@@ -28,7 +28,7 @@
 [
   {
     "name": "should_send2",
-    "service": "",
+    "service": "tests.integration",
     "resource": "ban",
     "trace_id": 1,
     "span_id": 1,
diff --git a/tests/snapshots/test_extended_sampling_w_None.json b/tests/snapshots/test_extended_sampling_w_None.json
index 8850a8d8109..edc5670410f 100644
--- a/tests/snapshots/test_extended_sampling_w_None.json
+++ b/tests/snapshots/test_extended_sampling_w_None.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "should_send1",
-    "service": "",
+    "service": "tests.integration",
     "resource": "banana",
     "trace_id": 0,
     "span_id": 1,
@@ -27,7 +27,7 @@
 [
   {
     "name": "should_not_send2",
-    "service": "",
+    "service": "tests.integration",
     "resource": "mycoolre$ource",
     "trace_id": 1,
     "span_id": 1,
@@ -54,7 +54,7 @@
 [
   {
     "name": "should_not_send",
-    "service": "",
+    "service": "tests.integration",
     "resource": "mycoolre$ource",
     "trace_id": 2,
     "span_id": 1,
diff --git a/tests/snapshots/test_extended_sampling_w_None_meta.json b/tests/snapshots/test_extended_sampling_w_None_meta.json
index de6c8a198f7..d4aa1e6b7fe 100644
--- a/tests/snapshots/test_extended_sampling_w_None_meta.json
+++ b/tests/snapshots/test_extended_sampling_w_None_meta.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "should_send1",
-    "service": "",
+    "service": "tests.integration",
     "resource": "banana",
     "trace_id": 0,
     "span_id": 1,
@@ -27,7 +27,7 @@
 [
   {
     "name": "should_not_send2",
-    "service": "",
+    "service": "tests.integration",
     "resource": "mycoolre$ource",
     "trace_id": 1,
     "span_id": 1,
@@ -54,7 +54,7 @@
 [
   {
     "name": "should_not_send",
-    "service": "",
+    "service": "tests.integration",
     "resource": "mycoolre$ource",
     "trace_id": 2,
     "span_id": 1,
diff --git a/tests/snapshots/test_extended_sampling_w_metrics.json b/tests/snapshots/test_extended_sampling_w_metrics.json
index ae6400d044f..9b8d7e07080 100644
--- a/tests/snapshots/test_extended_sampling_w_metrics.json
+++ b/tests/snapshots/test_extended_sampling_w_metrics.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "should_send1",
-    "service": "",
+    "service": "tests.integration",
     "resource": "banana",
     "trace_id": 0,
     "span_id": 1,
@@ -27,7 +27,7 @@
 [
   {
     "name": "should_not_send2",
-    "service": "",
+    "service": "tests.integration",
     "resource": "mycoolre$ource",
     "trace_id": 1,
     "span_id": 1,
@@ -54,7 +54,7 @@
 [
   {
     "name": "should_not_send",
-    "service": "",
+    "service": "tests.integration",
     "resource": "mycoolre$ource",
     "trace_id": 2,
     "span_id": 1,
diff --git a/tests/snapshots/test_extended_sampling_w_tags_none.json b/tests/snapshots/test_extended_sampling_w_tags_none.json
index d54834c1a2d..83f7d909f6a 100644
--- a/tests/snapshots/test_extended_sampling_w_tags_none.json
+++ b/tests/snapshots/test_extended_sampling_w_tags_none.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "should_send1",
-    "service": "",
+    "service": "tests.integration",
     "resource": "banana",
     "trace_id": 0,
     "span_id": 1,
@@ -27,7 +27,7 @@
 [
   {
     "name": "should_not_send2",
-    "service": "",
+    "service": "tests.integration",
     "resource": "mycoolre$ource",
     "trace_id": 1,
     "span_id": 1,
@@ -54,7 +54,7 @@
 [
   {
     "name": "should_not_send",
-    "service": "",
+    "service": "tests.integration",
     "resource": "mycoolre$ource",
     "trace_id": 2,
     "span_id": 1,
diff --git a/tests/snapshots/test_sampling_with_default_sample_rate_1.json b/tests/snapshots/test_sampling_with_default_sample_rate_1.json
index e9ec59dbab2..547a4ca82b2 100644
--- a/tests/snapshots/test_sampling_with_default_sample_rate_1.json
+++ b/tests/snapshots/test_sampling_with_default_sample_rate_1.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "trace2",
-    "service": "",
+    "service": "tests.integration",
     "resource": "trace2",
     "trace_id": 0,
     "span_id": 1,
@@ -26,7 +26,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/test_sampling_with_default_sample_rate_1_and_manual_drop.json b/tests/snapshots/test_sampling_with_default_sample_rate_1_and_manual_drop.json
index e26c5210293..60276609bef 100644
--- a/tests/snapshots/test_sampling_with_default_sample_rate_1_and_manual_drop.json
+++ b/tests/snapshots/test_sampling_with_default_sample_rate_1_and_manual_drop.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "trace6",
-    "service": "",
+    "service": "tests.integration",
     "resource": "trace6",
     "trace_id": 0,
     "span_id": 1,
@@ -24,7 +24,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/test_sampling_with_default_sample_rate_1_and_manual_keep.json b/tests/snapshots/test_sampling_with_default_sample_rate_1_and_manual_keep.json
index 043684a6765..66964f19158 100644
--- a/tests/snapshots/test_sampling_with_default_sample_rate_1_and_manual_keep.json
+++ b/tests/snapshots/test_sampling_with_default_sample_rate_1_and_manual_keep.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "trace7",
-    "service": "",
+    "service": "tests.integration",
     "resource": "trace7",
     "trace_id": 0,
     "span_id": 1,
@@ -24,7 +24,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/test_sampling_with_default_sample_rate_1_and_rule_0.json b/tests/snapshots/test_sampling_with_default_sample_rate_1_and_rule_0.json
index 88bbaef249d..dc692652c17 100644
--- a/tests/snapshots/test_sampling_with_default_sample_rate_1_and_rule_0.json
+++ b/tests/snapshots/test_sampling_with_default_sample_rate_1_and_rule_0.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "trace5",
-    "service": "",
+    "service": "tests.integration",
     "resource": "trace5",
     "trace_id": 0,
     "span_id": 1,
@@ -25,7 +25,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/test_sampling_with_default_sample_rate_1_and_rule_1.json b/tests/snapshots/test_sampling_with_default_sample_rate_1_and_rule_1.json
index 6674e845323..1236c727cd1 100644
--- a/tests/snapshots/test_sampling_with_default_sample_rate_1_and_rule_1.json
+++ b/tests/snapshots/test_sampling_with_default_sample_rate_1_and_rule_1.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "trace4",
-    "service": "",
+    "service": "tests.integration",
     "resource": "trace4",
     "trace_id": 0,
     "span_id": 1,
@@ -26,7 +26,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/test_sampling_with_default_sample_rate_tiny.json b/tests/snapshots/test_sampling_with_default_sample_rate_tiny.json
index 15b5649d93a..60298f1a984 100644
--- a/tests/snapshots/test_sampling_with_default_sample_rate_tiny.json
+++ b/tests/snapshots/test_sampling_with_default_sample_rate_tiny.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "trace3",
-    "service": "",
+    "service": "tests.integration",
     "resource": "trace3",
     "trace_id": 0,
     "span_id": 1,
@@ -25,7 +25,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/test_sampling_with_defaults.json b/tests/snapshots/test_sampling_with_defaults.json
index 192453b70ba..ecb2e299e76 100644
--- a/tests/snapshots/test_sampling_with_defaults.json
+++ b/tests/snapshots/test_sampling_with_defaults.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "trace1",
-    "service": "",
+    "service": "tests.integration",
     "resource": "trace1",
     "trace_id": 0,
     "span_id": 1,
@@ -24,7 +24,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/test_sampling_with_rate_limit_3.json b/tests/snapshots/test_sampling_with_rate_limit_3.json
index 267c8e68033..135ef02a789 100644
--- a/tests/snapshots/test_sampling_with_rate_limit_3.json
+++ b/tests/snapshots/test_sampling_with_rate_limit_3.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "trace5",
-    "service": "",
+    "service": "tests.integration",
     "resource": "trace5",
     "trace_id": 0,
     "span_id": 1,
@@ -24,7 +24,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/test_sampling_with_rate_sampler_with_tiny_rate.json b/tests/snapshots/test_sampling_with_rate_sampler_with_tiny_rate.json
index 6c9aa52bfa9..41c55f34c1b 100644
--- a/tests/snapshots/test_sampling_with_rate_sampler_with_tiny_rate.json
+++ b/tests/snapshots/test_sampling_with_rate_sampler_with_tiny_rate.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "trace8",
-    "service": "",
+    "service": "tests.integration",
     "resource": "trace8",
     "trace_id": 0,
     "span_id": 1,
@@ -23,7 +23,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/test_sampling_with_sample_rate_1_and_rate_limit_0.json b/tests/snapshots/test_sampling_with_sample_rate_1_and_rate_limit_0.json
index fc6535969a8..d93076528ee 100644
--- a/tests/snapshots/test_sampling_with_sample_rate_1_and_rate_limit_0.json
+++ b/tests/snapshots/test_sampling_with_sample_rate_1_and_rate_limit_0.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "trace5",
-    "service": "",
+    "service": "tests.integration",
     "resource": "trace5",
     "trace_id": 0,
     "span_id": 1,
@@ -26,7 +26,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/test_sampling_with_sample_rate_1_and_rate_limit_3_and_rule_0.json b/tests/snapshots/test_sampling_with_sample_rate_1_and_rate_limit_3_and_rule_0.json
index d8986904cf1..a445d6f10b5 100644
--- a/tests/snapshots/test_sampling_with_sample_rate_1_and_rate_limit_3_and_rule_0.json
+++ b/tests/snapshots/test_sampling_with_sample_rate_1_and_rate_limit_3_and_rule_0.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "trace5",
-    "service": "",
+    "service": "tests.integration",
     "resource": "trace5",
     "trace_id": 0,
     "span_id": 1,
@@ -25,7 +25,7 @@
   },
      {
        "name": "child",
-       "service": "",
+       "service": "tests.integration",
        "resource": "child",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/tests.appsec.appsec.test_processor.test_appsec_body_no_collection_snapshot.json b/tests/snapshots/tests.appsec.appsec.test_processor.test_appsec_body_no_collection_snapshot.json
index 0fcdb60d1e3..7910618da6f 100644
--- a/tests/snapshots/tests.appsec.appsec.test_processor.test_appsec_body_no_collection_snapshot.json
+++ b/tests/snapshots/tests.appsec.appsec.test_processor.test_appsec_body_no_collection_snapshot.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "test",
-    "service": null,
+    "service": "tests.appsec.appsec",
     "resource": "test",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.appsec.appsec.test_processor.test_appsec_cookies_no_collection_snapshot.json b/tests/snapshots/tests.appsec.appsec.test_processor.test_appsec_cookies_no_collection_snapshot.json
index 28175b2530a..ca97ab0281e 100644
--- a/tests/snapshots/tests.appsec.appsec.test_processor.test_appsec_cookies_no_collection_snapshot.json
+++ b/tests/snapshots/tests.appsec.appsec.test_processor.test_appsec_cookies_no_collection_snapshot.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "test",
-    "service": null,
+    "service": "tests.appsec.appsec",
     "resource": "test",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.aiohttp_jinja2.test_aiohttp_jinja2.test_template_rendering_snapshot.json b/tests/snapshots/tests.contrib.aiohttp_jinja2.test_aiohttp_jinja2.test_template_rendering_snapshot.json
index 50db03ecf9f..8af91b31f48 100644
--- a/tests/snapshots/tests.contrib.aiohttp_jinja2.test_aiohttp_jinja2.test_template_rendering_snapshot.json
+++ b/tests/snapshots/tests.contrib.aiohttp_jinja2.test_aiohttp_jinja2.test_template_rendering_snapshot.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "aiohttp.template",
-    "service": "",
+    "service": "tests.contrib.aiohttp_jinja2",
     "resource": "aiohttp.template",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.aiohttp_jinja2.test_aiohttp_jinja2.test_template_rendering_snapshot[pyloop].json b/tests/snapshots/tests.contrib.aiohttp_jinja2.test_aiohttp_jinja2.test_template_rendering_snapshot[pyloop].json
index 64319e8422e..9b8a03252ff 100644
--- a/tests/snapshots/tests.contrib.aiohttp_jinja2.test_aiohttp_jinja2.test_template_rendering_snapshot[pyloop].json
+++ b/tests/snapshots/tests.contrib.aiohttp_jinja2.test_aiohttp_jinja2.test_template_rendering_snapshot[pyloop].json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "aiohttp.template",
-    "service": "",
+    "service": "tests.contrib.aiohttp_jinja2",
     "resource": "aiohttp.template",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_djangoq_dd_trace_methods.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_djangoq_dd_trace_methods.json
index e71b2825d07..5573087ddff 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_djangoq_dd_trace_methods.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_djangoq_dd_trace_methods.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "65d4d02000000000",
       "asgi.version": "3.0",
@@ -48,7 +48,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "component": "django"
        },
        "duration": 2079917,
@@ -64,7 +64,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "component": "django"
           },
           "duration": 24625,
@@ -80,7 +80,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "component": "django"
           },
           "duration": 1929375,
@@ -96,7 +96,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "component": "django"
              },
              "duration": 25250,
@@ -112,7 +112,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "component": "django"
              },
              "duration": 1804584,
@@ -128,7 +128,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "component": "django"
                 },
                 "duration": 14583,
@@ -144,7 +144,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "component": "django"
                 },
                 "duration": 1697792,
@@ -160,7 +160,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "component": "django"
                    },
                    "duration": 14667,
@@ -176,7 +176,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "component": "django"
                    },
                    "duration": 1626792,
@@ -192,7 +192,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "component": "django"
                       },
                       "duration": 32833,
@@ -208,7 +208,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "component": "django"
                       },
                       "duration": 1495291,
@@ -224,7 +224,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "component": "django"
                          },
                          "duration": 1418083,
@@ -240,7 +240,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "component": "django"
                             },
                             "duration": 12208,
@@ -256,7 +256,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "component": "django"
                             },
                             "duration": 1290417,
@@ -272,7 +272,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "tests.contrib.django",
+                                 "_dd.base_service": "",
                                  "component": "django"
                                },
                                "duration": 1254209,
@@ -288,7 +288,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "tests.contrib.django",
+                                    "_dd.base_service": "",
                                     "component": "django"
                                   },
                                   "duration": 1211291,
@@ -304,7 +304,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "component": "django"
                                      },
                                      "duration": 25584,
@@ -320,7 +320,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "component": "django"
                                      },
                                      "duration": 21625,
@@ -336,7 +336,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "component": "django"
                                      },
                                      "duration": 167208,
@@ -352,7 +352,7 @@
                                         "type": "",
                                         "error": 0,
                                         "meta": {
-                                          "_dd.base_service": "tests.contrib.django",
+                                          "_dd.base_service": "",
                                           "component": "django"
                                         },
                                         "duration": 18083,
@@ -368,7 +368,7 @@
                                         "type": "",
                                         "error": 0,
                                         "meta": {
-                                          "_dd.base_service": "tests.contrib.django",
+                                          "_dd.base_service": "",
                                           "component": "django"
                                         },
                                         "duration": 76709,
@@ -384,7 +384,7 @@
                                            "type": "",
                                            "error": 0,
                                            "meta": {
-                                             "_dd.base_service": "tests.contrib.django",
+                                             "_dd.base_service": "",
                                              "component": "django"
                                            },
                                            "duration": 34166,
@@ -400,7 +400,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "component": "django"
                             },
                             "duration": 27042,
@@ -416,7 +416,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "component": "django"
                          },
                          "duration": 18084,
@@ -432,7 +432,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "component": "django"
                       },
                       "duration": 14708,
@@ -448,7 +448,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "component": "django"
                 },
                 "duration": 12334,
@@ -464,7 +464,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "component": "django"
              },
              "duration": 16834,
@@ -480,7 +480,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "component": "django"
           },
           "duration": 29750,
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403[flask_appsec_good_rules_env].json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403[flask_appsec_good_rules_env].json
index 92df6ded21b..28cc19763ff 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403[flask_appsec_good_rules_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403[flask_appsec_good_rules_env].json
@@ -12,7 +12,7 @@
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.json": "{\"triggers\":[\n  {\n    \"rule\": {\n      \"id\": \"blk-001-001\",\n      \"name\": \"Block IP addresses\",\n      \"on_match\": [\n        \"block\"\n      ],\n      \"tags\": {\n        \"category\": \"blocking\",\n        \"type\": \"ip_addresses\"\n      }\n    },\n    \"rule_matches\": [\n      {\n        \"operator\": \"ip_match\",\n        \"operator_value\": \"\",\n        \"parameters\": [\n          {\n            \"address\": \"http.client_ip\",\n            \"highlight\": [\n              \"8.8.4.4\"\n            ],\n            \"key_path\": [],\n            \"value\": \"8.8.4.4\"\n          }\n        ]\n      }\n    ]\n  }\n]}",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.origin": "appsec",
       "_dd.p.appsec": "1",
       "_dd.p.dm": "-5",
@@ -59,7 +59,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403[flask_appsec_good_rules_env]_220.json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403[flask_appsec_good_rules_env]_220.json
index e35bc2daf09..cb9c1ce72de 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403[flask_appsec_good_rules_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403[flask_appsec_good_rules_env]_220.json
@@ -12,7 +12,7 @@
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.json": "{\"triggers\":[\n  {\n    \"rule\": {\n      \"id\": \"blk-001-001\",\n      \"name\": \"Block IP addresses\",\n      \"on_match\": [\n        \"block\"\n      ],\n      \"tags\": {\n        \"category\": \"blocking\",\n        \"type\": \"ip_addresses\"\n      }\n    },\n    \"rule_matches\": [\n      {\n        \"operator\": \"ip_match\",\n        \"operator_value\": \"\",\n        \"parameters\": [\n          {\n            \"address\": \"http.client_ip\",\n            \"highlight\": [\n              \"8.8.4.4\"\n            ],\n            \"key_path\": [],\n            \"value\": \"8.8.4.4\"\n          }\n        ]\n      }\n    ]\n  }\n]}",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.origin": "appsec",
       "_dd.p.appsec": "1",
       "_dd.p.dm": "-5",
@@ -59,7 +59,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403_json[flask_appsec_good_rules_env].json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403_json[flask_appsec_good_rules_env].json
index 700d10dbad3..7dbeab81e7a 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403_json[flask_appsec_good_rules_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403_json[flask_appsec_good_rules_env].json
@@ -12,7 +12,7 @@
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.json": "{\"triggers\":[\n  {\n    \"rule\": {\n      \"id\": \"blk-001-001\",\n      \"name\": \"Block IP addresses\",\n      \"on_match\": [\n        \"block\"\n      ],\n      \"tags\": {\n        \"category\": \"blocking\",\n        \"type\": \"ip_addresses\"\n      }\n    },\n    \"rule_matches\": [\n      {\n        \"operator\": \"ip_match\",\n        \"operator_value\": \"\",\n        \"parameters\": [\n          {\n            \"address\": \"http.client_ip\",\n            \"highlight\": [\n              \"8.8.4.4\"\n            ],\n            \"key_path\": [],\n            \"value\": \"8.8.4.4\"\n          }\n        ]\n      }\n    ]\n  }\n]}",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.origin": "appsec",
       "_dd.p.appsec": "1",
       "_dd.p.dm": "-5",
@@ -59,7 +59,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403_json[flask_appsec_good_rules_env]_220.json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403_json[flask_appsec_good_rules_env]_220.json
index 35da84cd59f..eb86dfdf683 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403_json[flask_appsec_good_rules_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_ipblock_match_403_json[flask_appsec_good_rules_env]_220.json
@@ -12,7 +12,7 @@
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.json": "{\"triggers\":[\n  {\n    \"rule\": {\n      \"id\": \"blk-001-001\",\n      \"name\": \"Block IP addresses\",\n      \"on_match\": [\n        \"block\"\n      ],\n      \"tags\": {\n        \"category\": \"blocking\",\n        \"type\": \"ip_addresses\"\n      }\n    },\n    \"rule_matches\": [\n      {\n        \"operator\": \"ip_match\",\n        \"operator_value\": \"\",\n        \"parameters\": [\n          {\n            \"address\": \"http.client_ip\",\n            \"highlight\": [\n              \"8.8.4.4\"\n            ],\n            \"key_path\": [],\n            \"value\": \"8.8.4.4\"\n          }\n        ]\n      }\n    ]\n  }\n]}",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.origin": "appsec",
       "_dd.p.appsec": "1",
       "_dd.p.dm": "-5",
@@ -59,7 +59,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_osspawn[flask_appsec_good_rules_env].json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_osspawn[flask_appsec_good_rules_env].json
index 2b05a92f606..94d43de577b 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_osspawn[flask_appsec_good_rules_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_osspawn[flask_appsec_good_rules_env].json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -57,7 +57,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "run_osspawn",
@@ -76,7 +76,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -93,7 +93,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -110,7 +110,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -127,7 +127,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.flask",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -144,7 +144,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.flask",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exec": "['/bin/ls', '-l', '/']",
                   "cmd.exit_code": "0",
@@ -163,7 +163,7 @@
                    "type": "system",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.flask",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "cmd.exec": "['os.fork']",
                      "component": "os"
@@ -181,7 +181,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -198,7 +198,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -215,7 +215,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -232,7 +232,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_osspawn[flask_appsec_good_rules_env]_220.json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_osspawn[flask_appsec_good_rules_env]_220.json
index 0b00faf3bc8..481dab6544d 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_osspawn[flask_appsec_good_rules_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_osspawn[flask_appsec_good_rules_env]_220.json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -57,7 +57,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "run_osspawn",
@@ -76,7 +76,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -93,7 +93,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -110,7 +110,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.flask",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -127,7 +127,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.flask",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exec": "['/bin/ls', '-l', '/']",
                   "cmd.exit_code": "0",
@@ -146,7 +146,7 @@
                    "type": "system",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.flask",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "cmd.exec": "['os.fork']",
                      "component": "os"
@@ -164,7 +164,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -181,7 +181,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -198,7 +198,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -215,7 +215,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_ossystem[flask_appsec_good_rules_env].json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_ossystem[flask_appsec_good_rules_env].json
index 19733e736c2..f0d79286696 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_ossystem[flask_appsec_good_rules_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_ossystem[flask_appsec_good_rules_env].json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -57,7 +57,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "run_ossystem",
@@ -76,7 +76,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -93,7 +93,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -110,7 +110,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -127,7 +127,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.flask",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -144,7 +144,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.flask",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exit_code": "0",
                   "cmd.shell": "dir -li /",
@@ -163,7 +163,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -180,7 +180,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -197,7 +197,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -214,7 +214,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_ossystem[flask_appsec_good_rules_env]_220.json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_ossystem[flask_appsec_good_rules_env]_220.json
index a0aafddd68a..3ea6ae304d8 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_ossystem[flask_appsec_good_rules_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_ossystem[flask_appsec_good_rules_env]_220.json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -57,7 +57,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "run_ossystem",
@@ -76,7 +76,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -93,7 +93,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -110,7 +110,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.flask",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -127,7 +127,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.flask",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exit_code": "0",
                   "cmd.shell": "dir -li /",
@@ -146,7 +146,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -163,7 +163,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -180,7 +180,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -197,7 +197,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicatenoshell[flask_appsec_good_rules_env].json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicatenoshell[flask_appsec_good_rules_env].json
index 114ae3ada51..5cc68d6a6bb 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicatenoshell[flask_appsec_good_rules_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicatenoshell[flask_appsec_good_rules_env].json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -57,7 +57,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "run_subcommunicatenoshell",
@@ -76,7 +76,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -93,7 +93,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -110,7 +110,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -127,7 +127,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.flask",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -144,7 +144,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.flask",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000"
                 },
                 "duration": 97250,
@@ -160,7 +160,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.flask",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exec": "['dir', '-li', '/']",
                   "cmd.exit_code": "0",
@@ -179,7 +179,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.flask",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exec": "['dir', '-li', '/']",
                   "cmd.exit_code": "0",
@@ -198,7 +198,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -215,7 +215,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -232,7 +232,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -249,7 +249,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicatenoshell[flask_appsec_good_rules_env]_220.json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicatenoshell[flask_appsec_good_rules_env]_220.json
index 7aac0d5f8e7..d37bbd839d7 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicatenoshell[flask_appsec_good_rules_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicatenoshell[flask_appsec_good_rules_env]_220.json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -57,7 +57,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "run_subcommunicatenoshell",
@@ -76,7 +76,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -93,7 +93,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -110,7 +110,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.flask",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -127,7 +127,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.flask",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000"
                 },
                 "duration": 45166,
@@ -143,7 +143,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.flask",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exec": "['dir', '-li', '/']",
                   "cmd.exit_code": "0",
@@ -162,7 +162,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.flask",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exec": "['dir', '-li', '/']",
                   "cmd.exit_code": "0",
@@ -181,7 +181,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -198,7 +198,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -215,7 +215,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -232,7 +232,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicateshell[flask_appsec_good_rules_env].json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicateshell[flask_appsec_good_rules_env].json
index 0a7ab19a27d..5b23316cb90 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicateshell[flask_appsec_good_rules_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicateshell[flask_appsec_good_rules_env].json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -57,7 +57,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "run_subcommunicateshell",
@@ -76,7 +76,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -93,7 +93,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -110,7 +110,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -127,7 +127,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.flask",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -144,7 +144,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.flask",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000"
                 },
                 "duration": 49291,
@@ -160,7 +160,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.flask",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exit_code": "0",
                   "cmd.shell": "dir -li /",
@@ -179,7 +179,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.flask",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exit_code": "0",
                   "cmd.shell": "dir -li /",
@@ -198,7 +198,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -215,7 +215,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -232,7 +232,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -249,7 +249,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicateshell[flask_appsec_good_rules_env]_220.json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicateshell[flask_appsec_good_rules_env]_220.json
index 5a1cdf81f3a..ba344ea3ce4 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicateshell[flask_appsec_good_rules_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_processexec_subprocesscommunicateshell[flask_appsec_good_rules_env]_220.json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -57,7 +57,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "run_subcommunicateshell",
@@ -76,7 +76,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -93,7 +93,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -110,7 +110,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.flask",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -127,7 +127,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.flask",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000"
                 },
                 "duration": 43667,
@@ -143,7 +143,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.flask",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exit_code": "0",
                   "cmd.shell": "dir -li /",
@@ -162,7 +162,7 @@
                 "type": "system",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.flask",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "cmd.exit_code": "0",
                   "cmd.shell": "dir -li /",
@@ -181,7 +181,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -198,7 +198,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -215,7 +215,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -232,7 +232,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_200_json[flask_appsec_good_rules_env].json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_200_json[flask_appsec_good_rules_env].json
index 33ffd67de3c..d7a371db853 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_200_json[flask_appsec_good_rules_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_200_json[flask_appsec_good_rules_env].json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -58,7 +58,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "checkuser",
@@ -78,7 +78,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -95,7 +95,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -112,7 +112,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -129,7 +129,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.flask",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -146,7 +146,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -163,7 +163,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -180,7 +180,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -197,7 +197,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_200_json[flask_appsec_good_rules_env]_220.json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_200_json[flask_appsec_good_rules_env]_220.json
index fff05279887..eb1c40a7939 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_200_json[flask_appsec_good_rules_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_200_json[flask_appsec_good_rules_env]_220.json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -58,7 +58,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "checkuser",
@@ -78,7 +78,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -95,7 +95,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -112,7 +112,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.flask",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -129,7 +129,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -146,7 +146,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -163,7 +163,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -180,7 +180,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_403_json[flask_appsec_good_rules_env].json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_403_json[flask_appsec_good_rules_env].json
index 7eccd9ee5a1..345427444ea 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_403_json[flask_appsec_good_rules_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_403_json[flask_appsec_good_rules_env].json
@@ -12,7 +12,7 @@
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.json": "{\"triggers\":[\n  {\n    \"rule\": {\n      \"id\": \"blk-001-002\",\n      \"name\": \"Block User Addresses\",\n      \"on_match\": [\n        \"block\"\n      ],\n      \"tags\": {\n        \"category\": \"security_response\",\n        \"type\": \"block_user\"\n      }\n    },\n    \"rule_matches\": [\n      {\n        \"operator\": \"exact_match\",\n        \"operator_value\": \"\",\n        \"parameters\": [\n          {\n            \"address\": \"usr.id\",\n            \"highlight\": [\n              \"123456\"\n            ],\n            \"key_path\": [],\n            \"value\": \"123456\"\n          }\n        ]\n      }\n    ]\n  }\n]}",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.origin": "appsec",
       "_dd.p.appsec": "1",
       "_dd.p.dm": "-5",
@@ -69,7 +69,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "checkuser",
@@ -90,7 +90,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -107,7 +107,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -124,7 +124,7 @@
           "type": "",
           "error": 1,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask",
             "error.message": "??? Unknown Error: None",
@@ -146,7 +146,7 @@
              "type": "",
              "error": 1,
              "meta": {
-               "_dd.base_service": "tests.contrib.flask",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "flask",
                "error.message": "??? Unknown Error: None",
@@ -166,7 +166,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -183,7 +183,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.flask",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -200,7 +200,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -217,7 +217,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -234,7 +234,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -251,7 +251,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_403_json[flask_appsec_good_rules_env]_220.json b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_403_json[flask_appsec_good_rules_env]_220.json
index 104b7f4cbc0..2aa7846ca97 100644
--- a/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_403_json[flask_appsec_good_rules_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_appsec_flask_snapshot.test_flask_userblock_match_403_json[flask_appsec_good_rules_env]_220.json
@@ -12,7 +12,7 @@
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.json": "{\"triggers\":[\n  {\n    \"rule\": {\n      \"id\": \"blk-001-002\",\n      \"name\": \"Block User Addresses\",\n      \"on_match\": [\n        \"block\"\n      ],\n      \"tags\": {\n        \"category\": \"security_response\",\n        \"type\": \"block_user\"\n      }\n    },\n    \"rule_matches\": [\n      {\n        \"operator\": \"exact_match\",\n        \"operator_value\": \"\",\n        \"parameters\": [\n          {\n            \"address\": \"usr.id\",\n            \"highlight\": [\n              \"123456\"\n            ],\n            \"key_path\": [],\n            \"value\": \"123456\"\n          }\n        ]\n      }\n    ]\n  }\n]}",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.origin": "appsec",
       "_dd.p.appsec": "1",
       "_dd.p.dm": "-5",
@@ -69,7 +69,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "checkuser",
@@ -90,7 +90,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -107,7 +107,7 @@
           "type": "",
           "error": 1,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask",
             "error.message": "??? Unknown Error: None",
@@ -129,7 +129,7 @@
              "type": "",
              "error": 1,
              "meta": {
-               "_dd.base_service": "tests.contrib.flask",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "flask",
                "error.message": "??? Unknown Error: None",
@@ -149,7 +149,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -166,7 +166,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.flask",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -183,7 +183,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -200,7 +200,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -217,7 +217,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -234,7 +234,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_200[flask_default_env].json b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_200[flask_default_env].json
index 46be5c5b2c7..b8be5f39f15 100644
--- a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_200[flask_default_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_200[flask_default_env].json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "flask",
@@ -45,7 +45,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "index",
@@ -64,7 +64,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -81,7 +81,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -98,7 +98,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -115,7 +115,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.flask",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -132,7 +132,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -149,7 +149,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -166,7 +166,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -183,7 +183,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_200[flask_default_env]_220.json b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_200[flask_default_env]_220.json
index b5ecd559b16..c3e356e2360 100644
--- a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_200[flask_default_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_200[flask_default_env]_220.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "flask",
@@ -45,7 +45,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "index",
@@ -64,7 +64,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -81,7 +81,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -98,7 +98,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.flask",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -115,7 +115,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -132,7 +132,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -149,7 +149,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -166,7 +166,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_get_user[flask_default_env].json b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_get_user[flask_default_env].json
index cd37fb6ba5d..a78c18caea0 100644
--- a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_get_user[flask_default_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_get_user[flask_default_env].json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "flask",
@@ -51,7 +51,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "identify",
@@ -70,7 +70,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -87,7 +87,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -104,7 +104,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -121,7 +121,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.flask",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -138,7 +138,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -155,7 +155,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -172,7 +172,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -189,7 +189,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_get_user[flask_default_env]_220.json b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_get_user[flask_default_env]_220.json
index 93e35934a67..f5b34ff18f2 100644
--- a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_get_user[flask_default_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_get_user[flask_default_env]_220.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "flask",
@@ -51,7 +51,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "identify",
@@ -70,7 +70,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -87,7 +87,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -104,7 +104,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.flask",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -121,7 +121,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -138,7 +138,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -155,7 +155,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -172,7 +172,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_stream[flask_default_env].json b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_stream[flask_default_env].json
index 7e3e90c55e4..9f0c3c9cc1b 100644
--- a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_stream[flask_default_env].json
+++ b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_stream[flask_default_env].json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "flask",
@@ -45,7 +45,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "hello",
@@ -64,7 +64,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -81,7 +81,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -98,7 +98,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -115,7 +115,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.flask",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -132,7 +132,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -149,7 +149,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -166,7 +166,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -183,7 +183,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_stream[flask_default_env]_220.json b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_stream[flask_default_env]_220.json
index d4b1ea90a8e..ae4afc69839 100644
--- a/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_stream[flask_default_env]_220.json
+++ b/tests/snapshots/tests.contrib.flask.test_flask_snapshot.test_flask_stream[flask_default_env]_220.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.flask",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "flask",
@@ -45,7 +45,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask",
          "flask.endpoint": "hello",
@@ -64,7 +64,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -81,7 +81,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -98,7 +98,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.flask",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "flask"
              },
@@ -115,7 +115,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -132,7 +132,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -149,7 +149,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.flask",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "flask"
           },
@@ -166,7 +166,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.flask",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "flask"
        },
diff --git a/tests/snapshots/tests.contrib.redis.test_redis.test_custom_cmd_length_env.json b/tests/snapshots/tests.contrib.redis.test_redis.test_custom_cmd_length_env.json
index 81eb0086a63..fd04e286162 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis.test_custom_cmd_length_env.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis.test_custom_cmd_length_env.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.redis",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis.test_env_user_specified_redis_service.json b/tests/snapshots/tests.contrib.redis.test_redis.test_env_user_specified_redis_service.json
index 6dceb23b029..203e4018e45 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis.test_env_user_specified_redis_service.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis.test_env_user_specified_redis_service.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.redis",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
@@ -46,7 +46,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.redis",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "redis",
diff --git a/tests/snapshots/tests.contrib.redis.test_redis.test_full_command_in_resource_env.json b/tests/snapshots/tests.contrib.redis.test_redis.test_full_command_in_resource_env.json
index e5e77a81431..6864d38d52e 100644
--- a/tests/snapshots/tests.contrib.redis.test_redis.test_full_command_in_resource_env.json
+++ b/tests/snapshots/tests.contrib.redis.test_redis.test_full_command_in_resource_env.json
@@ -9,7 +9,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.redis",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "component": "redis",
       "db.system": "redis",
@@ -45,7 +45,7 @@
     "type": "redis",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.redis",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "component": "redis",
       "db.system": "redis",
diff --git a/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_False_worker_service_None.json b/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_False_worker_service_None.json
index 77e0316ae05..a2f2bcda6e5 100644
--- a/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_False_worker_service_None.json
+++ b/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_False_worker_service_None.json
@@ -9,7 +9,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.rq",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
@@ -39,7 +39,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.rq",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
          "job.id": "962dfa1e-4a5b-4d95-8edf-3444887c737a"
@@ -58,7 +58,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.rq",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
diff --git a/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_None_worker_service_None.json b/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_None_worker_service_None.json
index 1d8383fe582..51d35c2b586 100644
--- a/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_None_worker_service_None.json
+++ b/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_None_worker_service_None.json
@@ -9,7 +9,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.rq",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
@@ -39,7 +39,7 @@
        "type": "worker",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.rq",
+         "_dd.base_service": "",
          "_dd.p.dm": "-0",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
@@ -71,7 +71,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.rq",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "rq",
             "job.id": "5e7a8f08-e011-4ebb-8cab-3ebbd30e089e"
diff --git a/tests/tracer/runtime/test_runtime_metrics.py b/tests/tracer/runtime/test_runtime_metrics.py
index 399b536625a..7f8915714de 100644
--- a/tests/tracer/runtime/test_runtime_metrics.py
+++ b/tests/tracer/runtime/test_runtime_metrics.py
@@ -46,7 +46,7 @@ def test_one_tag(self):
         with self.override_global_tracer():
             with self.trace("test", service="test"):
                 tags = [k for (k, v) in RuntimeTags(enabled=[SERVICE])]
-                self.assertEqual(tags, [SERVICE])
+                self.assertEqual(tags, [SERVICE, SERVICE])
 
     def test_env_tag(self):
         def filter_only_env_tags(tags):
diff --git a/tests/tracer/test_settings.py b/tests/tracer/test_settings.py
index 1c80ef4c4dc..ffd64ece6f3 100644
--- a/tests/tracer/test_settings.py
+++ b/tests/tracer/test_settings.py
@@ -23,7 +23,7 @@ def test_service(self):
         # If none is provided the default should be ``None``
         with self.override_env(dict()):
             config = Config()
-            self.assertEqual(config.service, None)
+            self.assertEqual(config.service, "tests.tracer")
 
         with self.override_env(dict(DD_SERVICE="my-service")):
             config = Config()
@@ -148,7 +148,7 @@ def test_allow_exist_both_global_and_integration_config(self):
 
     def test_service(self):
         ic = IntegrationConfig(self.config, "foo")
-        assert ic.service is None
+        assert ic.service == "tests.tracer"
 
     @BaseTestCase.run_in_subprocess(env_overrides=dict(DD_FOO_SERVICE="foo-svc"))
     def test_service_env_var(self):
diff --git a/tests/tracer/test_tracer.py b/tests/tracer/test_tracer.py
index d8afffca463..83b9165945e 100644
--- a/tests/tracer/test_tracer.py
+++ b/tests/tracer/test_tracer.py
@@ -61,7 +61,7 @@ def test_tracer_vars(self):
         span.finish()
 
         span = self.trace("a")
-        span.assert_matches(name="a", service='tests.tracer', resource="a", span_type=None)
+        span.assert_matches(name="a", service=None, resource="a", span_type=None)
         span.finish()
 
     def test_tracer(self):
@@ -400,7 +400,7 @@ def test_start_span_optional(self):
 
     def test_start_span_service_default(self):
         span = self.start_span("")
-        span.assert_matches(service='tests.tracer')
+        span.assert_matches(service=None)
         span.finish()
 
     def test_start_span_service_from_parent(self):
@@ -466,7 +466,7 @@ def test_start_child_from_context(self):
         )
 
     def test_adding_services(self):
-        assert self.tracer._services == set('tests.tracer')
+        assert self.tracer._services == set("tests.tracer")
         with self.start_span("root", service="one") as root:
             assert self.tracer._services == set(["one", "tests.tracer"])
             with self.start_span("child", service="two", child_of=root):
@@ -475,14 +475,14 @@ def test_adding_services(self):
 
     @run_in_subprocess(env_overrides=dict(DD_SERVICE_MAPPING="two:three"))
     def test_adding_mapped_services(self):
-        assert self.tracer._services == set('tests.tracer')
+        assert self.tracer._services == set()
         with self.start_span("root", service="one") as root:
-            assert self.tracer._services == set(["one", "tests.tracer"])
+            assert self.tracer._services == set(["one"])
 
             # service "two" gets remapped to "three"
             with self.start_span("child", service="two", child_of=root):
                 pass
-        assert self.tracer._services == set(["one", "three", "tests.tracer"])
+        assert self.tracer._services == set(["one", "three"])
 
     def test_configure_dogstatsd_url_host_port(self):
         tracer = Tracer()

From a5a79725fdbd077c5b6fcf2795eb07134524abbf Mon Sep 17 00:00:00 2001
From: William Conti <william.conti@datadoghq.com>
Date: Thu, 14 Nov 2024 09:22:10 -0500
Subject: [PATCH 04/18] fix snapshots

---
 tests/contrib/flask/test_flask_helpers.py     |  2 +-
 tests/contrib/flask/test_template.py          |  4 +-
 tests/contrib/logging/test_logging.py         |  6 +-
 ....test_aiohttp_client.test_200_request.json |  4 +-
 ..._aiohttp_client.test_200_request_post.json |  4 +-
 ....test_aiohttp_client.test_500_request.json |  4 +-
 ..._aiohttp_client.test_auth_200_request.json |  4 +-
 ...st_aiohttp_client.test_trace_multiple.json | 12 ++--
 ...t_aiohttp_client.test_trace_parenting.json |  6 +-
 ...iohttp_client.test_trace_query_string.json |  4 +-
 ..._appsec_snapshots.test_appsec_enabled.json | 52 +++++++--------
 ..._snapshots.test_appsec_enabled_attack.json | 54 +++++++--------
 ...pshots.test_request_ipblock_match_403.json | 52 +++++++--------
 ...s.test_request_ipblock_match_403_json.json | 52 +++++++--------
 ...hots.test_request_ipblock_nomatch_200.json | 52 +++++++--------
 ..._django_snapshots.test_404_exceptions.json | 62 ++++++++---------
 ...go_snapshots.test_404_exceptions_111x.json | 36 +++++-----
 ...est_django_snapshots.test_asgi_200_3x.json | 52 +++++++--------
 ...shots.test_asgi_200_traced_simple_app.json |  2 +-
 ...est_django_snapshots.test_asgi_500_3x.json | 62 ++++++++---------
 ...napshots.test_django_resource_handler.json | 58 ++++++++--------
 ...s.test_middleware_trace_callable_view.json | 52 +++++++--------
 ...t_middleware_trace_callable_view_111x.json | 32 ++++-----
 ...t_middleware_trace_partial_based_view.json | 52 +++++++--------
 ...dleware_trace_partial_based_view_111x.json | 32 ++++-----
 ...snapshots.test_psycopg2_query_default.json |  4 +-
 ...snapshots.test_psycopg3_query_default.json |  4 +-
 ...o_snapshots.test_safe_string_encoding.json | 66 +++++++++----------
 ...pshots.test_safe_string_encoding_111x.json | 42 ++++++------
 ...t_django_snapshots.test_streamed_file.json | 52 +++++++--------
 ..._snapshots.test_templates_disabled_3x.json | 56 ++++++++--------
 ...o_snapshots.test_templates_enabled_3x.json | 58 ++++++++--------
 ...go_snapshots.test_urlpatterns_include.json | 52 +++++++--------
 ...ing_enabled_False_worker_service_None.json |  6 +-
 ...cing_enabled_None_worker_service_None.json |  6 +-
 35 files changed, 549 insertions(+), 549 deletions(-)

diff --git a/tests/contrib/flask/test_flask_helpers.py b/tests/contrib/flask/test_flask_helpers.py
index 28a1a52f36f..73f6fb1bf98 100644
--- a/tests/contrib/flask/test_flask_helpers.py
+++ b/tests/contrib/flask/test_flask_helpers.py
@@ -49,7 +49,7 @@ def test_jsonify(self):
         spans = self.get_spans()
         self.assertEqual(len(spans), 3)
 
-        self.assertIsNone(spans[0].service)
+        self.assertEqual(spans[0].service, "tests.contrib.flask")
         self.assertEqual(spans[0].name, "flask.jsonify")
         self.assertEqual(spans[0].resource, "flask.jsonify")
         assert set(spans[0].get_tags().keys()) == {"runtime-id", "_dd.p.dm", "_dd.p.tid", "component", "language"}
diff --git a/tests/contrib/flask/test_template.py b/tests/contrib/flask/test_template.py
index 90cd4cb7f97..f15c67aa207 100644
--- a/tests/contrib/flask/test_template.py
+++ b/tests/contrib/flask/test_template.py
@@ -48,7 +48,7 @@ def test_render_template(self):
         spans = self.get_spans()
         self.assertEqual(len(spans), 3)
 
-        self.assertIsNone(spans[0].service)
+        self.assertEqual(spans[0].service, "tests.contrib.flask")
         self.assertEqual(spans[0].name, "flask.render_template")
         resource = "tests.contrib.flask" if flask_version >= (2, 2, 0) else "test.html"
         self.assertEqual(spans[0].resource, resource)  # FIXME: should always be 'test.html'?
@@ -92,7 +92,7 @@ def test_render_template_string(self):
         spans = self.get_spans()
         self.assertEqual(len(spans), 3)
 
-        self.assertIsNone(spans[0].service)
+        self.assertEqual(spans[0].service, "tests.contrib.flask")
         self.assertEqual(spans[0].name, "flask.render_template_string")
         resource = "tests.contrib.flask" if flask_version >= (2, 2, 0) else "<memory>"
         self.assertEqual(spans[0].resource, resource)  # FIXME: should always be '<memory>'?
diff --git a/tests/contrib/logging/test_logging.py b/tests/contrib/logging/test_logging.py
index 1b3fadc5263..e2ffcddaa50 100644
--- a/tests/contrib/logging/test_logging.py
+++ b/tests/contrib/logging/test_logging.py
@@ -99,7 +99,7 @@ def test_patch(self):
             else:
                 assert not isinstance(logging.StrFormatStyle.format, wrapt.BoundFunctionWrapper)
 
-    def _test_logging(self, create_span, service="", version="", env=""):
+    def _test_logging(self, create_span, service="tests.contrib.logging", version="", env=""):
         def func():
             span = create_span()
             logger.info("Hello!")
@@ -237,8 +237,8 @@ def func():
 
             lines = output.splitlines()
             assert (
-                "Hello! [dd.service=tests.contrib.logging dd.env= dd.version= \
-                    dd.trace_id={:032x} dd.span_id={}]".format(
+                "Hello! [dd.service=tests.contrib.logging dd.env= dd.version= " +
+                    "dd.trace_id={:032x} dd.span_id={}]".format(
                     span.trace_id, span.span_id
                 )
                 == lines[0]
diff --git a/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_200_request.json b/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_200_request.json
index dda9dfc805a..1a407e674da 100644
--- a/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_200_request.json
+++ b/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_200_request.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "aiohttp.request",
-    "service": "",
+    "service": "tests.contrib.aiohttp",
     "resource": "aiohttp.request",
     "trace_id": 0,
     "span_id": 1,
@@ -32,7 +32,7 @@
   },
      {
        "name": "TCPConnector.connect",
-       "service": "",
+       "service": "tests.contrib.aiohttp",
        "resource": "TCPConnector.connect",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_200_request_post.json b/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_200_request_post.json
index 6eb375b803b..ad72fff13c5 100644
--- a/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_200_request_post.json
+++ b/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_200_request_post.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "aiohttp.request",
-    "service": "",
+    "service": "tests.contrib.aiohttp",
     "resource": "aiohttp.request",
     "trace_id": 0,
     "span_id": 1,
@@ -32,7 +32,7 @@
   },
      {
        "name": "TCPConnector.connect",
-       "service": "",
+       "service": "tests.contrib.aiohttp",
        "resource": "TCPConnector.connect",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_500_request.json b/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_500_request.json
index fa783896518..791a4538acc 100644
--- a/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_500_request.json
+++ b/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_500_request.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "aiohttp.request",
-    "service": "",
+    "service": "tests.contrib.aiohttp",
     "resource": "aiohttp.request",
     "trace_id": 0,
     "span_id": 1,
@@ -32,7 +32,7 @@
   },
      {
        "name": "TCPConnector.connect",
-       "service": "",
+       "service": "tests.contrib.aiohttp",
        "resource": "TCPConnector.connect",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_auth_200_request.json b/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_auth_200_request.json
index 827258ad1e7..63d69f2ead7 100644
--- a/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_auth_200_request.json
+++ b/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_auth_200_request.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "aiohttp.request",
-    "service": "",
+    "service": "tests.contrib.aiohttp",
     "resource": "aiohttp.request",
     "trace_id": 0,
     "span_id": 1,
@@ -32,7 +32,7 @@
   },
      {
        "name": "TCPConnector.connect",
-       "service": "",
+       "service": "tests.contrib.aiohttp",
        "resource": "TCPConnector.connect",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_trace_multiple.json b/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_trace_multiple.json
index e3ab3c9880e..edb367fd9cb 100644
--- a/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_trace_multiple.json
+++ b/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_trace_multiple.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "aiohttp.request",
-    "service": "",
+    "service": "tests.contrib.aiohttp",
     "resource": "aiohttp.request",
     "trace_id": 0,
     "span_id": 1,
@@ -32,7 +32,7 @@
   },
      {
        "name": "TCPConnector.connect",
-       "service": "",
+       "service": "tests.contrib.aiohttp",
        "resource": "TCPConnector.connect",
        "trace_id": 0,
        "span_id": 2,
@@ -49,7 +49,7 @@
 [
   {
     "name": "aiohttp.request",
-    "service": "",
+    "service": "tests.contrib.aiohttp",
     "resource": "aiohttp.request",
     "trace_id": 1,
     "span_id": 1,
@@ -80,7 +80,7 @@
   },
      {
        "name": "TCPConnector.connect",
-       "service": "",
+       "service": "tests.contrib.aiohttp",
        "resource": "TCPConnector.connect",
        "trace_id": 1,
        "span_id": 2,
@@ -97,7 +97,7 @@
 [
   {
     "name": "aiohttp.request",
-    "service": "",
+    "service": "tests.contrib.aiohttp",
     "resource": "aiohttp.request",
     "trace_id": 2,
     "span_id": 1,
@@ -128,7 +128,7 @@
   },
      {
        "name": "TCPConnector.connect",
-       "service": "",
+       "service": "tests.contrib.aiohttp",
        "resource": "TCPConnector.connect",
        "trace_id": 2,
        "span_id": 2,
diff --git a/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_trace_parenting.json b/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_trace_parenting.json
index 2712751f617..36887f31e76 100644
--- a/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_trace_parenting.json
+++ b/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_trace_parenting.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "parent",
-    "service": "",
+    "service": "tests.contrib.aiohttp",
     "resource": "parent",
     "trace_id": 0,
     "span_id": 1,
@@ -25,7 +25,7 @@
   },
      {
        "name": "aiohttp.request",
-       "service": "",
+       "service": "tests.contrib.aiohttp",
        "resource": "aiohttp.request",
        "trace_id": 0,
        "span_id": 2,
@@ -47,7 +47,7 @@
      },
         {
           "name": "TCPConnector.connect",
-          "service": "",
+          "service": "tests.contrib.aiohttp",
           "resource": "TCPConnector.connect",
           "trace_id": 0,
           "span_id": 3,
diff --git a/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_trace_query_string.json b/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_trace_query_string.json
index 206ff182af0..4f7e518a8eb 100644
--- a/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_trace_query_string.json
+++ b/tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_trace_query_string.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "aiohttp.request",
-    "service": "",
+    "service": "tests.contrib.aiohttp",
     "resource": "aiohttp.request",
     "trace_id": 0,
     "span_id": 1,
@@ -33,7 +33,7 @@
   },
      {
        "name": "TCPConnector.connect",
-       "service": "",
+       "service": "tests.contrib.aiohttp",
        "resource": "TCPConnector.connect",
        "trace_id": 0,
        "span_id": 2,
diff --git a/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_appsec_enabled.json b/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_appsec_enabled.json
index 29e22f260a6..b1a8a8b0bd4 100644
--- a/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_appsec_enabled.json
+++ b/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_appsec_enabled.json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "1.13.2",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -64,7 +64,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -81,7 +81,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -98,7 +98,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -115,7 +115,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -132,7 +132,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -149,7 +149,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -166,7 +166,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -183,7 +183,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -200,7 +200,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -217,7 +217,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -234,7 +234,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -251,7 +251,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -268,7 +268,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -285,7 +285,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -302,7 +302,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "tests.contrib.django",
+                                 "_dd.base_service": "",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -319,7 +319,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "tests.contrib.django",
+                                    "_dd.base_service": "",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -336,7 +336,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -353,7 +353,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -370,7 +370,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -387,7 +387,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -404,7 +404,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -421,7 +421,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -438,7 +438,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -455,7 +455,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -472,7 +472,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_appsec_enabled_attack.json b/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_appsec_enabled_attack.json
index 0ca0dba4fab..2da6e3029aa 100644
--- a/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_appsec_enabled_attack.json
+++ b/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_appsec_enabled_attack.json
@@ -12,7 +12,7 @@
       "_dd.appsec.event_rules.version": "1.13.2",
       "_dd.appsec.json": "{\"triggers\":[\n  {\n    \"rule\": {\n      \"id\": \"nfd-000-006\",\n      \"name\": \"Detect failed attempt to fetch sensitive files\",\n      \"tags\": {\n        \"capec\": \"1000/118/169\",\n        \"category\": \"attack_attempt\",\n        \"confidence\": \"1\",\n        \"cwe\": \"200\",\n        \"type\": \"security_scanner\"\n      }\n    },\n    \"rule_matches\": [\n      {\n        \"operator\": \"match_regex\",\n        \"operator_value\": \"^404$\",\n        \"parameters\": [\n          {\n            \"address\": \"server.response.status\",\n            \"highlight\": [\n              \"404\"\n            ],\n            \"key_path\": [],\n            \"value\": \"404\"\n          }\n        ]\n      },\n      {\n        \"operator\": \"match_regex\",\n        \"operator_value\": \"\\\\.(cgi|bat|dll|exe|key|cert|crt|pem|der|pkcs|pkcs|pkcs[0-9]*|nsf|jsa|war|java|class|vb|vba|so|git|svn|hg|cvs)([^a-zA-Z0-9_]|$)\",\n        \"parameters\": [\n          {\n            \"address\": \"server.request.uri.raw\",\n            \"highlight\": [\n              \".git\"\n            ],\n            \"key_path\": [],\n            \"value\": \"/.git\"\n          }\n        ]\n      }\n    ]\n  }\n]}",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.origin": "appsec",
       "_dd.p.appsec": "1",
       "_dd.p.dm": "-5",
@@ -67,7 +67,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -84,7 +84,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -101,7 +101,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -118,7 +118,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -135,7 +135,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -152,7 +152,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -169,7 +169,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -186,7 +186,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -203,7 +203,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -220,7 +220,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -237,7 +237,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -254,7 +254,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -271,7 +271,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -288,7 +288,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -305,7 +305,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "tests.contrib.django",
+                                 "_dd.base_service": "",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -322,7 +322,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "tests.contrib.django",
+                                    "_dd.base_service": "",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -339,7 +339,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -356,7 +356,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -373,7 +373,7 @@
                                      "type": "template",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django",
                                        "django.template.engine.class": "django.template.engine.Engine"
@@ -391,7 +391,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -408,7 +408,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -425,7 +425,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -442,7 +442,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -459,7 +459,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -476,7 +476,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -493,7 +493,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_match_403.json b/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_match_403.json
index eb5abdce029..91b403fd793 100644
--- a/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_match_403.json
+++ b/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_match_403.json
@@ -12,7 +12,7 @@
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.json": "{\"triggers\":[{\"rule\":{\"id\":\"blk-001-001\",\"name\":\"Block IP addresses\",\"on_match\":[\"block\"],\"tags\":{\"category\":\"blocking\",\"type\":\"ip_addresses\"}},\"rule_matches\":[{\"operator\":\"ip_match\",\"operator_value\":\"\",\"parameters\":[{\"address\":\"http.client_ip\",\"key_path\":[],\"value\":\"8.8.4.4\",\"highlight\":[\"8.8.4.4\"]}]}],\"span_id\":10192376353237234254}]}",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.origin": "appsec",
       "_dd.p.appsec": "1",
       "_dd.p.dm": "-5",
@@ -71,7 +71,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "component": "django"
        },
        "duration": 1442334,
@@ -87,7 +87,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "component": "django"
           },
           "duration": 17708,
@@ -103,7 +103,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "component": "django"
           },
           "duration": 1352459,
@@ -119,7 +119,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "component": "django"
              },
              "duration": 20292,
@@ -135,7 +135,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "component": "django"
              },
              "duration": 1262750,
@@ -151,7 +151,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "component": "django"
                 },
                 "duration": 9667,
@@ -167,7 +167,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "component": "django"
                 },
                 "duration": 1197125,
@@ -183,7 +183,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "component": "django"
                    },
                    "duration": 14417,
@@ -199,7 +199,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "component": "django"
                    },
                    "duration": 1148541,
@@ -215,7 +215,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "component": "django"
                       },
                       "duration": 27500,
@@ -231,7 +231,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "component": "django"
                       },
                       "duration": 1061375,
@@ -247,7 +247,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "component": "django"
                          },
                          "duration": 1010541,
@@ -263,7 +263,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "component": "django"
                             },
                             "duration": 7667,
@@ -279,7 +279,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "component": "django"
                             },
                             "duration": 925750,
@@ -295,7 +295,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "tests.contrib.django",
+                                 "_dd.base_service": "",
                                  "component": "django"
                                },
                                "duration": 903000,
@@ -311,7 +311,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "tests.contrib.django",
+                                    "_dd.base_service": "",
                                     "component": "django"
                                   },
                                   "duration": 876708,
@@ -327,7 +327,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "component": "django"
                                      },
                                      "duration": 18209,
@@ -343,7 +343,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "component": "django"
                                      },
                                      "duration": 12708,
@@ -359,7 +359,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "component": "django"
                                      },
                                      "duration": 36042,
@@ -375,7 +375,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "component": "django"
                             },
                             "duration": 20375,
@@ -391,7 +391,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "component": "django"
                          },
                          "duration": 11875,
@@ -407,7 +407,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "component": "django"
                       },
                       "duration": 8375,
@@ -423,7 +423,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "component": "django"
                 },
                 "duration": 7958,
@@ -439,7 +439,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "component": "django"
              },
              "duration": 9583,
@@ -455,7 +455,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "component": "django"
           },
           "duration": 9708,
diff --git a/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_match_403_json.json b/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_match_403_json.json
index f25dd8b7733..80badf55332 100644
--- a/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_match_403_json.json
+++ b/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_match_403_json.json
@@ -12,7 +12,7 @@
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.json": "{\"triggers\":[{\"rule\":{\"id\":\"blk-001-001\",\"name\":\"Block IP addresses\",\"on_match\":[\"block\"],\"tags\":{\"category\":\"blocking\",\"type\":\"ip_addresses\"}},\"rule_matches\":[{\"operator\":\"ip_match\",\"operator_value\":\"\",\"parameters\":[{\"address\":\"http.client_ip\",\"key_path\":[],\"value\":\"8.8.4.4\",\"highlight\":[\"8.8.4.4\"]}]}],\"span_id\":865087550764298227}]}",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.origin": "appsec",
       "_dd.p.appsec": "1",
       "_dd.p.dm": "-5",
@@ -71,7 +71,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "component": "django"
        },
        "duration": 1500333,
@@ -87,7 +87,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "component": "django"
           },
           "duration": 19375,
@@ -103,7 +103,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "component": "django"
           },
           "duration": 1402584,
@@ -119,7 +119,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "component": "django"
              },
              "duration": 20750,
@@ -135,7 +135,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "component": "django"
              },
              "duration": 1316375,
@@ -151,7 +151,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "component": "django"
                 },
                 "duration": 9625,
@@ -167,7 +167,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "component": "django"
                 },
                 "duration": 1250041,
@@ -183,7 +183,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "component": "django"
                    },
                    "duration": 9416,
@@ -199,7 +199,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "component": "django"
                    },
                    "duration": 1207291,
@@ -215,7 +215,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "component": "django"
                       },
                       "duration": 25334,
@@ -231,7 +231,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "component": "django"
                       },
                       "duration": 1122667,
@@ -247,7 +247,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "component": "django"
                          },
                          "duration": 1072125,
@@ -263,7 +263,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "component": "django"
                             },
                             "duration": 7500,
@@ -279,7 +279,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "component": "django"
                             },
                             "duration": 987375,
@@ -295,7 +295,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "tests.contrib.django",
+                                 "_dd.base_service": "",
                                  "component": "django"
                                },
                                "duration": 964541,
@@ -311,7 +311,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "tests.contrib.django",
+                                    "_dd.base_service": "",
                                     "component": "django"
                                   },
                                   "duration": 937292,
@@ -327,7 +327,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "component": "django"
                                      },
                                      "duration": 17042,
@@ -343,7 +343,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "component": "django"
                                      },
                                      "duration": 18958,
@@ -359,7 +359,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "component": "django"
                                      },
                                      "duration": 34958,
@@ -375,7 +375,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "component": "django"
                             },
                             "duration": 21625,
@@ -391,7 +391,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "component": "django"
                          },
                          "duration": 12458,
@@ -407,7 +407,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "component": "django"
                       },
                       "duration": 9250,
@@ -423,7 +423,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "component": "django"
                 },
                 "duration": 7625,
@@ -439,7 +439,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "component": "django"
              },
              "duration": 9709,
@@ -455,7 +455,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "component": "django"
           },
           "duration": 9916,
diff --git a/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_nomatch_200.json b/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_nomatch_200.json
index 85a0cd8fe0e..bc4695d1779 100644
--- a/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_nomatch_200.json
+++ b/tests/snapshots/tests.contrib.django.test_django_appsec_snapshots.test_request_ipblock_nomatch_200.json
@@ -11,7 +11,7 @@
     "meta": {
       "_dd.appsec.event_rules.version": "rules_good",
       "_dd.appsec.waf.version": "1.20.1",
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "_dd.runtime_family": "python",
@@ -64,7 +64,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -81,7 +81,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -98,7 +98,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -115,7 +115,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -132,7 +132,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -149,7 +149,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -166,7 +166,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -183,7 +183,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -200,7 +200,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -217,7 +217,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -234,7 +234,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -251,7 +251,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -268,7 +268,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -285,7 +285,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -302,7 +302,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "tests.contrib.django",
+                                 "_dd.base_service": "",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -319,7 +319,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "tests.contrib.django",
+                                    "_dd.base_service": "",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -336,7 +336,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -353,7 +353,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -370,7 +370,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -387,7 +387,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -404,7 +404,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -421,7 +421,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -438,7 +438,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -455,7 +455,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -472,7 +472,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_404_exceptions.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_404_exceptions.json
index f64347ea749..70a370b0d35 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_404_exceptions.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_404_exceptions.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -45,7 +45,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -62,7 +62,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -79,7 +79,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -96,7 +96,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -113,7 +113,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -130,7 +130,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -147,7 +147,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -164,7 +164,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -181,7 +181,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -198,7 +198,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -215,7 +215,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -232,7 +232,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -249,7 +249,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -266,7 +266,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -283,7 +283,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "tests.contrib.django",
+                                 "_dd.base_service": "",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -300,7 +300,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "tests.contrib.django",
+                                    "_dd.base_service": "",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -317,7 +317,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -334,7 +334,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -351,7 +351,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -368,7 +368,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -385,7 +385,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -402,7 +402,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -419,7 +419,7 @@
                                      "type": "template",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django",
                                        "django.template.engine.class": "django.template.engine.Engine"
@@ -437,7 +437,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -454,7 +454,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -471,7 +471,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -488,7 +488,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -505,7 +505,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -522,7 +522,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -539,7 +539,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_404_exceptions_111x.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_404_exceptions_111x.json
index daf7c67ae09..7e4f138ed68 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_404_exceptions_111x.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_404_exceptions_111x.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -43,7 +43,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -60,7 +60,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -77,7 +77,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -94,7 +94,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -111,7 +111,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -128,7 +128,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -145,7 +145,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -162,7 +162,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -179,7 +179,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -196,7 +196,7 @@
        "type": "template",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django",
          "django.template.engine.class": "django.template.engine.Engine"
@@ -214,7 +214,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -231,7 +231,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -248,7 +248,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -265,7 +265,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -282,7 +282,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -299,7 +299,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -316,7 +316,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_200_3x.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_200_3x.json
index 221ca76d069..1edc55d43d2 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_200_3x.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_200_3x.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "asgi.version": "3.0",
@@ -48,7 +48,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -65,7 +65,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -82,7 +82,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -99,7 +99,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -116,7 +116,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -133,7 +133,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -150,7 +150,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -167,7 +167,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -184,7 +184,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -201,7 +201,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -218,7 +218,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -235,7 +235,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -252,7 +252,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -269,7 +269,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -286,7 +286,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "tests.contrib.django",
+                                 "_dd.base_service": "",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -303,7 +303,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "tests.contrib.django",
+                                    "_dd.base_service": "",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -320,7 +320,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -337,7 +337,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -354,7 +354,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -371,7 +371,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -388,7 +388,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -405,7 +405,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -422,7 +422,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -439,7 +439,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -456,7 +456,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_200_traced_simple_app.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_200_traced_simple_app.json
index a50dc0c8a25..b4825a86440 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_200_traced_simple_app.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_200_traced_simple_app.json
@@ -1,7 +1,7 @@
 [[
   {
     "name": "asgi.request",
-    "service": "tests.contrib.django",
+    "service": "",
     "resource": "GET /traced-simple-asgi-app/",
     "trace_id": 0,
     "span_id": 1,
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_500_3x.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_500_3x.json
index 795b28c62ab..94b4654ac80 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_500_3x.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_asgi_500_3x.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 1,
     "meta": {
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "asgi.version": "3.0",
@@ -48,7 +48,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -65,7 +65,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -82,7 +82,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -99,7 +99,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -116,7 +116,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -133,7 +133,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -150,7 +150,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -167,7 +167,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -184,7 +184,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -201,7 +201,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -218,7 +218,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -235,7 +235,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -252,7 +252,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -269,7 +269,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -286,7 +286,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "tests.contrib.django",
+                                 "_dd.base_service": "",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -303,7 +303,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "tests.contrib.django",
+                                    "_dd.base_service": "",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -320,7 +320,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -337,7 +337,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -354,7 +354,7 @@
                                      "type": "",
                                      "error": 1,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django",
                                        "error.message": "Error 500",
@@ -374,7 +374,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -391,7 +391,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -408,7 +408,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -425,7 +425,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -442,7 +442,7 @@
                                      "type": "template",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django",
                                        "django.template.engine.class": "django.template.engine.Engine"
@@ -460,7 +460,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -477,7 +477,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -494,7 +494,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -511,7 +511,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -528,7 +528,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -545,7 +545,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_django_resource_handler.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_django_resource_handler.json
index 2625c6ae45b..dcf893a28ad 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_django_resource_handler.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_django_resource_handler.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "asgi.version": "3.0",
@@ -48,7 +48,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -65,7 +65,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -82,7 +82,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -99,7 +99,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -116,7 +116,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -133,7 +133,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -150,7 +150,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -167,7 +167,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -184,7 +184,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -201,7 +201,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -218,7 +218,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -235,7 +235,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -252,7 +252,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -269,7 +269,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -286,7 +286,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "tests.contrib.django",
+                                 "_dd.base_service": "",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -303,7 +303,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "tests.contrib.django",
+                                    "_dd.base_service": "",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -320,7 +320,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -337,7 +337,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -354,7 +354,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -371,7 +371,7 @@
                                         "type": "",
                                         "error": 0,
                                         "meta": {
-                                          "_dd.base_service": "tests.contrib.django",
+                                          "_dd.base_service": "",
                                           "_dd.p.tid": "654a694400000000",
                                           "component": "django"
                                         },
@@ -388,7 +388,7 @@
                                         "type": "",
                                         "error": 0,
                                         "meta": {
-                                          "_dd.base_service": "tests.contrib.django",
+                                          "_dd.base_service": "",
                                           "_dd.p.tid": "654a694400000000",
                                           "component": "django"
                                         },
@@ -405,7 +405,7 @@
                                            "type": "",
                                            "error": 0,
                                            "meta": {
-                                             "_dd.base_service": "tests.contrib.django",
+                                             "_dd.base_service": "",
                                              "_dd.p.tid": "654a694400000000",
                                              "component": "django"
                                            },
@@ -422,7 +422,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -439,7 +439,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -456,7 +456,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -473,7 +473,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -490,7 +490,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -507,7 +507,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_callable_view.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_callable_view.json
index a498faffa93..b464ea62a78 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_callable_view.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_callable_view.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -45,7 +45,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -62,7 +62,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -79,7 +79,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -96,7 +96,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -113,7 +113,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -130,7 +130,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -147,7 +147,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -164,7 +164,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -181,7 +181,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -198,7 +198,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -215,7 +215,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -232,7 +232,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -249,7 +249,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -266,7 +266,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -283,7 +283,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "tests.contrib.django",
+                                 "_dd.base_service": "",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -300,7 +300,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "tests.contrib.django",
+                                    "_dd.base_service": "",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -317,7 +317,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -334,7 +334,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -351,7 +351,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -368,7 +368,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -385,7 +385,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -402,7 +402,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -419,7 +419,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -436,7 +436,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -453,7 +453,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_callable_view_111x.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_callable_view_111x.json
index 4d6b9f46a4f..68c8a7323e7 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_callable_view_111x.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_callable_view_111x.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -44,7 +44,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -61,7 +61,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -78,7 +78,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -95,7 +95,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -112,7 +112,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -129,7 +129,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -146,7 +146,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -163,7 +163,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -180,7 +180,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -197,7 +197,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -214,7 +214,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -231,7 +231,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -248,7 +248,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -265,7 +265,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -282,7 +282,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_partial_based_view.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_partial_based_view.json
index 8b56757961b..9b21d7f1b84 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_partial_based_view.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_partial_based_view.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -45,7 +45,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -62,7 +62,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -79,7 +79,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -96,7 +96,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -113,7 +113,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -130,7 +130,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -147,7 +147,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -164,7 +164,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -181,7 +181,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -198,7 +198,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -215,7 +215,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -232,7 +232,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -249,7 +249,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -266,7 +266,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -283,7 +283,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "tests.contrib.django",
+                                 "_dd.base_service": "",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -300,7 +300,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "tests.contrib.django",
+                                    "_dd.base_service": "",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -317,7 +317,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -334,7 +334,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -351,7 +351,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -368,7 +368,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -385,7 +385,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -402,7 +402,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -419,7 +419,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -436,7 +436,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -453,7 +453,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_partial_based_view_111x.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_partial_based_view_111x.json
index 537f3a3694b..12cce6feb5d 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_partial_based_view_111x.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_partial_based_view_111x.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -44,7 +44,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -61,7 +61,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -78,7 +78,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -95,7 +95,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -112,7 +112,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -129,7 +129,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -146,7 +146,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -163,7 +163,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -180,7 +180,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -197,7 +197,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -214,7 +214,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -231,7 +231,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -248,7 +248,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -265,7 +265,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -282,7 +282,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_psycopg2_query_default.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_psycopg2_query_default.json
index 49506db455e..de9cdf41eb5 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_psycopg2_query_default.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_psycopg2_query_default.json
@@ -9,7 +9,7 @@
     "type": "sql",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django-postgres",
@@ -40,7 +40,7 @@
        "type": "sql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "psycopg",
          "db.application": "None",
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_psycopg3_query_default.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_psycopg3_query_default.json
index 5edf1999e64..c0d50873757 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_psycopg3_query_default.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_psycopg3_query_default.json
@@ -9,7 +9,7 @@
     "type": "sql",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django-postgres",
@@ -40,7 +40,7 @@
        "type": "sql",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "psycopg",
          "db.application": "None",
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_safe_string_encoding.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_safe_string_encoding.json
index 9403c178210..ab628f0b202 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_safe_string_encoding.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_safe_string_encoding.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -47,7 +47,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -64,7 +64,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -81,7 +81,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -98,7 +98,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -115,7 +115,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -132,7 +132,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -149,7 +149,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -166,7 +166,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -183,7 +183,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -200,7 +200,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -217,7 +217,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -234,7 +234,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -251,7 +251,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -268,7 +268,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -285,7 +285,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "tests.contrib.django",
+                                 "_dd.base_service": "",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -302,7 +302,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "tests.contrib.django",
+                                    "_dd.base_service": "",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -319,7 +319,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -336,7 +336,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -353,7 +353,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -370,7 +370,7 @@
                                         "type": "",
                                         "error": 0,
                                         "meta": {
-                                          "_dd.base_service": "tests.contrib.django",
+                                          "_dd.base_service": "",
                                           "_dd.p.tid": "654a694400000000",
                                           "component": "django"
                                         },
@@ -387,7 +387,7 @@
                                         "type": "",
                                         "error": 0,
                                         "meta": {
-                                          "_dd.base_service": "tests.contrib.django",
+                                          "_dd.base_service": "",
                                           "_dd.p.tid": "654a694400000000",
                                           "component": "django"
                                         },
@@ -404,7 +404,7 @@
                                            "type": "",
                                            "error": 0,
                                            "meta": {
-                                             "_dd.base_service": "tests.contrib.django",
+                                             "_dd.base_service": "",
                                              "_dd.p.tid": "654a694400000000",
                                              "component": "django"
                                            },
@@ -421,7 +421,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -438,7 +438,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -455,7 +455,7 @@
                                         "type": "template",
                                         "error": 0,
                                         "meta": {
-                                          "_dd.base_service": "tests.contrib.django",
+                                          "_dd.base_service": "",
                                           "_dd.p.tid": "654a694400000000",
                                           "component": "django",
                                           "django.template.engine.class": "django.template.engine.Engine",
@@ -474,7 +474,7 @@
                                            "type": "cache",
                                            "error": 0,
                                            "meta": {
-                                             "_dd.base_service": "tests.contrib.django",
+                                             "_dd.base_service": "",
                                              "_dd.p.tid": "654a694400000000",
                                              "component": "django",
                                              "django.cache.backend": "django.core.cache.backends.locmem.LocMemCache",
@@ -496,7 +496,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -513,7 +513,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -530,7 +530,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -547,7 +547,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -564,7 +564,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -581,7 +581,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_safe_string_encoding_111x.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_safe_string_encoding_111x.json
index 557ed4e48eb..88ad21bea48 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_safe_string_encoding_111x.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_safe_string_encoding_111x.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -46,7 +46,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -63,7 +63,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -80,7 +80,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -97,7 +97,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -114,7 +114,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -131,7 +131,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -148,7 +148,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -165,7 +165,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -182,7 +182,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -199,7 +199,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -216,7 +216,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -233,7 +233,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -250,7 +250,7 @@
           "type": "template",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django",
             "django.template.engine.class": "django.template.engine.Engine",
@@ -269,7 +269,7 @@
              "type": "cache",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django",
                "django.cache.backend": "django.core.cache.backends.locmem.LocMemCache",
@@ -291,7 +291,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -308,7 +308,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -325,7 +325,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -342,7 +342,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -359,7 +359,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -376,7 +376,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_streamed_file.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_streamed_file.json
index 2f9439b715c..60f30925b91 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_streamed_file.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_streamed_file.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "component": "django",
       "django.request.class": "django.core.handlers.wsgi.WSGIRequest",
@@ -44,7 +44,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "component": "django"
        },
        "duration": 12018000,
@@ -60,7 +60,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "component": "django"
           },
           "duration": 322000,
@@ -76,7 +76,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "component": "django"
           },
           "duration": 11563000,
@@ -92,7 +92,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "component": "django"
              },
              "duration": 270000,
@@ -108,7 +108,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "component": "django"
              },
              "duration": 11198000,
@@ -124,7 +124,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "component": "django"
                 },
                 "duration": 26000,
@@ -140,7 +140,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "component": "django"
                 },
                 "duration": 11081000,
@@ -156,7 +156,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "component": "django"
                    },
                    "duration": 22000,
@@ -172,7 +172,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "component": "django"
                    },
                    "duration": 11006000,
@@ -188,7 +188,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "component": "django"
                       },
                       "duration": 1586000,
@@ -204,7 +204,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "component": "django"
                       },
                       "duration": 9328000,
@@ -220,7 +220,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "component": "django"
                          },
                          "duration": 9248000,
@@ -236,7 +236,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "component": "django"
                             },
                             "duration": 16000,
@@ -252,7 +252,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "component": "django"
                             },
                             "duration": 9130000,
@@ -268,7 +268,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "tests.contrib.django",
+                                 "_dd.base_service": "",
                                  "component": "django"
                                },
                                "duration": 9096000,
@@ -284,7 +284,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "tests.contrib.django",
+                                    "_dd.base_service": "",
                                     "component": "django"
                                   },
                                   "duration": 9045000,
@@ -300,7 +300,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "component": "django"
                                      },
                                      "duration": 33000,
@@ -316,7 +316,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "component": "django"
                                      },
                                      "duration": 18000,
@@ -332,7 +332,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "component": "django"
                                      },
                                      "duration": 299000,
@@ -348,7 +348,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "component": "django"
                             },
                             "duration": 27000,
@@ -364,7 +364,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "component": "django"
                          },
                          "duration": 23000,
@@ -380,7 +380,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "component": "django"
                       },
                       "duration": 15000,
@@ -396,7 +396,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "component": "django"
                 },
                 "duration": 15000,
@@ -412,7 +412,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "component": "django"
              },
              "duration": 15000,
@@ -428,7 +428,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "component": "django"
           },
           "duration": 21000,
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_templates_disabled_3x.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_templates_disabled_3x.json
index e915b02eff2..6a2ab060e21 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_templates_disabled_3x.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_templates_disabled_3x.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "asgi.version": "3.0",
@@ -49,7 +49,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -66,7 +66,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -83,7 +83,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -100,7 +100,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -117,7 +117,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -134,7 +134,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -151,7 +151,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -168,7 +168,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -185,7 +185,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -202,7 +202,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -219,7 +219,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -236,7 +236,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -253,7 +253,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -270,7 +270,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -287,7 +287,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "tests.contrib.django",
+                                 "_dd.base_service": "",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -304,7 +304,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "tests.contrib.django",
+                                    "_dd.base_service": "",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -321,7 +321,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -338,7 +338,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -355,7 +355,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -372,7 +372,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -389,7 +389,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -406,7 +406,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -423,7 +423,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -440,7 +440,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -457,7 +457,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -474,7 +474,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -491,7 +491,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_templates_enabled_3x.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_templates_enabled_3x.json
index dabe241f4ff..6dfc1708861 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_templates_enabled_3x.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_templates_enabled_3x.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "asgi.version": "3.0",
@@ -49,7 +49,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -66,7 +66,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -83,7 +83,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -100,7 +100,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -117,7 +117,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -134,7 +134,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -151,7 +151,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -168,7 +168,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -185,7 +185,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -202,7 +202,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -219,7 +219,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -236,7 +236,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -253,7 +253,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -270,7 +270,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -287,7 +287,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "tests.contrib.django",
+                                 "_dd.base_service": "",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -304,7 +304,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "tests.contrib.django",
+                                    "_dd.base_service": "",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -321,7 +321,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -338,7 +338,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -355,7 +355,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -372,7 +372,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -389,7 +389,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -406,7 +406,7 @@
                                         "type": "template",
                                         "error": 0,
                                         "meta": {
-                                          "_dd.base_service": "tests.contrib.django",
+                                          "_dd.base_service": "",
                                           "_dd.p.tid": "654a694400000000",
                                           "component": "django",
                                           "django.template.engine.class": "django.template.engine.Engine",
@@ -425,7 +425,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -442,7 +442,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -459,7 +459,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -476,7 +476,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -493,7 +493,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -510,7 +510,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_urlpatterns_include.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_urlpatterns_include.json
index 6042a5e0565..934b404a020 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_urlpatterns_include.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_urlpatterns_include.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.django",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -45,7 +45,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.django",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -62,7 +62,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -79,7 +79,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -96,7 +96,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -113,7 +113,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -130,7 +130,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -147,7 +147,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -164,7 +164,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -181,7 +181,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "tests.contrib.django",
+                     "_dd.base_service": "",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -198,7 +198,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -215,7 +215,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -232,7 +232,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -249,7 +249,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -266,7 +266,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -283,7 +283,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "tests.contrib.django",
+                                 "_dd.base_service": "",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -300,7 +300,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "tests.contrib.django",
+                                    "_dd.base_service": "",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -317,7 +317,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -334,7 +334,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -351,7 +351,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "tests.contrib.django",
+                                       "_dd.base_service": "",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -368,7 +368,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "tests.contrib.django",
+                              "_dd.base_service": "",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -385,7 +385,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "tests.contrib.django",
+                           "_dd.base_service": "",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -402,7 +402,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "tests.contrib.django",
+                        "_dd.base_service": "",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -419,7 +419,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "tests.contrib.django",
+                  "_dd.base_service": "",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -436,7 +436,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "tests.contrib.django",
+               "_dd.base_service": "",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -453,7 +453,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.django",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_False_worker_service_None.json b/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_False_worker_service_None.json
index a2f2bcda6e5..77e0316ae05 100644
--- a/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_False_worker_service_None.json
+++ b/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_False_worker_service_None.json
@@ -9,7 +9,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
@@ -39,7 +39,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.rq",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
          "job.id": "962dfa1e-4a5b-4d95-8edf-3444887c737a"
@@ -58,7 +58,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
diff --git a/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_None_worker_service_None.json b/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_None_worker_service_None.json
index 51d35c2b586..1d8383fe582 100644
--- a/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_None_worker_service_None.json
+++ b/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_None_worker_service_None.json
@@ -9,7 +9,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.rq",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
@@ -39,7 +39,7 @@
        "type": "worker",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.rq",
          "_dd.p.dm": "-0",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
@@ -71,7 +71,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.rq",
             "_dd.p.tid": "654a694400000000",
             "component": "rq",
             "job.id": "5e7a8f08-e011-4ebb-8cab-3ebbd30e089e"

From d484e5f536e4b2e5135044363d4294ca4c60961b Mon Sep 17 00:00:00 2001
From: William Conti <william.conti@datadoghq.com>
Date: Thu, 14 Nov 2024 11:14:10 -0500
Subject: [PATCH 05/18] more test updates

---
 tests/contrib/django/test_django.py           |  4 +-
 .../langchain/test_langchain_community.py     | 22 +++----
 .../langchain/test_langchain_llmobs.py        | 24 +++----
 tests/contrib/logging/test_logging.py         |  8 +--
 tests/contrib/openai/test_openai_llmobs.py    | 58 ++++++++--------
 tests/llmobs/test_llmobs_span_agent_writer.py |  6 +-
 .../test_llmobs_span_agentless_writer.py      |  6 +-
 ..._django_snapshots.test_404_exceptions.json | 62 ++++++++---------
 ...s.test_middleware_trace_callable_view.json | 52 +++++++--------
 ...o_snapshots.test_safe_string_encoding.json | 66 +++++++++----------
 ...t_django_snapshots.test_streamed_file.json | 52 +++++++--------
 ...ing_enabled_False_worker_service_None.json |  4 +-
 ...cing_enabled_None_worker_service_None.json |  4 +-
 tests/tracer/runtime/test_runtime_metrics.py  |  2 +-
 tests/tracer/test_correlation_log_context.py  |  6 +-
 tests/tracer/test_trace_utils.py              |  6 +-
 tests/tracer/test_tracer.py                   |  6 +-
 17 files changed, 194 insertions(+), 194 deletions(-)

diff --git a/tests/contrib/django/test_django.py b/tests/contrib/django/test_django.py
index 04a04268099..cf44ed6bcdd 100644
--- a/tests/contrib/django/test_django.py
+++ b/tests/contrib/django/test_django.py
@@ -1425,14 +1425,14 @@ def test_cached_view(client, test_spans):
         "django.cache.key": (
             "views.decorators.cache.cache_page..GET.03cdc1cc4aab71b038a6764e5fcabb82.d41d8cd98f00b204e9800998ecf8..."
         ),
-        "_dd.base_service": "",
+        "_dd.base_service": "tests.contrib.django",
     }
 
     expected_meta_header = {
         "component": "django",
         "django.cache.backend": "django.core.cache.backends.locmem.LocMemCache",
         "django.cache.key": "views.decorators.cache.cache_header..03cdc1cc4aab71b038a6764e5fcabb82.en-us",
-        "_dd.base_service": "",
+        "_dd.base_service": "tests.contrib.django",
     }
 
     assert span_view.get_tags() == expected_meta_view
diff --git a/tests/contrib/langchain/test_langchain_community.py b/tests/contrib/langchain/test_langchain_community.py
index 739d33852bc..8fa415ec635 100644
--- a/tests/contrib/langchain/test_langchain_community.py
+++ b/tests/contrib/langchain/test_langchain_community.py
@@ -198,7 +198,7 @@ def test_llm_logs(langchain_openai, ddtrace_config_langchain, request_vcr, mock_
                     "message": "sampled langchain_openai.llms.base.OpenAI",
                     "hostname": mock.ANY,
                     "ddsource": "langchain",
-                    "service": "",
+                    "service": "tests.contrib.langchain",
                     "status": "info",
                     "ddtags": "env:,version:,langchain.request.provider:openai,langchain.request.model:gpt-3.5-turbo-instruct,langchain.request.type:llm,langchain.request.api_key:...key>",  # noqa: E501
                     "dd.trace_id": hex(trace_id)[2:],
@@ -352,7 +352,7 @@ def test_chat_model_logs(
                     "message": "sampled langchain_openai.chat_models.base.ChatOpenAI",
                     "hostname": mock.ANY,
                     "ddsource": "langchain",
-                    "service": "",
+                    "service": "tests.contrib.langchain",
                     "status": "info",
                     "ddtags": "env:,version:,langchain.request.provider:openai,langchain.request.model:gpt-3.5-turbo,langchain.request.type:chat_model,langchain.request.api_key:...key>",  # noqa: E501
                     "dd.trace_id": hex(trace_id)[2:],
@@ -449,7 +449,7 @@ def test_embedding_logs(langchain_openai, ddtrace_config_langchain, request_vcr,
                     "message": "sampled langchain_openai.embeddings.base.OpenAIEmbeddings",
                     "hostname": mock.ANY,
                     "ddsource": "langchain",
-                    "service": "",
+                    "service": "tests.contrib.langchain",
                     "status": "info",
                     "ddtags": "env:,version:,langchain.request.provider:openai,langchain.request.model:text-embedding-ada-002,langchain.request.type:embedding,langchain.request.api_key:...key>",  # noqa: E501
                     "dd.trace_id": hex(trace_id)[2:],
@@ -671,7 +671,7 @@ def test_chain_logs(
                     "message": "sampled langchain_openai.llms.base.OpenAI",
                     "hostname": mock.ANY,
                     "ddsource": "langchain",
-                    "service": "",
+                    "service": "tests.contrib.langchain",
                     "status": "info",
                     "ddtags": "env:,version:,langchain.request.provider:openai,langchain.request.model:gpt-3.5-turbo-instruct,langchain.request.type:llm,langchain.request.api_key:...key>",  # noqa: E501
                     "dd.trace_id": hex(llm_span.trace_id)[2:],
@@ -686,7 +686,7 @@ def test_chain_logs(
                     "message": "sampled langchain.chains.llm.LLMChain",
                     "hostname": mock.ANY,
                     "ddsource": "langchain",
-                    "service": "",
+                    "service": "tests.contrib.langchain",
                     "status": "info",
                     "ddtags": "env:,version:,langchain.request.provider:,langchain.request.model:,langchain.request.type:chain,langchain.request.api_key:",  # noqa: E501
                     "dd.trace_id": hex(mid_chain_span.trace_id)[2:],
@@ -706,7 +706,7 @@ def test_chain_logs(
                     "message": "sampled langchain.chains.llm_math.base.LLMMathChain",
                     "hostname": mock.ANY,
                     "ddsource": "langchain",
-                    "service": "",
+                    "service": "tests.contrib.langchain",
                     "status": "info",
                     "ddtags": "env:,version:,langchain.request.provider:,langchain.request.model:,langchain.request.type:chain,langchain.request.api_key:",  # noqa: E501
                     "dd.trace_id": hex(base_chain_span.trace_id)[2:],
@@ -867,7 +867,7 @@ def test_vectorstore_logs(
                     "message": "sampled langchain_openai.embeddings.base.OpenAIEmbeddings",
                     "hostname": mock.ANY,
                     "ddsource": "langchain",
-                    "service": "",
+                    "service": "tests.contrib.langchain",
                     "status": "info",
                     "ddtags": "env:,version:,langchain.request.provider:openai,langchain.request.model:text-embedding-ada-002,langchain.request.type:embedding,langchain.request.api_key:...key>",  # noqa: E501
                     "dd.trace_id": hex(embeddings_span.trace_id)[2:],
@@ -881,7 +881,7 @@ def test_vectorstore_logs(
                     "message": "sampled langchain_pinecone.vectorstores.PineconeVectorStore",
                     "hostname": mock.ANY,
                     "ddsource": "langchain",
-                    "service": "",
+                    "service": "tests.contrib.langchain",
                     "status": "info",
                     "ddtags": "env:,version:,langchain.request.provider:pineconevectorstore,langchain.request.model:,langchain.request.type:similarity_search,langchain.request.api_key:",  # noqa: E501
                     "dd.trace_id": hex(vectorstore_span.trace_id)[2:],
@@ -989,7 +989,7 @@ def test_llm_logs_when_response_not_completed(
                     "message": "sampled langchain_openai.llms.base.OpenAI",
                     "hostname": mock.ANY,
                     "ddsource": "langchain",
-                    "service": "",
+                    "service": "tests.contrib.langchain",
                     "status": "error",
                     "ddtags": "env:,version:,langchain.request.provider:openai,langchain.request.model:gpt-3.5-turbo-instruct,langchain.request.type:llm,langchain.request.api_key:...key>",  # noqa: E501
                     "dd.trace_id": hex(trace_id)[2:],
@@ -1025,7 +1025,7 @@ def test_chat_model_logs_when_response_not_completed(
             "message": "sampled langchain_openai.chat_models.base.ChatOpenAI",
             "hostname": mock.ANY,
             "ddsource": "langchain",
-            "service": "",
+            "service": "tests.contrib.langchain",
             "status": "error",
             "ddtags": "env:,version:,langchain.request.provider:openai,langchain.request.model:gpt-3.5-turbo,langchain.request.type:chat_model,langchain.request.api_key:...key>",  # noqa: E501
             "dd.trace_id": hex(trace_id)[2:],
@@ -1070,7 +1070,7 @@ def test_embedding_logs_when_response_not_completed(
                     "message": "sampled langchain_openai.embeddings.base.OpenAIEmbeddings",
                     "hostname": mock.ANY,
                     "ddsource": "langchain",
-                    "service": "",
+                    "service": "tests.contrib.langchain",
                     "status": "error",
                     "ddtags": "env:,version:,langchain.request.provider:openai,langchain.request.model:text-embedding-ada-002,langchain.request.type:embedding,langchain.request.api_key:...key>",  # noqa: E501
                     "dd.trace_id": hex(trace_id)[2:],
diff --git a/tests/contrib/langchain/test_langchain_llmobs.py b/tests/contrib/langchain/test_langchain_llmobs.py
index feba6f73aa5..ca8fe35883a 100644
--- a/tests/contrib/langchain/test_langchain_llmobs.py
+++ b/tests/contrib/langchain/test_langchain_llmobs.py
@@ -74,7 +74,7 @@ def _assert_expected_llmobs_llm_span(
             output_messages=output_messages if not mock_io else mock.ANY,
             metadata=metadata,
             token_metrics=metrics,
-            tags={"ml_app": "langchain_test"},
+            tags={"ml_app": "langchain_test", "service": "tests.contrib.langchain"},
         )
     )
 
@@ -85,7 +85,7 @@ def _assert_expected_llmobs_chain_span(span, mock_llmobs_span_writer, input_valu
         "workflow",
         input_value=input_value if input_value is not None else mock.ANY,
         output_value=output_value if output_value is not None else mock.ANY,
-        tags={"ml_app": "langchain_test"},
+        tags={"ml_app": "langchain_test", "service": "tests.contrib.langchain"},
     )
     mock_llmobs_span_writer.enqueue.assert_any_call(expected_chain_span_event)
 
@@ -420,7 +420,7 @@ def test_llmobs_embedding_query(self, langchain, mock_llmobs_span_writer, mock_t
                 model_provider="openai",
                 input_documents=[{"text": "hello world"}],
                 output_value="[1 embedding(s) returned with size 1536]",
-                tags={"ml_app": "langchain_test"},
+                tags={"ml_app": "langchain_test", "service": "tests.contrib.langchain"},
             )
         )
 
@@ -445,7 +445,7 @@ def test_llmobs_embedding_documents(self, langchain, mock_llmobs_span_writer, mo
                 model_provider="openai",
                 input_documents=[{"text": "hello world"}, {"text": "goodbye world"}],
                 output_value="[2 embedding(s) returned with size 1536]",
-                tags={"ml_app": "langchain_test"},
+                tags={"ml_app": "langchain_test", "service": "tests.contrib.langchain"},
             )
         )
 
@@ -472,7 +472,7 @@ def test_llmobs_similarity_search(self, langchain, mock_llmobs_span_writer, mock
             input_value="Who was Alan Turing?",
             output_documents=[{"text": mock.ANY, "id": mock.ANY, "name": mock.ANY}],
             output_value="[1 document(s) retrieved]",
-            tags={"ml_app": "langchain_test"},
+            tags={"ml_app": "langchain_test", "service": "tests.contrib.langchain"},
         )
         mock_llmobs_span_writer.enqueue.assert_any_call(expected_span)
         assert mock_llmobs_span_writer.enqueue.call_count == 2
@@ -725,7 +725,7 @@ def test_llmobs_embedding_query(self, langchain_community, langchain_openai, moc
                 model_provider="openai",
                 input_documents=[{"text": "hello world"}],
                 output_value="[1 embedding(s) returned with size 1536]",
-                tags={"ml_app": "langchain_test"},
+                tags={"ml_app": "langchain_test", "service": "tests.contrib.langchain"},
             )
         )
 
@@ -751,7 +751,7 @@ def test_llmobs_embedding_documents(
                 model_provider="fake",
                 input_documents=[{"text": "hello world"}, {"text": "goodbye world"}],
                 output_value="[2 embedding(s) returned with size 1536]",
-                tags={"ml_app": "langchain_test"},
+                tags={"ml_app": "langchain_test", "service": "tests.contrib.langchain"},
             )
         )
 
@@ -781,7 +781,7 @@ def test_llmobs_similarity_search(self, langchain_openai, langchain_pinecone, mo
                 {"text": mock.ANY, "id": mock.ANY, "name": "The Evolution of Communication Technologies"}
             ],
             output_value="[1 document(s) retrieved]",
-            tags={"ml_app": "langchain_test"},
+            tags={"ml_app": "langchain_test", "service": "tests.contrib.langchain"},
         )
         mock_llmobs_span_writer.enqueue.assert_any_call(expected_span)
 
@@ -828,7 +828,7 @@ def add(a: int, b: int) -> int:
                 ],
                 metadata={"temperature": 0.7},
                 token_metrics={"input_tokens": mock.ANY, "output_tokens": mock.ANY, "total_tokens": mock.ANY},
-                tags={"ml_app": "langchain_test"},
+                tags={"ml_app": "langchain_test", "service": "tests.contrib.langchain"},
             )
         )
 
@@ -871,7 +871,7 @@ def circumference_tool(radius: float) -> float:
                         "description": mock.ANY,
                     },
                 },
-                tags={"ml_app": "langchain_test"},
+                tags={"ml_app": "langchain_test", "service": "tests.contrib.langchain"},
             )
         )
 
@@ -920,7 +920,7 @@ def test_llmobs_streamed_chain(
                 output_messages=[{"content": "Python is\n\nthe best!", "role": "assistant"}],
                 metadata={"temperature": 0.7},
                 token_metrics={},
-                tags={"ml_app": "langchain_test"},
+                tags={"ml_app": "langchain_test", "service": "tests.contrib.langchain"},
             )
         )
 
@@ -956,7 +956,7 @@ def test_llmobs_streamed_llm(
                 output_messages=[{"content": "\n\nPython is cool!"}],
                 metadata={"temperature": 0.7, "max_tokens": 256},
                 token_metrics={},
-                tags={"ml_app": "langchain_test"},
+                tags={"ml_app": "langchain_test", "service": "tests.contrib.langchain"},
             )
         )
 
diff --git a/tests/contrib/logging/test_logging.py b/tests/contrib/logging/test_logging.py
index e2ffcddaa50..5a981fe1027 100644
--- a/tests/contrib/logging/test_logging.py
+++ b/tests/contrib/logging/test_logging.py
@@ -142,7 +142,7 @@ def create_span():
         self._test_logging(create_span=create_span)
 
         with self.override_global_config(dict(version="global.version", env="global.env")):
-            self._test_logging(create_span=create_span, version="global.version", env="global.env")
+            self._test_logging(create_span=create_span, version="global.version", env="global.env", service="")
 
     @TracerTestCase.run_in_subprocess(env_overrides=dict(DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED="True"))
     def test_log_trace_128bit_trace_ids(self):
@@ -157,7 +157,7 @@ def create_span():
             return span
 
         with self.override_global_config(dict(version="v1.666", env="test")):
-            self._test_logging(create_span=create_span, version="v1.666", env="test")
+            self._test_logging(create_span=create_span, version="v1.666", env="test", service="")
             # makes sense that this fails because _test_logging looks for the 64 bit trace id
 
     def test_log_trace_service(self):
@@ -267,8 +267,8 @@ def test_log_strformat_style_format(self):
             with self.tracer.trace("test.logging") as span:
                 record = logger.makeRecord("name", "INFO", "func", 534, "Manual log record", (), None)
                 log = formatter.format(record)
-                expected = "Manual log record [dd.service=tests.contrib.logging dd.env= dd.version= \
-                    dd.trace_id={:032x} dd.span_id={}]".format(
+                expected = ("Manual log record [dd.service=tests.contrib.logging dd.env= dd.version= " +
+                    "dd.trace_id={:032x} dd.span_id={}]").format(
                     span.trace_id, span.span_id
                 )
                 assert log == expected
diff --git a/tests/contrib/openai/test_openai_llmobs.py b/tests/contrib/openai/test_openai_llmobs.py
index d68cc67b2e3..a2f80c38a37 100644
--- a/tests/contrib/openai/test_openai_llmobs.py
+++ b/tests/contrib/openai/test_openai_llmobs.py
@@ -37,7 +37,7 @@ def test_completion(self, openai, ddtrace_global_config, mock_llmobs_writer, moc
                 output_messages=[{"content": ", relax!” I said to my laptop"}, {"content": " (1"}],
                 metadata={"temperature": 0.8, "max_tokens": 10, "n": 2, "stop": ".", "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 2, "output_tokens": 12, "total_tokens": 14},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -59,7 +59,7 @@ def test_completion_stream(self, openai, ddtrace_global_config, mock_llmobs_writ
                 output_messages=[{"content": expected_completion}],
                 metadata={"stream": True},
                 token_metrics={"input_tokens": 2, "output_tokens": 16, "total_tokens": 18},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             ),
         )
 
@@ -92,7 +92,7 @@ def test_chat_completion(self, openai, ddtrace_global_config, mock_llmobs_writer
                 output_messages=[{"role": "assistant", "content": choice.message.content} for choice in resp.choices],
                 metadata={"top_p": 0.9, "n": 2, "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 57, "output_tokens": 34, "total_tokens": 91},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -126,7 +126,7 @@ async def test_chat_completion_stream(self, openai, ddtrace_global_config, mock_
                 output_messages=[{"content": expected_completion, "role": "assistant"}],
                 metadata={"stream": True, "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 8, "output_tokens": 12, "total_tokens": 20},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -154,7 +154,7 @@ def test_chat_completion_function_call(self, openai, ddtrace_global_config, mock
                 output_messages=[function_call_expected_output],
                 metadata={"function_call": "auto", "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 157, "output_tokens": 57, "total_tokens": 214},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -189,7 +189,7 @@ def test_chat_completion_function_call_stream(self, openai, ddtrace_global_confi
                 output_messages=[tool_call_expected_output],
                 metadata={"stream": True, "user": "ddtrace-test", "function_call": "auto"},
                 token_metrics={"input_tokens": 63, "output_tokens": 33, "total_tokens": 96},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -233,7 +233,7 @@ def test_chat_completion_tool_call(self, openai, ddtrace_global_config, mock_llm
                 output_messages=[expected_output],
                 metadata={"tool_choice": "auto", "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 157, "output_tokens": 57, "total_tokens": 214},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -265,7 +265,7 @@ def test_completion_error(self, openai, ddtrace_global_config, mock_llmobs_write
                 error="openai.error.AuthenticationError",
                 error_message="Incorrect API key provided: <not-a-r****key>. You can find your API key at https://platform.openai.com/account/api-keys.",  # noqa: E501
                 error_stack=span.get_tag("error.stack"),
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -297,7 +297,7 @@ def test_chat_completion_error(self, openai, ddtrace_global_config, mock_llmobs_
                 error="openai.error.AuthenticationError",
                 error_message="Incorrect API key provided: <not-a-r****key>. You can find your API key at https://platform.openai.com/account/api-keys.",  # noqa: E501
                 error_stack=span.get_tag("error.stack"),
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -335,7 +335,7 @@ def test_completion(self, openai, ddtrace_global_config, mock_llmobs_writer, moc
                 output_messages=[{"content": ", relax!” I said to my laptop"}, {"content": " (1"}],
                 metadata={"temperature": 0.8, "max_tokens": 10, "n": 2, "stop": ".", "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 2, "output_tokens": 12, "total_tokens": 14},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -365,7 +365,7 @@ def test_completion_azure(
                 output_messages=[{"content": expected_output}],
                 metadata={"temperature": 0, "max_tokens": 20, "n": 1, "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 16, "output_tokens": 20, "total_tokens": 36},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -395,7 +395,7 @@ async def test_completion_azure_async(
                 output_messages=[{"content": expected_output}],
                 metadata={"temperature": 0, "max_tokens": 20, "n": 1, "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 16, "output_tokens": 20, "total_tokens": 36},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -422,7 +422,7 @@ def test_completion_stream(self, openai, ddtrace_global_config, mock_llmobs_writ
                 output_messages=[{"content": expected_completion}],
                 metadata={"stream": True},
                 token_metrics={"input_tokens": 2, "output_tokens": 2, "total_tokens": 4},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             ),
         )
 
@@ -454,7 +454,7 @@ def test_chat_completion(self, openai, ddtrace_global_config, mock_llmobs_writer
                 output_messages=[{"role": "assistant", "content": choice.message.content} for choice in resp.choices],
                 metadata={"top_p": 0.9, "n": 2, "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 57, "output_tokens": 34, "total_tokens": 91},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -484,7 +484,7 @@ def test_chat_completion_azure(
                 output_messages=[{"role": "assistant", "content": expected_output}],
                 metadata={"temperature": 0, "max_tokens": 20, "n": 1, "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 18, "output_tokens": 20, "total_tokens": 38},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -514,7 +514,7 @@ async def test_chat_completion_azure_async(
                 output_messages=[{"role": "assistant", "content": expected_output}],
                 metadata={"temperature": 0, "max_tokens": 20, "n": 1, "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 18, "output_tokens": 20, "total_tokens": 38},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -549,7 +549,7 @@ def test_chat_completion_stream(self, openai, ddtrace_global_config, mock_llmobs
                 output_messages=[{"content": expected_completion, "role": "assistant"}],
                 metadata={"stream": True, "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 8, "output_tokens": 8, "total_tokens": 16},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -584,7 +584,7 @@ def test_chat_completion_stream_tokens(self, openai, ddtrace_global_config, mock
                 output_messages=[{"content": expected_completion, "role": "assistant"}],
                 metadata={"stream": True, "stream_options": {"include_usage": True}},
                 token_metrics={"input_tokens": 17, "output_tokens": 19, "total_tokens": 36},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -627,7 +627,7 @@ def test_chat_completion_function_call(self, openai, ddtrace_global_config, mock
                 output_messages=[expected_output],
                 metadata={"function_call": "auto", "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 157, "output_tokens": 57, "total_tokens": 214},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -653,7 +653,7 @@ def test_chat_completion_tool_call(self, openai, ddtrace_global_config, mock_llm
                 output_messages=[tool_call_expected_output],
                 metadata={"user": "ddtrace-test"},
                 token_metrics={"input_tokens": 157, "output_tokens": 57, "total_tokens": 214},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -686,7 +686,7 @@ def test_chat_completion_tool_call_stream(self, openai, ddtrace_global_config, m
                 output_messages=[tool_call_expected_output],
                 metadata={"user": "ddtrace-test", "stream": True, "stream_options": {"include_usage": True}},
                 token_metrics={"input_tokens": 166, "output_tokens": 43, "total_tokens": 209},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -719,7 +719,7 @@ def test_completion_error(self, openai, ddtrace_global_config, mock_llmobs_write
                 error="openai.AuthenticationError",
                 error_message="Error code: 401 - {'error': {'message': 'Incorrect API key provided: <not-a-r****key>. You can find your API key at https://platform.openai.com/account/api-keys.', 'type': 'invalid_request_error', 'param': None, 'code': 'invalid_api_key'}}",  # noqa: E501
                 error_stack=span.get_tag("error.stack"),
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -752,7 +752,7 @@ def test_chat_completion_error(self, openai, ddtrace_global_config, mock_llmobs_
                 error="openai.AuthenticationError",
                 error_message="Error code: 401 - {'error': {'message': 'Incorrect API key provided: <not-a-r****key>. You can find your API key at https://platform.openai.com/account/api-keys.', 'type': 'invalid_request_error', 'param': None, 'code': 'invalid_api_key'}}",  # noqa: E501
                 error_stack=span.get_tag("error.stack"),
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -772,7 +772,7 @@ def test_embedding_string(self, openai, ddtrace_global_config, mock_llmobs_write
                 input_documents=[{"text": "hello world"}],
                 output_value="[1 embedding(s) returned with size 1536]",
                 token_metrics={"input_tokens": 2, "output_tokens": 0, "total_tokens": 2},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -792,7 +792,7 @@ def test_embedding_string_array(self, openai, ddtrace_global_config, mock_llmobs
                 input_documents=[{"text": "hello world"}, {"text": "hello again"}],
                 output_value="[2 embedding(s) returned with size 1536]",
                 token_metrics={"input_tokens": 4, "output_tokens": 0, "total_tokens": 4},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -812,7 +812,7 @@ def test_embedding_token_array(self, openai, ddtrace_global_config, mock_llmobs_
                 input_documents=[{"text": "[1111, 2222, 3333]"}],
                 output_value="[1 embedding(s) returned with size 1536]",
                 token_metrics={"input_tokens": 3, "output_tokens": 0, "total_tokens": 3},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -838,7 +838,7 @@ def test_embedding_array_of_token_arrays(self, openai, ddtrace_global_config, mo
                 ],
                 output_value="[3 embedding(s) returned with size 1536]",
                 token_metrics={"input_tokens": 9, "output_tokens": 0, "total_tokens": 9},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -863,7 +863,7 @@ def test_embedding_string_base64(self, openai, ddtrace_global_config, mock_llmob
                 input_documents=[{"text": "hello world"}],
                 output_value="[1 embedding(s) returned]",
                 token_metrics={"input_tokens": 2, "output_tokens": 0, "total_tokens": 2},
-                tags={"ml_app": "<ml-app-name>"},
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
             )
         )
 
@@ -893,7 +893,7 @@ def test_unserializable_param_is_handled(self, openai, ddtrace_global_config, mo
             error=span.get_tag("error.type"),
             error_message=span.get_tag("error.message"),
             error_stack=span.get_tag("error.stack"),
-            tags={"ml_app": "<ml-app-name>"},
+            tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
         )
         mock_llmobs_writer.enqueue.assert_called_with(expected_span)
         actual_span = mock_llmobs_writer.enqueue.call_args[0][0]
diff --git a/tests/llmobs/test_llmobs_span_agent_writer.py b/tests/llmobs/test_llmobs_span_agent_writer.py
index 010faf4f2c0..76fe0f21aef 100644
--- a/tests/llmobs/test_llmobs_span_agent_writer.py
+++ b/tests/llmobs/test_llmobs_span_agent_writer.py
@@ -55,9 +55,9 @@ def test_truncating_oversized_events(mock_writer_logs, mock_http_writer_send_pay
     llmobs_span_writer.enqueue(_oversized_workflow_event())
     mock_writer_logs.warning.assert_has_calls(
         [
-            mock.call("dropping event input/output because its size (%d) exceeds the event size limit (1MB)", 1400708),
-            mock.call("dropping event input/output because its size (%d) exceeds the event size limit (1MB)", 1400448),
-            mock.call("dropping event input/output because its size (%d) exceeds the event size limit (1MB)", 1400429),
+            mock.call("dropping event input/output because its size (%d) exceeds the event size limit (1MB)", 1400720),
+            mock.call("dropping event input/output because its size (%d) exceeds the event size limit (1MB)", 1400460),
+            mock.call("dropping event input/output because its size (%d) exceeds the event size limit (1MB)", 1400441),
         ]
     )
 
diff --git a/tests/llmobs/test_llmobs_span_agentless_writer.py b/tests/llmobs/test_llmobs_span_agentless_writer.py
index 7d479023726..223007fae70 100644
--- a/tests/llmobs/test_llmobs_span_agentless_writer.py
+++ b/tests/llmobs/test_llmobs_span_agentless_writer.py
@@ -63,13 +63,13 @@ def test_truncating_oversized_events(mock_writer_logs, mock_http_writer_send_pay
         mock_writer_logs.warning.assert_has_calls(
             [
                 mock.call(
-                    "dropping event input/output because its size (%d) exceeds the event size limit (1MB)", 1400708
+                    "dropping event input/output because its size (%d) exceeds the event size limit (1MB)", 14007720
                 ),
                 mock.call(
-                    "dropping event input/output because its size (%d) exceeds the event size limit (1MB)", 1400448
+                    "dropping event input/output because its size (%d) exceeds the event size limit (1MB)", 1400460
                 ),
                 mock.call(
-                    "dropping event input/output because its size (%d) exceeds the event size limit (1MB)", 1400429
+                    "dropping event input/output because its size (%d) exceeds the event size limit (1MB)", 1400441
                 ),
             ]
         )
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_404_exceptions.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_404_exceptions.json
index 70a370b0d35..f64347ea749 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_404_exceptions.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_404_exceptions.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -45,7 +45,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -62,7 +62,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -79,7 +79,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -96,7 +96,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -113,7 +113,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -130,7 +130,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -147,7 +147,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -164,7 +164,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -181,7 +181,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -198,7 +198,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -215,7 +215,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -232,7 +232,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -249,7 +249,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -266,7 +266,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -283,7 +283,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -300,7 +300,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -317,7 +317,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -334,7 +334,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -351,7 +351,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -368,7 +368,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -385,7 +385,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -402,7 +402,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -419,7 +419,7 @@
                                      "type": "template",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django",
                                        "django.template.engine.class": "django.template.engine.Engine"
@@ -437,7 +437,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -454,7 +454,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -471,7 +471,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -488,7 +488,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -505,7 +505,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -522,7 +522,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -539,7 +539,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_callable_view.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_callable_view.json
index b464ea62a78..a498faffa93 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_callable_view.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_middleware_trace_callable_view.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -45,7 +45,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -62,7 +62,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -79,7 +79,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -96,7 +96,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -113,7 +113,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -130,7 +130,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -147,7 +147,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -164,7 +164,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -181,7 +181,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -198,7 +198,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -215,7 +215,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -232,7 +232,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -249,7 +249,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -266,7 +266,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -283,7 +283,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -300,7 +300,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -317,7 +317,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -334,7 +334,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -351,7 +351,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -368,7 +368,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -385,7 +385,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -402,7 +402,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -419,7 +419,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -436,7 +436,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -453,7 +453,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_safe_string_encoding.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_safe_string_encoding.json
index ab628f0b202..9403c178210 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_safe_string_encoding.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_safe_string_encoding.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "django",
@@ -47,7 +47,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "_dd.p.tid": "654a694400000000",
          "component": "django"
        },
@@ -64,7 +64,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -81,7 +81,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
@@ -98,7 +98,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -115,7 +115,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -132,7 +132,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -149,7 +149,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -166,7 +166,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -183,7 +183,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "_dd.p.tid": "654a694400000000",
                      "component": "django"
                    },
@@ -200,7 +200,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -217,7 +217,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -234,7 +234,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -251,7 +251,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -268,7 +268,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -285,7 +285,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django",
                                  "_dd.p.tid": "654a694400000000",
                                  "component": "django"
                                },
@@ -302,7 +302,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django",
                                     "_dd.p.tid": "654a694400000000",
                                     "component": "django"
                                   },
@@ -319,7 +319,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -336,7 +336,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -353,7 +353,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -370,7 +370,7 @@
                                         "type": "",
                                         "error": 0,
                                         "meta": {
-                                          "_dd.base_service": "",
+                                          "_dd.base_service": "tests.contrib.django",
                                           "_dd.p.tid": "654a694400000000",
                                           "component": "django"
                                         },
@@ -387,7 +387,7 @@
                                         "type": "",
                                         "error": 0,
                                         "meta": {
-                                          "_dd.base_service": "",
+                                          "_dd.base_service": "tests.contrib.django",
                                           "_dd.p.tid": "654a694400000000",
                                           "component": "django"
                                         },
@@ -404,7 +404,7 @@
                                            "type": "",
                                            "error": 0,
                                            "meta": {
-                                             "_dd.base_service": "",
+                                             "_dd.base_service": "tests.contrib.django",
                                              "_dd.p.tid": "654a694400000000",
                                              "component": "django"
                                            },
@@ -421,7 +421,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -438,7 +438,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "_dd.p.tid": "654a694400000000",
                                        "component": "django"
                                      },
@@ -455,7 +455,7 @@
                                         "type": "template",
                                         "error": 0,
                                         "meta": {
-                                          "_dd.base_service": "",
+                                          "_dd.base_service": "tests.contrib.django",
                                           "_dd.p.tid": "654a694400000000",
                                           "component": "django",
                                           "django.template.engine.class": "django.template.engine.Engine",
@@ -474,7 +474,7 @@
                                            "type": "cache",
                                            "error": 0,
                                            "meta": {
-                                             "_dd.base_service": "",
+                                             "_dd.base_service": "tests.contrib.django",
                                              "_dd.p.tid": "654a694400000000",
                                              "component": "django",
                                              "django.cache.backend": "django.core.cache.backends.locmem.LocMemCache",
@@ -496,7 +496,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "_dd.p.tid": "654a694400000000",
                               "component": "django"
                             },
@@ -513,7 +513,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "_dd.p.tid": "654a694400000000",
                            "component": "django"
                          },
@@ -530,7 +530,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "_dd.p.tid": "654a694400000000",
                         "component": "django"
                       },
@@ -547,7 +547,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "_dd.p.tid": "654a694400000000",
                   "component": "django"
                 },
@@ -564,7 +564,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "_dd.p.tid": "654a694400000000",
                "component": "django"
              },
@@ -581,7 +581,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "_dd.p.tid": "654a694400000000",
             "component": "django"
           },
diff --git a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_streamed_file.json b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_streamed_file.json
index 60f30925b91..2f9439b715c 100644
--- a/tests/snapshots/tests.contrib.django.test_django_snapshots.test_streamed_file.json
+++ b/tests/snapshots/tests.contrib.django.test_django_snapshots.test_streamed_file.json
@@ -9,7 +9,7 @@
     "type": "web",
     "error": 0,
     "meta": {
-      "_dd.base_service": "",
+      "_dd.base_service": "tests.contrib.django",
       "_dd.p.dm": "-0",
       "component": "django",
       "django.request.class": "django.core.handlers.wsgi.WSGIRequest",
@@ -44,7 +44,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "",
+         "_dd.base_service": "tests.contrib.django",
          "component": "django"
        },
        "duration": 12018000,
@@ -60,7 +60,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "component": "django"
           },
           "duration": 322000,
@@ -76,7 +76,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "component": "django"
           },
           "duration": 11563000,
@@ -92,7 +92,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "component": "django"
              },
              "duration": 270000,
@@ -108,7 +108,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "component": "django"
              },
              "duration": 11198000,
@@ -124,7 +124,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "component": "django"
                 },
                 "duration": 26000,
@@ -140,7 +140,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "component": "django"
                 },
                 "duration": 11081000,
@@ -156,7 +156,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "component": "django"
                    },
                    "duration": 22000,
@@ -172,7 +172,7 @@
                    "type": "",
                    "error": 0,
                    "meta": {
-                     "_dd.base_service": "",
+                     "_dd.base_service": "tests.contrib.django",
                      "component": "django"
                    },
                    "duration": 11006000,
@@ -188,7 +188,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "component": "django"
                       },
                       "duration": 1586000,
@@ -204,7 +204,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "component": "django"
                       },
                       "duration": 9328000,
@@ -220,7 +220,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "component": "django"
                          },
                          "duration": 9248000,
@@ -236,7 +236,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "component": "django"
                             },
                             "duration": 16000,
@@ -252,7 +252,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "component": "django"
                             },
                             "duration": 9130000,
@@ -268,7 +268,7 @@
                                "type": "",
                                "error": 0,
                                "meta": {
-                                 "_dd.base_service": "",
+                                 "_dd.base_service": "tests.contrib.django",
                                  "component": "django"
                                },
                                "duration": 9096000,
@@ -284,7 +284,7 @@
                                   "type": "",
                                   "error": 0,
                                   "meta": {
-                                    "_dd.base_service": "",
+                                    "_dd.base_service": "tests.contrib.django",
                                     "component": "django"
                                   },
                                   "duration": 9045000,
@@ -300,7 +300,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "component": "django"
                                      },
                                      "duration": 33000,
@@ -316,7 +316,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "component": "django"
                                      },
                                      "duration": 18000,
@@ -332,7 +332,7 @@
                                      "type": "",
                                      "error": 0,
                                      "meta": {
-                                       "_dd.base_service": "",
+                                       "_dd.base_service": "tests.contrib.django",
                                        "component": "django"
                                      },
                                      "duration": 299000,
@@ -348,7 +348,7 @@
                             "type": "",
                             "error": 0,
                             "meta": {
-                              "_dd.base_service": "",
+                              "_dd.base_service": "tests.contrib.django",
                               "component": "django"
                             },
                             "duration": 27000,
@@ -364,7 +364,7 @@
                          "type": "",
                          "error": 0,
                          "meta": {
-                           "_dd.base_service": "",
+                           "_dd.base_service": "tests.contrib.django",
                            "component": "django"
                          },
                          "duration": 23000,
@@ -380,7 +380,7 @@
                       "type": "",
                       "error": 0,
                       "meta": {
-                        "_dd.base_service": "",
+                        "_dd.base_service": "tests.contrib.django",
                         "component": "django"
                       },
                       "duration": 15000,
@@ -396,7 +396,7 @@
                 "type": "",
                 "error": 0,
                 "meta": {
-                  "_dd.base_service": "",
+                  "_dd.base_service": "tests.contrib.django",
                   "component": "django"
                 },
                 "duration": 15000,
@@ -412,7 +412,7 @@
              "type": "",
              "error": 0,
              "meta": {
-               "_dd.base_service": "",
+               "_dd.base_service": "tests.contrib.django",
                "component": "django"
              },
              "duration": 15000,
@@ -428,7 +428,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "",
+            "_dd.base_service": "tests.contrib.django",
             "component": "django"
           },
           "duration": 21000,
diff --git a/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_False_worker_service_None.json b/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_False_worker_service_None.json
index 77e0316ae05..7a548d91093 100644
--- a/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_False_worker_service_None.json
+++ b/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_False_worker_service_None.json
@@ -9,7 +9,7 @@
     "type": "worker",
     "error": 0,
     "meta": {
-      "_dd.base_service": "tests.contrib.rq",
+      "_dd.base_service": "",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "654a694400000000",
       "component": "rq",
@@ -39,7 +39,7 @@
        "type": "",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.rq",
+         "_dd.base_service": "",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
          "job.id": "962dfa1e-4a5b-4d95-8edf-3444887c737a"
diff --git a/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_None_worker_service_None.json b/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_None_worker_service_None.json
index 1d8383fe582..a0befaff75f 100644
--- a/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_None_worker_service_None.json
+++ b/tests/snapshots/tests.contrib.rq.test_rq.test_enqueue_distributed_tracing_enabled_None_worker_service_None.json
@@ -39,7 +39,7 @@
        "type": "worker",
        "error": 0,
        "meta": {
-         "_dd.base_service": "tests.contrib.rq",
+         "_dd.base_service": "",
          "_dd.p.dm": "-0",
          "_dd.p.tid": "654a694400000000",
          "component": "rq",
@@ -71,7 +71,7 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.base_service": "tests.contrib.rq",
+            "_dd.base_service": "",
             "_dd.p.tid": "654a694400000000",
             "component": "rq",
             "job.id": "5e7a8f08-e011-4ebb-8cab-3ebbd30e089e"
diff --git a/tests/tracer/runtime/test_runtime_metrics.py b/tests/tracer/runtime/test_runtime_metrics.py
index 7f8915714de..399b536625a 100644
--- a/tests/tracer/runtime/test_runtime_metrics.py
+++ b/tests/tracer/runtime/test_runtime_metrics.py
@@ -46,7 +46,7 @@ def test_one_tag(self):
         with self.override_global_tracer():
             with self.trace("test", service="test"):
                 tags = [k for (k, v) in RuntimeTags(enabled=[SERVICE])]
-                self.assertEqual(tags, [SERVICE, SERVICE])
+                self.assertEqual(tags, [SERVICE])
 
     def test_env_tag(self):
         def filter_only_env_tags(tags):
diff --git a/tests/tracer/test_correlation_log_context.py b/tests/tracer/test_correlation_log_context.py
index 0522a042395..58f704eba3b 100644
--- a/tests/tracer/test_correlation_log_context.py
+++ b/tests/tracer/test_correlation_log_context.py
@@ -118,7 +118,7 @@ def test_get_log_correlation_context_no_active_span(self):
         assert dd_log_record == {
             "span_id": "0",
             "trace_id": "0",
-            "service": "",
+            "service": "tests.tracer",
             "env": "",
             "version": "",
         }
@@ -132,7 +132,7 @@ def test_get_log_correlation_context_disabled_tracer(self):
         assert dd_log_record == {
             "span_id": "0",
             "trace_id": "0",
-            "service": "",
+            "service": "tests.tracer",
             "env": "",
             "version": "",
         }
@@ -152,7 +152,7 @@ def test_custom_logging_injection(self):
         assert dd_log_record == {
             "span_id": str(span.span_id),
             "trace_id": format_trace_id(span),
-            "service": "",
+            "service": "tests.tracer",
             "env": "",
             "version": "",
         }
diff --git a/tests/tracer/test_trace_utils.py b/tests/tracer/test_trace_utils.py
index 1fefc505d7f..b385c6fac6e 100644
--- a/tests/tracer/test_trace_utils.py
+++ b/tests/tracer/test_trace_utils.py
@@ -257,7 +257,7 @@ def test_whitelist_case_insensitive(self, span, integration_config):
 @pytest.mark.parametrize(
     "pin,config_val,default,global_service,expected",
     [
-        (Pin(), None, None, None, None),
+        (Pin(), None, None, None, 'tests.tracer'),
         (Pin(), None, None, "global-svc", "global-svc"),
         (Pin(), None, "default-svc", None, "default-svc"),
         # Global service should have higher priority than the integration default.
@@ -280,10 +280,10 @@ def test_int_service(int_config, pin, config_val, default, global_service, expec
 def test_int_service_integration(int_config):
     pin = Pin()
     tracer = Tracer()
-    assert trace_utils.int_service(pin, int_config.myint) is None
+    assert trace_utils.int_service(pin, int_config.myint) == "tests.tracer"
 
     with override_global_config(dict(service="global-svc")):
-        assert trace_utils.int_service(pin, int_config.myint) is None
+        assert trace_utils.int_service(pin, int_config.myint) == "tests.tracer"
 
         with tracer.trace("something", service=trace_utils.int_service(pin, int_config.myint)) as s:
             assert s.service == "global-svc"
diff --git a/tests/tracer/test_tracer.py b/tests/tracer/test_tracer.py
index 83b9165945e..254d3006b4c 100644
--- a/tests/tracer/test_tracer.py
+++ b/tests/tracer/test_tracer.py
@@ -61,7 +61,7 @@ def test_tracer_vars(self):
         span.finish()
 
         span = self.trace("a")
-        span.assert_matches(name="a", service=None, resource="a", span_type=None)
+        span.assert_matches(name="a", service="tests.tracer", resource="a", span_type=None)
         span.finish()
 
     def test_tracer(self):
@@ -400,7 +400,7 @@ def test_start_span_optional(self):
 
     def test_start_span_service_default(self):
         span = self.start_span("")
-        span.assert_matches(service=None)
+        span.assert_matches(service="tests.tracer")
         span.finish()
 
     def test_start_span_service_from_parent(self):
@@ -466,7 +466,7 @@ def test_start_child_from_context(self):
         )
 
     def test_adding_services(self):
-        assert self.tracer._services == set("tests.tracer")
+        assert self.tracer._services == set(["tests.tracer"])
         with self.start_span("root", service="one") as root:
             assert self.tracer._services == set(["one", "tests.tracer"])
             with self.start_span("child", service="two", child_of=root):

From 6eb8f273a6a3ba71574ba41fc7e65d1af2dece0b Mon Sep 17 00:00:00 2001
From: William Conti <william.conti@datadoghq.com>
Date: Thu, 14 Nov 2024 12:12:19 -0500
Subject: [PATCH 06/18] more fixes

---
 tests/contrib/langchain/test_langchain.py     | 34 +++++++++----------
 tests/contrib/logging/test_logging.py         |  4 +--
 tests/contrib/openai/test_openai_v0.py        |  4 +--
 tests/contrib/openai/test_openai_v1.py        |  4 +--
 .../test_llmobs_span_agentless_writer.py      |  2 +-
 tests/tracer/runtime/test_runtime_metrics.py  |  2 +-
 tests/tracer/test_correlation_log_context.py  |  6 ++--
 tests/tracer/test_settings.py                 |  2 +-
 tests/tracer/test_tracer.py                   |  2 +-
 9 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/tests/contrib/langchain/test_langchain.py b/tests/contrib/langchain/test_langchain.py
index 9928723a845..ee7918d920d 100644
--- a/tests/contrib/langchain/test_langchain.py
+++ b/tests/contrib/langchain/test_langchain.py
@@ -174,7 +174,7 @@ def test_openai_llm_metrics(langchain, request_vcr, mock_metrics, mock_logs, sna
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.langchain",
         "langchain.request.provider:openai",
         "langchain.request.model:text-davinci-003",
         "langchain.request.type:llm",
@@ -213,7 +213,7 @@ def test_llm_logs(langchain, ddtrace_config_langchain, request_vcr, mock_logs, m
             "message": "sampled langchain.llms.openai.OpenAI",
             "hostname": mock.ANY,
             "ddsource": "langchain",
-            "service": "",
+            "service": "tests.contrib.langchain",
             "status": "info",
             "ddtags": "env:,version:,langchain.request.provider:openai,langchain.request.model:text-davinci-003,langchain.request.type:llm,langchain.request.api_key:...key>",  # noqa: E501
             "dd.trace_id": hex(trace_id)[2:],
@@ -334,7 +334,7 @@ def test_chat_model_metrics(langchain, request_vcr, mock_metrics, mock_logs, sna
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.langchain",
         "langchain.request.provider:openai",
         "langchain.request.model:gpt-3.5-turbo",
         "langchain.request.type:chat_model",
@@ -373,7 +373,7 @@ def test_chat_model_logs(langchain, ddtrace_config_langchain, request_vcr, mock_
             "message": "sampled langchain.chat_models.openai.ChatOpenAI",
             "hostname": mock.ANY,
             "ddsource": "langchain",
-            "service": "",
+            "service": "tests.contrib.langchain",
             "status": "info",
             "ddtags": "env:,version:,langchain.request.provider:openai,langchain.request.model:gpt-3.5-turbo,langchain.request.type:chat_model,langchain.request.api_key:...key>",  # noqa: E501
             "dd.trace_id": hex(trace_id)[2:],
@@ -424,7 +424,7 @@ def test_openai_embedding_metrics(langchain, request_vcr, mock_metrics, mock_log
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.langchain",
         "langchain.request.provider:openai",
         "langchain.request.model:text-embedding-ada-002",
         "langchain.request.type:embedding",
@@ -457,7 +457,7 @@ def test_embedding_logs(langchain, ddtrace_config_langchain, request_vcr, mock_l
             "message": "sampled langchain.embeddings.openai.OpenAIEmbeddings",
             "hostname": mock.ANY,
             "ddsource": "langchain",
-            "service": "",
+            "service": "tests.contrib.langchain",
             "status": "info",
             "ddtags": "env:,version:,langchain.request.provider:openai,langchain.request.model:text-embedding-ada-002,langchain.request.type:embedding,langchain.request.api_key:...key>",  # noqa: E501
             "dd.trace_id": hex(trace_id)[2:],
@@ -635,7 +635,7 @@ def test_openai_chain_metrics(langchain, request_vcr, mock_metrics, mock_logs, s
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.langchain",
         "langchain.request.provider:openai",
         "langchain.request.model:text-davinci-003",
         mock.ANY,  # should be in format "langchain.request.type:<type>"
@@ -678,7 +678,7 @@ def test_chain_logs(langchain, ddtrace_config_langchain, request_vcr, mock_logs,
                     "message": "sampled langchain.llms.openai.OpenAI",
                     "hostname": mock.ANY,
                     "ddsource": "langchain",
-                    "service": "",
+                    "service": "tests.contrib.langchain",
                     "status": "info",
                     "ddtags": "env:,version:,langchain.request.provider:openai,langchain.request.model:text-davinci-003,langchain.request.type:llm,langchain.request.api_key:...key>",  # noqa: E501
                     "dd.trace_id": hex(llm_span.trace_id)[2:],
@@ -693,7 +693,7 @@ def test_chain_logs(langchain, ddtrace_config_langchain, request_vcr, mock_logs,
                     "message": "sampled langchain.chains.llm.LLMChain",
                     "hostname": mock.ANY,
                     "ddsource": "langchain",
-                    "service": "",
+                    "service": "tests.contrib.langchain",
                     "status": "info",
                     "ddtags": "env:,version:,langchain.request.provider:,langchain.request.model:,langchain.request.type:chain,langchain.request.api_key:",  # noqa: E501
                     "dd.trace_id": hex(mid_chain_span.trace_id)[2:],
@@ -713,7 +713,7 @@ def test_chain_logs(langchain, ddtrace_config_langchain, request_vcr, mock_logs,
                     "message": "sampled langchain.chains.llm_math.base.LLMMathChain",
                     "hostname": mock.ANY,
                     "ddsource": "langchain",
-                    "service": "",
+                    "service": "tests.contrib.langchain",
                     "status": "info",
                     "ddtags": "env:,version:,langchain.request.provider:,langchain.request.model:,langchain.request.type:chain,langchain.request.api_key:",  # noqa: E501
                     "dd.trace_id": hex(base_chain_span.trace_id)[2:],
@@ -849,7 +849,7 @@ def test_vectorstore_similarity_search_metrics(langchain, request_vcr, mock_metr
     expected_tags = [
         "version:",
         "env:",
-        "service:",
+        "service:tests.contrib.langchain",
         "langchain.request.provider:pinecone",
         "langchain.request.model:",
         "langchain.request.type:similarity_search",
@@ -893,7 +893,7 @@ def test_vectorstore_logs(langchain, ddtrace_config_langchain, request_vcr, mock
                     "message": "sampled langchain.embeddings.openai.OpenAIEmbeddings",
                     "hostname": mock.ANY,
                     "ddsource": "langchain",
-                    "service": "",
+                    "service": "tests.contrib.langchain",
                     "status": "info",
                     "ddtags": "env:,version:,langchain.request.provider:openai,langchain.request.model:text-embedding-ada-002,langchain.request.type:embedding,langchain.request.api_key:...key>",  # noqa: E501
                     "dd.trace_id": hex(embeddings_span.trace_id)[2:],
@@ -907,7 +907,7 @@ def test_vectorstore_logs(langchain, ddtrace_config_langchain, request_vcr, mock
                     "message": "sampled langchain.vectorstores.pinecone.Pinecone",
                     "hostname": mock.ANY,
                     "ddsource": "langchain",
-                    "service": "",
+                    "service": "tests.contrib.langchain",
                     "status": "info",
                     "ddtags": "env:,version:,langchain.request.provider:pinecone,langchain.request.model:,langchain.request.type:similarity_search,langchain.request.api_key:...key>",  # noqa: E501
                     "dd.trace_id": hex(vectorstore_span.trace_id)[2:],
@@ -1020,7 +1020,7 @@ def test_llm_logs_when_response_not_completed(
             "message": "sampled langchain.llms.openai.OpenAI",
             "hostname": mock.ANY,
             "ddsource": "langchain",
-            "service": "",
+            "service": "tests.contrib.langchain",
             "status": "error",
             "ddtags": "env:,version:,langchain.request.provider:openai,langchain.request.model:text-davinci-003,langchain.request.type:llm,langchain.request.api_key:...key>",  # noqa: E501
             "dd.trace_id": hex(trace_id)[2:],
@@ -1054,7 +1054,7 @@ def test_chat_model_logs_when_response_not_completed(
             "message": "sampled langchain.chat_models.openai.ChatOpenAI",
             "hostname": mock.ANY,
             "ddsource": "langchain",
-            "service": "",
+            "service": "tests.contrib.langchain",
             "status": "error",
             "ddtags": "env:,version:,langchain.request.provider:openai,langchain.request.model:gpt-3.5-turbo,langchain.request.type:chat_model,langchain.request.api_key:...key>",  # noqa: E501
             "dd.trace_id": hex(trace_id)[2:],
@@ -1091,7 +1091,7 @@ def test_embedding_logs_when_response_not_completed(
             "message": "sampled langchain.embeddings.openai.OpenAIEmbeddings",
             "hostname": mock.ANY,
             "ddsource": "langchain",
-            "service": "",
+            "service": "tests.contrib.langchain",
             "status": "error",
             "ddtags": "env:,version:,langchain.request.provider:openai,langchain.request.model:text-embedding-ada-002,langchain.request.type:embedding,langchain.request.api_key:...key>",  # noqa: E501
             "dd.trace_id": hex(trace_id)[2:],
@@ -1134,7 +1134,7 @@ def test_vectorstore_logs_error(langchain, ddtrace_config_langchain, mock_logs,
             "message": "sampled langchain.vectorstores.pinecone.Pinecone",
             "hostname": mock.ANY,
             "ddsource": "langchain",
-            "service": "",
+            "service": "tests.contrib.langchain",
             "status": "error",
             "ddtags": "env:,version:,langchain.request.provider:pinecone,langchain.request.model:,langchain.request.type:similarity_search,langchain.request.api_key:...key>",  # noqa: E501
             "dd.trace_id": hex(vectorstore_span.trace_id)[2:],
diff --git a/tests/contrib/logging/test_logging.py b/tests/contrib/logging/test_logging.py
index 5a981fe1027..37eb28ec9a1 100644
--- a/tests/contrib/logging/test_logging.py
+++ b/tests/contrib/logging/test_logging.py
@@ -139,10 +139,10 @@ def test_log_trace(self):
         def create_span():
             return self.tracer.trace("test.logging")
 
-        self._test_logging(create_span=create_span)
+        self._test_logging(create_span=create_span, service="")
 
         with self.override_global_config(dict(version="global.version", env="global.env")):
-            self._test_logging(create_span=create_span, version="global.version", env="global.env", service="")
+            self._test_logging(create_span=create_span, version="global.version", env="global.env")
 
     @TracerTestCase.run_in_subprocess(env_overrides=dict(DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED="True"))
     def test_log_trace_128bit_trace_ids(self):
diff --git a/tests/contrib/openai/test_openai_v0.py b/tests/contrib/openai/test_openai_v0.py
index c3e5127f4a4..5207d4fc105 100644
--- a/tests/contrib/openai/test_openai_v0.py
+++ b/tests/contrib/openai/test_openai_v0.py
@@ -278,7 +278,7 @@ def test_logs_completions(openai_vcr, openai, ddtrace_config_openai, mock_logs,
                     "message": mock.ANY,
                     "hostname": mock.ANY,
                     "ddsource": "openai",
-                    "service": "",
+                    "service": "tests.contrib.openai",
                     "status": "info",
                     "ddtags": "env:,version:,openai.request.endpoint:/v1/completions,openai.request.method:POST,openai.request.model:ada,openai.organization.name:datadog-4,openai.user.api_key:sk-...key>",  # noqa: E501
                     "dd.trace_id": "{:x}".format(trace_id),
@@ -540,7 +540,7 @@ def test_logs_image_create(openai_vcr, openai, ddtrace_config_openai, mock_logs,
                     "message": mock.ANY,
                     "hostname": mock.ANY,
                     "ddsource": "openai",
-                    "service": "",
+                    "service": "tests.contrib.openai",
                     "status": "info",
                     "ddtags": "env:,version:,openai.request.endpoint:/v1/images/generations,openai.request.method:POST,openai.request.model:dall-e,openai.organization.name:datadog-4,openai.user.api_key:sk-...key>",  # noqa: E501
                     "dd.trace_id": "{:x}".format(trace_id),
diff --git a/tests/contrib/openai/test_openai_v1.py b/tests/contrib/openai/test_openai_v1.py
index 2972ed64114..f13de144fc5 100644
--- a/tests/contrib/openai/test_openai_v1.py
+++ b/tests/contrib/openai/test_openai_v1.py
@@ -300,7 +300,7 @@ def test_logs_completions(openai_vcr, openai, ddtrace_config_openai, mock_logs,
                     "message": mock.ANY,
                     "hostname": mock.ANY,
                     "ddsource": "openai",
-                    "service": "",
+                    "service": "tests.contrib.openai",
                     "status": "info",
                     "ddtags": "env:,version:,openai.request.endpoint:/v1/completions,openai.request.method:POST,openai.request.model:ada,openai.organization.name:datadog-4,openai.user.api_key:sk-...key>",  # noqa: E501
                     "dd.trace_id": "{:x}".format(trace_id),
@@ -589,7 +589,7 @@ def test_logs_image_create(openai_vcr, openai, ddtrace_config_openai, mock_logs,
                     "message": mock.ANY,
                     "hostname": mock.ANY,
                     "ddsource": "openai",
-                    "service": "",
+                    "service": "tests.contrib.openai",
                     "status": "info",
                     "ddtags": "env:,version:,openai.request.endpoint:/v1/images/generations,openai.request.method:POST,openai.request.model:dall-e,openai.organization.name:datadog-4,openai.user.api_key:sk-...key>",  # noqa: E501
                     "dd.trace_id": "{:x}".format(trace_id),
diff --git a/tests/llmobs/test_llmobs_span_agentless_writer.py b/tests/llmobs/test_llmobs_span_agentless_writer.py
index 223007fae70..96dc26e5146 100644
--- a/tests/llmobs/test_llmobs_span_agentless_writer.py
+++ b/tests/llmobs/test_llmobs_span_agentless_writer.py
@@ -63,7 +63,7 @@ def test_truncating_oversized_events(mock_writer_logs, mock_http_writer_send_pay
         mock_writer_logs.warning.assert_has_calls(
             [
                 mock.call(
-                    "dropping event input/output because its size (%d) exceeds the event size limit (1MB)", 14007720
+                    "dropping event input/output because its size (%d) exceeds the event size limit (1MB)", 1400720
                 ),
                 mock.call(
                     "dropping event input/output because its size (%d) exceeds the event size limit (1MB)", 1400460
diff --git a/tests/tracer/runtime/test_runtime_metrics.py b/tests/tracer/runtime/test_runtime_metrics.py
index 399b536625a..9039da147a5 100644
--- a/tests/tracer/runtime/test_runtime_metrics.py
+++ b/tests/tracer/runtime/test_runtime_metrics.py
@@ -46,7 +46,7 @@ def test_one_tag(self):
         with self.override_global_tracer():
             with self.trace("test", service="test"):
                 tags = [k for (k, v) in RuntimeTags(enabled=[SERVICE])]
-                self.assertEqual(tags, [SERVICE])
+                self.assertEqual(set(tags), set([SERVICE]))
 
     def test_env_tag(self):
         def filter_only_env_tags(tags):
diff --git a/tests/tracer/test_correlation_log_context.py b/tests/tracer/test_correlation_log_context.py
index 58f704eba3b..0522a042395 100644
--- a/tests/tracer/test_correlation_log_context.py
+++ b/tests/tracer/test_correlation_log_context.py
@@ -118,7 +118,7 @@ def test_get_log_correlation_context_no_active_span(self):
         assert dd_log_record == {
             "span_id": "0",
             "trace_id": "0",
-            "service": "tests.tracer",
+            "service": "",
             "env": "",
             "version": "",
         }
@@ -132,7 +132,7 @@ def test_get_log_correlation_context_disabled_tracer(self):
         assert dd_log_record == {
             "span_id": "0",
             "trace_id": "0",
-            "service": "tests.tracer",
+            "service": "",
             "env": "",
             "version": "",
         }
@@ -152,7 +152,7 @@ def test_custom_logging_injection(self):
         assert dd_log_record == {
             "span_id": str(span.span_id),
             "trace_id": format_trace_id(span),
-            "service": "tests.tracer",
+            "service": "",
             "env": "",
             "version": "",
         }
diff --git a/tests/tracer/test_settings.py b/tests/tracer/test_settings.py
index ffd64ece6f3..c78302712e7 100644
--- a/tests/tracer/test_settings.py
+++ b/tests/tracer/test_settings.py
@@ -148,7 +148,7 @@ def test_allow_exist_both_global_and_integration_config(self):
 
     def test_service(self):
         ic = IntegrationConfig(self.config, "foo")
-        assert ic.service == "tests.tracer"
+        assert ic.service is None
 
     @BaseTestCase.run_in_subprocess(env_overrides=dict(DD_FOO_SERVICE="foo-svc"))
     def test_service_env_var(self):
diff --git a/tests/tracer/test_tracer.py b/tests/tracer/test_tracer.py
index 254d3006b4c..b41768df5c6 100644
--- a/tests/tracer/test_tracer.py
+++ b/tests/tracer/test_tracer.py
@@ -61,7 +61,7 @@ def test_tracer_vars(self):
         span.finish()
 
         span = self.trace("a")
-        span.assert_matches(name="a", service="tests.tracer", resource="a", span_type=None)
+        span.assert_matches(name="a", resource="a", span_type=None)
         span.finish()
 
     def test_tracer(self):

From a19847c34d0bd420441059cccd453a7afcfbef09 Mon Sep 17 00:00:00 2001
From: William Conti <william.conti@datadoghq.com>
Date: Thu, 14 Nov 2024 12:56:24 -0500
Subject: [PATCH 07/18] more fixes

---
 tests/contrib/logging/test_logging.py  | 2 +-
 tests/contrib/openai/test_openai_v0.py | 4 ++--
 tests/tracer/test_sampler.py           | 8 ++++----
 tests/tracer/test_trace_utils.py       | 5 ++++-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/tests/contrib/logging/test_logging.py b/tests/contrib/logging/test_logging.py
index 37eb28ec9a1..5289ff73d9a 100644
--- a/tests/contrib/logging/test_logging.py
+++ b/tests/contrib/logging/test_logging.py
@@ -142,7 +142,7 @@ def create_span():
         self._test_logging(create_span=create_span, service="")
 
         with self.override_global_config(dict(version="global.version", env="global.env")):
-            self._test_logging(create_span=create_span, version="global.version", env="global.env")
+            self._test_logging(create_span=create_span, version="global.version", env="global.env", service="")
 
     @TracerTestCase.run_in_subprocess(env_overrides=dict(DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED="True"))
     def test_log_trace_128bit_trace_ids(self):
diff --git a/tests/contrib/openai/test_openai_v0.py b/tests/contrib/openai/test_openai_v0.py
index 5207d4fc105..04654f4a4cf 100644
--- a/tests/contrib/openai/test_openai_v0.py
+++ b/tests/contrib/openai/test_openai_v0.py
@@ -627,7 +627,7 @@ def test_logs_image_edit(openai_vcr, openai, ddtrace_config_openai, mock_logs, m
                     "message": mock.ANY,
                     "hostname": mock.ANY,
                     "ddsource": "openai",
-                    "service": "",
+                    "service": "tests.contrib.openai",
                     "status": "info",
                     "ddtags": "env:,version:,openai.request.endpoint:/v1/images/edits,openai.request.method:POST,openai.request.model:dall-e,openai.organization.name:datadog-4,openai.user.api_key:sk-...key>",  # noqa: E501
                     "dd.trace_id": "{:x}".format(trace_id),
@@ -711,7 +711,7 @@ def test_logs_image_variation(openai_vcr, openai, ddtrace_config_openai, mock_lo
                     "message": mock.ANY,
                     "hostname": mock.ANY,
                     "ddsource": "openai",
-                    "service": "",
+                    "service": "tests.contrib.openai",
                     "status": "info",
                     "ddtags": "env:,version:,openai.request.endpoint:/v1/images/variations,openai.request.method:POST,openai.request.model:dall-e,openai.organization.name:datadog-4,openai.user.api_key:sk-...key>",  # noqa: E501
                     "dd.trace_id": "{:x}".format(trace_id),
diff --git a/tests/tracer/test_sampler.py b/tests/tracer/test_sampler.py
index bf86dacef0a..035f8a0adeb 100644
--- a/tests/tracer/test_sampler.py
+++ b/tests/tracer/test_sampler.py
@@ -512,10 +512,10 @@ def test_sampling_rule_matches_name(span, rule, span_expected_to_match_rule):
         for service, pattern, expected_to_match in [
             ("my-service", SamplingRule.NO_RULE, True),
             ("my-service", None, False),
-            (None, None, True),
-            (None, "my-service", False),
-            (None, re.compile(r"my-service"), False),
-            (None, lambda service: "service" in service, False),
+            (None, "tests.tracer", True),
+            ("tests.tracer", "my-service", False),
+            ("tests.tracer", re.compile(r"my-service"), False),
+            ("tests.tracer", lambda service: "service" in service, False),
             ("my-service", "my-service", True),
             ("my-service", "my_service", False),
             ("my-service", re.compile(r"^my-"), True),
diff --git a/tests/tracer/test_trace_utils.py b/tests/tracer/test_trace_utils.py
index b385c6fac6e..5b07f1d63c7 100644
--- a/tests/tracer/test_trace_utils.py
+++ b/tests/tracer/test_trace_utils.py
@@ -283,7 +283,10 @@ def test_int_service_integration(int_config):
     assert trace_utils.int_service(pin, int_config.myint) == "tests.tracer"
 
     with override_global_config(dict(service="global-svc")):
-        assert trace_utils.int_service(pin, int_config.myint) == "tests.tracer"
+        # ensure int config picks up overriden changes
+        int_config = config
+
+        assert trace_utils.int_service(pin, int_config.myint) == "global-svc"
 
         with tracer.trace("something", service=trace_utils.int_service(pin, int_config.myint)) as s:
             assert s.service == "global-svc"

From 1fd2bb11721a8d2b097031cac1636db352ba5af3 Mon Sep 17 00:00:00 2001
From: William Conti <william.conti@datadoghq.com>
Date: Thu, 14 Nov 2024 12:56:51 -0500
Subject: [PATCH 08/18] fix lint

---
 tests/contrib/logging/test_logging.py      | 14 +++---
 tests/contrib/openai/test_openai_llmobs.py | 58 +++++++++++-----------
 tests/tracer/test_trace_utils.py           |  2 +-
 3 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/tests/contrib/logging/test_logging.py b/tests/contrib/logging/test_logging.py
index 5289ff73d9a..2e85d73e386 100644
--- a/tests/contrib/logging/test_logging.py
+++ b/tests/contrib/logging/test_logging.py
@@ -237,10 +237,8 @@ def func():
 
             lines = output.splitlines()
             assert (
-                "Hello! [dd.service=tests.contrib.logging dd.env= dd.version= " +
-                    "dd.trace_id={:032x} dd.span_id={}]".format(
-                    span.trace_id, span.span_id
-                )
+                "Hello! [dd.service=tests.contrib.logging dd.env= dd.version= "
+                + "dd.trace_id={:032x} dd.span_id={}]".format(span.trace_id, span.span_id)
                 == lines[0]
             )
 
@@ -267,10 +265,10 @@ def test_log_strformat_style_format(self):
             with self.tracer.trace("test.logging") as span:
                 record = logger.makeRecord("name", "INFO", "func", 534, "Manual log record", (), None)
                 log = formatter.format(record)
-                expected = ("Manual log record [dd.service=tests.contrib.logging dd.env= dd.version= " +
-                    "dd.trace_id={:032x} dd.span_id={}]").format(
-                    span.trace_id, span.span_id
-                )
+                expected = (
+                    "Manual log record [dd.service=tests.contrib.logging dd.env= dd.version= "
+                    + "dd.trace_id={:032x} dd.span_id={}]"
+                ).format(span.trace_id, span.span_id)
                 assert log == expected
 
                 assert not hasattr(record, "dd")
diff --git a/tests/contrib/openai/test_openai_llmobs.py b/tests/contrib/openai/test_openai_llmobs.py
index a2f80c38a37..ddba259e928 100644
--- a/tests/contrib/openai/test_openai_llmobs.py
+++ b/tests/contrib/openai/test_openai_llmobs.py
@@ -37,7 +37,7 @@ def test_completion(self, openai, ddtrace_global_config, mock_llmobs_writer, moc
                 output_messages=[{"content": ", relax!” I said to my laptop"}, {"content": " (1"}],
                 metadata={"temperature": 0.8, "max_tokens": 10, "n": 2, "stop": ".", "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 2, "output_tokens": 12, "total_tokens": 14},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -59,7 +59,7 @@ def test_completion_stream(self, openai, ddtrace_global_config, mock_llmobs_writ
                 output_messages=[{"content": expected_completion}],
                 metadata={"stream": True},
                 token_metrics={"input_tokens": 2, "output_tokens": 16, "total_tokens": 18},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             ),
         )
 
@@ -92,7 +92,7 @@ def test_chat_completion(self, openai, ddtrace_global_config, mock_llmobs_writer
                 output_messages=[{"role": "assistant", "content": choice.message.content} for choice in resp.choices],
                 metadata={"top_p": 0.9, "n": 2, "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 57, "output_tokens": 34, "total_tokens": 91},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -126,7 +126,7 @@ async def test_chat_completion_stream(self, openai, ddtrace_global_config, mock_
                 output_messages=[{"content": expected_completion, "role": "assistant"}],
                 metadata={"stream": True, "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 8, "output_tokens": 12, "total_tokens": 20},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -154,7 +154,7 @@ def test_chat_completion_function_call(self, openai, ddtrace_global_config, mock
                 output_messages=[function_call_expected_output],
                 metadata={"function_call": "auto", "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 157, "output_tokens": 57, "total_tokens": 214},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -189,7 +189,7 @@ def test_chat_completion_function_call_stream(self, openai, ddtrace_global_confi
                 output_messages=[tool_call_expected_output],
                 metadata={"stream": True, "user": "ddtrace-test", "function_call": "auto"},
                 token_metrics={"input_tokens": 63, "output_tokens": 33, "total_tokens": 96},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -233,7 +233,7 @@ def test_chat_completion_tool_call(self, openai, ddtrace_global_config, mock_llm
                 output_messages=[expected_output],
                 metadata={"tool_choice": "auto", "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 157, "output_tokens": 57, "total_tokens": 214},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -265,7 +265,7 @@ def test_completion_error(self, openai, ddtrace_global_config, mock_llmobs_write
                 error="openai.error.AuthenticationError",
                 error_message="Incorrect API key provided: <not-a-r****key>. You can find your API key at https://platform.openai.com/account/api-keys.",  # noqa: E501
                 error_stack=span.get_tag("error.stack"),
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -297,7 +297,7 @@ def test_chat_completion_error(self, openai, ddtrace_global_config, mock_llmobs_
                 error="openai.error.AuthenticationError",
                 error_message="Incorrect API key provided: <not-a-r****key>. You can find your API key at https://platform.openai.com/account/api-keys.",  # noqa: E501
                 error_stack=span.get_tag("error.stack"),
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -335,7 +335,7 @@ def test_completion(self, openai, ddtrace_global_config, mock_llmobs_writer, moc
                 output_messages=[{"content": ", relax!” I said to my laptop"}, {"content": " (1"}],
                 metadata={"temperature": 0.8, "max_tokens": 10, "n": 2, "stop": ".", "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 2, "output_tokens": 12, "total_tokens": 14},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -365,7 +365,7 @@ def test_completion_azure(
                 output_messages=[{"content": expected_output}],
                 metadata={"temperature": 0, "max_tokens": 20, "n": 1, "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 16, "output_tokens": 20, "total_tokens": 36},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -395,7 +395,7 @@ async def test_completion_azure_async(
                 output_messages=[{"content": expected_output}],
                 metadata={"temperature": 0, "max_tokens": 20, "n": 1, "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 16, "output_tokens": 20, "total_tokens": 36},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -422,7 +422,7 @@ def test_completion_stream(self, openai, ddtrace_global_config, mock_llmobs_writ
                 output_messages=[{"content": expected_completion}],
                 metadata={"stream": True},
                 token_metrics={"input_tokens": 2, "output_tokens": 2, "total_tokens": 4},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             ),
         )
 
@@ -454,7 +454,7 @@ def test_chat_completion(self, openai, ddtrace_global_config, mock_llmobs_writer
                 output_messages=[{"role": "assistant", "content": choice.message.content} for choice in resp.choices],
                 metadata={"top_p": 0.9, "n": 2, "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 57, "output_tokens": 34, "total_tokens": 91},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -484,7 +484,7 @@ def test_chat_completion_azure(
                 output_messages=[{"role": "assistant", "content": expected_output}],
                 metadata={"temperature": 0, "max_tokens": 20, "n": 1, "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 18, "output_tokens": 20, "total_tokens": 38},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -514,7 +514,7 @@ async def test_chat_completion_azure_async(
                 output_messages=[{"role": "assistant", "content": expected_output}],
                 metadata={"temperature": 0, "max_tokens": 20, "n": 1, "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 18, "output_tokens": 20, "total_tokens": 38},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -549,7 +549,7 @@ def test_chat_completion_stream(self, openai, ddtrace_global_config, mock_llmobs
                 output_messages=[{"content": expected_completion, "role": "assistant"}],
                 metadata={"stream": True, "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 8, "output_tokens": 8, "total_tokens": 16},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -584,7 +584,7 @@ def test_chat_completion_stream_tokens(self, openai, ddtrace_global_config, mock
                 output_messages=[{"content": expected_completion, "role": "assistant"}],
                 metadata={"stream": True, "stream_options": {"include_usage": True}},
                 token_metrics={"input_tokens": 17, "output_tokens": 19, "total_tokens": 36},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -627,7 +627,7 @@ def test_chat_completion_function_call(self, openai, ddtrace_global_config, mock
                 output_messages=[expected_output],
                 metadata={"function_call": "auto", "user": "ddtrace-test"},
                 token_metrics={"input_tokens": 157, "output_tokens": 57, "total_tokens": 214},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -653,7 +653,7 @@ def test_chat_completion_tool_call(self, openai, ddtrace_global_config, mock_llm
                 output_messages=[tool_call_expected_output],
                 metadata={"user": "ddtrace-test"},
                 token_metrics={"input_tokens": 157, "output_tokens": 57, "total_tokens": 214},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -686,7 +686,7 @@ def test_chat_completion_tool_call_stream(self, openai, ddtrace_global_config, m
                 output_messages=[tool_call_expected_output],
                 metadata={"user": "ddtrace-test", "stream": True, "stream_options": {"include_usage": True}},
                 token_metrics={"input_tokens": 166, "output_tokens": 43, "total_tokens": 209},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -719,7 +719,7 @@ def test_completion_error(self, openai, ddtrace_global_config, mock_llmobs_write
                 error="openai.AuthenticationError",
                 error_message="Error code: 401 - {'error': {'message': 'Incorrect API key provided: <not-a-r****key>. You can find your API key at https://platform.openai.com/account/api-keys.', 'type': 'invalid_request_error', 'param': None, 'code': 'invalid_api_key'}}",  # noqa: E501
                 error_stack=span.get_tag("error.stack"),
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -752,7 +752,7 @@ def test_chat_completion_error(self, openai, ddtrace_global_config, mock_llmobs_
                 error="openai.AuthenticationError",
                 error_message="Error code: 401 - {'error': {'message': 'Incorrect API key provided: <not-a-r****key>. You can find your API key at https://platform.openai.com/account/api-keys.', 'type': 'invalid_request_error', 'param': None, 'code': 'invalid_api_key'}}",  # noqa: E501
                 error_stack=span.get_tag("error.stack"),
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -772,7 +772,7 @@ def test_embedding_string(self, openai, ddtrace_global_config, mock_llmobs_write
                 input_documents=[{"text": "hello world"}],
                 output_value="[1 embedding(s) returned with size 1536]",
                 token_metrics={"input_tokens": 2, "output_tokens": 0, "total_tokens": 2},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -792,7 +792,7 @@ def test_embedding_string_array(self, openai, ddtrace_global_config, mock_llmobs
                 input_documents=[{"text": "hello world"}, {"text": "hello again"}],
                 output_value="[2 embedding(s) returned with size 1536]",
                 token_metrics={"input_tokens": 4, "output_tokens": 0, "total_tokens": 4},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -812,7 +812,7 @@ def test_embedding_token_array(self, openai, ddtrace_global_config, mock_llmobs_
                 input_documents=[{"text": "[1111, 2222, 3333]"}],
                 output_value="[1 embedding(s) returned with size 1536]",
                 token_metrics={"input_tokens": 3, "output_tokens": 0, "total_tokens": 3},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -838,7 +838,7 @@ def test_embedding_array_of_token_arrays(self, openai, ddtrace_global_config, mo
                 ],
                 output_value="[3 embedding(s) returned with size 1536]",
                 token_metrics={"input_tokens": 9, "output_tokens": 0, "total_tokens": 9},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -863,7 +863,7 @@ def test_embedding_string_base64(self, openai, ddtrace_global_config, mock_llmob
                 input_documents=[{"text": "hello world"}],
                 output_value="[1 embedding(s) returned]",
                 token_metrics={"input_tokens": 2, "output_tokens": 0, "total_tokens": 2},
-                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+                tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
             )
         )
 
@@ -893,7 +893,7 @@ def test_unserializable_param_is_handled(self, openai, ddtrace_global_config, mo
             error=span.get_tag("error.type"),
             error_message=span.get_tag("error.message"),
             error_stack=span.get_tag("error.stack"),
-            tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"}
+            tags={"ml_app": "<ml-app-name>", "service": "tests.contrib.openai"},
         )
         mock_llmobs_writer.enqueue.assert_called_with(expected_span)
         actual_span = mock_llmobs_writer.enqueue.call_args[0][0]
diff --git a/tests/tracer/test_trace_utils.py b/tests/tracer/test_trace_utils.py
index 5b07f1d63c7..33f3876fa15 100644
--- a/tests/tracer/test_trace_utils.py
+++ b/tests/tracer/test_trace_utils.py
@@ -257,7 +257,7 @@ def test_whitelist_case_insensitive(self, span, integration_config):
 @pytest.mark.parametrize(
     "pin,config_val,default,global_service,expected",
     [
-        (Pin(), None, None, None, 'tests.tracer'),
+        (Pin(), None, None, None, "tests.tracer"),
         (Pin(), None, None, "global-svc", "global-svc"),
         (Pin(), None, "default-svc", None, "default-svc"),
         # Global service should have higher priority than the integration default.

From 61afb08017cb9d77ec91b07f097022de7b535b3a Mon Sep 17 00:00:00 2001
From: William Conti <william.conti@datadoghq.com>
Date: Thu, 14 Nov 2024 13:01:14 -0500
Subject: [PATCH 09/18] fix spelling

---
 tests/tracer/test_trace_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tracer/test_trace_utils.py b/tests/tracer/test_trace_utils.py
index 33f3876fa15..79579e344e0 100644
--- a/tests/tracer/test_trace_utils.py
+++ b/tests/tracer/test_trace_utils.py
@@ -283,7 +283,7 @@ def test_int_service_integration(int_config):
     assert trace_utils.int_service(pin, int_config.myint) == "tests.tracer"
 
     with override_global_config(dict(service="global-svc")):
-        # ensure int config picks up overriden changes
+        # ensure int config picks up overridden changes
         int_config = config
 
         assert trace_utils.int_service(pin, int_config.myint) == "global-svc"

From 70c118ea56f12356a36372300bc981ef6087479a Mon Sep 17 00:00:00 2001
From: William Conti <william.conti@datadoghq.com>
Date: Thu, 14 Nov 2024 13:43:09 -0500
Subject: [PATCH 10/18] fix log creation test hopefully

---
 tests/tracer/test_correlation_log_context.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/tracer/test_correlation_log_context.py b/tests/tracer/test_correlation_log_context.py
index 0522a042395..7c7e059ee5a 100644
--- a/tests/tracer/test_correlation_log_context.py
+++ b/tests/tracer/test_correlation_log_context.py
@@ -118,7 +118,7 @@ def test_get_log_correlation_context_no_active_span(self):
         assert dd_log_record == {
             "span_id": "0",
             "trace_id": "0",
-            "service": "",
+            "service": "tests.tracer",
             "env": "",
             "version": "",
         }
@@ -132,7 +132,7 @@ def test_get_log_correlation_context_disabled_tracer(self):
         assert dd_log_record == {
             "span_id": "0",
             "trace_id": "0",
-            "service": "",
+            "service": "tests.tracer",
             "env": "",
             "version": "",
         }

From 5231fd7777a87c039a03b9b0b33bde50826a59b5 Mon Sep 17 00:00:00 2001
From: William Conti <william.conti@datadoghq.com>
Date: Thu, 14 Nov 2024 14:44:09 -0500
Subject: [PATCH 11/18] fix test

---
 tests/tracer/test_correlation_log_context.py | 2 +-
 tests/tracer/test_tracer.py                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/tracer/test_correlation_log_context.py b/tests/tracer/test_correlation_log_context.py
index 7c7e059ee5a..58f704eba3b 100644
--- a/tests/tracer/test_correlation_log_context.py
+++ b/tests/tracer/test_correlation_log_context.py
@@ -152,7 +152,7 @@ def test_custom_logging_injection(self):
         assert dd_log_record == {
             "span_id": str(span.span_id),
             "trace_id": format_trace_id(span),
-            "service": "",
+            "service": "tests.tracer",
             "env": "",
             "version": "",
         }
diff --git a/tests/tracer/test_tracer.py b/tests/tracer/test_tracer.py
index b41768df5c6..5ca6cf1063e 100644
--- a/tests/tracer/test_tracer.py
+++ b/tests/tracer/test_tracer.py
@@ -466,7 +466,7 @@ def test_start_child_from_context(self):
         )
 
     def test_adding_services(self):
-        assert self.tracer._services == set(["tests.tracer"])
+        assert self.tracer._services == set()
         with self.start_span("root", service="one") as root:
             assert self.tracer._services == set(["one", "tests.tracer"])
             with self.start_span("child", service="two", child_of=root):

From f47917ca47904353f089579c8ba69b640c41b220 Mon Sep 17 00:00:00 2001
From: William Conti <william.conti@datadoghq.com>
Date: Thu, 14 Nov 2024 15:10:07 -0500
Subject: [PATCH 12/18] why are these tests failing CI but passing locally ugh

---
 tests/tracer/test_tracer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tracer/test_tracer.py b/tests/tracer/test_tracer.py
index 5ca6cf1063e..b41768df5c6 100644
--- a/tests/tracer/test_tracer.py
+++ b/tests/tracer/test_tracer.py
@@ -466,7 +466,7 @@ def test_start_child_from_context(self):
         )
 
     def test_adding_services(self):
-        assert self.tracer._services == set()
+        assert self.tracer._services == set(["tests.tracer"])
         with self.start_span("root", service="one") as root:
             assert self.tracer._services == set(["one", "tests.tracer"])
             with self.start_span("child", service="two", child_of=root):

From 1114318942d66d5a390e39649a0ce828d0116ccf Mon Sep 17 00:00:00 2001
From: William Conti <william.conti@datadoghq.com>
Date: Thu, 14 Nov 2024 15:24:23 -0500
Subject: [PATCH 13/18] add debugging code

---
 ddtrace/settings/config.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ddtrace/settings/config.py b/ddtrace/settings/config.py
index 8af5aa9b2d6..6df6dfff84f 100644
--- a/ddtrace/settings/config.py
+++ b/ddtrace/settings/config.py
@@ -475,8 +475,16 @@ def __init__(self):
 
         self.env = _get_config("DD_ENV", self.tags.get("env"))
         self.service = _get_config("DD_SERVICE", self.tags.get("service", DEFAULT_SPAN_SERVICE_NAME))
+        print("service")
+        print(self.service)
+        print("args")
+        print(sys.argv)
+        print("sys executable")
+        print(sys.executable)
         self._inferred_base_service = detect_service(sys.argv)
-
+        print("inferredService")
+        print("service")
+        print(self._inferred_base_service)
         if self.service is None and in_gcp_function():
             self.service = _get_config(["K_SERVICE", "FUNCTION_NAME"], DEFAULT_SPAN_SERVICE_NAME)
         if self.service is None and in_azure_function():

From 1476aaf4a91c3239d8f6c413092a85c1cf6c8c07 Mon Sep 17 00:00:00 2001
From: William Conti <william.conti@datadoghq.com>
Date: Thu, 14 Nov 2024 16:18:41 -0500
Subject: [PATCH 14/18] fix tests hopefully

---
 ddtrace/settings/config.py                   |  17 +-
 tests/tracer/test_correlation_log_context.py | 244 ++++++++++++-------
 tests/tracer/test_tracer.py                  |   7 +-
 3 files changed, 160 insertions(+), 108 deletions(-)

diff --git a/ddtrace/settings/config.py b/ddtrace/settings/config.py
index 6df6dfff84f..d3db98d76c0 100644
--- a/ddtrace/settings/config.py
+++ b/ddtrace/settings/config.py
@@ -474,23 +474,16 @@ def __init__(self):
         self._propagation_http_baggage_enabled = _get_config("DD_TRACE_PROPAGATION_HTTP_BAGGAGE_ENABLED", False, asbool)
 
         self.env = _get_config("DD_ENV", self.tags.get("env"))
-        self.service = _get_config("DD_SERVICE", self.tags.get("service", DEFAULT_SPAN_SERVICE_NAME))
-        print("service")
-        print(self.service)
-        print("args")
-        print(sys.argv)
-        print("sys executable")
-        print(sys.executable)
+        self.service = _get_config("DD_SERVICE", self.tags.get("service", None))
+
         self._inferred_base_service = detect_service(sys.argv)
-        print("inferredService")
-        print("service")
-        print(self._inferred_base_service)
+
         if self.service is None and in_gcp_function():
             self.service = _get_config(["K_SERVICE", "FUNCTION_NAME"], DEFAULT_SPAN_SERVICE_NAME)
         if self.service is None and in_azure_function():
             self.service = _get_config("WEBSITE_SITE_NAME", DEFAULT_SPAN_SERVICE_NAME)
-        if self.service is None and self._inferred_base_service:
-            self.service = self._inferred_base_service
+        if self.service is None and DEFAULT_SPAN_SERVICE_NAME:
+            self.service = DEFAULT_SPAN_SERVICE_NAME
 
         self._extra_services = set()
         self._extra_services_queue = None if in_aws_lambda() or not self._remote_config_enabled else File_Queue()
diff --git a/tests/tracer/test_correlation_log_context.py b/tests/tracer/test_correlation_log_context.py
index 58f704eba3b..73b21443fbc 100644
--- a/tests/tracer/test_correlation_log_context.py
+++ b/tests/tracer/test_correlation_log_context.py
@@ -1,17 +1,11 @@
 import pytest
-import structlog
 
 from ddtrace import Tracer
 from ddtrace import config
 from ddtrace import tracer
-from ddtrace._trace.context import Context
-from ddtrace._trace.provider import _DD_CONTEXTVAR
-from ddtrace.opentracer.tracer import Tracer as OT_Tracer
-from tests.utils import override_global_config
 
 
-@pytest.fixture
-def global_config():
+def global_config(config):
     config.service = "test-service"
     config.env = "test-env"
     config.version = "test-version"
@@ -36,9 +30,15 @@ def format_trace_id(span):
         return str(span._trace_id_64bits)
 
 
-class TestCorrelationLogsContext(object):
-    def test_get_log_correlation_service(self, global_config):
-        """Ensure expected DDLogRecord service is generated via get_correlation_log_record."""
+@pytest.mark.subprocess()
+def test_get_log_correlation_service():
+    """Ensure expected DDLogRecord service is generated via get_correlation_log_record."""
+    from ddtrace import Tracer
+    from ddtrace import tracer
+    from tests.tracer.test_correlation_log_context import format_trace_id
+    from tests.utils import override_global_config
+
+    with override_global_config(dict(service="test-service", env="test-env", version="test-version")):
         with tracer.trace("test-span-1", service="span-service") as span1:
             dd_log_record = tracer.get_log_correlation_context()
         assert dd_log_record == {
@@ -60,8 +60,16 @@ def test_get_log_correlation_service(self, global_config):
             "version": "test-version",
         }
 
-    def test_get_log_correlation_context_basic(self, global_config):
-        """Ensure expected DDLogRecord is generated via get_correlation_log_record."""
+
+@pytest.mark.subprocess()
+def test_get_log_correlation_context_basic():
+    """Ensure expected DDLogRecord is generated via get_correlation_log_record."""
+    from ddtrace import Tracer
+    from ddtrace.context import Context
+    from tests.tracer.test_correlation_log_context import format_trace_id
+    from tests.utils import override_global_config
+
+    with override_global_config(dict(service="test-service", env="test-env", version="test-version")):
         tracer = Tracer()
         with tracer.trace("test-span-1") as span1:
             dd_log_record = tracer.get_log_correlation_context()
@@ -71,7 +79,7 @@ def test_get_log_correlation_context_basic(self, global_config):
             "service": "test-service",
             "env": "test-env",
             "version": "test-version",
-        }
+        }, dd_log_record
         test_tracer = Tracer()
         with test_tracer.trace("test-span-2") as span2:
             dd_log_record = test_tracer.get_log_correlation_context()
@@ -81,7 +89,7 @@ def test_get_log_correlation_context_basic(self, global_config):
             "service": "test-service",
             "env": "test-env",
             "version": "test-version",
-        }
+        }, dd_log_record
 
         tracer.context_provider.activate(
             Context(
@@ -95,10 +103,17 @@ def test_get_log_correlation_context_basic(self, global_config):
             "service": "test-service",
             "env": "test-env",
             "version": "test-version",
-        }
+        }, test_tracer.get_log_correlation_context()
+
+
+@pytest.mark.subprocess()
+def test_get_log_correlation_context_opentracer():
+    """Ensure expected DDLogRecord generated via get_correlation_log_record with an opentracing Tracer."""
+    from ddtrace.opentracer.tracer import Tracer as OT_Tracer
+    from tests.tracer.test_correlation_log_context import format_trace_id
+    from tests.utils import override_global_config
 
-    def test_get_log_correlation_context_opentracer(self, global_config):
-        """Ensure expected DDLogRecord generated via get_correlation_log_record with an opentracing Tracer."""
+    with override_global_config(dict(service="test-service", env="test-env", version="test-version")):
         ot_tracer = OT_Tracer(service_name="test-service")
         with ot_tracer.start_active_span("operation") as scope:
             dd_span = scope._span._dd_span
@@ -109,93 +124,136 @@ def test_get_log_correlation_context_opentracer(self, global_config):
             "service": "test-service",
             "env": "test-env",
             "version": "test-version",
-        }
+        }, dd_log_record
 
-    def test_get_log_correlation_context_no_active_span(self):
-        """Ensure empty DDLogRecord generated if no active span."""
-        tracer = Tracer()
+
+@pytest.mark.subprocess()
+def test_get_log_correlation_context_no_active_span():
+    """Ensure empty DDLogRecord generated if no active span."""
+    from ddtrace import Tracer
+
+    tracer = Tracer()
+    dd_log_record = tracer.get_log_correlation_context()
+    assert dd_log_record == {
+        "span_id": "0",
+        "trace_id": "0",
+        "service": "ddtrace_subprocess_dir",
+        "env": "",
+        "version": "",
+    }, dd_log_record
+
+
+@pytest.mark.subprocess()
+def test_get_log_correlation_context_disabled_tracer():
+    """Ensure get_correlation_log_record returns None if tracer is disabled."""
+    from ddtrace import Tracer
+
+    tracer = Tracer()
+    tracer.enabled = False
+    with tracer.trace("test-span"):
         dd_log_record = tracer.get_log_correlation_context()
-        assert dd_log_record == {
-            "span_id": "0",
-            "trace_id": "0",
-            "service": "tests.tracer",
-            "env": "",
-            "version": "",
-        }
+    assert dd_log_record == {
+        "span_id": "0",
+        "trace_id": "0",
+        "service": "ddtrace_subprocess_dir",
+        "env": "",
+        "version": "",
+    }, dd_log_record
 
-    def test_get_log_correlation_context_disabled_tracer(self):
-        """Ensure get_correlation_log_record returns None if tracer is disabled."""
-        tracer = Tracer()
-        tracer.enabled = False
-        with tracer.trace("test-span"):
-            dd_log_record = tracer.get_log_correlation_context()
-        assert dd_log_record == {
-            "span_id": "0",
-            "trace_id": "0",
-            "service": "tests.tracer",
-            "env": "",
-            "version": "",
-        }
 
-    def test_custom_logging_injection(self):
-        """Ensure custom log injection via get_correlation_log_record returns proper active span information."""
-        capture_log = structlog.testing.LogCapture()
-        structlog.configure(processors=[tracer_injection, capture_log, structlog.processors.JSONRenderer()])
-        logger = structlog.get_logger()
+@pytest.mark.subprocess()
+def test_custom_logging_injection_global_config():
+    """Ensure custom log injection via get_correlation_log_record returns proper tracer information."""
+    from ddtrace import tracer
+    from ddtrace._trace.provider import _DD_CONTEXTVAR
+    from ddtrace.contrib.structlog import patch
+    from tests.tracer.test_correlation_log_context import format_trace_id
+    from tests.tracer.test_correlation_log_context import tracer_injection
+    from tests.utils import override_global_config
+
+    patch()
+
+    import structlog
 
+    _DD_CONTEXTVAR.set(None)
+    capture_log = structlog.testing.LogCapture()
+    structlog.configure(processors=[tracer_injection, capture_log, structlog.processors.JSONRenderer()])
+    logger = structlog.get_logger()
+
+    with override_global_config(dict(version="global-version", env="global-env", service="global-service")):
         with tracer.trace("test span") as span:
             logger.msg("Hello!")
 
-        assert len(capture_log.entries) == 1
-        assert capture_log.entries[0]["event"] == "Hello!"
-        dd_log_record = capture_log.entries[0]["dd"]
-        assert dd_log_record == {
-            "span_id": str(span.span_id),
-            "trace_id": format_trace_id(span),
-            "service": "tests.tracer",
-            "env": "",
-            "version": "",
-        }
+    assert len(capture_log.entries) == 1
+    assert capture_log.entries[0]["event"] == "Hello!"
+    dd_log_record = capture_log.entries[0]["dd"]
+    assert dd_log_record == {
+        "span_id": str(span.span_id),
+        "trace_id": format_trace_id(span),
+        "service": "global-service",
+        "env": "global-env",
+        "version": "global-version",
+    }, dd_log_record
 
-    def test_custom_logging_injection_global_config(self):
-        """Ensure custom log injection via get_correlation_log_record returns proper tracer information."""
-        _DD_CONTEXTVAR.set(None)
-        capture_log = structlog.testing.LogCapture()
-        structlog.configure(processors=[tracer_injection, capture_log, structlog.processors.JSONRenderer()])
-        logger = structlog.get_logger()
 
-        with override_global_config(dict(version="global-version", env="global-env", service="global-service")):
-            with tracer.trace("test span") as span:
-                logger.msg("Hello!")
+@pytest.mark.subprocess()
+def test_custom_logging_injection_no_span():
+    """Ensure custom log injection via get_correlation_log_record with no active span returns empty record."""
+    from ddtrace._trace.provider import _DD_CONTEXTVAR
+    from ddtrace.contrib.structlog import patch
+    from tests.tracer.test_correlation_log_context import tracer_injection
+    from tests.utils import override_global_config
 
-        assert len(capture_log.entries) == 1
-        assert capture_log.entries[0]["event"] == "Hello!"
-        dd_log_record = capture_log.entries[0]["dd"]
-        assert dd_log_record == {
-            "span_id": str(span.span_id),
-            "trace_id": format_trace_id(span),
-            "service": "global-service",
-            "env": "global-env",
-            "version": "global-version",
-        }
+    patch()
 
-    def test_custom_logging_injection_no_span(self):
-        """Ensure custom log injection via get_correlation_log_record with no active span returns empty record."""
-        _DD_CONTEXTVAR.set(None)
-        capture_log = structlog.testing.LogCapture()
-        structlog.configure(processors=[tracer_injection, capture_log, structlog.processors.JSONRenderer()])
-        logger = structlog.get_logger()
+    import structlog
 
-        with override_global_config(dict(version="global-version", env="global-env", service="global-service")):
-            logger.msg("No Span!")
+    _DD_CONTEXTVAR.set(None)
+    capture_log = structlog.testing.LogCapture()
+    structlog.configure(processors=[tracer_injection, capture_log, structlog.processors.JSONRenderer()])
+    logger = structlog.get_logger()
 
-        assert len(capture_log.entries) == 1
-        assert capture_log.entries[0]["event"] == "No Span!"
-        dd_log_record = capture_log.entries[0]["dd"]
-        assert dd_log_record == {
-            "span_id": "0",
-            "trace_id": "0",
-            "service": "global-service",
-            "env": "global-env",
-            "version": "global-version",
-        }
+    with override_global_config(dict(version="global-version", env="global-env", service="global-service")):
+        logger.msg("No Span!")
+
+    assert len(capture_log.entries) == 1
+    assert capture_log.entries[0]["event"] == "No Span!"
+    dd_log_record = capture_log.entries[0]["dd"]
+    assert dd_log_record == {
+        "span_id": "0",
+        "trace_id": "0",
+        "service": "global-service",
+        "env": "global-env",
+        "version": "global-version",
+    }, dd_log_record
+
+
+@pytest.mark.subprocess()
+def test_custom_logging_injection():
+    """Ensure custom log injection via get_correlation_log_record returns proper active span information."""
+    from ddtrace import tracer
+    from ddtrace.contrib.structlog import patch
+    from tests.tracer.test_correlation_log_context import format_trace_id
+    from tests.tracer.test_correlation_log_context import tracer_injection
+
+    patch()
+
+    import structlog
+
+    capture_log = structlog.testing.LogCapture()
+    structlog.configure(processors=[tracer_injection, capture_log, structlog.processors.JSONRenderer()])
+    logger = structlog.get_logger()
+
+    with tracer.trace("test span") as span:
+        logger.msg("Hello!")
+
+    assert len(capture_log.entries) == 1
+    assert capture_log.entries[0]["event"] == "Hello!"
+    dd_log_record = capture_log.entries[0]["dd"]
+    assert dd_log_record == {
+        "span_id": str(span.span_id),
+        "trace_id": format_trace_id(span),
+        "service": "ddtrace_subprocess_dir",
+        "env": "",
+        "version": "",
+    }, dd_log_record
diff --git a/tests/tracer/test_tracer.py b/tests/tracer/test_tracer.py
index b41768df5c6..cd1a2c7cfca 100644
--- a/tests/tracer/test_tracer.py
+++ b/tests/tracer/test_tracer.py
@@ -465,13 +465,14 @@ def test_start_child_from_context(self):
             _parent=None,
         )
 
+    @run_in_subprocess()
     def test_adding_services(self):
-        assert self.tracer._services == set(["tests.tracer"])
+        assert self.tracer._services == set(), self.tracer._services
         with self.start_span("root", service="one") as root:
-            assert self.tracer._services == set(["one", "tests.tracer"])
+            assert self.tracer._services == set(["one"]), self.tracer._services
             with self.start_span("child", service="two", child_of=root):
                 pass
-        assert self.tracer._services == set(["one", "two", "tests.tracer"])
+        assert self.tracer._services == set(["one", "two"]), self.tracer._services
 
     @run_in_subprocess(env_overrides=dict(DD_SERVICE_MAPPING="two:three"))
     def test_adding_mapped_services(self):

From 3cb84d18f1a6d5aa0f5cc8c028ee63b389aa3956 Mon Sep 17 00:00:00 2001
From: William Conti <william.conti@datadoghq.com>
Date: Thu, 14 Nov 2024 17:05:38 -0500
Subject: [PATCH 15/18] fix telemetry tests

---
 ddtrace/settings/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ddtrace/settings/config.py b/ddtrace/settings/config.py
index d3db98d76c0..65baf99ccb3 100644
--- a/ddtrace/settings/config.py
+++ b/ddtrace/settings/config.py
@@ -483,7 +483,7 @@ def __init__(self):
         if self.service is None and in_azure_function():
             self.service = _get_config("WEBSITE_SITE_NAME", DEFAULT_SPAN_SERVICE_NAME)
         if self.service is None and DEFAULT_SPAN_SERVICE_NAME:
-            self.service = DEFAULT_SPAN_SERVICE_NAME
+            self.service = _get_config("DD_SERVICE", DEFAULT_SPAN_SERVICE_NAME)
 
         self._extra_services = set()
         self._extra_services_queue = None if in_aws_lambda() or not self._remote_config_enabled else File_Queue()

From 1bd25e3c482ffb976ca2d6897f79ab0d9eafc406 Mon Sep 17 00:00:00 2001
From: William Conti <william.conti@datadoghq.com>
Date: Fri, 15 Nov 2024 11:07:21 -0500
Subject: [PATCH 16/18] fix final tests

---
 ddtrace/sampler.py           |  11 +++-
 tests/tracer/test_sampler.py | 116 ++++++++++++++++++-----------------
 2 files changed, 69 insertions(+), 58 deletions(-)

diff --git a/ddtrace/sampler.py b/ddtrace/sampler.py
index 9c78905a70b..be6f8898ef0 100644
--- a/ddtrace/sampler.py
+++ b/ddtrace/sampler.py
@@ -134,10 +134,17 @@ def __init__(self, sample_rate=1.0):
     def set_sample_rate(
         self,
         sample_rate,  # type: float
-        service="",  # type: str
-        env="",  # type: str
+        service=None,  # type: Optional[str]
+        env=None,  # type: Optional[str]
     ):
         # type: (...) -> None
+
+        # if we have a blank service, we need to match it to the config.service
+        if service is None:
+            service = config.service
+        if env is None:
+            env = config.env
+
         self._by_service_samplers[self._key(service, env)] = _AgentRateSampler(sample_rate)
 
     def sample(self, span):
diff --git a/tests/tracer/test_sampler.py b/tests/tracer/test_sampler.py
index 035f8a0adeb..ad1496f67ae 100644
--- a/tests/tracer/test_sampler.py
+++ b/tests/tracer/test_sampler.py
@@ -154,68 +154,72 @@ def test_sample_rate_0_does_not_reset_to_1(self):
         ), "Setting the sample rate to zero should result in the sample rate being zero"
 
 
-class RateByServiceSamplerTest(unittest.TestCase):
-    def test_default_key(self):
-        assert (
-            "service:,env:" == RateByServiceSampler._default_key
-        ), "default key should correspond to no service and no env"
+# RateByServiceSamplerTest Cases
+def test_default_key():
+    assert (
+        "service:,env:" == RateByServiceSampler._default_key
+    ), "default key should correspond to no service and no env"
 
-    def test_key(self):
-        assert (
-            RateByServiceSampler._default_key == RateByServiceSampler._key()
-        ), "_key() with no arguments returns the default key"
-        assert "service:mcnulty,env:" == RateByServiceSampler._key(
-            service="mcnulty"
-        ), "_key call with service name returns expected result"
-        assert "service:,env:test" == RateByServiceSampler._key(
-            env="test"
-        ), "_key call with env name returns expected result"
-        assert "service:mcnulty,env:test" == RateByServiceSampler._key(
-            service="mcnulty", env="test"
-        ), "_key call with service and env name returns expected result"
-        assert "service:mcnulty,env:test" == RateByServiceSampler._key(
-            "mcnulty", "test"
-        ), "_key call with service and env name as positional args returns expected result"
-
-    @run_in_subprocess(env=dict(DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED="true"))
-    def test_sample_rate_deviation_128bit_trace_id(self):
-        self._test_sample_rate_deviation()
-
-    @run_in_subprocess(env=dict(DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED="false"))
-    def test_sample_rate_deviation_64bit_trace_id(self):
-        self._test_sample_rate_deviation()
-
-    def _test_sample_rate_deviation(self):
-        for sample_rate in [0.1, 0.25, 0.5, 1]:
-            tracer = DummyTracer()
-            tracer.configure(sampler=RateByServiceSampler())
-            tracer._sampler.set_sample_rate(sample_rate)
 
-            iterations = int(1e4 / sample_rate)
+def test_key():
+    assert (
+        RateByServiceSampler._default_key == RateByServiceSampler._key()
+    ), "_key() with no arguments returns the default key"
+    assert "service:mcnulty,env:" == RateByServiceSampler._key(
+        service="mcnulty"
+    ), "_key call with service name returns expected result"
+    assert "service:,env:test" == RateByServiceSampler._key(
+        env="test"
+    ), "_key call with env name returns expected result"
+    assert "service:mcnulty,env:test" == RateByServiceSampler._key(
+        service="mcnulty", env="test"
+    ), "_key call with service and env name returns expected result"
+    assert "service:mcnulty,env:test" == RateByServiceSampler._key(
+        "mcnulty", "test"
+    ), "_key call with service and env name as positional args returns expected result"
+
+
+@run_in_subprocess(env=dict(DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED="true"))
+def test_sample_rate_deviation_128bit_trace_id():
+    _test_sample_rate_deviation()
+
+
+@run_in_subprocess(env=dict(DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED="false", DD_SERVICE="my-svc"))
+def test_sample_rate_deviation_64bit_trace_id():
+    _test_sample_rate_deviation()
+
+
+def _test_sample_rate_deviation():
+    for sample_rate in [0.1, 0.25, 0.5, 1]:
+        tracer = DummyTracer()
+        tracer.configure(sampler=RateByServiceSampler())
+        tracer._sampler.set_sample_rate(sample_rate)
 
-            for i in range(iterations):
-                span = tracer.trace(str(i))
-                span.finish()
+        iterations = int(1e4 / sample_rate)
 
-            samples = tracer.pop()
-            samples_with_high_priority = 0
-            for sample in samples:
-                sample_priority = sample.context.sampling_priority
-                samples_with_high_priority += int(bool(sample_priority > 0))
-                assert_sampling_decision_tags(
-                    sample,
-                    agent=sample_rate,
-                    trace_tag="-{}".format(SamplingMechanism.AGENT_RATE),
-                )
-
-            deviation = abs(samples_with_high_priority - (iterations * sample_rate)) / (iterations * sample_rate)
-            assert (
-                deviation < 0.05
-            ), "Actual sample rate should be within 5 percent of set sample " "rate (actual: %f, set: %f)" % (
-                deviation,
-                sample_rate,
+        for i in range(iterations):
+            span = tracer.trace(str(i))
+            span.finish()
+
+        samples = tracer.pop()
+        samples_with_high_priority = 0
+        for sample in samples:
+            sample_priority = sample.context.sampling_priority
+            samples_with_high_priority += int(bool(sample_priority > 0))
+            assert_sampling_decision_tags(
+                sample,
+                agent=sample_rate,
+                trace_tag="-{}".format(SamplingMechanism.AGENT_RATE),
             )
 
+        deviation = abs(samples_with_high_priority - (iterations * sample_rate)) / (iterations * sample_rate)
+        assert (
+            deviation < 0.05
+        ), "Actual sample rate should be within 5 percent of set sample " "rate (actual: %f, set: %f)" % (
+            deviation,
+            sample_rate,
+        )
+
 
 @pytest.mark.parametrize(
     "sample_rate,expectation",

From 4e1d94dead1176eed5865dcfe78b44fe11027fb5 Mon Sep 17 00:00:00 2001
From: William Conti <william.conti@datadoghq.com>
Date: Fri, 15 Nov 2024 12:11:22 -0500
Subject: [PATCH 17/18] add release note

---
 ...fix-pytest-inferred-service-naming-5ba12e991d040a1b.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 releasenotes/notes/fix-pytest-inferred-service-naming-5ba12e991d040a1b.yaml

diff --git a/releasenotes/notes/fix-pytest-inferred-service-naming-5ba12e991d040a1b.yaml b/releasenotes/notes/fix-pytest-inferred-service-naming-5ba12e991d040a1b.yaml
new file mode 100644
index 00000000000..2f440c5175e
--- /dev/null
+++ b/releasenotes/notes/fix-pytest-inferred-service-naming-5ba12e991d040a1b.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Updates the inferred base service name algorithm to ensure that arguments following ``--ddtrace`` are no 
+    longer skipped when executing tests with pytest. Previously, the algorithm misinterpreted these arguments 
+    as standard flags, overlooking possible test paths that may contribute to the inferred service name.

From 2237bea8d487828d5422720067979bbaf9151242 Mon Sep 17 00:00:00 2001
From: William Conti <58711692+wconti27@users.noreply.github.com>
Date: Mon, 18 Nov 2024 12:40:58 -0500
Subject: [PATCH 18/18] Update
 releasenotes/notes/fix-pytest-inferred-service-naming-5ba12e991d040a1b.yaml

---
 .../fix-pytest-inferred-service-naming-5ba12e991d040a1b.yaml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/releasenotes/notes/fix-pytest-inferred-service-naming-5ba12e991d040a1b.yaml b/releasenotes/notes/fix-pytest-inferred-service-naming-5ba12e991d040a1b.yaml
index 2f440c5175e..cb6977a3816 100644
--- a/releasenotes/notes/fix-pytest-inferred-service-naming-5ba12e991d040a1b.yaml
+++ b/releasenotes/notes/fix-pytest-inferred-service-naming-5ba12e991d040a1b.yaml
@@ -1,6 +1,6 @@
 ---
 fixes:
   - |
-    Updates the inferred base service name algorithm to ensure that arguments following ``--ddtrace`` are no 
+    ci_visibility: Updates the inferred base service name algorithm to ensure that arguments following ``--ddtrace`` are no 
     longer skipped when executing tests with pytest. Previously, the algorithm misinterpreted these arguments 
     as standard flags, overlooking possible test paths that may contribute to the inferred service name.