remove deprecated config module

open-telemetry · Mar 6, 2025 · d789ac2 · d789ac2
1 parent bc53d2b
commit d789ac2
Show file tree

Hide file tree

Showing 47 changed files with 8 additions and 12,386 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -72,7 +72,7 @@ issues:
         - usestdlibvars
     # Ignoring gosec G402: TLS MinVersion too low
     # as the https://pkg.go.dev/crypto/tls#Config handles MinVersion default well.
-    - path: config/*.go
+    - path: otelconf/*.go
       text: "G402: TLS MinVersion too low."
       linters:
         - gosec

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [Unreleased]
 
+### Removed
+
+- The deprecated `go.opentelemetry.io/contrib/config` package is removed. (#6894)
+
 <!-- Released section -->
 <!-- Don't change this section unless doing release -->
 

diff --git a/Makefile b/Makefile
@@ -329,12 +329,12 @@ OPENTELEMETRY_CONFIGURATION_JSONSCHEMA_VERSION=v0.3.0
 genjsonschema-cleanup:
 	rm -Rf ${OPENTELEMETRY_CONFIGURATION_JSONSCHEMA_SRC_DIR}
 
-GENERATED_CONFIG=./config/${OPENTELEMETRY_CONFIGURATION_JSONSCHEMA_VERSION}/generated_config.go
+GENERATED_CONFIG=./otelconf/${OPENTELEMETRY_CONFIGURATION_JSONSCHEMA_VERSION}/generated_config.go
 
 # Generate structs for configuration from opentelemetry-configuration schema
 genjsonschema: genjsonschema-cleanup $(GOJSONSCHEMA)
 	mkdir -p ${OPENTELEMETRY_CONFIGURATION_JSONSCHEMA_SRC_DIR}
-	mkdir -p ./config/${OPENTELEMETRY_CONFIGURATION_JSONSCHEMA_VERSION}
+	mkdir -p ./otelconf/${OPENTELEMETRY_CONFIGURATION_JSONSCHEMA_VERSION}
 	curl -sSL https://api.github.com/repos/open-telemetry/opentelemetry-configuration/tarball/${OPENTELEMETRY_CONFIGURATION_JSONSCHEMA_VERSION} | tar xz --strip 1 -C ${OPENTELEMETRY_CONFIGURATION_JSONSCHEMA_SRC_DIR}
 	$(GOJSONSCHEMA) \
 		--capitalization ID \
@@ -345,7 +345,7 @@ genjsonschema: genjsonschema-cleanup $(GOJSONSCHEMA)
 		--output ${GENERATED_CONFIG} \
 		${OPENTELEMETRY_CONFIGURATION_JSONSCHEMA_SRC_DIR}/schema/opentelemetry_configuration.json
 	@echo Modify jsonschema generated files.
-	sed -f ./config/jsonschema_patch.sed ${GENERATED_CONFIG} > ${GENERATED_CONFIG}.tmp
+	sed -f ./otelconf/jsonschema_patch.sed ${GENERATED_CONFIG} > ${GENERATED_CONFIG}.tmp
 	mv ${GENERATED_CONFIG}.tmp ${GENERATED_CONFIG}
 	$(MAKE) genjsonschema-cleanup
 

diff --git a/config/doc.go b/config/doc.go
diff --git a/config/go.mod b/config/go.mod
diff --git a/config/go.sum b/config/go.sum
diff --git a/config/jsonschema_patch.sed b/config/jsonschema_patch.sed
diff --git a/config/testdata/bad_cert.crt b/config/testdata/bad_cert.crt
diff --git a/config/testdata/ca.crt b/config/testdata/ca.crt
diff --git a/config/testdata/invalid_bool.json b/config/testdata/invalid_bool.json
diff --git a/config/testdata/invalid_bool.yaml b/config/testdata/invalid_bool.yaml
diff --git a/config/testdata/invalid_nil_name.json b/config/testdata/invalid_nil_name.json
diff --git a/config/testdata/invalid_nil_name.yaml b/config/testdata/invalid_nil_name.yaml