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

Conversation

owent
Copy link
Member

@owent owent commented Apr 6, 2022

Changes

Do nothing but merge main into async-changes and use main version for all conflicts, so we can enable CI checks for async-changes.

owent and others added 6 commits March 20, 2022 23:41
@owent
Cocurrency otlp http session (open-telemetry#1274)
c3eaa9d
@DebajitDas
Async callback Exporter to Processor changes (open-telemetry#1275)
6f53da3
@DebajitDas
Changing the type of callback function in Export function to std::fun…
729c2f8 
…ction (open-telemetry#1278)
@owent
Cocurrency otlp http session (open-telemetry#1281)
15e7725
@DebajitDas
Added feature flag for asynchronous export (open-telemetry#1295)
ad3bdfe
@owent
Merge remote-tracking branch 'opentelemetry/main' into merge_main_int…
e33e789 
…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 requested a review from a team April 6, 2022 06:11
@codecov
Copy link

codecov bot commented Apr 6, 2022 •
edited
Loading

Codecov Report

Merging #1320 (0321848) into main (fd338cc) will decrease coverage by 0.63%.
The diff coverage is 75.19%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1320      +/-   ##
==========================================
- Coverage   91.70%   91.08%   -0.62%     
==========================================
  Files         217      217              
  Lines        7842     7909      +67     
==========================================
+ Hits         7191     7203      +12     
- Misses        651      706      +55
Impacted Files Coverage Δ
api/include/opentelemetry/common/spin_lock_mutex.h 25.00% <0.00%> (-4.41%) ⬇️
...lemetry/exporters/memory/in_memory_span_exporter.h 91.31% <ø> (ø)
...de/opentelemetry/exporters/ostream/span_exporter.h 100.00% <ø> (ø)
exporters/ostream/src/span_exporter.cc 90.82% <ø> (ø)
...nclude/opentelemetry/ext/http/client/http_client.h 93.34% <ø> (ø)
sdk/include/opentelemetry/sdk/trace/exporter.h 100.00% <ø> (ø)
sdk/test/trace/simple_processor_test.cc 85.72% <ø> (ø)
sdk/test/trace/batch_span_processor_test.cc 95.84% <16.67%> (-4.16%) ⬇️
api/include/opentelemetry/common/timestamp.h 81.25% <25.00%> (-18.75%) ⬇️
...ntelemetry/ext/http/client/curl/http_client_curl.h 87.81% <35.72%> (-4.50%) ⬇️
... and 7 more

@lalitb
Copy link
Member

lalitb commented Apr 6, 2022

This seems to be merging async-changes into main, not the other way around?

@owent owent mentioned this pull request Apr 6, 2022
Merged
3 tasks
@owent owent closed this Apr 6, 2022
@owent
Copy link
Member Author

owent commented Apr 6, 2022 •
edited
Loading

This seems to be merging async-changes into main, not the other way around?

Sorry, my mistake, I have raised another PR (#1321 )

@owent owent deleted the merge_main_into_async_changes branch April 9, 2022 04:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@owent @lalitb @DebajitDas