Skip to content
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

(chore)APM: Refactor Bedrock Integration #5137

Open
wants to merge 11 commits into
base: master
Choose a base branch
from

Conversation

yahya-mouman
Copy link
Contributor

@yahya-mouman yahya-mouman commented Jan 20, 2025

What does this PR do?

This PR adds the following changes to the AWS Bedrock APM Integration

  • Adds parsing for more variations of the model id in bedrock
  • Channel suffix space removal
  • Plugin rename from bedrock to bedrockruntime
  • Structure refactor adding a utils file with all the parsing logic

Please also review #5116
As it contains some fixture refactors to the testing code

Motivation

The addition of the LLMObs plugin for this integration makes it necessary to refactor the code and share utilities to avoid code duplication.

Plugin Checklist

Additional Notes

Copy link

github-actions bot commented Jan 20, 2025

Overall package size

Self size: 8.53 MB
Deduped: 94.89 MB
No deduping: 95.4 MB

Dependency sizes | name | version | self size | total size | |------|---------|-----------|------------| | @datadog/libdatadog | 0.4.0 | 29.44 MB | 29.44 MB | | @datadog/native-appsec | 8.4.0 | 19.25 MB | 19.26 MB | | @datadog/native-iast-taint-tracking | 3.2.0 | 13.9 MB | 13.91 MB | | @datadog/pprof | 5.4.1 | 9.76 MB | 10.13 MB | | protobufjs | 7.2.5 | 2.77 MB | 5.16 MB | | @datadog/native-iast-rewriter | 2.6.1 | 2.59 MB | 2.73 MB | | @opentelemetry/core | 1.14.0 | 872.87 kB | 1.47 MB | | @datadog/native-metrics | 3.1.0 | 1.06 MB | 1.46 MB | | @opentelemetry/api | 1.8.0 | 1.21 MB | 1.21 MB | | import-in-the-middle | 1.11.2 | 112.74 kB | 826.22 kB | | source-map | 0.7.4 | 226 kB | 226 kB | | opentracing | 0.14.7 | 194.81 kB | 194.81 kB | | lru-cache | 7.18.3 | 133.92 kB | 133.92 kB | | pprof-format | 2.1.0 | 111.69 kB | 111.69 kB | | @datadog/sketches-js | 2.1.0 | 109.9 kB | 109.9 kB | | semver | 7.6.3 | 95.82 kB | 95.82 kB | | lodash.sortby | 4.7.0 | 75.76 kB | 75.76 kB | | ignore | 5.3.1 | 51.46 kB | 51.46 kB | | shell-quote | 1.8.1 | 44.96 kB | 44.96 kB | | istanbul-lib-coverage | 3.2.0 | 29.34 kB | 29.34 kB | | rfdc | 1.3.1 | 25.21 kB | 25.21 kB | | @isaacs/ttlcache | 1.4.1 | 25.2 kB | 25.2 kB | | tlhunter-sorted-set | 0.1.0 | 24.94 kB | 24.94 kB | | limiter | 1.1.5 | 23.17 kB | 23.17 kB | | dc-polyfill | 0.1.4 | 23.1 kB | 23.1 kB | | retry | 0.13.1 | 18.85 kB | 18.85 kB | | jest-docblock | 29.7.0 | 8.99 kB | 12.76 kB | | crypto-randomuuid | 1.0.0 | 11.18 kB | 11.18 kB | | ttl-set | 1.0.0 | 4.61 kB | 9.69 kB | | path-to-regexp | 0.1.12 | 6.6 kB | 6.6 kB | | koalas | 1.0.2 | 6.47 kB | 6.47 kB | | module-details-from-path | 1.0.3 | 4.47 kB | 4.47 kB |

🤖 This report was automatically generated by heaviest-objects-in-the-universe

@pr-commenter
Copy link

pr-commenter bot commented Jan 20, 2025

Benchmarks

Benchmark execution time: 2025-01-23 18:42:04

Comparing candidate commit 798a0d3 in PR branch yahya/refactor-apm-bedrock-runtime with baseline commit 30efc06 in branch master.

Found 0 performance improvements and 2 performance regressions! Performance is the same for 908 metrics, 23 unstable metrics.

scenario:plugin-http-client-control-18

  • 🟥 execution_time [+32.673ms; +40.239ms] or [+6.505%; +8.012%]
  • 🟥 instructions [+29.3M instructions; +37.0M instructions] or [+5.753%; +7.280%]

@yahya-mouman yahya-mouman marked this pull request as ready for review January 20, 2025 17:03
@yahya-mouman yahya-mouman requested review from a team as code owners January 20, 2025 17:03
@yahya-mouman yahya-mouman changed the title refactor apm tracing [APM] Refactor Bedrock Integration Jan 20, 2025
@yahya-mouman yahya-mouman changed the title [APM] Refactor Bedrock Integration (Chore) APM : Refactor Bedrock Integration Jan 21, 2025
@yahya-mouman yahya-mouman changed the title (Chore) APM : Refactor Bedrock Integration (Chore)APM: Refactor Bedrock Integration Jan 21, 2025
Copy link
Collaborator

@sabrenner sabrenner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just a couple comments - this is a really nice cleanup, awesome job!

@yahya-mouman yahya-mouman changed the title (Chore)APM: Refactor Bedrock Integration (chore)APM: Refactor Bedrock Integration Jan 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants