diff --git a/cf-java-logging-support-opentelemetry-agent-extension/README.md b/cf-java-logging-support-opentelemetry-agent-extension/README.md index 527e8dc9..664a2fa7 100644 --- a/cf-java-logging-support-opentelemetry-agent-extension/README.md +++ b/cf-java-logging-support-opentelemetry-agent-extension/README.md @@ -5,7 +5,7 @@ The extension scans the service bindings of an application for SAP Collector as If such a binding is found, the OpenTelemetry Java Agent is configured to ship observability data to those services. Thus, this extension provides a convenient auto-instrumentation for Java applications running on SAP BTP. -> Note: CaaS currently is an SAP internal only service. +> Note: CaaS is an SAP internal only service. The service bindings supported by this extension (v1) are no longer created. CaaS support is deprecated as of version 4.3.0 and will be removed in a future release. The extension provides the following main features: @@ -95,7 +95,7 @@ The extension itself can be configured by specifying the following system proper | Property | Description | Default Value | |--------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------|-----------------| -| `sap.caas.cf.binding.label.value` | The label of the managed CaaS service binding to bind to. | `caas-service` | +| `sap.caas.cf.binding.label.value` | **Deprecated since 4.3.0.** The label of the managed CaaS service binding to bind to. | `caas-service` | | `sap.cloud-logging.cf.binding.label.value` | The label of the managed service binding to bind to. | `cloud-logging` | | `sap.cloud-logging.cf.binding.tag.value` | The tag of any service binding (managed or user-provided) to bind to. | `Cloud Logging` | | `sap.dynatrace.cf.binding.label.value` | The label of the managed service binding to bind to. | `dynatrace` | diff --git a/cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/binding/CaasBindingPropertiesSupplier.java b/cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/binding/CaasBindingPropertiesSupplier.java index 370cafb7..a9219e66 100644 --- a/cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/binding/CaasBindingPropertiesSupplier.java +++ b/cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/binding/CaasBindingPropertiesSupplier.java @@ -14,6 +14,12 @@ import static java.util.Collections.emptyMap; +/** + * Supplies OTel configuration properties derived from a CaaS (Collector as a Service) service binding. + * + * @deprecated CaaS is an SAP internal only service. The service bindings supported by this extension (v1) are no longer created. Will be removed in a future release. + */ +@Deprecated(since = "4.3.0", forRemoval = true) public class CaasBindingPropertiesSupplier implements Supplier> { private static final String CAAS_CLIENT_KEY = "tls.key"; diff --git a/cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/binding/CaasServiceProvider.java b/cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/binding/CaasServiceProvider.java index 6a77f4f2..5304e1cf 100644 --- a/cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/binding/CaasServiceProvider.java +++ b/cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/binding/CaasServiceProvider.java @@ -6,6 +6,12 @@ import java.util.Collections; import java.util.function.Supplier; +/** + * Provides the CaaS (Collector as a Service) service binding. + * + * @deprecated CaaS is an SAP internal only service. The service bindings supported by this extension (v1) are no longer created. Will be removed in a future release. + */ +@Deprecated(since = "4.3.0", forRemoval = true) public class CaasServiceProvider implements Supplier { private final CloudFoundryServiceInstance service; diff --git a/cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/config/ExtensionConfigurations.java b/cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/config/ExtensionConfigurations.java index 246c3a3b..bf4e1b34 100644 --- a/cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/config/ExtensionConfigurations.java +++ b/cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/config/ExtensionConfigurations.java @@ -382,12 +382,20 @@ interface CLOUD_FOUNDRY { interface RUNTIME { interface CLOUD_FOUNDRY { interface SERVICE { + /** + * @deprecated CaaS is an SAP internal only service. The service bindings supported by this extension (v1) are no longer created. + * Will be removed in a future release. + */ + @Deprecated(since = "4.3.0", forRemoval = true) interface CAAS { /** *

Parses {@code sap.caas.cf.binding.label.value}.

*

The label value used to identify managed CaaS service bindings. Default is * {@code "caas-service"}.

+ * + * @deprecated CaaS is an SAP internal only service. The service bindings supported by this extension (v1) are no longer created. */ + @Deprecated(since = "4.3.0", forRemoval = true) ConfigProperty LABEL = stringValued("sap.caas.cf.binding.label.value").withDefaultValue("caas-service").build(); }