Skip to content

Commit b978f52

Browse files
authored
Revert "Add lambda function url trigger and inferred span (#197)" (#198)
* Revert "Add lambda function url trigger and inferred span (#197)" This reverts commit 117474f. * Remove spurrious lines from the integration tests
1 parent 117474f commit b978f52

15 files changed

+212
-545
lines changed

datadog_lambda/tracing.py

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
TraceContextSource,
1414
XrayDaemon,
1515
)
16-
from datadog_lambda.trigger import parse_event_source, EventTypes
1716
from datadog_lambda.xray import (
1817
send_segment,
1918
parse_xray_header,
@@ -378,62 +377,13 @@ def set_dd_trace_py_root(trace_context_source, merge_xray_traces):
378377
)
379378

380379

381-
def create_inferred_span(event, context, make_inferred_spans):
382-
event_source = parse_event_source(event)
383-
try:
384-
if event_source.equals(EventTypes.LAMBDA_FUNCTION_URL):
385-
logger.debug("Function URL event detected. Inferring a span")
386-
return create_inferred_span_from_lambda_function_url_event(event, context)
387-
if not make_inferred_spans:
388-
return None
389-
# the rest of the inferred span logic goes here
390-
except Exception as e:
391-
logger.debug(
392-
"Unable to infer span. Detected type: {}. Reason: {}",
393-
event_source.to_string(),
394-
e,
395-
)
396-
return None
397-
logger.debug("Unable to infer a span: unknown event type")
398-
return None
399-
400-
401-
def create_inferred_span_from_lambda_function_url_event(event, context):
402-
domain = event["requestContext"]["domainName"]
403-
path = event["rawPath"]
404-
tags = {
405-
"operation_name": "aws.lambda.url",
406-
"http.url": domain + path,
407-
"endpoint": path,
408-
"http.method": event["requestContext"]["http"]["method"],
409-
"resource_names": domain + path,
410-
"request_id": context.aws_request_id,
411-
"service": "aws.lambda",
412-
}
413-
request_time_epoch = event["requestContext"]["timeEpoch"]
414-
args = {
415-
"resource": domain + path,
416-
"span_type": "http",
417-
}
418-
tracer.set_tags(
419-
{"_dd.origin": "lambda"}
420-
) # function urls don't count as lambda_inferred,
421-
# because they're in the same service as the inferring lambda function
422-
span = tracer.trace("aws.lambda.url", **args)
423-
if span:
424-
span.set_tags(tags)
425-
span.start = request_time_epoch / 1000
426-
return span
427-
428-
429380
def create_function_execution_span(
430381
context,
431382
function_name,
432383
is_cold_start,
433384
trace_context_source,
434385
merge_xray_traces,
435386
trigger_tags,
436-
parent_span=None,
437387
):
438388
tags = {}
439389
if context:
@@ -465,6 +415,4 @@ def create_function_execution_span(
465415
span = tracer.trace("aws.lambda", **args)
466416
if span:
467417
span.set_tags(tags)
468-
if parent_span:
469-
span.parent_id = parent_span.span_id
470418
return span

0 commit comments

Comments
 (0)