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

Merge otlp exporters #4499

Merged
merged 3 commits into from
May 28, 2022
Merged

Conversation

jack-berg
Copy link
Member

  • Merge otlp http trace and metric exporters into :exporters:otlp:all
  • Merge otlp http log exporter into :exporters:otlp:logs

@jack-berg jack-berg requested a review from a user May 27, 2022 15:47
@jack-berg jack-berg requested a review from Oberon00 as a code owner May 27, 2022 15:47
@@ -324,4 +327,29 @@ void configuresGlobal() {
assertThat(server.metricRequests).isNotEmpty();
});
}

static void shutdownGlobalSdk() {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I merged the testOtlpGrpc and testOtlpHttp test sets, but ran into some problems because both test suites had a test that sets up GlobalOpenTelemetry with a periodic metric reader that continues to export after the test is over and the test grpc / http server is shutdown.

The solution I came up with is to use reflection to obtain OpenTelemetrySdk from GlobalOpenTelemetry and call shutdown.

We might consider adding a utility to this to the sdk-testing in case users need to set up GlobalOpenTelemetry for some reason, and need to cleanup after.

@codecov
Copy link

codecov bot commented May 27, 2022

Codecov Report

Merging #4499 (9de04a8) into main (60cc5f4) will decrease coverage by 0.05%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #4499      +/-   ##
============================================
- Coverage     90.06%   90.01%   -0.06%     
  Complexity     5040     5040              
============================================
  Files           578      578              
  Lines         15553    15553              
  Branches       1498     1498              
============================================
- Hits          14008    14000       -8     
- Misses         1083     1090       +7     
- Partials        462      463       +1     
Impacted Files Coverage Δ
...rter/otlp/http/metrics/OtlpHttpMetricExporter.java 90.90% <ø> (ø)
...lp/http/metrics/OtlpHttpMetricExporterBuilder.java 100.00% <ø> (ø)
...exporter/otlp/http/trace/OtlpHttpSpanExporter.java 77.77% <ø> (ø)
...r/otlp/http/trace/OtlpHttpSpanExporterBuilder.java 100.00% <ø> (ø)
...y/exporter/otlp/http/logs/OtlpHttpLogExporter.java 77.77% <ø> (ø)
...ter/otlp/http/logs/OtlpHttpLogExporterBuilder.java 100.00% <ø> (ø)
...metry/exporter/internal/okhttp/OkHttpExporter.java 85.71% <0.00%> (-9.53%) ⬇️
...metry/sdk/metrics/export/PeriodicMetricReader.java 86.95% <0.00%> (-2.90%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 60cc5f4...9de04a8. Read the comment docs.

Copy link
Contributor

@jkwatson jkwatson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems fine to me

@jkwatson jkwatson merged commit 92bd659 into open-telemetry:main May 28, 2022
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