-
Notifications
You must be signed in to change notification settings - Fork 4k
ARROW-14958: [C++][Python][FlightRPC] Implement Flight middleware for OpenTelemetry propagation #11920
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+726
−22
Merged
ARROW-14958: [C++][Python][FlightRPC] Implement Flight middleware for OpenTelemetry propagation #11920
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| #include "arrow/flight/client_tracing_middleware.h" | ||
|
|
||
| #include <memory> | ||
| #include <string> | ||
| #include <utility> | ||
| #include <vector> | ||
|
|
||
| #include "arrow/util/tracing_internal.h" | ||
|
|
||
| #ifdef ARROW_WITH_OPENTELEMETRY | ||
| #include <opentelemetry/context/propagation/global_propagator.h> | ||
| #include <opentelemetry/context/propagation/text_map_propagator.h> | ||
| #endif | ||
|
|
||
| namespace arrow { | ||
| namespace flight { | ||
|
|
||
| namespace { | ||
| #ifdef ARROW_WITH_OPENTELEMETRY | ||
| namespace otel = opentelemetry; | ||
| class FlightClientCarrier : public otel::context::propagation::TextMapCarrier { | ||
| public: | ||
| FlightClientCarrier() = default; | ||
|
|
||
| otel::nostd::string_view Get(otel::nostd::string_view key) const noexcept override { | ||
| return ""; | ||
| } | ||
|
|
||
| void Set(otel::nostd::string_view key, | ||
| otel::nostd::string_view value) noexcept override { | ||
| context_.emplace_back(key, value); | ||
| } | ||
|
|
||
| std::vector<std::pair<std::string, std::string>> context_; | ||
| }; | ||
|
|
||
| class TracingClientMiddleware : public ClientMiddleware { | ||
| public: | ||
| explicit TracingClientMiddleware(FlightClientCarrier carrier) | ||
| : carrier_(std::move(carrier)) {} | ||
| virtual ~TracingClientMiddleware() = default; | ||
|
|
||
| void SendingHeaders(AddCallHeaders* outgoing_headers) override { | ||
| // The exact headers added are not arbitrary and are defined in | ||
| // the OpenTelemetry specification (see | ||
| // open-telemetry/opentelemetry-specification api-propagators.md) | ||
| for (const auto& pair : carrier_.context_) { | ||
| outgoing_headers->AddHeader(pair.first, pair.second); | ||
| } | ||
| } | ||
| void ReceivedHeaders(const CallHeaders&) override {} | ||
| void CallCompleted(const Status&) override {} | ||
|
|
||
| private: | ||
| FlightClientCarrier carrier_; | ||
| }; | ||
|
|
||
| class TracingClientMiddlewareFactory : public ClientMiddlewareFactory { | ||
| public: | ||
| virtual ~TracingClientMiddlewareFactory() = default; | ||
| void StartCall(const CallInfo& info, | ||
| std::unique_ptr<ClientMiddleware>* middleware) override { | ||
| FlightClientCarrier carrier; | ||
| auto context = otel::context::RuntimeContext::GetCurrent(); | ||
| auto propagator = | ||
| otel::context::propagation::GlobalTextMapPropagator::GetGlobalPropagator(); | ||
| propagator->Inject(carrier, context); | ||
|
||
| *middleware = std::make_unique<TracingClientMiddleware>(std::move(carrier)); | ||
| } | ||
| }; | ||
| #else | ||
| class TracingClientMiddlewareFactory : public ClientMiddlewareFactory { | ||
| public: | ||
| virtual ~TracingClientMiddlewareFactory() = default; | ||
| void StartCall(const CallInfo&, std::unique_ptr<ClientMiddleware>*) override {} | ||
| }; | ||
| #endif | ||
| } // namespace | ||
|
|
||
| std::shared_ptr<ClientMiddlewareFactory> MakeTracingClientMiddlewareFactory() { | ||
| return std::make_shared<TracingClientMiddlewareFactory>(); | ||
| } | ||
|
|
||
| } // namespace flight | ||
| } // namespace arrow | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| // Middleware implementation for propagating OpenTelemetry spans. | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <memory> | ||
|
|
||
| #include "arrow/flight/client_middleware.h" | ||
|
|
||
| namespace arrow { | ||
| namespace flight { | ||
|
|
||
| /// \brief Returns a ClientMiddlewareFactory that handles sending OpenTelemetry spans. | ||
| ARROW_FLIGHT_EXPORT std::shared_ptr<ClientMiddlewareFactory> | ||
| MakeTracingClientMiddlewareFactory(); | ||
|
|
||
| } // namespace flight | ||
| } // namespace arrow |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm... if OTel is adding arbitrary key-value pairs, should these really be propagated as HTTP headers, or am I missing something?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's designed to be transported in headers, it's just that the API doesn't tell you what they are. They're well defined in the spec (formats listed here: https://github.com/open-telemetry/opentelemetry-specification/blob/e2c2472985b17e37a25a7dc5aa0aa071e6683c98/specification/context/api-propagators.md#propagators-distribution)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, can you add a comment about that?