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

OpenTelemetry integration #981

Closed
wants to merge 78 commits into from
Closed

OpenTelemetry integration #981

wants to merge 78 commits into from

Conversation

dhoard
Copy link
Collaborator

@dhoard dhoard commented Jun 22, 2024

OpenTelemetry integration.

dhoard added 17 commits June 19, 2024 15:39
@dhoard
Initial work to integrate OpenTelemtry
a59fd52 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Initial OpenTelemetry integration tests
1ee23d1 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Added Prometheus container
3f87236 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Removed unused code
7755e5a 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Added code to start required containers and test that Prometheus is r…
1b56648 
…unning

Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Renamed methods
bee7bef 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Refactored OpenTelemetryTest to allow multi-threaded execution
acf0009 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Adding more test functionality
d2a1cb8 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Updated AntuBLUE test engine
ea94e19 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Updated AntuBLUE test engine
c9548ea 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Formatting
c16c05e 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Removed groupId since it's inherited
55e76c5 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Added shading configuration. Formatting
1655b3a 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Added AntuBLUE Test Engine Extras
58bfc2b 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Fixed tests
b78468d 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Formatting
e4a660a 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Removed unused member variable
887db75 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard dhoard requested a review from fstab June 22, 2024 13:45
dhoard added 12 commits June 25, 2024 09:12
@dhoard
Renamed method. Add code to close response
11779b8 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Updated AntuBLUE Test Engine
0421bd2 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Refactored OpenTelemetry tests
3b02389 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Code cleanup
d8dce81 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Code cleanup
789649b 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Fixed spelling
038ad85 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Renamed test methods
2702d30 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Refactored common code to abstract base class. Renamed DockerImageNam…
96396a1 
…es to JavaDockerImageNames

Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Refactored common code to abstract base class. Renamed DockerImageNam…
0748089 
…es to JavaDockerImageNames

Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Updated Javadoc
9fe6822 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Refactored Docker Java image handling
5f80863 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Updated README.md
6e2002d 
Signed-off-by: dhoard <doug.hoard@gmail.com>
dhoard added 4 commits July 19, 2024 23:15
@dhoard
Changed to use Verifyica test engine
e24afac 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Added Verifyica configuration properties
4409507 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Merge branch 'refactor-integration-tests' into otel-integration
59e18e6
@dhoard
Updated Verifyica test engine version
d64323a 
Signed-off-by: dhoard <doug.hoard@gmail.com>
fstab
fstab requested changes Jul 23, 2024
View reviewed changes
Copy link
Member

@fstab fstab left a comment

Choose a reason for hiding this comment

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

Hi Doug, sorry for the delay, I finally found the time for a first review. I focused mostly on the production code. Looking good, I left a few comments.

...ommon/src/main/java/io/prometheus/jmx/common/opentelemetry/OpenTelemetryExporterFactory.java Outdated Show resolved Hide resolved
jmx_prometheus_javaagent/src/main/java/io/prometheus/jmx/JavaAgent.java Outdated Show resolved Hide resolved
jmx_prometheus_javaagent/src/main/java/io/prometheus/jmx/JavaAgent.java Outdated Show resolved Hide resolved
dhoard added 13 commits July 23, 2024 23:37
@dhoard
Changed code to use OpenTelemetry default is configuration is not spe…
734d51a 
…cified

Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Removed unused static references
f86cf36 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Changed code so that HTTP / OpenTelemetry modes are exclusive
4c2e541 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Added missing class
6ef71f6 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Added new Java test containers
4888cf4 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Added missing resource
ab05361 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Changed jmx_prometheus_httpserver module to jmx_prometheus_standalone
7ea84cc 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Changed methods for consistency
566478b 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Code cleanup
9c61465 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Increase max throttle time
50dce7d 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Updated Verifyica test engine version
add9256 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Cleaned up argument parsing. Updated tests
6f8a334 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Updated Verifyica test engine version
746ba2e 
Signed-off-by: dhoard <doug.hoard@gmail.com>
fstab
fstab requested changes Aug 4, 2024
View reviewed changes
Copy link
Member

@fstab fstab left a comment

Choose a reason for hiding this comment

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

Hi Doug, it's looking great!

I got a few minor comments regarding error messages or renames. Functionality is looking great.

jmx_prometheus_javaagent/src/main/java/io/prometheus/jmx/JavaAgent.java Outdated Show resolved Hide resolved
jmx_prometheus_javaagent/src/main/java/io/prometheus/jmx/JavaAgent.java Outdated Show resolved Hide resolved
jmx_prometheus_javaagent/src/main/java/io/prometheus/jmx/Arguments.java Show resolved Hide resolved
run_sample_httpserver.sh Outdated Show resolved Hide resolved
run_sample_httpserver.sh Outdated Show resolved Hide resolved
tools/patch-and-run-integration-test-suite.sh Show resolved Hide resolved
dhoard added 6 commits August 4, 2024 15:56
@dhoard
Changed/fix shell script
01bfc92 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Fixed usage information
4cc1369 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Changed per code review
a08970b 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Rolled Verifyica version
6c84cbb 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Updated Verifyica test engine version
f577cf0 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Fixed container startup check
7b98afe 
Signed-off-by: dhoard <doug.hoard@gmail.com>
fstab
fstab reviewed Aug 9, 2024
View reviewed changes
jmx_prometheus_javaagent/src/main/java/io/prometheus/jmx/Arguments.java
format("Malformed arguments for Standalone HTTP mode [%s]", agentArgument));
}
} else {
mode = Mode.OPEN_TELEMETRY;
Copy link
Member

Choose a reason for hiding this comment

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

If I understand correctly, if neither a port for the Prometheus HTTP endpoint nor opentelemetry: in the config is specified, jmx_exporter will silently do nothing.

Should we print an error and exit in that case?

@dhoard
Copy link
Collaborator Author

dhoard commented Aug 13, 2024

I am closing PR for new/cleaner PR.

@dhoard dhoard closed this Aug 13, 2024
@fstab
Copy link
Member

fstab commented Aug 13, 2024

👍 please ping me when the new PR is ready.

@dhoard dhoard deleted the otel-integration branch August 13, 2024 12:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fstab fstab fstab requested changes

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
@dhoard @shivanshuraj1333 @fstab