Skip to content

Commit

Permalink
[pkg/translator/prometheusremotewrite] Split from prometheusremotewri…
Browse files Browse the repository at this point in the history
…teexporter (open-telemetry#7240)

* Make otlp to Prom RW conversion importable

This will make it super easy for existing Remote Write compatible systems
like Prometheus ingest OTLP.

Now its as simple as:

```
	prwe := &prometheusremotewriteexporter.PRWExporter{}
	tsMap, dropped, errs := prwe.ConvertMetrics(ctx, md)
```

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

* Move metrics conversion to pkg/translate

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

* Add changelog entry

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

* Make lint pass

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
  • Loading branch information
gouthamve authored and tomsanbear committed Mar 2, 2022
1 parent 6fe3862 commit ddda53f
Show file tree
Hide file tree
Showing 32 changed files with 3,486 additions and 1,168 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- `attributesprocessor` `resourceprocessor`: Add `from_context` value source
- `resourcedetectionprocessor`: check cluster config to verify resource is on aws for eks resources (#7186)
- `awscloudwatchlogsexporter`: enable awscloudwatchlogsexporter which accepts and exports log data (#7297)
- `translator/prometheusremotewrite`: add a new module to help translate data from OTLP to Prometheus Remote Write (#7240)

## 🛑 Breaking changes 🛑

Expand Down
7 changes: 5 additions & 2 deletions cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.43.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.43.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.43.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.43.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.43.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.43.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.43.0 // indirect
Expand Down Expand Up @@ -366,7 +367,7 @@ require (
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/common/sigv4 v0.1.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/prometheus/prometheus v1.8.2-0.20220111145625-076109fa1910 // indirect
github.com/prometheus/prometheus v1.8.2-0.20220117154355-4855a0c067e2 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/rs/cors v1.8.2 // indirect
github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect
Expand Down Expand Up @@ -435,7 +436,7 @@ require (
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
golang.org/x/tools v0.1.8 // indirect
golang.org/x/tools v0.1.9-0.20211209172050-90a85b2969be // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gonum.org/v1/gonum v0.9.3 // indirect
google.golang.org/api v0.65.0 // indirect
Expand Down Expand Up @@ -629,6 +630,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin => ../../pkg/translator/zipkin

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite => ../../pkg/translator/prometheusremotewrite

replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor => ../../processor/attributesprocessor

replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor => ../../processor/cumulativetodeltaprocessor/
Expand Down
7 changes: 5 additions & 2 deletions cmd/configschema/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions examples/demo/otel-collector-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ exporters:
endpoint: "0.0.0.0:8889"
const_labels:
label1: value1

logging:

zipkin:
Expand Down
5 changes: 4 additions & 1 deletion exporter/awsprometheusremotewriteexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ require (
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.43.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.43.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/prometheus v1.8.2-0.20220111145625-076109fa1910 // indirect
github.com/prometheus/prometheus v1.8.2-0.20220117154355-4855a0c067e2 // indirect
github.com/rs/cors v1.8.2 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/tidwall/gjson v1.10.2 // indirect
Expand Down Expand Up @@ -57,3 +58,5 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prome
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry => ../../pkg/resourcetotelemetry

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite => ../../pkg/translator/prometheusremotewrite
Loading

0 comments on commit ddda53f

Please sign in to comment.