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.

Sign up for GitHub

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

[exporter/elasticsearch] Add OTel mapping mode for metrics #34248

Merged
merged 35 commits into from
Aug 19, 2024
Merged

[exporter/elasticsearch] Add OTel mapping mode for metrics #34248

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
5815374
Add metrics grouping for otel mode
carsonip Jul 25, 2024
c816d4d
Add test
carsonip Jul 25, 2024
50a46fa
Add hack
carsonip Jul 25, 2024
786d0f0
Emit dynamic templates
carsonip Jul 25, 2024
4d03f98
Fix dynamic template name
carsonip Jul 26, 2024
98f5d7c
Workaround tsdb not supporting bool dimension
carsonip Jul 26, 2024
9d806e9
Temporarily use start_time instead of start_timestamp
carsonip Jul 26, 2024
2b5c24f
Revert to use start_timestamp
carsonip Jul 26, 2024
c8663a0
Add complex object to fix histogram falling into doc _ignored
carsonip Jul 29, 2024
fdcf8ca
Only emit start_timestamp when it is non-zero
carsonip Jul 29, 2024
91e10ae
Fix otel test
carsonip Jul 29, 2024
76ad969
Add sum to test
carsonip Jul 29, 2024
552a0b2
Fix tests
carsonip Jul 29, 2024
53b0253
Revert "Workaround tsdb not supporting bool dimension"
carsonip Jul 30, 2024
51bca38
Merge branch 'main' into otel-mode-metrics
carsonip Aug 12, 2024
8ded84c
Bump go-docappender to v2.3.0
carsonip Aug 12, 2024
497fbb5
go mod tidy
carsonip Aug 12, 2024
bcae04a
Remove go mod replace
carsonip Aug 12, 2024
6246e32
Fix NumberDataPointValueTypeEmpty dynamicTemplates
carsonip Aug 12, 2024
c48624f
Rename to KindUnflattenableObject
carsonip Aug 12, 2024
66b3cf4
Merge branch 'main' into otel-mode-metrics
carsonip Aug 12, 2024
0190df2
Fix typo
carsonip Aug 13, 2024
2998221
Fix quantiles
carsonip Aug 13, 2024
ff9d86a
Dynamically map summary
carsonip Aug 13, 2024
8ccf3a1
Use summary_metrics instead of summary_gauge
carsonip Aug 13, 2024
88128ac
Add FIXME
carsonip Aug 13, 2024
7086ea3
Exclude DS attr in metric hash
carsonip Aug 13, 2024
e371e53
Fix test
carsonip Aug 13, 2024
69ac0b3
Change quantiles from FIXME to TODO
carsonip Aug 13, 2024
dd1a70e
Merge branch 'main' into otel-mode-metrics
carsonip Aug 13, 2024
03228a4
Add changelog
carsonip Aug 13, 2024
2290cc0
Revert go mod diff
carsonip Aug 13, 2024
5c7d991
Make linter happy
carsonip Aug 13, 2024
20ed43f
Make ECS use mapHashExcludeDataStreamAttr
carsonip Aug 14, 2024
bd7cbd7
Describe metricDpToDynamicTemplate
carsonip Aug 14, 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
Prev Previous commit
Next Next commit
Revert go mod diff
  • Loading branch information
@carsonip
carsonip committed Aug 13, 2024
commit 2290cc0f161d8dae4aeba0146bdd225542a7b478
9 changes: 5 additions & 4 deletions cmd/otelcontribcol/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ require (
go.opentelemetry.io/collector/receiver v0.107.0
go.opentelemetry.io/collector/receiver/nopreceiver v0.107.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.107.0
golang.org/x/sys v0.24.0
golang.org/x/sys v0.23.0
)

require (
Expand Down Expand Up @@ -457,8 +457,8 @@ require (
github.com/elastic/go-elasticsearch/v8 v8.14.0 // indirect
github.com/elastic/go-grok v0.3.1 // indirect
github.com/elastic/go-structform v0.0.11 // indirect
github.com/elastic/go-sysinfo v1.14.1 // indirect
github.com/elastic/go-windows v1.0.2 // indirect
github.com/elastic/go-sysinfo v1.7.1 // indirect
github.com/elastic/go-windows v1.0.1 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/envoyproxy/go-control-plane v0.12.0 // indirect
github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect
Expand Down Expand Up @@ -562,6 +562,7 @@ require (
github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
github.com/jonboulle/clockwork v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
Expand Down Expand Up @@ -830,7 +831,7 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect
howett.net/plist v1.0.1 // indirect
howett.net/plist v1.0.0 // indirect
k8s.io/api v0.29.3 // indirect
k8s.io/apimachinery v0.29.3 // indirect
k8s.io/client-go v0.29.3 // indirect
Expand Down
23 changes: 15 additions & 8 deletions cmd/otelcontribcol/go.sum
View file
Open in desktop

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

9 changes: 5 additions & 4 deletions exporter/elasticsearchexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/elastic/elastic-transport-go/v8 v8.6.0 // indirect
github.com/elastic/go-elasticsearch/v8 v8.14.0 // indirect
github.com/elastic/go-sysinfo v1.14.1 // indirect
github.com/elastic/go-windows v1.0.2 // indirect
github.com/elastic/go-sysinfo v1.7.1 // indirect
github.com/elastic/go-windows v1.0.1 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
Expand All @@ -45,6 +45,7 @@ require (
github.com/golang/snappy v0.0.4 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/knadh/koanf/maps v0.1.1 // indirect
Expand Down Expand Up @@ -90,13 +91,13 @@ require (
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/grpc v1.65.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
howett.net/plist v1.0.1 // indirect
howett.net/plist v1.0.0 // indirect
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common
Expand Down
30 changes: 22 additions & 8 deletions exporter/elasticsearchexporter/go.sum
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions exporter/elasticsearchexporter/integrationtest/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ require (
github.com/elastic/go-elasticsearch/v8 v8.14.0 // indirect
github.com/elastic/go-grok v0.3.1 // indirect
github.com/elastic/go-structform v0.0.11 // indirect
github.com/elastic/go-sysinfo v1.14.1 // indirect
github.com/elastic/go-windows v1.0.2 // indirect
github.com/elastic/go-sysinfo v1.14.0 // indirect
github.com/elastic/go-windows v1.0.1 // indirect
github.com/expr-lang/expr v1.16.9 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
Expand Down Expand Up @@ -180,7 +180,7 @@ require (
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
gonum.org/v1/gonum v0.15.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240723171418-e6d459c13d2a // indirect
Expand Down
Loading
Loading