Use upstream dbotconf (#2713)

* Add upstream dbotconf dep * Remove local dbotconf * Update Makefile * Run dependabot generation
open-telemetry · Mar 21, 2022 · 6132008 · 6132008
1 parent fdbcf71
commit 6132008
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 198 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,292 +1,291 @@
-# File generated by "make dependabot-generate"; DO NOT EDIT.
-
+# File generated by dbotconf; DO NOT EDIT.
 version: 2
 updates:
   - package-ecosystem: github-actions
     directory: /
     labels:
       - dependencies
       - actions
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /bridge/opencensus
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /bridge/opencensus/test
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /bridge/opentracing
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /example/fib
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /example/jaeger
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /example/namedtracer
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /example/opencensus
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /example/otel-collector
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /example/passthrough
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /example/prometheus
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /example/zipkin
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /exporters/jaeger
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /exporters/otlp/internal/retry
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /exporters/otlp/otlpmetric
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /exporters/otlp/otlpmetric/otlpmetricgrpc
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /exporters/otlp/otlpmetric/otlpmetrichttp
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /exporters/otlp/otlptrace
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /exporters/otlp/otlptrace/otlptracegrpc
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /exporters/otlp/otlptrace/otlptracehttp
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /exporters/prometheus
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /exporters/stdout/stdoutmetric
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /exporters/stdout/stdouttrace
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /exporters/zipkin
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /internal/tools
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /metric
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /schema
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /sdk
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /sdk/export/metric
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /sdk/metric
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /trace
     labels:
       - dependencies
       - go
-      - "Skip Changelog"
+      - Skip Changelog
     schedule:
-      day: sunday
       interval: weekly
+      day: sunday
diff --git a/Makefile b/Makefile
@@ -48,7 +48,7 @@ CROSSLINK = $(TOOLS)/crosslink
 $(TOOLS)/crosslink: PACKAGE=go.opentelemetry.io/otel/$(TOOLS_MOD_DIR)/crosslink
 
 DBOTCONF = $(TOOLS)/dbotconf
-$(TOOLS)/dbotconf: PACKAGE=go.opentelemetry.io/otel/$(TOOLS_MOD_DIR)/dbotconf
+$(TOOLS)/dbotconf: PACKAGE=go.opentelemetry.io/build-tools/dbotconf
 
 GOLANGCI_LINT = $(TOOLS)/golangci-lint
 $(TOOLS)/golangci-lint: PACKAGE=github.com/golangci/golangci-lint/cmd/golangci-lint
@@ -178,26 +178,14 @@ license-check:
 	           exit 1; \
 	   fi
 
-DEPENDABOT_PATH=./.github/dependabot.yml
+DEPENDABOT_CONFIG = .github/dependabot.yml
 .PHONY: dependabot-check
-dependabot-check:
-	@result=$$( \
-		for f in $$( find . -type f -name go.mod -exec dirname {} \; | sed 's/^.//' ); \
-			do grep -q "directory: \+$$f" $(DEPENDABOT_PATH) \
-			|| echo "$$f"; \
-		done; \
-	); \
-	if [ -n "$$result" ]; then \
-		echo "missing dependabot entry:"; echo "$$result"; \
-		echo "new modules need to be added to the $(DEPENDABOT_PATH) file"; \
-		echo "(run: make dependabot-generate)"; \
-		exit 1; \
-	fi
+dependabot-check: | $(DBOTCONF)
+	@$(DBOTCONF) verify $(DEPENDABOT_CONFIG) || echo "(run: make dependabot-generate)"
 
 .PHONY: dependabot-generate
-dependabot-generate: $(DBOTCONF)
-	@echo "gerating dependabot configuration"; \
-	$(DBOTCONF)
+dependabot-generate: | $(DBOTCONF)
+	@$(DBOTCONF) generate > $(DEPENDABOT_CONFIG)
 
 .PHONY: check-clean-work-tree
 check-clean-work-tree: