Skip to content

Commit

Permalink
chore: use upstream logdedup processor (#1882)
Browse files Browse the repository at this point in the history
* use upstream logdedup processor

* add upstream processor to processor factories

* make readme consistent

* make dedup processor readme version consistent

* fix go mod
  • Loading branch information
colelaven authored Sep 26, 2024
1 parent a022fea commit 211ccbf
Show file tree
Hide file tree
Showing 19 changed files with 6 additions and 1,632 deletions.
11 changes: 0 additions & 11 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,6 @@ updates:
commit-message:
prefix: "deps"
include: "scope"
- package-ecosystem: "gomod"
directory: "/processor/logdeduplicationprocessor//"
schedule:
interval: "weekly"
ignore:
# Opentelemetry updates will be done manually
- dependency-name: "github.com/open-telemetry/opentelemetry-collector*"
- dependency-name: "go.opentelemetry.io/*"
commit-message:
prefix: "deps"
include: "scope"
- package-ecosystem: "gomod"
directory: "/processor/maskprocessor/"
schedule:
Expand Down
2 changes: 1 addition & 1 deletion docs/processors.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Below is a list of supported processors with links to their documentation pages.
| Group by Trace Processor | [groupbytraceprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.109.0/processor/groupbytraceprocessor/README.md) |
| Kubernetes Attributes Processor | [k8sattributesprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.109.0/processor/k8sattributesprocessor/README.md) |
| Log Count Processor | [logcountprocessor](../processor/logcountprocessor/README.md) |
| Log DeDuplication Processor | [logdeduplicationprocessor](../processor/logdeduplicationprocessor/README.md) |
| Log DeDuplication Processor | [logdedupprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.109.0/processor/logdedupprocessor/README.md) |
| Logs Transform Processor | [logstransform](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.109.0/processor/logstransformprocessor/README.md) |
| Lookup Processor | [lookupprocessor](../processor/lookupprocessor/README.md) |
| Marshal Processor | [marshalprocessor](../processor/marshalprocessor/README.md) |
Expand Down
4 changes: 2 additions & 2 deletions factories/processors.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"github.com/observiq/bindplane-agent/internal/processor/snapshotprocessor"
"github.com/observiq/bindplane-agent/processor/datapointcountprocessor"
"github.com/observiq/bindplane-agent/processor/logcountprocessor"
"github.com/observiq/bindplane-agent/processor/logdeduplicationprocessor"
"github.com/observiq/bindplane-agent/processor/lookupprocessor"
"github.com/observiq/bindplane-agent/processor/marshalprocessor"
"github.com/observiq/bindplane-agent/processor/maskprocessor"
Expand All @@ -36,6 +35,7 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/logdedupprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/logstransformprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor"
Expand Down Expand Up @@ -64,7 +64,7 @@ var defaultProcessors = []processor.Factory{
groupbytraceprocessor.NewFactory(),
k8sattributesprocessor.NewFactory(),
logcountprocessor.NewFactory(),
logdeduplicationprocessor.NewFactory(),
logdedupprocessor.NewFactory(),
logstransformprocessor.NewFactory(),
lookupprocessor.NewFactory(),
marshalprocessor.NewFactory(),
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ require (
github.com/observiq/bindplane-agent/packagestate v1.61.0
github.com/observiq/bindplane-agent/processor/datapointcountprocessor v1.61.0
github.com/observiq/bindplane-agent/processor/logcountprocessor v1.61.0
github.com/observiq/bindplane-agent/processor/logdeduplicationprocessor v1.61.0
github.com/observiq/bindplane-agent/processor/lookupprocessor v1.61.0
github.com/observiq/bindplane-agent/processor/marshalprocessor v1.61.0
github.com/observiq/bindplane-agent/processor/maskprocessor v1.61.0
Expand Down Expand Up @@ -87,6 +86,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.109.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.109.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.109.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/logdedupprocessor v0.109.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/logstransformprocessor v0.109.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.109.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.109.0
Expand Down Expand Up @@ -818,8 +818,6 @@ replace github.com/observiq/bindplane-agent/processor/logcountprocessor => ./pro

replace github.com/observiq/bindplane-agent/processor/metricextractprocessor => ./processor/metricextractprocessor

replace github.com/observiq/bindplane-agent/processor/logdeduplicationprocessor => ./processor/logdeduplicationprocessor

replace github.com/observiq/bindplane-agent/processor/spancountprocessor => ./processor/spancountprocessor

replace github.com/observiq/bindplane-agent/processor/datapointcountprocessor => ./processor/datapointcountprocessor
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2096,6 +2096,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytrace
github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.109.0/go.mod h1:fg599JS4SNwUzbWo16Cl36T2cvIPI7NYOX13cWkJga8=
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.109.0 h1:lkAPT2Wje/4WnYYVajW4bv4Fbuajcw+9WzYb+C9ZpHc=
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.109.0/go.mod h1:jwDh0L2ybXkAPmG4Rf5RYIAskfW81JX256s6HA9sAe8=
github.com/open-telemetry/opentelemetry-collector-contrib/processor/logdedupprocessor v0.109.0 h1:K+kUlWkVxOxdz0yss42yVxELLWZzbbsZ2zEYRK+tvWo=
github.com/open-telemetry/opentelemetry-collector-contrib/processor/logdedupprocessor v0.109.0/go.mod h1:C9k1oV5j9ewZ0QjBMMAnBLqw0a0qRESMDw7eUbw84fM=
github.com/open-telemetry/opentelemetry-collector-contrib/processor/logstransformprocessor v0.109.0 h1:ziu8fGQSgeB3ZrFi4ToCzYymcXEu0TiUV3rCMyIpnRs=
github.com/open-telemetry/opentelemetry-collector-contrib/processor/logstransformprocessor v0.109.0/go.mod h1:xeskTbt7F4xZhQ7XzjShCrPU6Dsp7hHS1viQ5/f4sqU=
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.109.0 h1:FvsCAzInSpYMQcC5yQQ0XDB5TzrX3UzvbIwcNqQVXyM=
Expand Down
1 change: 0 additions & 1 deletion license.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,4 @@ exceptions:
- path: "./processor/maskprocessor"
- path: "./processor/logcountprocessor"
- path: "./processor/metricextractprocessor"
- path: "./processor/logdeduplicationprocessor"
- path: "./expr"
75 changes: 0 additions & 75 deletions processor/logdeduplicationprocessor/README.md

This file was deleted.

113 changes: 0 additions & 113 deletions processor/logdeduplicationprocessor/config.go

This file was deleted.

Loading

0 comments on commit 211ccbf

Please sign in to comment.