-
Notifications
You must be signed in to change notification settings - Fork 214
feat: Open Telemetry Publish Side Support #1241
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
Merged
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
04e5623
Add opentelemetry as a dependency in setup.py
mukund-ananthu ac86799
Add enable_open_telemetry_tracing Publisher Option
mukund-ananthu b736635
Set/ Override Open Telemetry enabled PublisherOption in the Publish c…
mukund-ananthu d700967
Add OpenTelemetryContextSetter to use for context propagation
mukund-ananthu 5a42d0e
Add Publish Create Span and PublishMessageWrapper
mukund-ananthu e7aea6c
Add Publish Flow Control Span
mukund-ananthu 2e3f576
End Publisher Flow Control and Create Span on FlowControlLimitError
mukund-ananthu 0f865d7
Add Publisher Batching Span
mukund-ananthu b4a51df
Fix TraceContextPropagation
mukund-ananthu f98b3c5
Plumb PublishMessageWrapper to sequencers and batch publish
mukund-ananthu 343ef17
Increase test coverage across files
mukund-ananthu 02b9355
Add Publish RPC Span
mukund-ananthu b519fb5
Fix mypy type checking errors
mukund-ananthu f6c3c8f
Update messaging.system attribute of publish RPC span
mukund-ananthu cf8d039
Update publish RPC sampling test to include both sampled and unsampled
mukund-ananthu 3519fbd
Fix test comments
mukund-ananthu 3bc3a56
Update publish RPC and create span to use shorter format of topic
mukund-ananthu c5982ca
Code clean up
mukund-ananthu 4ab4426
Address review comments
mukund-ananthu de487a1
Merge branch 'main' into otel_publish
mukund-ananthu 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| # Copyright 2024, Google LLC All rights reserved. | ||
| # | ||
| # Licensed 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. |
39 changes: 39 additions & 0 deletions
39
google/cloud/pubsub_v1/open_telemetry/context_propagation.py
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,39 @@ | ||
| # Copyright 2024, Google LLC All rights reserved. | ||
| # | ||
| # Licensed 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. | ||
|
|
||
| from opentelemetry.propagators.textmap import Setter | ||
|
|
||
| from google.pubsub_v1 import PubsubMessage | ||
|
|
||
|
|
||
| class OpenTelemetryContextSetter(Setter): | ||
| """ | ||
| Used by Open Telemetry for context propagation. | ||
| """ | ||
|
|
||
| def set(self, carrier: PubsubMessage, key: str, value: str) -> None: | ||
| """ | ||
| Injects trace context into Pub/Sub message attributes with | ||
| "googclient_" prefix. | ||
|
|
||
| Args: | ||
| carrier(PubsubMessage): The Pub/Sub message which is the carrier of Open Telemetry | ||
| data. | ||
| key(str): The key for which the Open Telemetry context data needs to be set. | ||
| value(str): The Open Telemetry context value to be set. | ||
|
|
||
| Returns: | ||
| None | ||
| """ | ||
| carrier.attributes["googclient_" + key] = value | ||
142 changes: 142 additions & 0 deletions
142
google/cloud/pubsub_v1/open_telemetry/publish_message_wrapper.py
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,142 @@ | ||
| # Copyright 2017, Google LLC All rights reserved. | ||
| # | ||
| # Licensed 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. | ||
|
|
||
| import sys | ||
| from datetime import datetime | ||
| from typing import Optional | ||
|
|
||
| from opentelemetry import trace | ||
| from opentelemetry.trace.propagation import set_span_in_context | ||
| from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator | ||
|
|
||
| from google.pubsub_v1 import types as gapic_types | ||
| from google.cloud.pubsub_v1.open_telemetry.context_propagation import ( | ||
| OpenTelemetryContextSetter, | ||
| ) | ||
|
|
||
|
|
||
| class PublishMessageWrapper: | ||
| _OPEN_TELEMETRY_TRACER_NAME: str = "google.cloud.pubsub_v1" | ||
| _OPEN_TELEMETRY_MESSAGING_SYSTEM: str = "gcp_pubsub" | ||
| _OPEN_TELEMETRY_PUBLISHER_BATCHING = "publisher batching" | ||
|
|
||
| _PUBLISH_START_EVENT: str = "publish start" | ||
| _PUBLISH_FLOW_CONTROL: str = "publisher flow control" | ||
|
|
||
| def __init__(self, message: gapic_types.PubsubMessage): | ||
| self._message: gapic_types.PubsubMessage = message | ||
| self._create_span: Optional[trace.Span] = None | ||
| self._flow_control_span: Optional[trace.Span] = None | ||
| self._batching_span: Optional[trace.Span] = None | ||
|
|
||
| @property | ||
| def message(self): | ||
| return self._message | ||
|
|
||
| @message.setter # type: ignore[no-redef] # resetting message value is intentional here | ||
| def message(self, message: gapic_types.PubsubMessage): | ||
| self._message = message | ||
|
|
||
| @property | ||
| def create_span(self): | ||
| return self._create_span | ||
|
|
||
| def __eq__(self, other): # pragma: NO COVER | ||
| """Used for pytest asserts to compare two PublishMessageWrapper objects with the same message""" | ||
| if isinstance(self, other.__class__): | ||
| return self.message == other.message | ||
| return False | ||
|
|
||
| def start_create_span(self, topic: str, ordering_key: str) -> None: | ||
| tracer = trace.get_tracer(self._OPEN_TELEMETRY_TRACER_NAME) | ||
| assert len(topic.split("/")) == 4 | ||
| topic_short_name = topic.split("/")[3] | ||
hongalex marked this conversation as resolved.
Show resolved
Hide resolved
mukund-ananthu marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| with tracer.start_as_current_span( | ||
| name=f"{topic_short_name} create", | ||
| attributes={ | ||
| "messaging.system": self._OPEN_TELEMETRY_MESSAGING_SYSTEM, | ||
hongalex marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "messaging.destination.name": topic_short_name, | ||
| "code.function": "publish", | ||
| "messaging.gcp_pubsub.message.ordering_key": ordering_key, | ||
| "messaging.operation": "create", | ||
| "gcp.project_id": topic.split("/")[1], | ||
| "messaging.message.body.size": sys.getsizeof( | ||
| self._message.data | ||
| ), # sys.getsizeof() used since the attribute expects size of message body in bytes | ||
| }, | ||
| kind=trace.SpanKind.PRODUCER, | ||
| end_on_exit=False, | ||
| ) as create_span: | ||
| create_span.add_event( | ||
| name=self._PUBLISH_START_EVENT, | ||
| attributes={ | ||
| "timestamp": str(datetime.now()), | ||
| }, | ||
| ) | ||
| self._create_span = create_span | ||
| TraceContextTextMapPropagator().inject( | ||
| carrier=self._message, | ||
| setter=OpenTelemetryContextSetter(), | ||
| ) | ||
|
|
||
| def end_create_span(self, exc: Optional[BaseException] = None) -> None: | ||
| assert self._create_span is not None | ||
| if exc: | ||
| self._create_span.record_exception(exception=exc) | ||
| self._create_span.set_status( | ||
| trace.Status(status_code=trace.StatusCode.ERROR) | ||
| ) | ||
| self._create_span.end() | ||
|
|
||
| def start_publisher_flow_control_span(self) -> None: | ||
| tracer = trace.get_tracer(self._OPEN_TELEMETRY_TRACER_NAME) | ||
| assert self._create_span is not None | ||
| with tracer.start_as_current_span( | ||
| name=self._PUBLISH_FLOW_CONTROL, | ||
| kind=trace.SpanKind.INTERNAL, | ||
| context=set_span_in_context(self._create_span), | ||
| end_on_exit=False, | ||
| ) as flow_control_span: | ||
| self._flow_control_span = flow_control_span | ||
|
|
||
| def end_publisher_flow_control_span( | ||
| self, exc: Optional[BaseException] = None | ||
| ) -> None: | ||
| assert self._flow_control_span is not None | ||
| if exc: | ||
| self._flow_control_span.record_exception(exception=exc) | ||
| self._flow_control_span.set_status( | ||
| trace.Status(status_code=trace.StatusCode.ERROR) | ||
| ) | ||
| self._flow_control_span.end() | ||
|
|
||
| def start_publisher_batching_span(self) -> None: | ||
| assert self._create_span is not None | ||
| tracer = trace.get_tracer(self._OPEN_TELEMETRY_TRACER_NAME) | ||
| with tracer.start_as_current_span( | ||
| name=self._OPEN_TELEMETRY_PUBLISHER_BATCHING, | ||
| kind=trace.SpanKind.INTERNAL, | ||
| context=set_span_in_context(self._create_span), | ||
| end_on_exit=False, | ||
| ) as batching_span: | ||
| self._batching_span = batching_span | ||
|
|
||
| def end_publisher_batching_span(self, exc: Optional[BaseException] = None) -> None: | ||
| assert self._batching_span is not None | ||
| if exc: | ||
| self._batching_span.record_exception(exception=exc) | ||
| self._batching_span.set_status( | ||
| trace.Status(status_code=trace.StatusCode.ERROR) | ||
| ) | ||
| self._batching_span.end() | ||
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
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.
Uh oh!
There was an error while loading. Please reload this page.