diff --git a/tests/snapshots/tests.contrib.openai.test_openai_v0.test_integration_service_name[None-None].json b/tests/snapshots/tests.contrib.openai.test_openai_v0.test_integration_service_name[None-None].json
deleted file mode 100644
index 65eec00d96..0000000000
--- a/tests/snapshots/tests.contrib.openai.test_openai_v0.test_integration_service_name[None-None].json
+++ /dev/null
@@ -1,77 +0,0 @@
-[[
-  {
-    "name": "openai.request",
-    "service": "ddtrace_subprocess_dir",
-    "resource": "createCompletion",
-    "trace_id": 0,
-    "span_id": 1,
-    "parent_id": 0,
-    "type": "",
-    "error": 0,
-    "meta": {
-      "_dd.p.dm": "-0",
-      "_dd.p.tid": "65674d7100000000",
-      "component": "openai",
-      "language": "python",
-      "openai.api_base": "https://api.openai.com/v1",
-      "openai.api_type": "open_ai",
-      "openai.organization.name": "datadog-4",
-      "openai.request.client": "OpenAI",
-      "openai.request.endpoint": "/v1/completions",
-      "openai.request.max_tokens": "10",
-      "openai.request.method": "POST",
-      "openai.request.model": "ada",
-      "openai.request.n": "2",
-      "openai.request.prompt.0": "Hello world",
-      "openai.request.stop": ".",
-      "openai.request.temperature": "0.8",
-      "openai.response.choices.0.finish_reason": "length",
-      "openai.response.choices.0.text": ", relax!\u201d I said to my laptop",
-      "openai.response.choices.1.finish_reason": "stop",
-      "openai.response.choices.1.text": " (1",
-      "openai.response.created": "1681852797",
-      "openai.response.id": "cmpl-76n1xLvRKv3mfjx7hJ41UHrHy9ar6",
-      "openai.response.model": "ada",
-      "openai.user.api_key": "sk-...key>",
-      "runtime-id": "8c92d3e850d9413593bf481d805039d1"
-    },
-    "metrics": {
-      "_dd.measured": 1,
-      "_dd.top_level": 1,
-      "_dd.tracer_kr": 1.0,
-      "_sampling_priority_v1": 1,
-      "openai.organization.ratelimit.requests.limit": 3000,
-      "openai.organization.ratelimit.requests.remaining": 2999,
-      "openai.organization.ratelimit.tokens.limit": 250000,
-      "openai.organization.ratelimit.tokens.remaining": 249979,
-      "process_id": 20673
-    },
-    "duration": 21745000,
-    "start": 1701268849462298000
-  },
-     {
-       "name": "requests.request",
-       "service": "openai",
-       "resource": "POST /v1/completions",
-       "trace_id": 0,
-       "span_id": 2,
-       "parent_id": 1,
-       "type": "http",
-       "error": 0,
-       "meta": {
-         "_dd.base_service": "ddtrace_subprocess_dir",
-         "component": "requests",
-         "http.method": "POST",
-         "http.status_code": "200",
-         "http.url": "https://api.openai.com/v1/completions",
-         "http.useragent": "OpenAI/v1 PythonBindings/0.27.2",
-         "out.host": "api.openai.com",
-         "span.kind": "client"
-       },
-       "metrics": {
-         "_dd.measured": 1,
-         "_dd.top_level": 1
-       },
-       "duration": 2999000,
-       "start": 1701268849479960000
-     }]]
diff --git a/tests/snapshots/tests.contrib.openai.test_openai_v0.test_integration_service_name[None-v0].json b/tests/snapshots/tests.contrib.openai.test_openai_v0.test_integration_service_name[None-v0].json
deleted file mode 100644
index d6417fb566..0000000000
--- a/tests/snapshots/tests.contrib.openai.test_openai_v0.test_integration_service_name[None-v0].json
+++ /dev/null
@@ -1,77 +0,0 @@
-[[
-  {
-    "name": "openai.request",
-    "service": "ddtrace_subprocess_dir",
-    "resource": "createCompletion",
-    "trace_id": 0,
-    "span_id": 1,
-    "parent_id": 0,
-    "type": "",
-    "error": 0,
-    "meta": {
-      "_dd.p.dm": "-0",
-      "_dd.p.tid": "65674d7200000000",
-      "component": "openai",
-      "language": "python",
-      "openai.api_base": "https://api.openai.com/v1",
-      "openai.api_type": "open_ai",
-      "openai.organization.name": "datadog-4",
-      "openai.request.client": "OpenAI",
-      "openai.request.endpoint": "/v1/completions",
-      "openai.request.max_tokens": "10",
-      "openai.request.method": "POST",
-      "openai.request.model": "ada",
-      "openai.request.n": "2",
-      "openai.request.prompt.0": "Hello world",
-      "openai.request.stop": ".",
-      "openai.request.temperature": "0.8",
-      "openai.response.choices.0.finish_reason": "length",
-      "openai.response.choices.0.text": ", relax!\u201d I said to my laptop",
-      "openai.response.choices.1.finish_reason": "stop",
-      "openai.response.choices.1.text": " (1",
-      "openai.response.created": "1681852797",
-      "openai.response.id": "cmpl-76n1xLvRKv3mfjx7hJ41UHrHy9ar6",
-      "openai.response.model": "ada",
-      "openai.user.api_key": "sk-...key>",
-      "runtime-id": "675032183b244929ba8c3a0a1c0021e5"
-    },
-    "metrics": {
-      "_dd.measured": 1,
-      "_dd.top_level": 1,
-      "_dd.tracer_kr": 1.0,
-      "_sampling_priority_v1": 1,
-      "openai.organization.ratelimit.requests.limit": 3000,
-      "openai.organization.ratelimit.requests.remaining": 2999,
-      "openai.organization.ratelimit.tokens.limit": 250000,
-      "openai.organization.ratelimit.tokens.remaining": 249979,
-      "process_id": 20696
-    },
-    "duration": 20412000,
-    "start": 1701268850764763000
-  },
-     {
-       "name": "requests.request",
-       "service": "openai",
-       "resource": "POST /v1/completions",
-       "trace_id": 0,
-       "span_id": 2,
-       "parent_id": 1,
-       "type": "http",
-       "error": 0,
-       "meta": {
-         "_dd.base_service": "ddtrace_subprocess_dir",
-         "component": "requests",
-         "http.method": "POST",
-         "http.status_code": "200",
-         "http.url": "https://api.openai.com/v1/completions",
-         "http.useragent": "OpenAI/v1 PythonBindings/0.27.2",
-         "out.host": "api.openai.com",
-         "span.kind": "client"
-       },
-       "metrics": {
-         "_dd.measured": 1,
-         "_dd.top_level": 1
-       },
-       "duration": 3134000,
-       "start": 1701268850780901000
-     }]]
diff --git a/tests/snapshots/tests.contrib.openai.test_openai_v0.test_integration_service_name[None-v1].json b/tests/snapshots/tests.contrib.openai.test_openai_v0.test_integration_service_name[None-v1].json
deleted file mode 100644
index 979ea768ef..0000000000
--- a/tests/snapshots/tests.contrib.openai.test_openai_v0.test_integration_service_name[None-v1].json
+++ /dev/null
@@ -1,77 +0,0 @@
-[[
-  {
-    "name": "openai.request",
-    "service": "ddtrace_subprocess_dir",
-    "resource": "createCompletion",
-    "trace_id": 0,
-    "span_id": 1,
-    "parent_id": 0,
-    "type": "",
-    "error": 0,
-    "meta": {
-      "_dd.p.dm": "-0",
-      "_dd.p.tid": "65674d7400000000",
-      "component": "openai",
-      "language": "python",
-      "openai.api_base": "https://api.openai.com/v1",
-      "openai.api_type": "open_ai",
-      "openai.organization.name": "datadog-4",
-      "openai.request.client": "OpenAI",
-      "openai.request.endpoint": "/v1/completions",
-      "openai.request.max_tokens": "10",
-      "openai.request.method": "POST",
-      "openai.request.model": "ada",
-      "openai.request.n": "2",
-      "openai.request.prompt.0": "Hello world",
-      "openai.request.stop": ".",
-      "openai.request.temperature": "0.8",
-      "openai.response.choices.0.finish_reason": "length",
-      "openai.response.choices.0.text": ", relax!\u201d I said to my laptop",
-      "openai.response.choices.1.finish_reason": "stop",
-      "openai.response.choices.1.text": " (1",
-      "openai.response.created": "1681852797",
-      "openai.response.id": "cmpl-76n1xLvRKv3mfjx7hJ41UHrHy9ar6",
-      "openai.response.model": "ada",
-      "openai.user.api_key": "sk-...key>",
-      "runtime-id": "1f3499a720954236be60cf0fece4246c"
-    },
-    "metrics": {
-      "_dd.measured": 1,
-      "_dd.top_level": 1,
-      "_dd.tracer_kr": 1.0,
-      "_sampling_priority_v1": 1,
-      "openai.organization.ratelimit.requests.limit": 3000,
-      "openai.organization.ratelimit.requests.remaining": 2999,
-      "openai.organization.ratelimit.tokens.limit": 250000,
-      "openai.organization.ratelimit.tokens.remaining": 249979,
-      "process_id": 20714
-    },
-    "duration": 19970000,
-    "start": 1701268852029562000
-  },
-     {
-       "name": "http.client.request",
-       "service": "ddtrace_subprocess_dir",
-       "resource": "POST /v1/completions",
-       "trace_id": 0,
-       "span_id": 2,
-       "parent_id": 1,
-       "type": "http",
-       "error": 0,
-       "meta": {
-         "_dd.peer.service.source": "out.host",
-         "component": "requests",
-         "http.method": "POST",
-         "http.status_code": "200",
-         "http.url": "https://api.openai.com/v1/completions",
-         "http.useragent": "OpenAI/v1 PythonBindings/0.27.2",
-         "out.host": "api.openai.com",
-         "peer.service": "api.openai.com",
-         "span.kind": "client"
-       },
-       "metrics": {
-         "_dd.measured": 1
-       },
-       "duration": 2897000,
-       "start": 1701268852045569000
-     }]]
diff --git a/tests/snapshots/tests.contrib.openai.test_openai_v0.test_integration_service_name[mysvc-None].json b/tests/snapshots/tests.contrib.openai.test_openai_v0.test_integration_service_name[mysvc-None].json
deleted file mode 100644
index a80c1218ca..0000000000
--- a/tests/snapshots/tests.contrib.openai.test_openai_v0.test_integration_service_name[mysvc-None].json
+++ /dev/null
@@ -1,77 +0,0 @@
-[[
-  {
-    "name": "openai.request",
-    "service": "mysvc",
-    "resource": "createCompletion",
-    "trace_id": 0,
-    "span_id": 1,
-    "parent_id": 0,
-    "type": "",
-    "error": 0,
-    "meta": {
-      "_dd.p.dm": "-0",
-      "_dd.p.tid": "65674d7500000000",
-      "component": "openai",
-      "language": "python",
-      "openai.api_base": "https://api.openai.com/v1",
-      "openai.api_type": "open_ai",
-      "openai.organization.name": "datadog-4",
-      "openai.request.client": "OpenAI",
-      "openai.request.endpoint": "/v1/completions",
-      "openai.request.max_tokens": "10",
-      "openai.request.method": "POST",
-      "openai.request.model": "ada",
-      "openai.request.n": "2",
-      "openai.request.prompt.0": "Hello world",
-      "openai.request.stop": ".",
-      "openai.request.temperature": "0.8",
-      "openai.response.choices.0.finish_reason": "length",
-      "openai.response.choices.0.text": ", relax!\u201d I said to my laptop",
-      "openai.response.choices.1.finish_reason": "stop",
-      "openai.response.choices.1.text": " (1",
-      "openai.response.created": "1681852797",
-      "openai.response.id": "cmpl-76n1xLvRKv3mfjx7hJ41UHrHy9ar6",
-      "openai.response.model": "ada",
-      "openai.user.api_key": "sk-...key>",
-      "runtime-id": "1244eea37568412fb5bdedf9c37ed48a"
-    },
-    "metrics": {
-      "_dd.measured": 1,
-      "_dd.top_level": 1,
-      "_dd.tracer_kr": 1.0,
-      "_sampling_priority_v1": 1,
-      "openai.organization.ratelimit.requests.limit": 3000,
-      "openai.organization.ratelimit.requests.remaining": 2999,
-      "openai.organization.ratelimit.tokens.limit": 250000,
-      "openai.organization.ratelimit.tokens.remaining": 249979,
-      "process_id": 20736
-    },
-    "duration": 19953000,
-    "start": 1701268853284736000
-  },
-     {
-       "name": "requests.request",
-       "service": "openai",
-       "resource": "POST /v1/completions",
-       "trace_id": 0,
-       "span_id": 2,
-       "parent_id": 1,
-       "type": "http",
-       "error": 0,
-       "meta": {
-         "_dd.base_service": "mysvc",
-         "component": "requests",
-         "http.method": "POST",
-         "http.status_code": "200",
-         "http.url": "https://api.openai.com/v1/completions",
-         "http.useragent": "OpenAI/v1 PythonBindings/0.27.2",
-         "out.host": "api.openai.com",
-         "span.kind": "client"
-       },
-       "metrics": {
-         "_dd.measured": 1,
-         "_dd.top_level": 1
-       },
-       "duration": 2837000,
-       "start": 1701268853300833000
-     }]]
diff --git a/tests/snapshots/tests.contrib.openai.test_openai_v0.test_integration_service_name[mysvc-v0].json b/tests/snapshots/tests.contrib.openai.test_openai_v0.test_integration_service_name[mysvc-v0].json
deleted file mode 100644
index f3f9c57f76..0000000000
--- a/tests/snapshots/tests.contrib.openai.test_openai_v0.test_integration_service_name[mysvc-v0].json
+++ /dev/null
@@ -1,77 +0,0 @@
-[[
-  {
-    "name": "openai.request",
-    "service": "mysvc",
-    "resource": "createCompletion",
-    "trace_id": 0,
-    "span_id": 1,
-    "parent_id": 0,
-    "type": "",
-    "error": 0,
-    "meta": {
-      "_dd.p.dm": "-0",
-      "_dd.p.tid": "65674d7600000000",
-      "component": "openai",
-      "language": "python",
-      "openai.api_base": "https://api.openai.com/v1",
-      "openai.api_type": "open_ai",
-      "openai.organization.name": "datadog-4",
-      "openai.request.client": "OpenAI",
-      "openai.request.endpoint": "/v1/completions",
-      "openai.request.max_tokens": "10",
-      "openai.request.method": "POST",
-      "openai.request.model": "ada",
-      "openai.request.n": "2",
-      "openai.request.prompt.0": "Hello world",
-      "openai.request.stop": ".",
-      "openai.request.temperature": "0.8",
-      "openai.response.choices.0.finish_reason": "length",
-      "openai.response.choices.0.text": ", relax!\u201d I said to my laptop",
-      "openai.response.choices.1.finish_reason": "stop",
-      "openai.response.choices.1.text": " (1",
-      "openai.response.created": "1681852797",
-      "openai.response.id": "cmpl-76n1xLvRKv3mfjx7hJ41UHrHy9ar6",
-      "openai.response.model": "ada",
-      "openai.user.api_key": "sk-...key>",
-      "runtime-id": "12b4a711854c44f681695957b545dcf5"
-    },
-    "metrics": {
-      "_dd.measured": 1,
-      "_dd.top_level": 1,
-      "_dd.tracer_kr": 1.0,
-      "_sampling_priority_v1": 1,
-      "openai.organization.ratelimit.requests.limit": 3000,
-      "openai.organization.ratelimit.requests.remaining": 2999,
-      "openai.organization.ratelimit.tokens.limit": 250000,
-      "openai.organization.ratelimit.tokens.remaining": 249979,
-      "process_id": 20750
-    },
-    "duration": 25352000,
-    "start": 1701268854568669000
-  },
-     {
-       "name": "requests.request",
-       "service": "openai",
-       "resource": "POST /v1/completions",
-       "trace_id": 0,
-       "span_id": 2,
-       "parent_id": 1,
-       "type": "http",
-       "error": 0,
-       "meta": {
-         "_dd.base_service": "mysvc",
-         "component": "requests",
-         "http.method": "POST",
-         "http.status_code": "200",
-         "http.url": "https://api.openai.com/v1/completions",
-         "http.useragent": "OpenAI/v1 PythonBindings/0.27.2",
-         "out.host": "api.openai.com",
-         "span.kind": "client"
-       },
-       "metrics": {
-         "_dd.measured": 1,
-         "_dd.top_level": 1
-       },
-       "duration": 3922000,
-       "start": 1701268854588758000
-     }]]
diff --git a/tests/snapshots/tests.contrib.openai.test_openai_v0.test_integration_service_name[mysvc-v1].json b/tests/snapshots/tests.contrib.openai.test_openai_v0.test_integration_service_name[mysvc-v1].json
deleted file mode 100644
index 0696ae5445..0000000000
--- a/tests/snapshots/tests.contrib.openai.test_openai_v0.test_integration_service_name[mysvc-v1].json
+++ /dev/null
@@ -1,77 +0,0 @@
-[[
-  {
-    "name": "openai.request",
-    "service": "mysvc",
-    "resource": "createCompletion",
-    "trace_id": 0,
-    "span_id": 1,
-    "parent_id": 0,
-    "type": "",
-    "error": 0,
-    "meta": {
-      "_dd.p.dm": "-0",
-      "_dd.p.tid": "65674d7700000000",
-      "component": "openai",
-      "language": "python",
-      "openai.api_base": "https://api.openai.com/v1",
-      "openai.api_type": "open_ai",
-      "openai.organization.name": "datadog-4",
-      "openai.request.client": "OpenAI",
-      "openai.request.endpoint": "/v1/completions",
-      "openai.request.max_tokens": "10",
-      "openai.request.method": "POST",
-      "openai.request.model": "ada",
-      "openai.request.n": "2",
-      "openai.request.prompt.0": "Hello world",
-      "openai.request.stop": ".",
-      "openai.request.temperature": "0.8",
-      "openai.response.choices.0.finish_reason": "length",
-      "openai.response.choices.0.text": ", relax!\u201d I said to my laptop",
-      "openai.response.choices.1.finish_reason": "stop",
-      "openai.response.choices.1.text": " (1",
-      "openai.response.created": "1681852797",
-      "openai.response.id": "cmpl-76n1xLvRKv3mfjx7hJ41UHrHy9ar6",
-      "openai.response.model": "ada",
-      "openai.user.api_key": "sk-...key>",
-      "runtime-id": "03e7664126ea4fe99e0aefec4efd003c"
-    },
-    "metrics": {
-      "_dd.measured": 1,
-      "_dd.top_level": 1,
-      "_dd.tracer_kr": 1.0,
-      "_sampling_priority_v1": 1,
-      "openai.organization.ratelimit.requests.limit": 3000,
-      "openai.organization.ratelimit.requests.remaining": 2999,
-      "openai.organization.ratelimit.tokens.limit": 250000,
-      "openai.organization.ratelimit.tokens.remaining": 249979,
-      "process_id": 20772
-    },
-    "duration": 19966000,
-    "start": 1701268855885252000
-  },
-     {
-       "name": "http.client.request",
-       "service": "mysvc",
-       "resource": "POST /v1/completions",
-       "trace_id": 0,
-       "span_id": 2,
-       "parent_id": 1,
-       "type": "http",
-       "error": 0,
-       "meta": {
-         "_dd.peer.service.source": "out.host",
-         "component": "requests",
-         "http.method": "POST",
-         "http.status_code": "200",
-         "http.url": "https://api.openai.com/v1/completions",
-         "http.useragent": "OpenAI/v1 PythonBindings/0.27.2",
-         "out.host": "api.openai.com",
-         "peer.service": "api.openai.com",
-         "span.kind": "client"
-       },
-       "metrics": {
-         "_dd.measured": 1
-       },
-       "duration": 2849000,
-       "start": 1701268855901267000
-     }]]