Skip to content

Commit

Permalink
Removed the pkg directory (#287)
Browse files Browse the repository at this point in the history
* Removed the pkg directory to make the project structure more inline with go projects

Signed-off-by: Corbin Phelps <[email protected]>

* Removed plugins from gitignore. I think they're covered by other gitignores for the ones we don't want

Signed-off-by: Corbin Phelps <[email protected]>
  • Loading branch information
Corbin Phelps authored Mar 17, 2022
1 parent 3888fef commit 802e932
Show file tree
Hide file tree
Showing 90 changed files with 21 additions and 22 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@ windows/**/wix
stanza-plugins
windows/config.yaml
opentelemetry-java-contrib-jmx-metrics.jar
plugins
release_deps
tmp
2 changes: 1 addition & 1 deletion cmd/collector/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"fmt"
"log"

"github.com/observiq/observiq-collector/collector"
"github.com/observiq/observiq-collector/internal/version"
"github.com/observiq/observiq-collector/pkg/collector"
"github.com/spf13/pflag"
"go.opentelemetry.io/collector/service"
)
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/collector/settings.go → collector/settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package collector
import (
"os"

"github.com/observiq/observiq-collector/pkg/factories"
"github.com/observiq/observiq-collector/factories"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/service"
"go.uber.org/zap"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/processors.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Below is a list of supported processors with links to there documentation pages.
- [metricstransformprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.45.1/processor/metricstransformprocessor/README.md)
- [normalizesumsprocessor](https://github.com/GoogleCloudPlatform/opentelemetry-operations-collector/blob/master/processor/normalizesumsprocessor/README.md)
- [probabilisticsamplerprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.45.1/processor/probabilisticsamplerprocessor/README.md)
- [resourceattributetransposerprocessor](../pkg/processor/resourceattributetransposerprocessor/README.md)
- [resourceattributetransposerprocessor](../processor/resourceattributetransposerprocessor/README.md)
- [resourcedetectionprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.45.1/processor/resourcedetectionprocessor/README.md)
- [resourceprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.45.1/processor/resourceprocessor/README.md)
- [routingprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.45.1/processor/routingprocessor/README.md)
Expand Down
2 changes: 1 addition & 1 deletion docs/receivers.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Below is a list of supported receivers with links to there documentation pages.
- [kafkametricsreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.45.1/receiver/kafkametricsreceiver/README.md)
- [kafkareceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.45.1/receiver/kafkareceiver/README.md)
- [kubeletstatsreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.45.1/receiver/kubeletstatsreceiver/README.md)
- [logsreceiver](../pkg/receiver/logsreceiver/README.md)
- [logsreceiver](../receiver/logsreceiver/README.md)
- [memcachedreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.45.1/receiver/memcachedreceiver/README.md)
- [mongodbatlasreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.45.1/receiver/mongodbatlasreceiver/README.md)
- [mongodbreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.45.1/receiver/mongodbreceiver/README.md)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/factories/processors.go → factories/processors.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package factories

import (
"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/processor/normalizesumsprocessor"
"github.com/observiq/observiq-collector/pkg/processor/resourceattributetransposerprocessor"
"github.com/observiq/observiq-collector/processor/resourceattributetransposerprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor"
Expand Down
2 changes: 1 addition & 1 deletion pkg/factories/receivers.go → factories/receivers.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package factories

import (
"github.com/observiq/observiq-collector/pkg/receiver/logsreceiver"
"github.com/observiq/observiq-collector/receiver/logsreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"strconv"
"strings"

"github.com/observiq/observiq-collector/pkg/receiver/logsreceiver/severity"
"github.com/observiq/observiq-collector/pkg/receiver/logsreceiver/timestamp"
"github.com/observiq/observiq-collector/receiver/logsreceiver/severity"
"github.com/observiq/observiq-collector/receiver/logsreceiver/timestamp"
"go.opentelemetry.io/collector/model/pdata"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ import (
_ "github.com/open-telemetry/opentelemetry-log-collection/operator/builtin/output/stdout"

// register non-opentelemetry operators
_ "github.com/observiq/observiq-collector/pkg/receiver/operators/input/aws/cloudwatch"
_ "github.com/observiq/observiq-collector/pkg/receiver/operators/input/azure/eventhub"
_ "github.com/observiq/observiq-collector/pkg/receiver/operators/input/azure/loganalytics"
_ "github.com/observiq/observiq-collector/pkg/receiver/operators/input/goflow"
_ "github.com/observiq/observiq-collector/pkg/receiver/operators/input/http"
_ "github.com/observiq/observiq-collector/receiver/operators/input/aws/cloudwatch"
_ "github.com/observiq/observiq-collector/receiver/operators/input/azure/eventhub"
_ "github.com/observiq/observiq-collector/receiver/operators/input/azure/loganalytics"
_ "github.com/observiq/observiq-collector/receiver/operators/input/goflow"
_ "github.com/observiq/observiq-collector/receiver/operators/input/http"

_ "github.com/observiq/observiq-collector/pkg/receiver/operators/parser/keyvalue"
_ "github.com/observiq/observiq-collector/receiver/operators/parser/keyvalue"

_ "github.com/observiq/observiq-collector/pkg/receiver/operators/transformer/k8smetadata"
_ "github.com/observiq/observiq-collector/receiver/operators/transformer/k8smetadata"
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package eventhub
import (
"context"

"github.com/observiq/observiq-collector/pkg/receiver/operators/input/azure"
"github.com/observiq/observiq-collector/receiver/operators/input/azure"
"github.com/open-telemetry/opentelemetry-log-collection/operator"
"github.com/open-telemetry/opentelemetry-log-collection/operator/helper"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package eventhub
import (
"testing"

"github.com/observiq/observiq-collector/pkg/receiver/operators/input/azure"
"github.com/observiq/observiq-collector/receiver/operators/input/azure"
"github.com/open-telemetry/opentelemetry-log-collection/testutil"
"github.com/stretchr/testify/require"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"context"

azhub "github.com/Azure/azure-event-hubs-go/v3"
"github.com/observiq/observiq-collector/pkg/receiver/operators/input/azure"
"github.com/observiq/observiq-collector/receiver/operators/input/azure"
"go.uber.org/zap"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"context"

jsoniter "github.com/json-iterator/go"
"github.com/observiq/observiq-collector/pkg/receiver/operators/input/azure"
"github.com/observiq/observiq-collector/receiver/operators/input/azure"
"github.com/open-telemetry/opentelemetry-log-collection/operator"
"github.com/open-telemetry/opentelemetry-log-collection/operator/helper"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package loganalytics
import (
"testing"

"github.com/observiq/observiq-collector/pkg/receiver/operators/input/azure"
"github.com/observiq/observiq-collector/receiver/operators/input/azure"
"github.com/open-telemetry/opentelemetry-log-collection/testutil"
"github.com/stretchr/testify/require"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"time"

azhub "github.com/Azure/azure-event-hubs-go/v3"
"github.com/observiq/observiq-collector/pkg/receiver/operators/input/azure"
"github.com/observiq/observiq-collector/receiver/operators/input/azure"
"github.com/open-telemetry/opentelemetry-log-collection/entry"
"github.com/open-telemetry/opentelemetry-log-collection/errors"
"go.uber.org/zap"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 802e932

Please sign in to comment.