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

OpenSearch Exporter initial PR #20

Merged
merged 27 commits into from
Jun 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
bab80bf
[chore] clean up comments (#23643)
Jun 22, 2023
03b375e
[chore] Run integration tests without coverage (#22808)
djaglowski Jun 22, 2023
703be0d
[receiver/kafkametrics] Fix metrics in kafkametricsreceiver (#4327) (…
ZenoCC-Peng Jun 22, 2023
7c0fd3d
Add JMX metrics gatherer version 1.27.0-alpha (#23435)
opentelemetrybot Jun 22, 2023
b2a1d1f
DSET-3468: update dataset-go to latest, send more details in user-age…
zdaratom-s1 Jun 23, 2023
c40be10
feat(statsdReceiver): add name and version to scope (#23564)
paologallinaharbur Jun 23, 2023
403b0ef
[receiver/awsecscontainermetrics] Fix possible panics from unchecked …
bryan-aguilar Jun 23, 2023
31742d8
Added space
MitchellGale Jun 25, 2023
cb37238
Added MitchellGale to CODEOWNERS
MitchellGale Jun 25, 2023
89dca47
Added OpenSearchExporter builder-config.yaml.
MitchellGale Jun 26, 2023
1928c8f
Added OpenSearchExporter go.mod otel contrib col.
MitchellGale Jun 26, 2023
4a1672b
Added MakeFile for OpenSearchExporter.
MitchellGale Jun 26, 2023
aa474de
Added OpenSearchExporter for versions.yaml
MitchellGale Jun 26, 2023
8758cba
Added OpenSearchExporter for .golangci.yml, bug_report.yaml, feature_…
MitchellGale Jun 26, 2023
e355bd2
Reverted changes in go.mod
MitchellGale Jun 26, 2023
969fc59
Reverted MakeFile space.
MitchellGale Jun 26, 2023
b4aedd5
Reverted go.mod manual change.
MitchellGale Jun 26, 2023
b2ae742
added OS config.go
MitchellGale Jun 26, 2023
3d99174
added link for OS config.go
MitchellGale Jun 26, 2023
f9dd5cd
Added go mod
MitchellGale Jun 26, 2023
d1a6c93
Renamed Makefile
MitchellGale Jun 26, 2023
29076e6
Switched go mod go version from 1.20 to 1.19
MitchellGale Jun 26, 2023
4a35bea
Ran `make genotelcontribcol`
MitchellGale Jun 26, 2023
62dd060
Made with go mod changes and adding factory.go, and adding config to …
MitchellGale Jun 27, 2023
e286d18
Fixed issues in config and factor go.
MitchellGale Jun 27, 2023
8a51d24
go sum
MitchellGale Jun 27, 2023
85d206f
Added YangDB and Max Ksyunz to code owners for OpenSearch exporter.
MitchellGale Jun 28, 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
20 changes: 20 additions & 0 deletions .chloggen/dataset-more-detailed-user-agent.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Use this changelog template to create an entry for release notes.
# If your change doesn't affect end users, such as a test fix or a tooling change,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: exporter/datasetexporter

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "Add more details to User-Agent header for DataSet HTTP requests"

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [20660]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
20 changes: 20 additions & 0 deletions .chloggen/ecsRecvDeRefCheck.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Use this changelog template to create an entry for release notes.
# If your change doesn't affect end users, such as a test fix or a tooling change,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: awsecscontainermetricsreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Fix possible panics in awsecscontainermetrics receiver

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [23644]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
20 changes: 20 additions & 0 deletions .chloggen/fix-all-kafkametric-receiver-types.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Use this changelog template to create an entry for release notes.
# If your change doesn't affect end users, such as a test fix or a tooling change,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: receiver/kafkametricsreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Updates certain metrics in kafkametricsreceiver to function as non-monotonic sums.

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [4327]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: Update the metrics type in KafkaMetricsReceiver from "gauge" to "nonmonotonic sum". Changes metrics are, kafka.brokers, kafka.topic.partitions, kafka.partition.replicas, kafka.partition.replicas_in_sync, kafka.consumer_group.members.
16 changes: 16 additions & 0 deletions .chloggen/statsd-version-name-in-metrics.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: statsdreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: All receivers are setting receiver name and version when sending data. This change introduces the same behaviour to the statsd receiver.

# One or more tracking issues related to the change
issues: [23563]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ exporter/logzioexporter/ @open-telemetry/collect
exporter/lokiexporter/ @open-telemetry/collector-contrib-approvers @gramidt @gouthamve @jpkrohling @kovrus @mar4uk
exporter/mezmoexporter/ @open-telemetry/collector-contrib-approvers @dashpole @billmeyer @gjanco
exporter/opencensusexporter/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
exporter/opensearchexporter/ @open-telemetry/collector-contrib-approvers @mitchellgale @MaxKsyunz @YANG-DB
exporter/parquetexporter/ @open-telemetry/collector-contrib-approvers @atoulme
exporter/prometheusexporter/ @open-telemetry/collector-contrib-approvers @Aneurysm9
exporter/prometheusremotewriteexporter/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @rapphil
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ body:
- exporter/loki
- exporter/mezmo
- exporter/opencensus
- exporter/opensearch
- exporter/parquet
- exporter/prometheus
- exporter/prometheusremotewrite
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ body:
- exporter/loki
- exporter/mezmo
- exporter/opencensus
- exporter/opensearch
- exporter/parquet
- exporter/prometheus
- exporter/prometheusremotewrite
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/other.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ body:
- exporter/loki
- exporter/mezmo
- exporter/opencensus
- exporter/opensearch
- exporter/parquet
- exporter/prometheus
- exporter/prometheusremotewrite
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ jobs:
~/go/pkg/mod
key: go-cache-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
- name: Run Integration Tests
run: make integration-tests-with-cover
run: make integration-test

correctness-traces:
runs-on: ubuntu-latest
Expand Down
3 changes: 3 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,9 @@ issues:
- path: opencensus
linters:
- exhaustive
- path: opensearch
linters:
- exhaustive
- path: signalfx
linters:
- exhaustive
Expand Down
11 changes: 9 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,13 @@ all-common:
e2e-test: otelcontribcol oteltestbedcol
$(MAKE) -C testbed run-tests

TARGET="do-integration-tests-with-cover"
.PHONY: integration-test
integration-test:
@$(MAKE) for-integration-target TARGET="mod-integration-test"

.PHONY: integration-tests-with-cover
integration-tests-with-cover: $(INTEGRATION_MODS)
integration-tests-with-cover:
@$(MAKE) for-integration-target TARGET="do-integration-tests-with-cover"

# Long-running e2e tests
.PHONY: stability-tests
Expand Down Expand Up @@ -205,6 +209,9 @@ for-pkg-target: $(PKG_MODS)
.PHONY: for-other-target
for-other-target: $(OTHER_MODS)

.PHONY: for-integration-target
for-integration-target: $(INTEGRATION_MODS)

# Debugging target, which helps to quickly determine whether for-all-target is working or not.
.PHONY: all-pwd
all-pwd:
Expand Down
17 changes: 13 additions & 4 deletions Makefile.Common
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# In order to ensure make instructions fail if there is command that fails a pipe (ie: `go test ... | tee -a ./test_results.txt`)
# the value `-o pipefail` (or `set -o pipefail`) is added to each shell command that make runs
# otherwise in the example command pipe, only the exit code of `tee` is recorded instead of `go test` which can cause
# otherwise in the example command pipe, only the exit code of `tee` is recorded instead of `go test` which can cause
# test to pass in CI when they should not.
SHELL = /bin/bash
ifeq ($(shell uname -s),Windows)
.SHELLFLAGS = /o pipefile /c
else
else
.SHELLFLAGS = -o pipefail -c
endif

Expand All @@ -17,7 +17,8 @@ GO_BUILD_TAGS=""
GOTEST_OPT?= -race -timeout 300s -parallel 4 --tags=$(GO_BUILD_TAGS)
GOTEST_INTEGRATION_OPT?= -race -timeout 360s -parallel 4
GOTEST_OPT_WITH_COVERAGE = $(GOTEST_OPT) -coverprofile=coverage.txt -covermode=atomic
GOTEST_OPT_WITH_INTEGRATION=$(GOTEST_INTEGRATION_OPT) -tags=integration,$(GO_BUILD_TAGS) -run=Integration -coverprofile=integration-coverage.txt -covermode=atomic
GOTEST_OPT_WITH_INTEGRATION=$(GOTEST_INTEGRATION_OPT) -tags=integration,$(GO_BUILD_TAGS) -run=Integration
GOTEST_OPT_WITH_INTEGRATION_COVERAGE=$(GOTEST_OPT_WITH_INTEGRATION) -coverprofile=integration-coverage.txt -covermode=atomic
GOCMD?= go
GOTEST=$(GOCMD) test
GOOS=$(shell $(GOCMD) env GOOS)
Expand Down Expand Up @@ -108,10 +109,18 @@ do-unit-tests-with-cover:
$(GOTEST) $(GOTEST_OPT_WITH_COVERAGE) ./...
$(GOCMD) tool cover -html=coverage.txt -o coverage.html

.PHONY: mod-integration-test
mod-integration-test:
@echo "running $(GOCMD) integration test ./... in `pwd`"
$(GOTEST) $(GOTEST_OPT_WITH_INTEGRATION) ./...
@if [ -e integration-coverage.txt ]; then \
$(GOCMD) tool cover -html=integration-coverage.txt -o integration-coverage.html; \
fi

.PHONY: do-integration-tests-with-cover
do-integration-tests-with-cover:
@echo "running $(GOCMD) integration test ./... + coverage in `pwd`"
$(GOTEST) $(GOTEST_OPT_WITH_INTEGRATION) ./...
$(GOTEST) $(GOTEST_OPT_WITH_INTEGRATION_COVERAGE) ./...
@if [ -e integration-coverage.txt ]; then \
$(GOCMD) tool cover -html=integration-coverage.txt -o integration-coverage.html; \
fi
Expand Down
2 changes: 1 addition & 1 deletion cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ require (
github.com/relvacode/iso8601 v1.3.0 // indirect
github.com/rs/cors v1.9.0 // indirect
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.14 // indirect
github.com/scalyr/dataset-go v0.0.8 // indirect
github.com/scalyr/dataset-go v0.0.9 // indirect
github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.5.0 // indirect
github.com/segmentio/asm v1.2.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions cmd/configschema/go.sum

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

2 changes: 2 additions & 0 deletions cmd/otelcontribcol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ exporters:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.80.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter v0.80.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.80.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.80.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/parquetexporter v0.80.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.80.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.80.0
Expand Down Expand Up @@ -355,6 +356,7 @@ replaces:
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter => ../../exporter/fileexporter
- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry => ../../pkg/resourcetotelemetry
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter => ../../exporter/opencensusexporter
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter => ../../exporter/opensearchexporter
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders => ../../internal/metadataproviders
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy => ../../internal/aws/proxy
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snmpreceiver => ../../receiver/snmpreceiver
Expand Down
Loading