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

Update to OTel 1.13 #5799

Merged
merged 12 commits into from
Apr 13, 2022
Merged

Update to OTel 1.13 #5799

merged 12 commits into from
Apr 13, 2022

Conversation

anuraaga
Copy link
Contributor

No description provided.

@@ -30,6 +32,11 @@ void reset() {
collectedRequests.clear();
}

@Override
public AggregationTemporality getAggregationTemporality(InstrumentType instrumentType) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

/cc @jack-berg Hopefully people will generally be able to use our metric exporters even in testing, but if for some reason someone has to implement this method they'll have absolutely no idea how to do so I think. I have a feeling defaulting to cumulative would have a net positive effect on confused users (it will also cause confusion, but my hypothesis is less so)

abstract class TomcatSmokeTest extends AppServerTest {

protected String getTargetImagePrefix() {
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat"
}

@Override
protected TargetWaitStrategy getWaitStrategy() {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I saw connection failures and thought it could be Armeria-related, but realized that the tests were running before the server started. I don't think there's anything in this PR that would slow down startup time but maybe there is? Or just at a borderline that I'm unluckily breaking

@trask
Copy link
Member

trask commented Apr 12, 2022

@anuraaga the Java 8 tests should be fixed by #5809

@anuraaga anuraaga marked this pull request as ready for review April 13, 2022 02:54
@anuraaga anuraaga requested a review from a team April 13, 2022 02:54
Comment on lines -30 to +29
SdkMeterProvider.builder()
.registerMetricReader(metricReader)
.setMinimumCollectionInterval(Duration.ZERO)
.build();
SdkMeterProvider.builder().registerMetricReader(metricReader).build();
Copy link
Member

Choose a reason for hiding this comment

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

❤️

.hasInstrumentationLibraryInfo(
InstrumentationLibraryInfo.create("test", null))
.hasInstrumentationScopeInfo(InstrumentationScopeInfo.create("test"))
Copy link
Member

Choose a reason for hiding this comment

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

well, that's something better about Scope, it's shorter then Library 😄

Comment on lines +27 to +29
protected TargetWaitStrategy getWaitStrategy() {
return new TargetWaitStrategy.Log(Duration.ofMinutes(1), ".*Listening on.*")
}
Copy link
Member

Choose a reason for hiding this comment

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

thx for adding all of these 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just want to confirm if it's anything to be concerned about (file an issue about)? I've never seen startup time failures until this PR I think

Copy link
Member

Choose a reason for hiding this comment

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

let's see what @laurit thinks, he's been looking at the smoke tests recently (e.g. #5772)

Copy link
Contributor

Choose a reason for hiding this comment

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

I think this is the correct thing to do. It is hard to explain why these are suddenly needed but for example SpringBootSmokeTest already had it while it was added to SpringBootWithSamplingSmokeTest in this pr. So might as well argue that it was strange that SpringBootWithSamplingSmokeTest worked before.

@laurit laurit merged commit e58d39d into open-telemetry:main Apr 13, 2022
RashmiRam pushed a commit to RashmiRam/opentelemetry-auto-instr-java that referenced this pull request May 23, 2022
* Update to OTel 1.13

* Fix test

* Foo

* Fix app server test and start yak shaving

* Yak

* Yak

* groovy fail

* Yak

* GROOVY

* yak farm
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.

4 participants