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.

Sign up for GitHub

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

Jump to bottom

[http] Add http.client.request.duration metric and .NET Framework support #4870

Merged
merged 55 commits into from
Oct 3, 2023
Merged

[http] Add http.client.request.duration metric and .NET Framework support #4870

merged 55 commits into from
Oct 3, 2023

Commits on Sep 15, 2023

  1. snapshot

    @matt-hensley
    matt-hensley committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    17d67e0 View commit details
    Browse the repository at this point in the history

  2. null actvitiy is tracing is disabled

    @matt-hensley
    matt-hensley committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    800a71d View commit details
    Browse the repository at this point in the history

  3. setup metics without tracing

    @matt-hensley
    matt-hensley committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    4a9239e View commit details
    Browse the repository at this point in the history

  4. only emit when there is a listener

    @matt-hensley
    matt-hensley committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    d7b2472 View commit details
    Browse the repository at this point in the history

  5. modify tests for netfx

    @matt-hensley
    matt-hensley committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    46de1a9 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2023

  1. always capture response status code

    @matt-hensley
    matt-hensley committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    4e445b5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into net462httpclientmetricsv3

    @matt-hensley
    matt-hensley committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    f0ca432 View commit details
    Browse the repository at this point in the history

  3. undo conditional extraction

    @matt-hensley
    matt-hensley committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    bed7b2b View commit details
    Browse the repository at this point in the history

  4. activity duration or stopwatch

    @matt-hensley
    matt-hensley committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    ba04ac0 View commit details
    Browse the repository at this point in the history

  5. activity duration or stopwatch

    @matt-hensley
    matt-hensley committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    48c354a View commit details
    Browse the repository at this point in the history

  6. Merge branch 'net462httpclientmetricsv3' of https://github.com/matt-h… 

    …ensley/opentelemetry-dotnet into net462httpclientmetricsv3
    @matt-hensley
    matt-hensley committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    872ce63 View commit details
    Browse the repository at this point in the history

  7. activity may be null here

    @matt-hensley
    matt-hensley committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    6999167 View commit details
    Browse the repository at this point in the history

  8. duration -> durationMs for now

    @matt-hensley
    matt-hensley committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    42e9022 View commit details
    Browse the repository at this point in the history

  9. StartTimestamp handling

    @matt-hensley
    matt-hensley committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    527106f View commit details
    Browse the repository at this point in the history

  10. adopt taglist

    @matt-hensley
    matt-hensley committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    e31f687 View commit details
    Browse the repository at this point in the history

  11. using directive is unnecessary

    @matt-hensley
    matt-hensley committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    01840c0 View commit details
    Browse the repository at this point in the history

  12. using directive is unnecessary

    @matt-hensley
    matt-hensley committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    9ef2915 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'net462httpclientmetricsv3' of https://github.com/matt-h… 

    …ensley/opentelemetry-dotnet into net462httpclientmetricsv3

# Conflicts:
#	src/OpenTelemetry.Instrumentation.Http/MeterProviderBuilderExtensions.cs
    @matt-hensley
    matt-hensley committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    47fc955 View commit details
    Browse the repository at this point in the history

  14. remove URL attribute

    @matt-hensley
    matt-hensley committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    d9ca497 View commit details
    Browse the repository at this point in the history

  15. status enum to int

    @matt-hensley
    matt-hensley committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    308ca8f View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. remove ternary

    @matt-hensley
    matt-hensley committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    480940e View commit details
    Browse the repository at this point in the history

  2. early return if tracing and metrics are not enabled

    @matt-hensley
    matt-hensley committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    27ad5ab View commit details
    Browse the repository at this point in the history

  3. set activity

    @matt-hensley
    matt-hensley committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    025c02d View commit details
    Browse the repository at this point in the history

  4. Update src/OpenTelemetry.Instrumentation.Http/Implementation/HttpWebR… 

    …equestActivitySource.netfx.cs

Co-authored-by: Johannes Tax <johannes@johannes.tax>
    @matt-hensley @pyohannes
    matt-hensley and pyohannes committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    dfaa8f7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'net462httpclientmetricsv3' of https://github.com/matt-h… 

    …ensley/opentelemetry-dotnet into net462httpclientmetricsv3
    @matt-hensley
    matt-hensley committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    ad10683 View commit details
    Browse the repository at this point in the history

  6. Update src/OpenTelemetry.Instrumentation.Http/Implementation/HttpWebR… 

    …equestActivitySource.netfx.cs

