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(openai): add model tag for openai metrics for consistency with openai saas integration [backport 2.11] #10382

Merged
merged 2 commits into from
Aug 27, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Aug 26, 2024

Backport 07ecb27 from #10282 to 2.11.

Metrics from the OpenAI SaaS integration (openai.api.usage...) have a model tag. We should also tag metrics from OpenAI APM Integration with model for convenience (for example if customers want to use both openai.api.usage... metrics and openai.ratelimit... metrics in the same dashboard).

Addresses #10185

Checklist

  • PR author has checked that all the criteria below are met
  • The PR description includes an overview of the change
  • The PR description articulates the motivation for the change
  • The change includes tests OR the PR description describes a testing strategy
  • The PR description notes risks associated with the change, if any
  • Newly-added code is easy to change
  • The change follows the library release note guidelines
  • The change includes or references documentation updates if necessary
  • Backport labels are set (if applicable)

Reviewer Checklist

  • Reviewer has checked that all the criteria below are met
  • Title is accurate
  • All changes are related to the pull request's stated goal
  • Avoids breaking API changes
  • Testing strategy adequately addresses listed risks
  • Newly-added code is easy to change
  • Release note makes sense to a user of the library
  • If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment
  • Backport labels are set in a manner that is consistent with the release branch maintenance policy

…h openai saas integration (#10282)

Metrics from the OpenAI SaaS integration `(openai.api.usage...)` have a
`model` tag. We should also tag metrics from OpenAI APM Integration with
`model` for convenience (for example if customers want to use both
`openai.api.usage...` metrics and `openai.ratelimit...` metrics in the
same dashboard).

Addresses #10185

## Checklist
- [x] PR author has checked that all the criteria below are met
- The PR description includes an overview of the change
- The PR description articulates the motivation for the change
- The change includes tests OR the PR description describes a testing
strategy
- The PR description notes risks associated with the change, if any
- Newly-added code is easy to change
- The change follows the [library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
- The change includes or references documentation updates if necessary
- Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist
- [x] Reviewer has checked that all the criteria below are met
- Title is accurate
- All changes are related to the pull request's stated goal
- Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- Testing strategy adequately addresses listed risks
- Newly-added code is easy to change
- Release note makes sense to a user of the library
- If necessary, author has acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment
- Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

---------

Co-authored-by: lievan <[email protected]>
(cherry picked from commit 07ecb27)
@Yun-Kim Yun-Kim enabled auto-merge (squash) August 26, 2024 15:45
@datadog-dd-trace-py-rkomorn
Copy link

datadog-dd-trace-py-rkomorn bot commented Aug 26, 2024

Datadog Report

Branch report: backport-10282-to-2.11
Commit report: 9503e3a
Test service: dd-trace-py

✅ 0 Failed, 795 Passed, 40209 Skipped, 15m 29.26s Total Time

@pr-commenter
Copy link

pr-commenter bot commented Aug 26, 2024

Benchmarks

Benchmark execution time: 2024-08-26 20:24:28

Comparing candidate commit 9503e3a in PR branch backport-10282-to-2.11 with baseline commit b95a737 in branch 2.11.

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

@Yun-Kim Yun-Kim closed this Aug 26, 2024
auto-merge was automatically disabled August 26, 2024 17:27

Pull request was closed

@Yun-Kim Yun-Kim reopened this Aug 26, 2024
Copy link
Contributor Author

CODEOWNERS have been resolved as:

releasenotes/notes/openai-model-tag-2482b3d5b2905db9.yaml               @DataDog/apm-python
ddtrace/llmobs/_integrations/openai.py                                  @DataDog/ml-observability
tests/contrib/openai/test_openai_v0.py                                  @DataDog/ml-observability
tests/contrib/openai/test_openai_v1.py                                  @DataDog/ml-observability

@Yun-Kim Yun-Kim merged commit 26e44e4 into 2.11 Aug 27, 2024
116 of 120 checks passed
@Yun-Kim Yun-Kim deleted the backport-10282-to-2.11 branch August 27, 2024 15:46
erikayasuda added a commit that referenced this pull request Sep 9, 2024
…ncy with openai saas integration [backport 2.11]" (#10573)

- [x] Reverts #10382
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants