[continuous-profiling] adjust for frameinfo value in DoStackSnapshot callbacks (#4635)

Author: lachmatt

src/OpenTelemetry.AutoInstrumentation.Native/continuous_profiler.cpp

@@ -767,13 +767,13 @@ trace::WSTRING* NamingHelper::Lookup(const FunctionIdentifier& function_identifi
 
 FunctionIdentifier NamingHelper::Lookup(const FunctionID functionId, const COR_PRF_FRAME_INFO frameInfo)
 {
-    const FunctionIdentifierResolveArgs cacheKey         = {functionId, frameInfo};
+    const FunctionIdentifierResolveArgs cacheKey         = {functionId};
     const auto                          cachedIdentifier = function_identifier_cache_.Get(cacheKey);
     if (cachedIdentifier.is_valid)
     {
         return cachedIdentifier;
     }
-    const auto resolvedIdentifier = this->GetFunctionIdentifier(cacheKey.function_id, cacheKey.frame_info);
+    const auto resolvedIdentifier = this->GetFunctionIdentifier(cacheKey.function_id, frameInfo);
     function_identifier_cache_.Put(cacheKey, resolvedIdentifier);
     return resolvedIdentifier;
 }
@@ -799,7 +799,15 @@ static HRESULT __stdcall FrameCallback(_In_ FunctionID         func_id,
     const auto params = static_cast<DoStackSnapshotParams*>(client_data);
     params->prof->stats_.total_frames++;
 
-    const auto identifier = params->prof->helper.Lookup(func_id, frame_info);
+    // Use '0' as a frame_info value.
+    // It is documented to be equivalent to using value provided in frame_info parameter.
+    // See
+    // https://github.com/dotnet/runtime/blob/988296b080776c885ee0725b481db4ae4d4360ed/src/coreclr/inc/corprof.idl#L3167-L3172
+    // and
+    // https://github.com/dotnet/runtime/blob/bda571bfc728369cc2bbd33f2c161ea73c762b8d/docs/design/coreclr/profiling/davbr-blog-archive/Generics%20and%20Your%20Profiler.md?plain=1#L82-L101
+    // for details.
+
+    const auto identifier = params->prof->helper.Lookup(func_id, 0);
     params->buffer->push_back(identifier);
 
     return S_OK;

src/OpenTelemetry.AutoInstrumentation.Native/continuous_profiler.h

@@ -54,17 +54,19 @@ struct FunctionIdentifier
 struct FunctionIdentifierResolveArgs
 {
     FunctionID  function_id;
-    COR_PRF_FRAME_INFO frame_info;
 
     FunctionIdentifierResolveArgs() = delete;
-    FunctionIdentifierResolveArgs(const FunctionID func_id, const COR_PRF_FRAME_INFO frame_info)
+    FunctionIdentifierResolveArgs(const FunctionID func_id)
         : function_id(func_id)
-        , frame_info(frame_info)
     {
     }
     bool operator==(const FunctionIdentifierResolveArgs& p) const
     {
-        return function_id == p.function_id && frame_info == p.frame_info;
+        return function_id == p.function_id;
+    }
+    bool operator!=(const FunctionIdentifierResolveArgs& p) const
+    {
+        return !(*this == p);
     }
 };
 
@@ -86,6 +88,10 @@ struct trace_context
     {
         return trace_id_low_ == p.trace_id_low_ && trace_id_high_ == p.trace_id_high_;
     }
+    bool operator!=(const trace_context& p) const
+    {
+        return !(*this == p);
+    }
     [[nodiscard]] bool IsDefault() const;
 };
 
@@ -138,7 +144,7 @@ struct std::hash<continuous_profiler::FunctionIdentifierResolveArgs>
 {
     std::size_t operator()(const continuous_profiler::FunctionIdentifierResolveArgs& k) const noexcept
     {
-        return hash_combine(k.function_id, k.frame_info);
+        return hash_combine(k.function_id);
     }
 };