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

Jump to bottom

Enable persistent queue in the build by default #5828

Merged
merged 4 commits into from
Aug 5, 2022
Merged

Enable persistent queue in the build by default #5828

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
267e107
Enable persistent queue in the build by default
Aug 4, 2022
9acfc1e
Update exporter/exporterhelper/queued_retry_inmemory.go
Aug 5, 2022
1556698
Update exporter/exporterhelper/queued_retry_inmemory.go
Aug 5, 2022
c320f9b
Fix formatting
Aug 5, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@

### 💡 Enhancements 💡

- Enable persistent queue in the build by default (#5828)
- Bump to opentelemetry-proto v0.19.0. (#5823)
- Expose `Scope.Attributes` in pdata (#5826)

Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ gomoddownload:

.PHONY: gotest
gotest:
@$(MAKE) for-all-target TARGET="test test-unstable"
@$(MAKE) for-all-target TARGET="test"

.PHONY: gobenchmark
gobenchmark:
Expand All @@ -75,7 +75,7 @@ goporto:

.PHONY: golint
golint:
@$(MAKE) for-all-target TARGET="lint lint-unstable"
@$(MAKE) for-all-target TARGET="lint"

.PHONY: goimpi
goimpi:
Expand Down
8 changes: 0 additions & 8 deletions Makefile.Common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ GH := $(shell which gh)
test:
$(GOTEST) $(GOTEST_OPT) ./...

.PHONY: test-unstable
test-unstable:
$(GOTEST) $(GOTEST_OPT) -tags enable_unstable ./...

.PHONY: test-with-cover
test-with-cover:
$(GO_ACC) --output=coverage.out ./...
Expand All @@ -44,10 +40,6 @@ tidy:
lint:
$(LINT) run

.PHONY: lint-unstable
lint-unstable:
$(LINT) run --build-tags enable_unstable

.PHONY: generate
generate:
$(GOCMD) generate ./...
Expand Down
9 changes: 4 additions & 5 deletions exporter/exporterhelper/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,14 @@ The following configuration options can be modified:

### Persistent Queue

**Status: under development**
**Status: [alpha]**

> :warning: The capability is under development and currently can be enabled only in OpenTelemetry
> Collector Contrib with `enable_unstable` build tag set.
> :warning: The capability is under development. To use it, a storage extension needs to be set up.
With this build tag set, additional configuration option can be enabled:
To use the persistent queue, the following setting needs to be set:

- `sending_queue`
- `storage` (default = none): When set, enables persistence and uses the component specified as a storage extension for the persistent queue
(note, `enable_unstable` build tag needs to be enabled first, see below for more details)

The maximum number of batches stored to disk can be controlled using `sending_queue.queue_size` parameter (which,
similarly as for in-memory buffering, defaults to 5000 batches).
Expand Down Expand Up @@ -111,3 +109,4 @@ service:
```

[filestorage]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/storage/filestorage
[alpha]: https://github.com/open-telemetry/opentelemetry-collector#alpha
3 changes: 0 additions & 3 deletions exporter/exporterhelper/internal/persistent_queue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build enable_unstable
// +build enable_unstable

package internal // import "go.opentelemetry.io/collector/exporter/exporterhelper/internal"

import (
Expand Down
3 changes: 0 additions & 3 deletions exporter/exporterhelper/internal/persistent_queue_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build enable_unstable
// +build enable_unstable

package internal

import (
Expand Down
3 changes: 0 additions & 3 deletions exporter/exporterhelper/internal/persistent_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build enable_unstable
// +build enable_unstable

package internal // import "go.opentelemetry.io/collector/exporter/exporterhelper/internal"

import (
Expand Down
3 changes: 0 additions & 3 deletions exporter/exporterhelper/internal/persistent_storage_batch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build enable_unstable
// +build enable_unstable

package internal // import "go.opentelemetry.io/collector/exporter/exporterhelper/internal"

import (
Expand Down
3 changes: 0 additions & 3 deletions exporter/exporterhelper/internal/persistent_storage_batch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build enable_unstable
// +build enable_unstable

package internal

import (
Expand Down
3 changes: 0 additions & 3 deletions exporter/exporterhelper/internal/persistent_storage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build enable_unstable
// +build enable_unstable

package internal

import (
Expand Down
246 changes: 0 additions & 246 deletions exporter/exporterhelper/queued_retry_experimental.go
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions exporter/exporterhelper/queued_retry_experimental_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build enable_unstable
// +build enable_unstable

package exporterhelper
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Followup to rename this file or merge into the queue_retry_inmemory_test. We should file an issue to not forget but a different PR is better.

Copy link
Contributor Author

@swiatekm swiatekm Aug 5, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to submit a PR cleaning this up after this one is merged, don't think we need an issue for it.


import (
Expand Down
Loading