-
Notifications
You must be signed in to change notification settings - Fork 163
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
Datadog observability driver #998
Merged
Merged
Changes from 18 commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
cd690fa
initial local dd obs driver
cjkindel f240740
set default service_name for DD
cjkindel aab35a4
move default tracerProvider to post_init
cjkindel 0316684
trace_provider default none
cjkindel c8ad6c1
add service env
cjkindel caf2b3c
add service version
cjkindel 530a47c
re-format attribute def
cjkindel 97b4fe6
revert attribute gen
cjkindel 871d716
parameterize dd_agent endpoint
cjkindel 971e6a0
fix dumb
cjkindel 0bd3001
move trace_provider back to factory
cjkindel f2b8fdb
reorder params
cjkindel e6cc5b0
tests
cjkindel e658a4e
use generic dd agent endpoint
cjkindel d15822e
changelog
cjkindel d171f2d
Merge branch 'dev' into feature/datadog-observability
cjkindel ab35705
comments
cjkindel 3080e81
use default open-telemetry params
cjkindel 9260df8
Merge branch 'dev' into feature/datadog-observability
cjkindel 2785f1f
poetry lock --no-update
cjkindel 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 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 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
22 changes: 22 additions & 0 deletions
22
griptape/drivers/observability/datadog_observability_driver.py
This file contains 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,22 @@ | ||
import os | ||
|
||
from attrs import Factory, define, field | ||
from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter | ||
from opentelemetry.sdk.trace import SpanProcessor | ||
from opentelemetry.sdk.trace.export import BatchSpanProcessor | ||
|
||
from griptape.drivers.observability.open_telemetry_observability_driver import OpenTelemetryObservabilityDriver | ||
|
||
|
||
@define | ||
class DatadogObservabilityDriver(OpenTelemetryObservabilityDriver): | ||
datadog_agent_endpoint: str = field( | ||
default=Factory(lambda: os.getenv("DD_AGENT_ENDPOINT", "http://localhost:4318")), kw_only=True | ||
) | ||
span_processor: SpanProcessor = field( | ||
default=Factory( | ||
lambda self: BatchSpanProcessor(OTLPSpanExporter(endpoint=f"{self.datadog_agent_endpoint}/v1/traces")), | ||
takes_self=True, | ||
), | ||
kw_only=True, | ||
) |
This file contains 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 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains 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
28 changes: 28 additions & 0 deletions
28
tests/unit/drivers/observability/test_datadog_observability_driver.py
This file contains 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,28 @@ | ||
import os | ||
from unittest import mock | ||
|
||
from griptape.drivers import DatadogObservabilityDriver | ||
|
||
|
||
class TestDatadogTelemetryObservabilityDriver: | ||
def test_init(self): | ||
driver = DatadogObservabilityDriver() | ||
|
||
assert driver.service_name == "griptape" | ||
assert driver.datadog_agent_endpoint == "http://localhost:4318" | ||
|
||
@mock.patch.dict(os.environ, {"DD_AGENT_ENDPOINT": "http://griptape.ai:1234"}) | ||
def test_init_env_var_dd_agent(self): | ||
driver = DatadogObservabilityDriver() | ||
|
||
assert driver.datadog_agent_endpoint == "http://griptape.ai:1234" | ||
|
||
def test_init_set_dd_agent(self): | ||
driver = DatadogObservabilityDriver(datadog_agent_endpoint="http://griptape.ai:4321") | ||
|
||
assert driver.datadog_agent_endpoint == "http://griptape.ai:4321" | ||
|
||
def test_init_set_service_name(self): | ||
driver = DatadogObservabilityDriver(service_name="test") | ||
|
||
assert driver.service_name == "test" |
This file contains 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
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.
Small refactoring opportunity: If we have a default here, then we don't really need it in
GriptapeObservabilityDriver
anymore (which also mean that we need to overridetrace_provider
there too).Though its fine by me if you don't want to do it in this PR
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.
I assumed GriptapeCloud used a non-attribute trace_provider on purpose. If we are OK with GriptapeCloud using the OpenTelemetry tracer_provider, then happy to. Just not clear why it used its own trace_provider in the first place
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.
tracer_provider
was just addedGriptapeObservabilityDriver
in order to work around some attrs awkwardness. Theresource
arg was left out because Griptape Cloud doesn't really need them, but they don't hurt either. I'd personally prefer simpler code