From db8c04c3e44d6ac4689f918bd0d2d0363b894db0 Mon Sep 17 00:00:00 2001 From: Harshvir Potpose <122517264+akagami-harsh@users.noreply.github.com> Date: Thu, 21 Mar 2024 23:03:56 +0530 Subject: [PATCH 1/3] [jaeger-v2] Add support for Opensearch (#5257) ## Which problem is this PR solving? - part of #4843 ## Description of the changes - Added OpenSearch support in jaeger-V2. - Reused the existing Elasticsearch factory for OpenSearch. ## How was this change tested? - tested locally by running jaeger-v2 with newly added opensearch config-file. - Run the opensearch container: ```bash docker run --rm --name opensearch -p 9200:9200 -e "discovery.type=single-node" opensearchproject/opensearch:1.3.0 ``` - Execute below to run jaeger-V2 ```bash go run -tags=ui ./cmd/jaeger/. --config ./cmd/jaeger/config-opensearch.yaml ``` ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `yarn lint` and `yarn test` --------- Signed-off-by: Harshvir Potpose Signed-off-by: Harshvir Potpose <122517264+akagami-harsh@users.noreply.github.com> --- cmd/jaeger/config-opensearch.yaml | 54 +++++++++++++++++++ .../extension/jaegerstorage/config.go | 1 + .../extension/jaegerstorage/extension.go | 7 +++ 3 files changed, 62 insertions(+) create mode 100644 cmd/jaeger/config-opensearch.yaml diff --git a/cmd/jaeger/config-opensearch.yaml b/cmd/jaeger/config-opensearch.yaml new file mode 100644 index 000000000000..7debd780ee6e --- /dev/null +++ b/cmd/jaeger/config-opensearch.yaml @@ -0,0 +1,54 @@ +service: + extensions: [jaeger_storage, jaeger_query] + pipelines: + traces: + receivers: [otlp] + processors: [batch] + exporters: [jaeger_storage_exporter] + +extensions: + jaeger_query: + trace_storage: os_main + trace_storage_archive: os_archive + ui_config: ./cmd/jaeger/config-ui.json + + jaeger_storage: + opensearch: + os_main: + server_urls: https://localhost:9200 + log_level: "error" + index_prefix: "jaeger-main" + use_aliases: true + username: "admin" + password: "admin" + tls: + enabled: true + skip_host_verify: true + tags_as_fields: + all: true + + os_archive: + server_urls: https://localhost:9200 + log_level: "error" + index_prefix: "jaeger-archive" + use_aliases: true + username: "admin" + password: "admin" + tls: + enabled: true + skip_host_verify: true + tags_as_fields: + all: true + +receivers: + otlp: + protocols: + grpc: + http: + +processors: + batch: + +exporters: + jaeger_storage_exporter: + trace_storage: os_main diff --git a/cmd/jaeger/internal/extension/jaegerstorage/config.go b/cmd/jaeger/internal/extension/jaegerstorage/config.go index 446360007245..10afd448c9e0 100644 --- a/cmd/jaeger/internal/extension/jaegerstorage/config.go +++ b/cmd/jaeger/internal/extension/jaegerstorage/config.go @@ -19,6 +19,7 @@ type Config struct { Memory map[string]memoryCfg.Configuration `mapstructure:"memory"` Badger map[string]badgerCfg.NamespaceConfig `mapstructure:"badger"` GRPC map[string]grpcCfg.Configuration `mapstructure:"grpc"` + Opensearch map[string]esCfg.Configuration `mapstructure:"opensearch"` Elasticsearch map[string]esCfg.Configuration `mapstructure:"elasticsearch"` Cassandra map[string]cassandraCfg.Configuration `mapstructure:"cassandra"` // TODO add other storage types here diff --git a/cmd/jaeger/internal/extension/jaegerstorage/extension.go b/cmd/jaeger/internal/extension/jaegerstorage/extension.go index 2f292ad030f0..f718ca8cef00 100644 --- a/cmd/jaeger/internal/extension/jaegerstorage/extension.go +++ b/cmd/jaeger/internal/extension/jaegerstorage/extension.go @@ -130,6 +130,12 @@ func (s *storageExt) Start(ctx context.Context, host component.Host) error { cfg: s.config.Elasticsearch, builder: es.NewFactoryWithConfig, } + osStarter := &starter[esCfg.Configuration, *es.Factory]{ + ext: s, + storageKind: "opensearch", + cfg: s.config.Opensearch, + builder: es.NewFactoryWithConfig, + } cassandraStarter := &starter[cassandraCfg.Configuration, *cassandra.Factory]{ ext: s, storageKind: "cassandra", @@ -142,6 +148,7 @@ func (s *storageExt) Start(ctx context.Context, host component.Host) error { badgerStarter.build, grpcStarter.build, esStarter.build, + osStarter.build, cassandraStarter.build, // TODO add support for other backends } From 250e27b310a99fa3ae1b3fe67be9e65914a80d40 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 14:57:58 +0100 Subject: [PATCH 2/3] build(deps): bump github.com/prometheus/common from 0.49.0 to 0.51.0 (#5289) [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/prometheus/common&package-manager=go_modules&previous-version=0.49.0&new-version=0.51.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 4e513d67649b..05684cb68dfb 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/testbed v0.96.0 github.com/prometheus/client_golang v1.19.0 github.com/prometheus/client_model v0.6.0 - github.com/prometheus/common v0.49.0 + github.com/prometheus/common v0.51.0 github.com/soheilhy/cmux v0.1.5 github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 @@ -77,7 +77,7 @@ require ( go.uber.org/automaxprocs v1.5.3 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - golang.org/x/net v0.21.0 + golang.org/x/net v0.22.0 golang.org/x/sys v0.18.0 google.golang.org/grpc v1.62.0 google.golang.org/protobuf v1.33.0 @@ -213,7 +213,7 @@ require ( go.opentelemetry.io/collector/config/internal v0.96.0 // indirect go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.0 // indirect go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.0 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.0 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.0 go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.0 // indirect go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.0 // indirect go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.0 // indirect @@ -234,7 +234,7 @@ require ( go.opentelemetry.io/proto/otlp v1.1.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.19.0 // indirect + golang.org/x/crypto v0.21.0 // indirect golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect golang.org/x/text v0.14.0 // indirect gonum.org/v1/gonum v0.14.0 // indirect diff --git a/go.sum b/go.sum index 991dfdce4371..f53840274be2 100644 --- a/go.sum +++ b/go.sum @@ -397,8 +397,8 @@ github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdU github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.49.0 h1:ToNTdK4zSnPVJmh698mGFkDor9wBI/iGaJy5dbH1EgI= -github.com/prometheus/common v0.49.0/go.mod h1:Kxm+EULxRbUkjGU6WFsQqo3ORzB4tyKvlWFOE9mB2sE= +github.com/prometheus/common v0.51.0 h1:vT5R9NAlW4V6k8Wruk7ikrHaHRsrPbduM/cKTOdQM/k= +github.com/prometheus/common v0.51.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= @@ -648,8 +648,8 @@ golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= -golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -689,11 +689,11 @@ golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= -golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= From c56e724a5a6561a35b872df4fdab45e92d77b55b Mon Sep 17 00:00:00 2001 From: majermarci <43880232+majermarci@users.noreply.github.com> Date: Fri, 22 Mar 2024 15:28:46 +0100 Subject: [PATCH 3/3] Replaced the deprecated logging exporter to debug exporter (#5291) Hi, it's my first very basic PR. I removed `loggingexporter` since it's deprecated and replaced it with the `debugexporter`. --------- Signed-off-by: Marcell Majer Co-authored-by: Marcell Majer --- cmd/jaeger/internal/components.go | 4 ++-- go.mod | 3 +-- go.sum | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cmd/jaeger/internal/components.go b/cmd/jaeger/internal/components.go index d98582023bad..cf9b10a9e71a 100644 --- a/cmd/jaeger/internal/components.go +++ b/cmd/jaeger/internal/components.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/connector" "go.opentelemetry.io/collector/connector/forwardconnector" "go.opentelemetry.io/collector/exporter" - "go.opentelemetry.io/collector/exporter/loggingexporter" + "go.opentelemetry.io/collector/exporter/debugexporter" "go.opentelemetry.io/collector/exporter/otlpexporter" "go.opentelemetry.io/collector/exporter/otlphttpexporter" "go.opentelemetry.io/collector/extension" @@ -80,7 +80,7 @@ func (b builders) build() (otelcol.Factories, error) { factories.Exporters, err = b.exporter( // standard - loggingexporter.NewFactory(), + debugexporter.NewFactory(), otlpexporter.NewFactory(), otlphttpexporter.NewFactory(), // add-ons diff --git a/go.mod b/go.mod index 05684cb68dfb..b8779d79855c 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,6 @@ require ( go.opentelemetry.io/collector/connector/forwardconnector v0.96.0 go.opentelemetry.io/collector/consumer v0.96.0 go.opentelemetry.io/collector/exporter v0.96.0 - go.opentelemetry.io/collector/exporter/loggingexporter v0.96.0 go.opentelemetry.io/collector/exporter/otlpexporter v0.96.0 go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.0 go.opentelemetry.io/collector/extension v0.96.0 @@ -217,7 +216,7 @@ require ( go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.0 // indirect go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.0 // indirect go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.0 // indirect - go.opentelemetry.io/collector/exporter/debugexporter v0.96.0 // indirect + go.opentelemetry.io/collector/exporter/debugexporter v0.96.0 go.opentelemetry.io/collector/extension/auth v0.96.0 // indirect go.opentelemetry.io/collector/featuregate v1.3.0 // indirect go.opentelemetry.io/collector/semconv v0.96.0 // indirect diff --git a/go.sum b/go.sum index f53840274be2..81fb526cd887 100644 --- a/go.sum +++ b/go.sum @@ -551,8 +551,6 @@ go.opentelemetry.io/collector/exporter v0.96.0 h1:SmOSaP+zUNq0nl+BcllsCSsYePdUNI go.opentelemetry.io/collector/exporter v0.96.0/go.mod h1:DcuGaxcINhOV2LgojDI56r3830cUtuCsNadINMIU23c= go.opentelemetry.io/collector/exporter/debugexporter v0.96.0 h1:88v2GWCIuYgd3e4KdwF0JLklIgBzETBw0e3dkEJ7BbI= go.opentelemetry.io/collector/exporter/debugexporter v0.96.0/go.mod h1:mZjJ0G6Pn6aSS7T4UeEjXSHt3pgslvaZa/4Uam8DKuo= -go.opentelemetry.io/collector/exporter/loggingexporter v0.96.0 h1:fKHt4iTcD7C0utDzeww6ZYVlDYaC0dw9wtzVwLha4CM= -go.opentelemetry.io/collector/exporter/loggingexporter v0.96.0/go.mod h1:vpuKdiIQ6yjwZbKiiAs/MV8rZMKiQfPF55vX8UxO8fk= go.opentelemetry.io/collector/exporter/otlpexporter v0.96.0 h1:vZEd10B/zj7WkBWSVegDkGOwv7FZhUwyk60E2zkYwL4= go.opentelemetry.io/collector/exporter/otlpexporter v0.96.0/go.mod h1:tzJFwn1fR88rdGKkpvygMawu2Prc53bFhuKFk3EnpS8= go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.0 h1:c7pBEGYxlsnPPfs4ECIr2E+mEh25OTV+v20tv3pCIyU=