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

Merge main into async changes #1321

Merged
merged 18 commits into from
Apr 6, 2022
Merged

Merge main into async changes #1321

merged 18 commits into from
Apr 6, 2022

Commits on Mar 21, 2022

  1. install sdk config (open-telemetry#1273)

    @esigo
    esigo authored Mar 21, 2022
    Configuration menu
    Copy the full SHA
    e072daa View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2022

  1. Bump actions/cache from 2 to 3 (open-telemetry#1277)

    @dependabot
    dependabot[bot] authored Mar 22, 2022
    Configuration menu
    Copy the full SHA
    6ec1b59 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2022

  1. Add owent as an Approver (open-telemetry#1276) 

    * add owent as reviewer

* fix order
    @lalitb
    lalitb authored Mar 23, 2022
    Configuration menu
    Copy the full SHA
    b5155a5 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2022

  1. Disable benchmark action failure (open-telemetry#1284)

    @esigo
    esigo authored Mar 24, 2022
    Configuration menu
    Copy the full SHA
    0c9aece View commit details
    Browse the repository at this point in the history

  2. metrics exemplar round 1 (open-telemetry#1264)

    @esigo
    esigo authored Mar 24, 2022
    1 Configuration menu
    Copy the full SHA
    3c7b44b View commit details
    Browse the repository at this point in the history

  3. [Metrics SDK] - fix spelling (AggregationTemporarily to AggregationTe… 

    …mporality) (open-telemetry#1288)
    @lalitb
    lalitb authored Mar 24, 2022
    1 Configuration menu
    Copy the full SHA
    2c9ce39 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2022

  1. fix compilation error with protobuf 3.5 (open-telemetry#1289)

    @esigo
    esigo authored Mar 25, 2022
    2 Configuration menu
    Copy the full SHA
    91b0572 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2022

  1. Fix span SetAttribute crash (open-telemetry#1283)

    @esigo
    esigo authored Mar 26, 2022
    Configuration menu
    Copy the full SHA
    c1b9590 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2022

  1. Synchronous Metric collection (Delta , Cumulative) (open-telemetry#1265)

    @lalitb
    lalitb authored Mar 30, 2022
    Configuration menu
    Copy the full SHA
    a7e814a View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2022

  1. Rename http_client_curl to opentelemetry_http_client_curl (open-t… 

    …elemetry#1301)

Signed-off-by: owent <[email protected]>
    @owent
    owent authored Mar 31, 2022
    2 Configuration menu
    Copy the full SHA
    76c664a View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2022

  1. Don't show coverage annotation for pull requests (open-telemetry#1304)

    @ThomsonTan
    ThomsonTan authored Apr 1, 2022
    1 Configuration menu
    Copy the full SHA
    2034c9b View commit details
    Browse the repository at this point in the history

  2. Implement periodic exporting metric reader (open-telemetry#1286)

    @lalitb
    lalitb authored Apr 1, 2022
    1 Configuration menu
    Copy the full SHA
    33d9c62 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2022

  1. Add async-changes branch to pull_request of github action (open-tel… 

    …emetry#1309)

Signed-off-by: owent <[email protected]>
    @owent
    owent authored Apr 4, 2022
    Configuration menu
    Copy the full SHA
    48a4060 View commit details
    Browse the repository at this point in the history

  2. Add InstrumentationInfo and Resource to the metrics data to be export… 

    …ed. (open-telemetry#1299)
    @lalitb
    lalitb authored Apr 4, 2022
    1 Configuration menu
    Copy the full SHA
    be75bbc View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2022

  1. Excempt should be applied on issue instead of PR (open-telemetry#1316)

    @ThomsonTan
    ThomsonTan authored Apr 5, 2022
    2 Configuration menu
    Copy the full SHA
    237a0b2 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2022

  1. Bump codecov/codecov-action from 2.1.0 to 3 (open-telemetry#1318)

    @dependabot
    dependabot[bot] authored Apr 6, 2022
    1 Configuration menu
    Copy the full SHA
    fd338cc View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'opentelemetry/main' into merge_main_int… 

    …o_async_changes

Signed-off-by: owent <[email protected]>

# Conflicts:
#	sdk/include/opentelemetry/sdk/metrics/aggregation/sum_aggregation.h
#	sdk/include/opentelemetry/sdk/metrics/data/point_data.h
#	sdk/include/opentelemetry/sdk/metrics/metric_exporter.h
#	sdk/include/opentelemetry/sdk/metrics/metric_reader.h
#	sdk/include/opentelemetry/sdk/metrics/state/sync_metric_storage.h
#	sdk/test/metrics/sync_metric_storage_test.cc
    @owent
    owent committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    e33e789 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'opentelemetry/main' into merge_main_int… 

    …o_async_changes
    @owent
    owent committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    0321848 View commit details
    Browse the repository at this point in the history