Co-authored-by: Johannes Tax <johannes@johannes.tax>
    @matt-hensley @pyohannes
    matt-hensley and pyohannes committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    8bd64ef View commit details
    Browse the repository at this point in the history

  7. Update src/OpenTelemetry.Instrumentation.Http/Implementation/HttpWebR… 

    …equestActivitySource.netfx.cs

Co-authored-by: Johannes Tax <johannes@johannes.tax>
    @matt-hensley @pyohannes
    matt-hensley and pyohannes committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    6ca5c9d View commit details
    Browse the repository at this point in the history

  8. Merge branch 'net462httpclientmetricsv3' of https://github.com/matt-h… 

    …ensley/opentelemetry-dotnet into net462httpclientmetricsv3
    @matt-hensley
    matt-hensley committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    61a01f7 View commit details
    Browse the repository at this point in the history

  9. flag name change

    @matt-hensley
    matt-hensley committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    b4dd250 View commit details
    Browse the repository at this point in the history

  10. remove Moq from test

    @matt-hensley
    matt-hensley committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    bca1361 View commit details
    Browse the repository at this point in the history

  11. need to pick context off current activity for propagator to work

    @matt-hensley
    matt-hensley committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    5200afb View commit details
    Browse the repository at this point in the history

  12. extra line

    @matt-hensley
    matt-hensley committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    4d15ca6 View commit details
    Browse the repository at this point in the history

  13. modify tests to handle metrics and/or tracing on/off

    @matt-hensley
    matt-hensley committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    dd07ca0 View commit details
    Browse the repository at this point in the history

  14. null handling

    @matt-hensley
    matt-hensley committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    fc47558 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. null check for safety, tests don't blow up here for some reason?

    @matt-hensley
    matt-hensley committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    9ae0193 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into net462httpclientmetricsv3

    @matt-hensley
    matt-hensley committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    9c4c3b5 View commit details
    Browse the repository at this point in the history

  3. remove note that netfx does not have metrics

    @matt-hensley
    matt-hensley committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    dcdde2c View commit details
    Browse the repository at this point in the history

  4. changelog entry

    @matt-hensley
    matt-hensley committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    a063be1 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2023

  1. correct whitespace

    @matt-hensley
    matt-hensley committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    7ce3c51 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into net462httpclientmetricsv3

    @matt-hensley
    matt-hensley committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    bef3862 View commit details
    Browse the repository at this point in the history

  3. reorder methods per linter

    @matt-hensley
    matt-hensley committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    812ad91 View commit details
    Browse the repository at this point in the history

  4. putting the combinations in one test is causing intermittent failures

    @matt-hensley
    matt-hensley committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    2cfc3e2 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2023

  1. Merge branch 'main' into net462httpclientmetricsv3

    @matt-hensley
    matt-hensley committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    051cb42 View commit details
    Browse the repository at this point in the history

  2. lift null checks

    @matt-hensley
    matt-hensley committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    0f37992 View commit details
    Browse the repository at this point in the history

  3. make this isn't hit when tracing is disabled

    @matt-hensley
    matt-hensley committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    86c8ab0 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2023

  1. Update src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md 

    Co-authored-by: Piotr Kiełkowicz <pkiekowicz@splunk.com>
    @matt-hensley @Kielek
    matt-hensley and Kielek committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    7704a82 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into net462httpclientmetricsv3

    @matt-hensley
    matt-hensley committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    7e03ca7 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. modify test to ensure duration was written

    @matt-hensley
    matt-hensley committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    0ce3ced View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2023

  1. Fixes, tweaks, and cleanup.

    @CodeBlanch
    CodeBlanch committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    5218b65 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2023

  1. Code review.

    @CodeBlanch
    CodeBlanch committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    e70629b View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2023

  1. Add support for http.client.request.duration.

    @CodeBlanch
    CodeBlanch committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    616f299 View commit details
    Browse the repository at this point in the history

  2. Update src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHand… 

    …lerMetricsDiagnosticListener.cs

Co-authored-by: Vishwesh Bankwar <vishweshbankwar@users.noreply.github.com>
    @CodeBlanch @vishweshbankwar
    CodeBlanch and vishweshbankwar committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    1502d64 View commit details
    Browse the repository at this point in the history

  3. MD lint.

    @CodeBlanch
    CodeBlanch committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    34e39f4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'net462httpclientmetricsv3' of https://github.com/matt-h… 

    …ensley/opentelemetry-dotnet into net462httpclientmetricsv3
    @CodeBlanch
    CodeBlanch committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    9f1f887 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into net462httpclientmetricsv3

    @CodeBlanch
    CodeBlanch committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    f2e864b View commit details
    Browse the repository at this point in the history