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

[coordinator] Influxdb importer endpoint (at /api/v1/influxdb/write) #2083

Merged
merged 4 commits into from
Jan 13, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
4 changes: 4 additions & 0 deletions glide.lock

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

5 changes: 5 additions & 0 deletions glide.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
package: github.com/m3db/m3
import:
- package: github.com/influxdata/influxdb
version: 01c8dd416270f424ab0c40f9291e269ac6921964
subpackages:
- models

- package: github.com/m3db/bitset
version: 07973db6b78acb62ac207d0538055e874b49d90d

Expand Down
91 changes: 91 additions & 0 deletions src/query/api/v1/handler/influxdb/rewrite.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
// Copyright (c) 2019 Uber Technologies, Inc.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

package influxdb

import (
"regexp"
)

type regexpRewriter struct {
okStart, okRest [256]bool
replacement byte
}

func newRegexpRewriter(startRe, restRe string) *regexpRewriter {
createArray := func(okRe string) (ret [256]bool) {
re := regexp.MustCompile(okRe)
// Check for only 7 bit non-control ASCII characters
for i := 32; i < 128; i++ {
if re.Match([]byte{byte(i)}) {
ret[i] = true
}
}
return
}
Comment on lines +33 to +42
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: can we drop regex from this completely? i.e. generate this bool array from a list of valid characters directly? The fewer moving parts the better 👍

return &regexpRewriter{okStart: createArray(startRe), okRest: createArray(restRe), replacement: byte('_')}
}

func (rr *regexpRewriter) rewrite(input []byte) {
if len(input) == 0 {
return
}
if !rr.okStart[input[0]] {
input[0] = rr.replacement
}
for i := 1; i < len(input); i++ {
if !rr.okRest[input[i]] {
input[i] = rr.replacement
}
}
}

// Utility, which handles both __name__ ('metric') tag, as well as
// rest of tags ('labels')
//
// It allow using any influxdb client, rewriting the tag names + the
// magic __name__ tag to match what Prometheus expects
type promRewriter struct {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Probably able to do this with just string utilities to avoid regexp matching? I think it's fine to merge this however without considering most optimal performance and iterate on this later, just wanted to call it out as potentially limiting for overall throughput.

Copy link
Collaborator

@arnikola arnikola Jan 6, 2020

Choose a reason for hiding this comment

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

Ah, I was thinking a bitmap to make it even faster (i.e. [255]bool arrays, describing if each rune was valid), since this is a write endpoint and probably expected to be pretty hot

Copy link
Contributor Author

Choose a reason for hiding this comment

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

[256]byte is ~10x faster than regexp match even with precompiled regexp (+ you get essentially free replace on top of it too so not needing the slow path at all). So changing to this, although I'd like to quote Knuth here, as it isn't really showing in our profiling :-)

metric, metricTail, label *regexpRewriter
}

func newPromRewriter() *promRewriter {
return &promRewriter{
metric: newRegexpRewriter(
"[a-zA-Z_:]",
"[a-zA-Z0-9_:]"),
metricTail: newRegexpRewriter(
"[a-zA-Z0-9_:]",
"[a-zA-Z0-9_:]"),
label: newRegexpRewriter(
"[a-zA-Z_]", "[a-zA-Z0-9_]")}
}

func (pr *promRewriter) rewriteMetric(data []byte) {
pr.metric.rewrite(data)
}

func (pr *promRewriter) rewriteMetricTail(data []byte) {
pr.metricTail.rewrite(data)
}

func (pr *promRewriter) rewriteLabel(data []byte) {
pr.label.rewrite(data)
}
53 changes: 53 additions & 0 deletions src/query/api/v1/handler/influxdb/rewrite_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
// Copyright (c) 2019 Uber Technologies, Inc.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

package influxdb

import (
"testing"

"github.com/stretchr/testify/assert"
)

type test struct {
in, outMetric, outMetricTail, outLabel string
}

func TestPromRewriter(t *testing.T) {
r := newPromRewriter()
tests := []test{{"foo", "foo", "foo", "foo"},
{".bar", "_bar", "_bar", "_bar"},
{"b.ar", "b_ar", "b_ar", "b_ar"},
{":bar", ":bar", ":bar", "_bar"},
{"ba:r", "ba:r", "ba:r", "ba_r"},
{"9bar", "_bar", "9bar", "_bar"},
}
for _, test := range tests {
in1 := []byte(test.in)
r.rewriteMetric(in1)
assert.Equal(t, test.outMetric, string(in1))
in2 := []byte(test.in)
r.rewriteMetricTail(in2)
assert.Equal(t, test.outMetricTail, string(in2))
in3 := []byte(test.in)
r.rewriteLabel(in3)
assert.Equal(t, test.outLabel, string(in3))
}
}
Loading