Skip to content

Commit

Permalink
Remove m3collector (#3962)
Browse files Browse the repository at this point in the history
The m3collector is a dead project and never graduated out of the alpha stage. It doesn't seem to have been updated in over 4 years, but people still have to make refactoring changes to it when they are upgrading some other part of m3. We should remove this dead code to increase development velocity.
  • Loading branch information
ryanhall07 authored Dec 3, 2021
1 parent 00f21b1 commit fc654f1
Show file tree
Hide file tree
Showing 38 changed files with 3 additions and 4,317 deletions.
4 changes: 2 additions & 2 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ steps:
run: app
workdir: /go/src/github.com/m3db/m3
<<: *common
- label: "Integration (collector, m3em, cluster, msg, metrics) %n"
- label: "Integration (m3em, cluster, msg, metrics) %n"
parallelism: 4
command: make clean install-vendor-m3 test-ci-integration-collector test-ci-integration-m3em test-ci-integration-cluster test-ci-integration-msg test-ci-integration-metrics
command: make clean install-vendor-m3 test-ci-integration-m3em test-ci-integration-cluster test-ci-integration-msg test-ci-integration-metrics
plugins:
docker-compose#v2.5.1:
run: app
Expand Down
8 changes: 0 additions & 8 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ coverage:
target: auto
threshold: 5%
flags: aggregator
collector:
target: auto
threshold: 5%
flags: collector
query:
target: auto
threshold: 5%
Expand All @@ -56,10 +52,6 @@ coverage:
default: off

flags:
collector:
paths:
- src/collector/
- src/cmd/services/m3collector/
aggregator:
paths:
- src/aggregator/
Expand Down
6 changes: 0 additions & 6 deletions .fossa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@ analyze:
path: src/cmd/services/m3aggregator/main
options:
allow-unresolved: true
- name: github.com/m3db/m3/src/cmd/services/m3collector/main
type: go
target: github.com/m3db/m3/src/cmd/services/m3collector/main
path: src/cmd/services/m3collector/main
options:
allow-unresolved: true
- name: github.com/m3db/m3/src/cmd/services/m3coordinator/main
type: go
target: github.com/m3db/m3/src/cmd/services/m3coordinator/main
Expand Down
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ SERVICES := \
m3coordinator \
m3aggregator \
m3query \
m3collector \
m3em_agent \
m3comparator \
r2ctl \
Expand All @@ -61,7 +60,6 @@ SUBDIRS := \
msg \
metrics \
cmd \
collector \
dbnode \
query \
m3em \
Expand Down
29 changes: 0 additions & 29 deletions docker/m3collector/Dockerfile

This file was deleted.

10 changes: 0 additions & 10 deletions docker/m3collector/development.Dockerfile

This file was deleted.

15 changes: 0 additions & 15 deletions scripts/development/m3_stack/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,21 +96,6 @@ services:
# Note: Use ".tmp" suffix is git ignored.
- "./m3coordinator.yml.tmp:/etc/m3coordinator/m3coordinator.yml"
- "./schema.proto:/etc/m3coordinator/schema.proto"
m3collector01:
expose:
- "7206"
- "7207"
ports:
- "0.0.0.0:7206:7206"
- "0.0.0.0:7207:7207"
networks:
- backend
build:
context: ../../../bin
dockerfile: ./docker/m3collector/development.Dockerfile
image: m3collector:dev
volumes:
- "./m3collector.yml:/etc/m3collector/m3collector.yml"
prometheus01:
expose:
- "9090"
Expand Down
89 changes: 0 additions & 89 deletions scripts/development/m3_stack/m3collector.yml

This file was deleted.

15 changes: 0 additions & 15 deletions scripts/development/m3_stack/start_m3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ fi
M3DBNODE_DEV_IMG=$(docker images m3dbnode:dev | fgrep -iv repository | wc -l | xargs)
M3COORDINATOR_DEV_IMG=$(docker images m3coordinator:dev | fgrep -iv repository | wc -l | xargs)
M3AGGREGATOR_DEV_IMG=$(docker images m3aggregator:dev | fgrep -iv repository | wc -l | xargs)
M3COLLECTOR_DEV_IMG=$(docker images m3collector:dev | fgrep -iv repository | wc -l | xargs)

if [[ "$M3DBNODE_DEV_IMG" == "0" ]] || [[ "$FORCE_BUILD" == true ]] || [[ "$BUILD_M3DBNODE" == true ]]; then
prepare_build_cmd "make m3dbnode-linux-amd64"
Expand Down Expand Up @@ -157,16 +156,6 @@ if [[ "$USE_AGGREGATOR" = true ]]; then
# Bring up the second replica
docker-compose -f docker-compose.yml up $DOCKER_ARGS m3aggregator02
fi

if [[ "$M3COLLECTOR_DEV_IMG" == "0" ]] || [[ "$FORCE_BUILD" == true ]] || [[ "$BUILD_M3COLLECTOR" == true ]]; then
prepare_build_cmd "make m3collector-linux-amd64"
echo "Building m3collector binary first"
bash -c "$build_cmd"

docker-compose -f docker-compose.yml up --build $DOCKER_ARGS m3collector01
else
docker-compose -f docker-compose.yml up $DOCKER_ARGS m3collector01
fi
else
echo "Not running aggregator pipeline"
fi
Expand Down Expand Up @@ -357,10 +346,6 @@ if [[ "$USE_AGGREGATOR" = true ]]; then
fi

docker-compose -f docker-compose.yml up $DOCKER_ARGS m3coordinator01

# May not necessarily flush
echo "Sending unaggregated metric to m3collector"
curl http://localhost:7206/api/v1/json/report -X POST -d '{"metrics":[{"type":"gauge","value":42,"tags":{"__name__":"foo_metric","foo":"bar"}}]}'
fi

echo "Starting Prometheus"
Expand Down
3 changes: 1 addition & 2 deletions scripts/process-cover.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ fi
COVERFILE=$1
SUBMIT_COVER="$(dirname $0)/../.ci/codecov.sh"

TARGETS=("aggregator" "dbnode" "query" "collector" "cluster" "m3ninx" "m3em" "x")
TARGETS=("aggregator" "dbnode" "query" "cluster" "m3ninx" "m3em" "x")
target_patterns() {
case $1 in
'collector') echo "^mode|github.com/m3db/m3/src/collector|github.com/m3db/m3/src/cmd/services/m3collector";;
'cluster') echo "^mode|github.com/m3db/m3/src/cluster";;
'aggregator') echo "^mode|github.com/m3db/m3/src/aggregator|github.com/m3db/m3/src/cmd/services/m3aggregator";;
'dbnode') echo "^mode|github.com/m3db/m3/src/dbnode|github.com/m3db/m3/src/cmd/services/m3dbnode";;
Expand Down
51 changes: 0 additions & 51 deletions src/cmd/services/m3collector/config/config.go

This file was deleted.

48 changes: 0 additions & 48 deletions src/cmd/services/m3collector/main/main.go

This file was deleted.

6 changes: 0 additions & 6 deletions src/collector/README.md

This file was deleted.

Loading

0 comments on commit fc654f1

Please sign in to comment.