Skip to content

Commit

Permalink
cleanup processor congif code
Browse files Browse the repository at this point in the history
  • Loading branch information
varshith257 committed Jun 5, 2024
1 parent 0a0d8c6 commit bc73ae1
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 63 deletions.
11 changes: 0 additions & 11 deletions docker-compose/monitor/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,6 @@ dev: export JAEGER_IMAGE_TAG = dev
dev:
docker compose -f docker-compose.yml up

# starts older spanmetrics processor setup, for example,
# to test backwards compatibility of Jaeger with spanmetrics processor.
.PHONY: dev-processor
dev-processor: export JAEGER_IMAGE_TAG = dev
# Fix to a version before the breaking changes were introduced.
dev-processor: export OTEL_IMAGE_TAG = 0.70.0
dev-processor: export OTEL_CONFIG_SRC = ./otel-collector-config-processor.yml
dev-processor: export PROMETHEUS_QUERY_SUPPORT_SPANMETRICS_CONNECTOR = false
dev-processor:
docker compose -f docker-compose.yml up

.PHONY: clean-jaeger
clean-jaeger:
# Also cleans up intermediate cached containers.
Expand Down
42 changes: 0 additions & 42 deletions docker-compose/monitor/otel-collector-config-processor.yml

This file was deleted.

10 changes: 0 additions & 10 deletions plugin/metrics/prometheus/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,6 @@ func TestWithDefaultConfiguration(t *testing.T) {
}

func TestWithConfiguration(t *testing.T) {
t.Run("still supports the deprecated spanmetrics processor", func(t *testing.T) {
f := NewFactory()
v, command := config.Viperize(f.AddFlags)
err := command.ParseFlags([]string{
"--prometheus.query.support-spanmetrics-connector=false",
})
require.NoError(t, err)
f.InitFromViper(v, zap.NewNop())
assert.False(t, f.options.Primary.SupportSpanmetricsConnector)
})
t.Run("with custom configuration and no space in token file path", func(t *testing.T) {
f := NewFactory()
v, command := config.Viperize(f.AddFlags)
Expand Down

0 comments on commit bc73ae1

Please sign in to comment.