This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch CAMEL-21378
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 5d4c733c8eadb051d1f2a6aaaa91d2b5b3cff5ff
Author: John Poth <poth.j...@gmail.com>
AuthorDate: Wed Oct 23 11:30:18 2024 +0200
CAMEL-21378: Remove OpenTelemetryConditionalAutoConfiguration as it is
redundant with OpenTelemetryAutoConfiguration
---
.../OpenTelemetryConditionalAutoConfiguration.java | 31 ----------------------
...rk.boot.autoconfigure.AutoConfiguration.imports | 1 -
2 files changed, 32 deletions(-)
diff --git
a/components-starter/camel-opentelemetry-starter/src/main/java/org/apache/camel/opentelemetry/starter/OpenTelemetryConditionalAutoConfiguration.java
b/components-starter/camel-opentelemetry-starter/src/main/java/org/apache/camel/opentelemetry/starter/OpenTelemetryConditionalAutoConfiguration.java
deleted file mode 100644
index 87d71cbed32..00000000000
---
a/components-starter/camel-opentelemetry-starter/src/main/java/org/apache/camel/opentelemetry/starter/OpenTelemetryConditionalAutoConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.opentelemetry.starter;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-/**
- * A configuration controller to enable OpenTracing via the configuration
property. Useful to bootstrap OpenTracing when
- * not using the {@link CamelOpenTelemetry} annotation.
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnProperty(value = "camel.opentelemetry.enabled")
-@Import(OpenTelemetryAutoConfiguration.class)
-public class OpenTelemetryConditionalAutoConfiguration {
-}
diff --git
a/components-starter/camel-opentelemetry-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
b/components-starter/camel-opentelemetry-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 002159927be..4cac1ccde5f 100644
---
a/components-starter/camel-opentelemetry-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++
b/components-starter/camel-opentelemetry-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -14,5 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-org.apache.camel.opentelemetry.starter.OpenTelemetryConditionalAutoConfiguration
org.apache.camel.opentelemetry.starter.OpenTelemetryAutoConfiguration
\ No newline at end of file
