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 support for OTEL spanmetrics processor #5484

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ee076e6
remove SpanProcessorMetrics
varshith257 May 23, 2024
ac7731c
Bump the otel-instrumentation group with 2 updates (#5474)
dependabot[bot] May 23, 2024
655c398
Rename `Processor` to `PostAggregator` (#5479)
Pushkarm029 May 24, 2024
0690d16
[refactor] move root span handler into aggregator (#5478)
Pushkarm029 May 26, 2024
5f6118d
Split v1 and v2 ES/OS integration tests (#5487)
yurishkuro May 26, 2024
b3ce25a
Bump github/codeql-action from 2.2.4 to 3.25.6 (#5488)
dependabot[bot] May 26, 2024
36b4938
Revert #5482 - ppc64le is not yet supported by delve (#5489)
yurishkuro May 26, 2024
a6ca30b
Bump anchore/sbom-action from 0.15.11 to 0.16.0 (#5492)
dependabot[bot] May 27, 2024
6172fb0
Remove support for Elasticsearch v5 and v6 #5439 (#5491)
vinayakjaas May 27, 2024
40141af
Bump step-security/harden-runner from 2.7.0 to 2.8.0 (#5493)
dependabot[bot] May 27, 2024
a1b0dd2
Remove support for expvar-backed metrics (#5437)
joeyyy09 May 27, 2024
d10998b
Use docker compose for elasticsearch/opensearch integration tests (#5…
hellspawn679 May 28, 2024
95f493d
[test] Use locks to avoid race condition (#5502)
yurishkuro May 30, 2024
d5d62e6
Replace internal metrics.Factory usage with direct calls to expvar (#…
prakrit55 May 31, 2024
004a465
[agent/test] Wait for goroutine to exit (#5503)
yurishkuro May 31, 2024
1bb2084
Use docker compose for kafka integration tests (#5500)
hellspawn679 May 31, 2024
4e8e0ea
Add Elasticsearch helper binaries to release (#5501)
FlamingSaint Jun 1, 2024
8284c96
remove comments
varshith257 Jun 2, 2024
4c403e9
Merge branch 'main' into deprecate-spanmetrics-processor
varshith257 Jun 2, 2024
2cbfeac
remove flag of spanmetrics processor
varshith257 Jun 2, 2024
d68ca79
Merge branch 'deprecate-spanmetrics-processor' of https://github.com/…
varshith257 Jun 2, 2024
7f6b144
update readme
varshith257 Jun 2, 2024
f7e92f4
Merge branch 'main' into deprecate-spanmetrics-processor
varshith257 Jun 3, 2024
0a0d8c6
Merge branch 'main' into deprecate-spanmetrics-processor
varshith257 Jun 3, 2024
9b012c7
cleanup processor congif code
varshith257 Jun 5, 2024
acaccde
Merge branch 'main' into deprecate-spanmetrics-processor
varshith257 Jun 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
4 changes: 2 additions & 2 deletions docker-compose/monitor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ This environment consists the following backend components:

- [MicroSim](https://github.com/yurishkuro/microsim): a program to simulate traces.
- [Jaeger All-in-one](https://www.jaegertracing.io/docs/1.24/getting-started/#all-in-one): the full Jaeger stack in a single container image.
- [OpenTelemetry Collector](https://opentelemetry.io/docs/collector/): vendor agnostic integration layer for traces and metrics. Its main role in this particular development environment is to receive Jaeger spans, forward these spans untouched to Jaeger All-in-one while simultaneously aggregating metrics out of this span data. To learn more about span metrics aggregation, please refer to the [spanmetrics processor documentation][spanmetricsprocessor].
- [OpenTelemetry Collector](https://opentelemetry.io/docs/collector/): vendor agnostic integration layer for traces and metrics. Its main role in this particular development environment is to receive Jaeger spans, forward these spans untouched to Jaeger All-in-one while simultaneously aggregating metrics out of this span data. To learn more about span metrics aggregation, please refer to the [spanmetrics connector documentation](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/connector/spanmetricsconnector/README.md).
- [Prometheus](https://prometheus.io/): a metrics collection and query engine, used to scrape metrics computed by OpenTelemetry Collector, and presents an API for Jaeger All-in-one to query these metrics.
- [Grafana](https://grafana.com/): a metrics visualization, analytics & monitoring solution supporting multiple metrics databases.

Expand Down Expand Up @@ -65,7 +65,7 @@ make build
make dev
```

## Backwards compatibility testing with spanmetrics processor
## Backwards compatibility testing with spanmetrics connector

```bash
make dev-processor
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
8 changes: 1 addition & 7 deletions plugin/metrics/prometheus/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ package prometheus
import (
"flag"
"fmt"
"log"
"strings"
"time"

Expand Down Expand Up @@ -48,8 +47,6 @@ const (
defaultLatencyUnit = "ms"
defaultNormalizeCalls = false
defaultNormalizeDuration = false

deprecatedSpanMetricsProcessor = "(deprecated, will be removed after 2024-01-01 or in release v1.53.0, whichever is later) "
)

type namespaceConfig struct {
Expand Down Expand Up @@ -97,7 +94,7 @@ func (opt *Options) AddFlags(flagSet *flag.FlagSet) {
flagSet.Bool(
nsConfig.namespace+suffixSupportSpanmetricsConnector,
defaultSupportSpanmetricsConnector,
deprecatedSpanMetricsProcessor+" Controls whether the metrics queries should match the OpenTelemetry Collector's spanmetrics connector naming (when true) or spanmetrics processor naming (when false).")
" Controls the metrics queries should match the OpenTelemetry Collector's spanmetrics connector naming.")
flagSet.String(nsConfig.namespace+suffixMetricNamespace, defaultMetricNamespace,
`The metric namespace that is prefixed to the metric name. A '.' separator will be added between `+
`the namespace and the metric name.`)
Expand Down Expand Up @@ -128,9 +125,6 @@ func (opt *Options) InitFromViper(v *viper.Viper) error {
cfg.TokenFilePath = v.GetString(cfg.namespace + suffixTokenFilePath)

cfg.SupportSpanmetricsConnector = v.GetBool(cfg.namespace + suffixSupportSpanmetricsConnector)
if !cfg.SupportSpanmetricsConnector {
log.Printf("using Spanmetrics Processor's metrics naming conventions " + deprecatedSpanMetricsProcessor)
}
cfg.MetricNamespace = v.GetString(cfg.namespace + suffixMetricNamespace)
cfg.LatencyUnit = v.GetString(cfg.namespace + suffixLatencyUnit)
cfg.NormalizeCalls = v.GetBool(cfg.namespace + suffixNormalizeCalls)
Expand Down
Loading