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.10] #10383

Merged
merged 2 commits into from
Sep 3, 2024

Conversation

github-actions[bot]
Copy link
Contributor

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

Backport 07ecb27 from #10282 to 2.10.

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)
@github-actions github-actions bot requested a review from a team as a code owner August 26, 2024 15:35
@github-actions github-actions bot requested a review from a team as a code owner August 26, 2024 15:35
@github-actions github-actions bot requested review from avara1986 and mabdinur August 26, 2024 15:35
@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.10
Commit report: 4af88c1
Test service: dd-trace-py

✅ 0 Failed, 884 Passed, 39570 Skipped, 17m 15.12s Total Time
⌛ 1 Performance Regression

⌛ Performance Regressions vs Default Branch (1)

  • test_inject_128bit_trace_id_b3multi - test_propagation.py 3.26s (+2.63s, +413%) - Details

@pr-commenter
Copy link

pr-commenter bot commented Aug 26, 2024

Benchmarks

Benchmark execution time: 2024-09-03 18:17:54

Comparing candidate commit 4af88c1 in PR branch backport-10282-to-2.10 with baseline commit fd0bfa1 in branch 2.10.

Found 0 performance improvements and 0 performance regressions! Performance is the same for 221 metrics, 9 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
@Yun-Kim Yun-Kim closed this Aug 26, 2024
@Yun-Kim Yun-Kim reopened this Aug 26, 2024
@Yun-Kim Yun-Kim added changelog/no-changelog A changelog entry is not required for this PR. and removed changelog/no-changelog A changelog entry is not required for this PR. labels Sep 3, 2024
@brettlangdon brettlangdon merged commit d1cb550 into 2.10 Sep 3, 2024
95 of 115 checks passed
@brettlangdon brettlangdon deleted the backport-10282-to-2.10 branch September 3, 2024 18:37
erikayasuda added a commit that referenced this pull request Sep 9, 2024
…ncy with openai saas integration [backport 2.10]" (#10572)

- [x] Reverts #10383
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.

3 participants