Skip to content

Commit

Permalink
feat: Remove logreceiver (#358)
Browse files Browse the repository at this point in the history
* Removed logsreceiver

Signed-off-by: Corbin Phelps <corbin.phelps@bluemedora.com>

* Changed references to stanza-plugins to internal plugins

Signed-off-by: Corbin Phelps <corbin.phelps@bluemedora.com>

* fix local msi build

Co-authored-by: Brandon Johnson <brandon.johnson@bluemedora.com>
  • Loading branch information
Corbin Phelps and BinaryFissionGames authored Apr 19, 2022
1 parent b1efdfd commit 03a1953
Show file tree
Hide file tree
Showing 80 changed files with 9 additions and 14,112 deletions.
15 changes: 0 additions & 15 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,6 @@ updates:
commit-message:
prefix: "deps"
include: "scope"
- package-ecosystem: "gomod"
directory: "/receiver/logsreceiver"
schedule:
interval: "weekly"
ignore:
# Opentelemetry updates will be done manually
- dependency-name: "github.com/open-telemetry/opentelemetry-collector*"
- dependency-name: "go.opentelemetry.io/collector/*"

# AWS we want to ignore nightly patch releases
- dependency-name: "github.com/aws/aws-sdk-go"
update-types: ["version-update:semver-patch"]
commit-message:
prefix: "deps"
include: "scope"
- package-ecosystem: "gomod"
directory: "/processor/resourceattributetransposerprocessor"
schedule:
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ gpg.*
*.zip
windows/**/wix.dynamic.json
windows/**/wix
stanza-plugins
windows/config.yaml
windows/LICENSE
windows/plugins
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ release-prep:
@rm -rf release_deps
@mkdir release_deps
./buildscripts/download-dependencies.sh release_deps
@cp -r ./plugins release_deps/
@cp config/example.yaml release_deps/config.yaml

# Build, sign, and release
Expand Down
1 change: 0 additions & 1 deletion PLUGINS_VERSION

This file was deleted.

16 changes: 0 additions & 16 deletions buildscripts/download-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,10 @@
set -e

DOWNLOAD_DIR="${1:-.}"
START_DIR=$PWD
BASEDIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
PROJECT_BASE="$BASEDIR/.."
PLUGIN_VERSION="$(cat "$PROJECT_BASE/PLUGINS_VERSION")"
JAVA_CONTRIB_VERSION="$(cat "$PROJECT_BASE/JAVA_CONTRIB_VERSION")"

echo "Retrieving java contrib at $JAVA_CONTRIB_VERSION"
curl -fL -o "$DOWNLOAD_DIR/opentelemetry-java-contrib-jmx-metrics.jar" \
"https://github.com/open-telemetry/opentelemetry-java-contrib/releases/download/$JAVA_CONTRIB_VERSION/opentelemetry-jmx-metrics.jar" > /dev/null 2>&1


echo "Retrieving stanza-plugs at commit $PLUGIN_VERSION"
if [ ! -d "$DOWNLOAD_DIR/stanza-plugins" ]; then
git clone https://github.com/observIQ/stanza-plugins.git "$DOWNLOAD_DIR/stanza-plugins" > /dev/null 2>&1
fi

cd "$DOWNLOAD_DIR/stanza-plugins"
git fetch --all > /dev/null 2>&1
git checkout $PLUGIN_VERSION > /dev/null 2>&1
cd "$START_DIR"

cp -r "$DOWNLOAD_DIR/stanza-plugins/plugins" "$DOWNLOAD_DIR"
rm -rf "$DOWNLOAD_DIR/stanza-plugins"
1 change: 0 additions & 1 deletion docs/receivers.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ Below is a list of supported receivers with links to their 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](../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
2 changes: 0 additions & 2 deletions factories/receivers.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
package factories

import (
"github.com/observiq/observiq-otel-collector/receiver/logsreceiver"
"github.com/observiq/observiq-otel-collector/receiver/pluginreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver"
Expand Down Expand Up @@ -97,7 +96,6 @@ var defaultReceivers = []component.ReceiverFactory{
kafkametricsreceiver.NewFactory(),
kafkareceiver.NewFactory(),
kubeletstatsreceiver.NewFactory(),
logsreceiver.NewFactory(),
memcachedreceiver.NewFactory(),
mongodbatlasreceiver.NewFactory(),
mongodbreceiver.NewFactory(),
Expand Down
9 changes: 0 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ go 1.17
require (
github.com/GoogleCloudPlatform/opentelemetry-operations-collector v0.0.3-0.20220215000048-11a223a1d94f
github.com/observiq/observiq-otel-collector/processor/resourceattributetransposerprocessor v0.2.0
github.com/observiq/observiq-otel-collector/receiver/logsreceiver v0.2.0
github.com/observiq/observiq-otel-collector/receiver/pluginreceiver v0.2.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.45.1
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.45.1
Expand Down Expand Up @@ -119,10 +118,7 @@ require (
code.cloudfoundry.org/rfc5424 v0.0.0-20201103192249-000122071b78 // indirect
contrib.go.opencensus.io/exporter/prometheus v0.4.0 // indirect
contrib.go.opencensus.io/exporter/stackdriver v0.13.10 // indirect
github.com/Azure/azure-amqp-common-go/v3 v3.2.3 // indirect
github.com/Azure/azure-event-hubs-go/v3 v3.3.17 // indirect
github.com/Azure/azure-sdk-for-go v61.1.0+incompatible // indirect
github.com/Azure/go-amqp v0.17.0 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.23 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.18 // indirect
Expand Down Expand Up @@ -163,7 +159,6 @@ require (
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dennwc/varint v1.0.0 // indirect
github.com/devigned/tab v0.1.1 // indirect
github.com/digitalocean/godo v1.73.0 // indirect
github.com/docker/distribution v2.8.0+incompatible // indirect
github.com/docker/docker v20.10.12+incompatible // indirect
Expand Down Expand Up @@ -246,7 +241,6 @@ require (
github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b // indirect
github.com/leoluk/perflib_exporter v0.1.0 // indirect
github.com/lib/pq v1.10.4 // indirect
github.com/libp2p/go-reuseport v0.0.1 // indirect
github.com/linode/linodego v1.2.1 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/magiconair/properties v1.8.6 // indirect
Expand All @@ -272,7 +266,6 @@ require (
github.com/nginxinc/nginx-prometheus-exporter v0.8.1-0.20201110005315-f5a5f8086c19 // indirect
github.com/observiq/ctimefmt v1.0.0 // indirect
github.com/observiq/go-syslog/v3 v3.0.2 // indirect
github.com/observiq/goflow/v3 v3.4.4 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.45.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.45.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.45.1 // indirect
Expand Down Expand Up @@ -417,8 +410,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googl

replace github.com/observiq/observiq-otel-collector/processor/resourceattributetransposerprocessor v0.2.0 => ./processor/resourceattributetransposerprocessor

replace github.com/observiq/observiq-otel-collector/receiver/logsreceiver v0.2.0 => ./receiver/logsreceiver

replace github.com/observiq/observiq-otel-collector/receiver/pluginreceiver v0.2.0 => ./receiver/pluginreceiver

replace go.opentelemetry.io/collector v0.47.0 => go.opentelemetry.io/collector v0.46.0
Expand Down
Loading

0 comments on commit 03a1953

Please sign in to comment.