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

feat: OTLP Exporter #1324

Merged
merged 27 commits into from
Feb 8, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
bb0d00d
feat: deprecate jaeger enabled in favor or specifying tracing exporter
markphelps Feb 3, 2023
2d9b8ad
chore: update example config; cue/json schemas
markphelps Feb 3, 2023
5b754c8
feat: add zipkin support for traces
markphelps Feb 3, 2023
a8ca1d3
chore: add shutdown functionality
markphelps Feb 3, 2023
e1d8e0b
chore: switch to 'backend'
markphelps Feb 6, 2023
253adcc
Merge branch 'main' into deprecate-jaeger-enabled
markphelps Feb 6, 2023
dcd6d01
chore: missed a few renames
markphelps Feb 6, 2023
f57704f
chore: missed in deprecations.md
markphelps Feb 6, 2023
9f6efe8
chore: change log msg
markphelps Feb 6, 2023
b7fb210
chore: merge in upstream branch
markphelps Feb 6, 2023
913d4bd
chore: merge main
markphelps Feb 6, 2023
c4d87d2
chore: add cue/json schema
markphelps Feb 6, 2023
39b40ba
chore: update tracing example docker-compose
markphelps Feb 6, 2023
f9061ab
chore: use build for docker-compose for now until release
markphelps Feb 6, 2023
3de305d
chore: config tests
markphelps Feb 6, 2023
91ca180
chore: update README
markphelps Feb 6, 2023
5dd3738
feat: support otlp exporter
markphelps Feb 6, 2023
e8b834a
chore: merge main
markphelps Feb 7, 2023
055c203
chore: fix readme merge conflicts; rename back to exporter
markphelps Feb 7, 2023
b89df15
chore: fix tests
markphelps Feb 7, 2023
3b08295
chore: add readme; finish backend->exporter
markphelps Feb 7, 2023
1f2ea9b
chore: update tracing example readme
markphelps Feb 7, 2023
cf1993c
chore: update config schemas
markphelps Feb 7, 2023
da2689b
chore: update examples docker-compose files
markphelps Feb 7, 2023
a036dd3
Update config/flipt.schema.cue
markphelps Feb 8, 2023
12aad19
chore: respond to PR feedback
markphelps Feb 8, 2023
281e252
Merge branch 'main' into otlp
markphelps Feb 8, 2023
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
Prev Previous commit
Next Next commit
chore: respond to PR feedback
  • Loading branch information
markphelps committed Feb 8, 2023
commit 12aad1949d0c669cbfcda309e3216225c2a048af
22 changes: 11 additions & 11 deletions config/flipt.schema.cue
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ import "strings"

#cache: {
enabled?: bool | *false
backend?: "memory" | "redis" | *"memory"
backend?: *"memory" | "redis"
ttl?: =~"^([0-9]+(ns|us|µs|ms|s|m|h))+$" | int | *"60s"

// Redis
Expand All @@ -74,9 +74,9 @@ import "strings"

// Memory
memory?: {
enabled?: bool | *false
enabled?: bool | *false
eviction_interval?: =~"^([0-9]+(ns|us|µs|ms|s|m|h))+$" | int | *"5m"
expiration?: =~"^([0-9]+(ns|us|µs|ms|s|m|h))+$" | int | *"60s"
expiration?: =~"^([0-9]+(ns|us|µs|ms|s|m|h))+$" | int | *"60s"
}
}

Expand All @@ -87,7 +87,7 @@ import "strings"

#db: {
url?: string | *"file:/var/opt/flipt/flipt.db"
protocol?: "cockroach" | "cockroachdb" | "file" | "mysql" | "postgres" | "sqlite"
protocol?: *"sqlite" | "cockroach" | "cockroachdb" | "file" | "mysql" | "postgres"
host?: string
port?: int
name?: string
Expand All @@ -102,12 +102,12 @@ import "strings"
_#all: _#lower + [ for x in _#lower {strings.ToUpper(x)}]
#log: {
file?: string
encoding?: "json" | "console" | *"console"
encoding?: *"console" | "json"
level?: #log.#log_level
grpc_level?: #log.#log_level
keys?: {
time?: string | *"T"
level?: string | *"L"
time?: string | *"T"
level?: string | *"L"
message?: string | *"M"
}

Expand All @@ -121,7 +121,7 @@ import "strings"
}

#server: {
protocol?: "http" | "https" | *"http"
protocol?: *"http" | "https"
host?: string | *"0.0.0.0"
https_port?: int | *443
http_port?: int | *8080
Expand All @@ -131,7 +131,7 @@ import "strings"
}

#tracing: {
enabled?: bool | *false
enabled?: bool | *false
exporter?: *"jaeger" | "zipkin" | "otlp"

// Jaeger
Expand All @@ -143,12 +143,12 @@ import "strings"

// Zipkin
zipkin?: {
endpoint?: string | *"http://localhost:9411/api/v2/spans"
endpoint?: string | *"http://localhost:9411/api/v2/spans"
}

// OTLP
otlp?: {
endpoint?: string | *"localhost:4317"
endpoint?: string | *"localhost:4317"
}
}

Expand Down
1 change: 0 additions & 1 deletion examples/openfeature/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ services:
- flipt_network
environment:
- "FLIPT_LOG_LEVEL=debug"
- "FLIPT_TELMETRY_ENABLED=false"
- "FLIPT_TRACING_ENABLED=true"
- "FLIPT_TRACING_EXPORTER=jaeger"
- "FLIPT_TRACING_JAEGER_HOST=jaeger"
Expand Down