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

Remove existing OpenTelemetry Collector code #2828

Merged
merged 3 commits into from
Feb 25, 2021
Merged

Remove existing OpenTelemetry Collector code #2828

merged 3 commits into from
Feb 25, 2021

Conversation

jpkrohling
Copy link
Contributor

The current OpenTelemetry code isn't representative anymore of where we want to go for Jaeger v2. In order to reduce confusion to users, we discussed during the last weekly meeting about removing this code. Exporters that were created for this are still available in earlier tags and can be recovered from there when needed.

Signed-off-by: Juraci Paixão Kröhling juraci@kroehling.de

@codecov
Copy link

codecov bot commented Feb 23, 2021

Codecov Report

Merging #2828 (72a8e34) into master (b635dbd) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2828      +/-   ##
==========================================
- Coverage   95.94%   95.93%   -0.02%     
==========================================
  Files         221      221              
  Lines        9696     9689       -7     
==========================================
- Hits         9303     9295       -8     
- Misses        325      326       +1     
  Partials       68       68              
Impacted Files Coverage Δ
cmd/agent/app/reporter/grpc/flags.go 100.00% <ø> (ø)
cmd/ingester/app/flags.go 100.00% <ø> (ø)
plugin/storage/kafka/options.go 93.68% <ø> (-0.07%) ⬇️
cmd/agent/app/flags.go 91.30% <100.00%> (-0.37%) ⬇️
cmd/collector/app/builder_flags.go 100.00% <100.00%> (ø)
plugin/sampling/strategystore/static/options.go 100.00% <100.00%> (ø)
plugin/storage/badger/spanstore/reader.go 95.37% <0.00%> (-0.72%) ⬇️
plugin/storage/integration/integration.go 77.34% <0.00%> (-0.56%) ⬇️
cmd/query/app/static_handler.go 96.77% <0.00%> (+1.61%) ⬆️

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 b635dbd...72a8e34. Read the comment docs.

@pavolloffay
Copy link
Member

Are these components going to be migrated to https://github.com/jaegertracing/jaeger-otelcol?

The main reason for having the code here was for the ease of development. Many times changes in the core Jaeger components were required.

@joe-elliott
Copy link
Member

There were a number of places that these "AddOtelFlags" methods were added:

https://github.com/jaegertracing/jaeger/blob/master/cmd/ingester/app/flags.go#L92

Should we clean those up as well?

@jpkrohling
Copy link
Contributor Author

From what I understand, we'll first adapt this repository here to have multiple go modules, and then move the contents of jaeger-otelcol to this repo here. The goal is to avoid the circular dependency between otelcol and Jaeger, while still being able to have the binaries being built as part of this single repository.

@joe-elliott is working on the reorganization, and @kevinearls will work on moving things here. Some of the components removed by this PR will get a new life after this reorganization.

@jpkrohling
Copy link
Contributor Author

For context, the decision to remove this here right now also has to do with #2781, as we can't bump Thrift to 0.14 in the otelcol modules as it depends on a Zipkin Thrift repository that is still on 0.13. Unfortunately, Thrift 0.14 is incompatible with 0.13, as it adds context.Context to some methods...

@jpkrohling
Copy link
Contributor Author

Should we clean those up as well?

Done!

@pavolloffay
Copy link
Member

For context, the decision to remove this here right now also has to do with #2781, as we can't bump Thrift to 0.14 in the otelcol modules as it depends on a Zipkin Thrift repository that is still on 0.13. Unfortunately, Thrift 0.14 is incompatible with 0.13, as it adds context.Context to some methods...

The same problem might pop up after in OTEL collector as well. Better would be to bump zipkin to thrift 0.14 as well.

@jpkrohling
Copy link
Contributor Author

The same problem might pop up after in OTEL collector as well.

Indeed, it will affect that as well.

Copy link
Member

@joe-elliott joe-elliott 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 to me

Copy link
Member

@joe-elliott joe-elliott left a comment

Choose a reason for hiding this comment

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

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
@mergify mergify bot dismissed joe-elliott’s stale review February 25, 2021 10:58

Pull request has been modified.

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
Copy link
Contributor

@albertteoh albertteoh left a comment

Choose a reason for hiding this comment

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

lgtm

}

// AddOTELFlags adds flags that are exposed by OTEL collector
func AddOTELFlags(flags *flag.FlagSet) {
flags.String(collectorHostPort, "", "Comma-separated string representing host:port of a static list of collectors to connect to directly")
Copy link
Contributor

Choose a reason for hiding this comment

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

I wonder why these were considered specific to OTEL in the first place

Copy link
Member

Choose a reason for hiding this comment

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

Not all flags were added to OTEL distros in other words some flags made sense only for legacy Jaeger.

@jpkrohling
Copy link
Contributor Author

I'm merging with two approvals, any left overs can be removed in a follow-up PR.

@jpkrohling jpkrohling merged commit 72279ee into jaegertracing:master Feb 25, 2021
@altexdim altexdim mentioned this pull request Apr 7, 2021
@jpkrohling jpkrohling added this to the Release 1.23.0 milestone Jun 4, 2021
@jpkrohling jpkrohling deleted the jpkrohling/remove-current-otelcol-code branch July 28, 2021 19:21
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.

5 participants