Skip to content

Commit 4d5cd14

Browse files
MaxKsyunzMaxKsyunz
committed
Add opensearchexporter to otelcontribcol
Signed-off-by: Max Ksyunz <[email protected]>
1 parent 1eb1b8f commit 4d5cd14

File tree

19 files changed

+128
-6
lines changed

19 files changed

+128
-6
lines changed

‎.chloggen/add-opensearchexporter.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
change_type: enhancement
4+
component: opensearchexporter
5+
6+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
7+
note: Promote opensearchexporter to alpha.
8+
9+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
10+
issues: [24668]

‎cmd/configschema/go.mod

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,7 @@ require (
485485
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.89.0 // indirect
486486
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.89.0 // indirect
487487
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.89.0 // indirect
488+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.89.0 // indirect
488489
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.89.0 // indirect
489490
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tanzuobservabilityexporter v0.89.0 // indirect
490491
github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.89.0 // indirect
@@ -539,6 +540,7 @@ require (
539540
github.com/opencontainers/runc v1.1.9 // indirect
540541
github.com/opencontainers/runtime-spec v1.1.0-rc.3 // indirect
541542
github.com/opencontainers/selinux v1.11.0 // indirect
543+
github.com/opensearch-project/opensearch-go/v2 v2.3.0 // indirect
542544
github.com/openshift/api v3.9.0+incompatible // indirect
543545
github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect
544546
github.com/opentracing/opentracing-go v1.2.0 // indirect
@@ -807,6 +809,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmo
807809

808810
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter => ../../exporter/opencensusexporter
809811

812+
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter => ../../exporter/opensearchexporter
813+
810814
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter => ../../exporter/prometheusexporter
811815

812816
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter => ../../exporter/prometheusremotewriteexporter

‎cmd/configschema/go.sum

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/otelcontribcol/builder-config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ exporters:
6666
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.89.0
6767
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter v0.89.0
6868
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.89.0
69+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.89.0
6970
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.89.0
7071
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.89.0
7172
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter v0.89.0
@@ -359,6 +360,7 @@ replaces:
359360
- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry => ../../pkg/resourcetotelemetry
360361
- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden
361362
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter => ../../exporter/opencensusexporter
363+
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter => ../../exporter/opensearchexporter
362364
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders => ../../internal/metadataproviders
363365
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy => ../../internal/aws/proxy
364366
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snmpreceiver => ../../receiver/snmpreceiver

‎cmd/otelcontribcol/components.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/otelcontribcol/exporters_test.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"github.com/stretchr/testify/require"
1818
"go.opentelemetry.io/collector/component"
1919
"go.opentelemetry.io/collector/config/configgrpc"
20+
"go.opentelemetry.io/collector/config/confighttp"
2021
"go.opentelemetry.io/collector/config/configopaque"
2122
"go.opentelemetry.io/collector/exporter"
2223
"go.opentelemetry.io/collector/exporter/exportertest"
@@ -50,6 +51,7 @@ import (
5051
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter"
5152
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter"
5253
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter"
54+
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter"
5355
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter"
5456
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter"
5557
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter"
@@ -140,6 +142,17 @@ func TestDefaultExporters(t *testing.T) {
140142
},
141143
expectConsumeErr: true,
142144
},
145+
{
146+
exporter: "opensearch",
147+
getConfigFn: func() component.Config {
148+
cfg := expFactories["opensearch"].CreateDefaultConfig().(*opensearchexporter.Config)
149+
cfg.HTTPClientSettings = confighttp.HTTPClientSettings{
150+
Endpoint: "http://" + endpoint,
151+
}
152+
return cfg
153+
},
154+
expectConsumeErr: true,
155+
},
143156
{
144157
exporter: "otlp",
145158
getConfigFn: func() component.Config {

‎cmd/otelcontribcol/go.mod

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ require (
4242
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.89.0
4343
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter v0.89.0
4444
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.89.0
45+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.89.0
4546
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.89.0
4647
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.89.0
4748
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter v0.89.0
@@ -188,6 +189,7 @@ require (
188189
github.com/stretchr/testify v1.8.4
189190
go.opentelemetry.io/collector/component v0.89.0
190191
go.opentelemetry.io/collector/config/configgrpc v0.89.0
192+
go.opentelemetry.io/collector/config/confighttp v0.89.0
191193
go.opentelemetry.io/collector/config/configopaque v0.89.0
192194
go.opentelemetry.io/collector/confmap v0.89.0
193195
go.opentelemetry.io/collector/connector v0.89.0
@@ -557,6 +559,7 @@ require (
557559
github.com/opencontainers/runc v1.1.9 // indirect
558560
github.com/opencontainers/runtime-spec v1.1.0-rc.3 // indirect
559561
github.com/opencontainers/selinux v1.10.0 // indirect
562+
github.com/opensearch-project/opensearch-go/v2 v2.3.0 // indirect
560563
github.com/openshift/api v3.9.0+incompatible // indirect
561564
github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect
562565
github.com/opentracing/opentracing-go v1.2.0 // indirect
@@ -645,7 +648,6 @@ require (
645648
go.opentelemetry.io/collector v0.89.0 // indirect
646649
go.opentelemetry.io/collector/config/configauth v0.89.0 // indirect
647650
go.opentelemetry.io/collector/config/configcompression v0.89.0 // indirect
648-
go.opentelemetry.io/collector/config/confighttp v0.89.0 // indirect
649651
go.opentelemetry.io/collector/config/confignet v0.89.0 // indirect
650652
go.opentelemetry.io/collector/config/configtelemetry v0.89.0 // indirect
651653
go.opentelemetry.io/collector/config/configtls v0.89.0 // indirect
@@ -1026,6 +1028,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden =>
10261028

10271029
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter => ../../exporter/opencensusexporter
10281030

1031+
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter => ../../exporter/opensearchexporter
1032+
10291033
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders => ../../internal/metadataproviders
10301034

10311035
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy => ../../internal/aws/proxy

0 commit comments

Comments
 (0)