Skip to content

Commit 871297f

Browse files
authored
Merge branch 'master' into repro-core-loading
2 parents e26fe3c + b539362 commit 871297f

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

lib/datadog/appsec/actions_handler/serializable_backtrace.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module ActionsHandler
1111
#
1212
# It represents the stack trace that is added to span metastruct field.
1313
class SerializableBacktrace
14-
CLASS_AND_FUNCTION_NAME_REGEX = /\b([\w+:{2}]*\w+)?[#|.]?\b(\w+)\z/.freeze
14+
CLASS_AND_FUNCTION_NAME_REGEX = /\b((?:\w+::)*\w+)?[#.]?\b(\w+)\z/.freeze
1515

1616
def initialize(locations:, stack_id:)
1717
@stack_id = stack_id

sig/datadog/tracing/correlation.rbs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ module Datadog
4545
def self?.identifier_from_digest: (untyped digest) -> untyped
4646

4747
def self?.format_trace_id: (untyped trace_id) -> untyped
48+
49+
def self?.format_trace_id_128: (untyped trace_id) -> untyped
4850
end
4951
end
5052
end

0 commit comments

Comments
 (0)