remove generated jsonschema code (#8620)

This code will live in the opentelemetry-go-contrib repo in the future. This depends on open-telemetry/opentelemetry-go-contrib#4376 --------- Signed-off-by: Alex Boten <aboten@lightstep.com>
open-telemetry · Nov 16, 2023 · a82663e · a82663e
1 parent e13dd5b
commit a82663e
Show file tree

Hide file tree

Showing 42 changed files with 323 additions and 1,225 deletions.
diff --git a/.chloggen/codeboten_rm-generated-jsonschema-code.yaml b/.chloggen/codeboten_rm-generated-jsonschema-code.yaml
@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: deprecation
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: telemetry
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: deprecate jsonschema generated types
+
+# One or more tracking issues or pull requests related to the change
+issues: [15009]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [api]
diff --git a/Makefile b/Makefile
@@ -250,32 +250,6 @@ genpdata:
 	$(GOCMD) run pdata/internal/cmd/pdatagen/main.go
 	$(MAKE) fmt
 
-# The source directory for configuration schema.
-OPENTELEMETRY_JSONSCHEMA_SRC_DIR=service/internal/proctelemetry/opentelememetry-configuration
-
-# The SHA matching the current version of the configuration schema to use
-OPENTELEMETRY_JSONSCHEMA_VERSION=main
-
-# Cleanup temporary directory
-genjsonschema-cleanup:
-	rm -Rf ${OPENTELEMETRY_JSONSCHEMA_SRC_DIR}
-
-# Generate structs for configuration from configuration schema
-genjsonschema: genjsonschema-cleanup $(GOJSONSCHEMA)
-	mkdir -p ${OPENTELEMETRY_JSONSCHEMA_SRC_DIR}
-	curl -sSL https://api.github.com/repos/open-telemetry/opentelemetry-configuration/tarball/${OPENTELEMETRY_JSONSCHEMA_VERSION} | tar xz --strip 1 -C ${OPENTELEMETRY_JSONSCHEMA_SRC_DIR}
-	$(GOJSONSCHEMA) \
-		--package telemetry \
-		--tags mapstructure \
-		--output ./service/telemetry/generated_config.go \
-		--schema-package=https://opentelemetry.io/otelconfig/opentelemetry_configuration.json=github.com/open-telemetry/opentelemetry-collector/schema \
-    	${OPENTELEMETRY_JSONSCHEMA_SRC_DIR}/schema/opentelemetry_configuration.json
-	@echo Modify jsonschema generated files.
-	sed -f $(TOOLS_MOD_DIR)/jsonschema_patch.sed service/telemetry/generated_config.go > service/telemetry/generated_config_tmp.go
-	mv service/telemetry/generated_config_tmp.go service/telemetry/generated_config.go
-	$(MAKE) fmt
-	$(MAKE) genjsonschema-cleanup
-
 # Generate semantic convention constants. Requires a clone of the opentelemetry-specification repo
 gensemconv:
 	@[ "${SPECPATH}" ] || ( echo ">> env var SPECPATH is not set"; exit 1 )

diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod
@@ -94,6 +94,7 @@ require (
 	go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 // indirect
 	go.opentelemetry.io/collector/semconv v0.89.0 // indirect
 	go.opentelemetry.io/collector/service v0.89.0 // indirect
+	go.opentelemetry.io/contrib/config v0.1.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
 	go.opentelemetry.io/contrib/propagators/b3 v1.21.0 // indirect

diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum
diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod
@@ -100,8 +100,6 @@ replace go.opentelemetry.io/collector/processor => ../../processor
 
 replace go.opentelemetry.io/collector/exporter => ../../exporter
 
-replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension
-
 replace go.opentelemetry.io/collector/receiver => ../../receiver
 
 replace go.opentelemetry.io/collector/connector => ../../connector
@@ -112,8 +110,4 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata
 
 replace go.opentelemetry.io/collector/component => ../../component
 
-replace go.opentelemetry.io/collector/semconv => ../../semconv
-
 replace go.opentelemetry.io/collector/consumer => ../../consumer
-
-replace go.opentelemetry.io/collector/service => ../../service
diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod
@@ -59,8 +59,6 @@ replace go.opentelemetry.io/collector/config/configauth => ../configauth
 
 replace go.opentelemetry.io/collector/config/configcompression => ../configcompression
 
-replace go.opentelemetry.io/collector/config/confignet => ../confignet
-
 replace go.opentelemetry.io/collector/config/configopaque => ../configopaque
 
 replace go.opentelemetry.io/collector/config/configtls => ../configtls
@@ -79,8 +77,6 @@ replace go.opentelemetry.io/collector/processor => ../../processor
 
 replace go.opentelemetry.io/collector/exporter => ../../exporter
 
-replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension
-
 replace go.opentelemetry.io/collector/receiver => ../../receiver
 
 replace go.opentelemetry.io/collector/connector => ../../connector
@@ -91,8 +87,4 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata
 
 replace go.opentelemetry.io/collector/component => ../../component
 
-replace go.opentelemetry.io/collector/semconv => ../../semconv
-
 replace go.opentelemetry.io/collector/consumer => ../../consumer
-
-replace go.opentelemetry.io/collector/service => ../../service
diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod
@@ -59,10 +59,6 @@ replace go.opentelemetry.io/collector/processor => ../../processor
 
 replace go.opentelemetry.io/collector/receiver => ../../receiver
 
-replace go.opentelemetry.io/collector/semconv => ../../semconv
-
-replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension
-
 replace go.opentelemetry.io/collector/featuregate => ../../featuregate
 
 replace go.opentelemetry.io/collector/consumer => ../../consumer
@@ -74,8 +70,4 @@ retract (
 	v0.69.0 // Release failed, use v0.69.1
 )
 
-replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet
-
 replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry
-
-replace go.opentelemetry.io/collector/service => ../../service
diff --git a/connector/go.mod b/connector/go.mod
@@ -54,8 +54,6 @@ replace go.opentelemetry.io/collector/consumer => ../consumer
 
 replace go.opentelemetry.io/collector/extension => ../extension
 
-replace go.opentelemetry.io/collector/extension/zpagesextension => ../extension/zpagesextension
-
 replace go.opentelemetry.io/collector/featuregate => ../featuregate
 
 replace go.opentelemetry.io/collector/pdata => ../pdata
@@ -64,10 +62,4 @@ replace go.opentelemetry.io/collector/processor => ../processor
 
 replace go.opentelemetry.io/collector/receiver => ../receiver
 
-replace go.opentelemetry.io/collector/semconv => ../semconv
-
 replace go.opentelemetry.io/collector/exporter => ../exporter
-
-replace go.opentelemetry.io/collector/config/confignet => ../config/confignet
-
-replace go.opentelemetry.io/collector/service => ../service
diff --git a/consumer/go.mod b/consumer/go.mod
@@ -37,8 +37,6 @@ replace go.opentelemetry.io/collector/exporter => ../exporter
 
 replace go.opentelemetry.io/collector/extension => ../extension
 
-replace go.opentelemetry.io/collector/extension/zpagesextension => ../extension/zpagesextension
-
 replace go.opentelemetry.io/collector/featuregate => ../featuregate
 
 replace go.opentelemetry.io/collector/pdata => ../pdata
@@ -47,17 +45,11 @@ replace go.opentelemetry.io/collector/processor => ../processor
 
 replace go.opentelemetry.io/collector/receiver => ../receiver
 
-replace go.opentelemetry.io/collector/semconv => ../semconv
-
 retract (
 	v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module, use v0.76.1
 	v0.69.0 // Release failed, use v0.69.1
 )
 
 replace go.opentelemetry.io/collector/connector => ../connector
 
-replace go.opentelemetry.io/collector/config/confignet => ../config/confignet
-
 replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry
-
-replace go.opentelemetry.io/collector/service => ../service
diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod
@@ -63,18 +63,10 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata
 
 replace go.opentelemetry.io/collector/receiver => ../../receiver
 
-replace go.opentelemetry.io/collector/semconv => ../../semconv
-
-replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension
-
 replace go.opentelemetry.io/collector/extension => ../../extension
 
 replace go.opentelemetry.io/collector/connector => ../../connector
 
-replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet
-
 replace go.opentelemetry.io/collector/processor => ../../processor
 
 replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry
-
-replace go.opentelemetry.io/collector/service => ../../service
diff --git a/exporter/go.mod b/exporter/go.mod
@@ -74,8 +74,6 @@ replace go.opentelemetry.io/collector/consumer => ../consumer
 
 replace go.opentelemetry.io/collector/extension => ../extension
 
-replace go.opentelemetry.io/collector/extension/zpagesextension => ../extension/zpagesextension
-
 replace go.opentelemetry.io/collector/featuregate => ../featuregate
 
 replace go.opentelemetry.io/collector/pdata => ../pdata
@@ -84,14 +82,8 @@ replace go.opentelemetry.io/collector/processor => ../processor
 
 replace go.opentelemetry.io/collector/receiver => ../receiver
 
-replace go.opentelemetry.io/collector/semconv => ../semconv
-
 retract v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module
 
 replace go.opentelemetry.io/collector/connector => ../connector
 
-replace go.opentelemetry.io/collector/config/confignet => ../config/confignet
-
 replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry
-
-replace go.opentelemetry.io/collector/service => ../service
diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod
@@ -68,19 +68,11 @@ replace go.opentelemetry.io/collector/processor => ../../processor
 
 replace go.opentelemetry.io/collector/receiver => ../../receiver
 
-replace go.opentelemetry.io/collector/semconv => ../../semconv
-
-replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension
-
 retract (
 	v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module, use v0.76.1
 	v0.69.0 // Release failed, use v0.69.1
 )
 
 replace go.opentelemetry.io/collector/connector => ../../connector
 
-replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet
-
 replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry
-
-replace go.opentelemetry.io/collector/service => ../../service
diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod
@@ -55,12 +55,13 @@ require (
 	go.opentelemetry.io/collector/extension/auth v0.89.0 // indirect
 	go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect
 	go.opentelemetry.io/collector/receiver v0.89.0 // indirect
-	go.opentelemetry.io/collector/service v0.89.0 // indirect
+	go.opentelemetry.io/contrib/config v0.1.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
 	go.opentelemetry.io/otel v1.20.0 // indirect
 	go.opentelemetry.io/otel/metric v1.20.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.20.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.20.0 // indirect
 	go.opentelemetry.io/otel/trace v1.20.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
@@ -104,12 +105,6 @@ replace go.opentelemetry.io/collector/processor => ../../processor
 
 replace go.opentelemetry.io/collector/receiver => ../../receiver
 
-replace go.opentelemetry.io/collector/semconv => ../../semconv
-
-replace go.opentelemetry.io/collector/service => ../../service
-
-replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension
-
 replace go.opentelemetry.io/collector/consumer => ../../consumer
 
 retract (
@@ -124,3 +119,5 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/con
 replace go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp
 
 replace go.opentelemetry.io/collector/receiver/otlpreceiver => ../../receiver/otlpreceiver
+
+replace go.opentelemetry.io/collector/semconv => ../../semconv
diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum
diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod
@@ -56,12 +56,13 @@ require (
 	go.opentelemetry.io/collector/extension v0.89.0 // indirect
 	go.opentelemetry.io/collector/extension/auth v0.89.0 // indirect
 	go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect
-	go.opentelemetry.io/collector/service v0.89.0 // indirect
+	go.opentelemetry.io/contrib/config v0.1.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
 	go.opentelemetry.io/otel v1.20.0 // indirect
 	go.opentelemetry.io/otel/metric v1.20.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.20.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.20.0 // indirect
 	go.opentelemetry.io/otel/trace v1.20.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/net v0.18.0 // indirect
@@ -114,10 +115,6 @@ replace go.opentelemetry.io/collector/receiver/otlpreceiver => ../../receiver/ot
 
 replace go.opentelemetry.io/collector/semconv => ../../semconv
 
-replace go.opentelemetry.io/collector/service => ../../service
-
-replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension
-
 replace go.opentelemetry.io/collector/consumer => ../../consumer
 
 retract (

diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum
diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod
@@ -62,10 +62,6 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata
 
 replace go.opentelemetry.io/collector/receiver => ../../receiver
 
-replace go.opentelemetry.io/collector/semconv => ../../semconv
-
-replace go.opentelemetry.io/collector/extension/zpagesextension => ../zpagesextension
-
 replace go.opentelemetry.io/collector/consumer => ../../consumer
 
 retract (
@@ -77,8 +73,4 @@ replace go.opentelemetry.io/collector/processor => ../../processor
 
 replace go.opentelemetry.io/collector/connector => ../../connector
 
-replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet
-
 replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry
-
-replace go.opentelemetry.io/collector/service => ../../service
diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod
@@ -29,13 +29,13 @@ require (
 	github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/collector/config/configtelemetry v0.89.0 // indirect
 	go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect
 	go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 // indirect
-	go.opentelemetry.io/collector/service v0.89.0 // indirect
+	go.opentelemetry.io/contrib/config v0.1.0 // indirect
 	go.opentelemetry.io/otel v1.20.0 // indirect
 	go.opentelemetry.io/otel/metric v1.20.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.20.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/net v0.18.0 // indirect
 	golang.org/x/sys v0.14.0 // indirect
@@ -66,10 +66,6 @@ replace go.opentelemetry.io/collector/processor => ../../processor
 
 replace go.opentelemetry.io/collector/receiver => ../../receiver
 
-replace go.opentelemetry.io/collector/semconv => ../../semconv
-
-replace go.opentelemetry.io/collector/service => ../../service
-
 replace go.opentelemetry.io/collector/consumer => ../../consumer
 
 retract (