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 #1320

Closed
wants to merge 7 commits into from
Closed

Merge main into async-changes #1320

wants to merge 7 commits into from

Commits on Mar 21, 2022

  1. Cocurrency otlp http session (open-telemetry#1274)

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

  2. Async callback Exporter to Processor changes (open-telemetry#1275)

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

Commits on Mar 22, 2022

  1. Changing the type of callback function in Export function to std::fun… 

    …ction (open-telemetry#1278)
    @DebajitDas
    DebajitDas authored Mar 22, 2022
    Configuration menu
    Copy the full SHA
    729c2f8 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2022

  1. Cocurrency otlp http session (open-telemetry#1281)

    @owent
    owent authored Mar 29, 2022
    Configuration menu
    Copy the full SHA
    15e7725 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2022

  1. Added feature flag for asynchronous export (open-telemetry#1295)

    @DebajitDas
    DebajitDas authored Mar 31, 2022
    Configuration menu
    Copy the full SHA
    ad3bdfe View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2022

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

    …o_async_changes

Signed-off-by: owent <admin@owent.net>

# 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

  2. 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