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

Support spanmetrics connector by default #4704

Merged
merged 7 commits into from
Aug 29, 2023

Conversation

albertteoh
Copy link
Contributor

@albertteoh albertteoh commented Aug 28, 2023

Which problem is this PR solving?

  • Supports the new spanmetrics connector by default.
  • Some local developer improvements.

Description of the changes

  • Defaults the PROMETHEUS_QUERY_SUPPORT_SPANMETRICS_CONNECTOR parameter to true.
  • The next release will remove this configuration and not support the spanmetrics processor.
  • Removes the use of the deprecated jaeger exporter in OTEL config. For more details, please refer to: Deprecate jaeger exporters. open-telemetry/opentelemetry-specification#2858.
  • Simplifies the Makefile by:
    • Providing defaults in the docker-compose.yml file to prefer the spanmetrics connector.
    • Removing the run target in favour of docker compose up.
    • Removing the run- prefix of the remaining targets.

How was this change tested?

  • Tested the following commands to confirm metrics are visible in the Monitor tab:
$ make build
$ make dev
$ make dev-processor
$ docker compose up

# No longer works
$ make run

Checklist

Signed-off-by: albertteoh <see.kwang.teoh@gmail.com>
Signed-off-by: albertteoh <see.kwang.teoh@gmail.com>
Signed-off-by: albertteoh <see.kwang.teoh@gmail.com>
@albertteoh albertteoh requested a review from a team as a code owner August 28, 2023 11:57
Signed-off-by: albertteoh <see.kwang.teoh@gmail.com>
@@ -64,7 +64,7 @@ func NewOptions(primaryNamespace string) *Options {
ServerURL: defaultServerURL,
ConnectTimeout: defaultConnectTimeout,

SupportSpanmetricsConnector: false,
SupportSpanmetricsConnector: defaultSupportSpanmetricsConnector,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the main (breaking) change.

The other changes relate to local developer improvements with a similar theme of defaulting to the spanmetrics connector as well.

If we feel those changes should be decoupled into separate PRs, I'm happy to break them up.

Signed-off-by: albertteoh <see.kwang.teoh@gmail.com>
@codecov
Copy link

codecov bot commented Aug 28, 2023

Codecov Report

Patch coverage: 100.00% and project coverage change: +0.01% 🎉

Comparison is base (7a6bae2) 97.04% compared to head (e926a47) 97.05%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4704      +/-   ##
==========================================
+ Coverage   97.04%   97.05%   +0.01%     
==========================================
  Files         301      301              
  Lines       17880    17880              
==========================================
+ Hits        17352    17354       +2     
+ Misses        423      422       -1     
+ Partials      105      104       -1     
Flag Coverage Δ
unittests 97.05% <100.00%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
plugin/metrics/prometheus/options.go 100.00% <100.00%> (ø)

... and 2 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@@ -29,7 +29,7 @@ service:
traces:
receivers: [otlp, jaeger]
processors: [batch]
exporters: [spanmetrics, jaeger]
Copy link
Contributor Author

Choose a reason for hiding this comment

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

jaeger exporter is deprecated, hence the switch to otlp exporter.

CHANGELOG.md Outdated Show resolved Hide resolved
yurishkuro
yurishkuro previously approved these changes Aug 28, 2023
Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Signed-off-by: Albert <26584478+albertteoh@users.noreply.github.com>
@albertteoh albertteoh merged commit 3a6d057 into jaegertracing:main Aug 29, 2023
31 checks passed
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.

2 participants