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

Verify in smoke tests that JVM metrics are exported #136

Merged
merged 5 commits into from
Mar 22, 2021
Merged

Verify in smoke tests that JVM metrics are exported #136

merged 5 commits into from
Mar 22, 2021

Conversation

mateuszrzeszutek
Copy link
Contributor

@mateuszrzeszutek mateuszrzeszutek commented Mar 18, 2021 •
edited
Loading

This PR implements smoke tests verifying that our micrometer metrics get consumed by the collector correctly (and runtime. is added).

  • Applied same fake-backend changes as in the upstream javaagent project
  • Bumped otel-collector version
  • Changed windows otel-collector image to contrib (has signalfx receiver)

@mateuszrzeszutek mateuszrzeszutek marked this pull request as draft March 19, 2021 09:12
@mateuszrzeszutek mateuszrzeszutek force-pushed the add-metrics-to-fake-backend branch from 0f085be to 5bff1e9 Compare March 19, 2021 09:13
@mateuszrzeszutek mateuszrzeszutek changed the title Add metrics collection to smoke-tests' fake-backend Verify in smoke tests that JVM metrics are exported Mar 19, 2021
@mateuszrzeszutek mateuszrzeszutek force-pushed the add-metrics-to-fake-backend branch from 56e15fe to d4eac0b Compare March 19, 2021 15:15
@mateuszrzeszutek mateuszrzeszutek force-pushed the add-metrics-to-fake-backend branch from d4eac0b to ca8e329 Compare March 19, 2021 15:17
@mateuszrzeszutek mateuszrzeszutek marked this pull request as ready for review March 19, 2021 15:20
breedx-splk
breedx-splk approved these changes Mar 19, 2021
View reviewed changes
Copy link
Contributor

@breedx-splk breedx-splk left a comment

Choose a reason for hiding this comment

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

Looks good. Had a few ideas/suggestions but nothing blocking. Thanks!

...ke-backend/src/main/java/com/splunk/opentelemetry/smoketest/fakebackend/FakeBackendMain.java Show resolved Hide resolved
...ke-backend/src/main/java/com/splunk/opentelemetry/smoketest/fakebackend/FakeBackendMain.java Show resolved Hide resolved
smoke-tests/src/test/java/com/splunk/opentelemetry/SmokeTest.java Show resolved Hide resolved
smoke-tests/src/test/java/com/splunk/opentelemetry/TelemetryRetriever.java Outdated Show resolved Hide resolved
smoke-tests/src/test/java/com/splunk/opentelemetry/TelemetryRetriever.java Outdated Show resolved Hide resolved
@mateuszrzeszutek
Copy link
Contributor Author

I had to revert the Windows collector image changes and disable metrics on Windows: as it turned out, the otel-collector-contrib image is missing the changes from this PR: open-telemetry/opentelemetry-collector#2272
And it just doesn't work in docker right now. I'll create a separate issue for this matter.

@mateuszrzeszutek mateuszrzeszutek merged commit 56a998b into main Mar 22, 2021
@delete-merged-branch delete-merged-branch bot deleted the add-metrics-to-fake-backend branch March 22, 2021 16:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@breedx-splk breedx-splk breedx-splk approved these changes

@jkwatson jkwatson jkwatson approved these changes

@iNikem iNikem Awaiting requested review from iNikem

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
@mateuszrzeszutek @jkwatson @breedx-splk