fix: removes mentions to conhos (#36)

Author: betinacosta

README.md

@@ -10,12 +10,12 @@ The Python SDK offers a clean, type-safe API following Python best practices whi
 
 ### Key Features
 
-- 🤖 **AI Core Integration**
-- 📋 **Audit Log Service**
-- 🌐 **Destination Service**
-- 🗂️ **ObjectStore Service**
-- 🔐 **Secret Resolver**
-- 📊 **Telemetry & Observability**
+- **AI Core Integration**
+- **Audit Log Service**
+- **Destination Service**
+- **ObjectStore Service**
+- **Secret Resolver**
+- **Telemetry & Observability**
 
 ## Requirements and Setup
 
@@ -43,16 +43,6 @@ The SDK automatically resolves configuration from multiple sources with the foll
    - For instance names, hyphens (`"-"`) are replaced with underscores (`"_"`) for compatibility with system environment variables.
    - You can see examples in our [env_integration_tests.example](.env_integration_tests.example)
 
-### Telemetry Configuration
-
-For production environments (SAP BTP Managed Runtime), no configuration is needed as `OTEL_EXPORTER_OTLP_ENDPOINT` is automatically injected.
-
-For local development:
-
-```bash
-export OTEL_EXPORTER_OTLP_ENDPOINT="https://otel-collector.example.com"
-```
-
 ### Usage Guides
 
 Each module has comprehensive usage guides:

src/sap_cloud_sdk/core/secret_resolver/user-guide.md

@@ -52,7 +52,7 @@ print(f"Database: {config.username}@{config.host}:{config.port}")
 The Secret Resolver expects mounted secrets to follow this hierarchy:
 
 ```
-/etc/secrets/
+/etc/secrets/appfnd
 └── <module_name>/
     └── <instance_name>/
         ├── host
@@ -63,7 +63,7 @@ The Secret Resolver expects mounted secrets to follow this hierarchy:
 
 Example for the above configuration:
 ```
-/etc/secrets/
+/etc/secrets/appfnd
 └── database/
     └── primary/
         ├── host          # Contains: "db.example.com"
@@ -122,7 +122,7 @@ read_from_mount_and_fallback_to_env_var(
 
 **Mounted secrets structure:**
 ```
-/etc/secrets/
+/etc/secrets/appfnd
 └── objectstore/
     └── credentials/
         ├── access_key_id

src/sap_cloud_sdk/core/telemetry/auto_instrument.py

@@ -7,7 +7,7 @@
 from sap_cloud_sdk.core.telemetry import Module, Operation
 from sap_cloud_sdk.core.telemetry.config import (
     create_resource_attributes_from_env,
-    _get_conhos_app_name,
+    _get_app_name,
 )
 from sap_cloud_sdk.core.telemetry.genai_attribute_transformer import (
     GenAIAttributeTransformer,
@@ -44,7 +44,7 @@ def auto_instrument():
 
     resource = create_resource_attributes_from_env()
     Traceloop.init(
-        app_name=_get_conhos_app_name(),
+        app_name=_get_app_name(),
         exporter=exporter,
         resource_attributes=resource,
         should_enrich_metrics=True,

src/sap_cloud_sdk/core/telemetry/config.py

@@ -22,32 +22,32 @@
 DEFAULT_UNKNOWN = "unknown"
 
 # Environment variable keys
-ENV_CONHOS_REGION = "APPFND_CONHOS_REGION"
-ENV_CONHOS_ENVIRONMENT = "APPFND_CONHOS_ENVIRONMENT"
-ENV_CONHOS_SUBACCOUNT_ID = "APPFND_CONHOS_SUBACCOUNTID"
-ENV_CONHOS_APP_NAME = "APPFND_CONHOS_APP_NAME"
+ENV_REGION = "APPFND_CONHOS_REGION"
+ENV_ENVIRONMENT = "APPFND_CONHOS_ENVIRONMENT"
+ENV_SUBACCOUNT_ID = "APPFND_CONHOS_SUBACCOUNTID"
+ENV_APP_NAME = "APPFND_CONHOS_APP_NAME"
 ENV_HOSTNAME = "HOSTNAME"
 ENV_SYSTEM_ROLE = "APPFND_CONHOS_SYSTEM_ROLE"
 
 
-def _get_conhos_region() -> str:
-    """Get ConHost region from environment or return default."""
-    return os.getenv(ENV_CONHOS_REGION, DEFAULT_UNKNOWN)
+def _get_region() -> str:
+    """Get region from environment or return default."""
+    return os.getenv(ENV_REGION, DEFAULT_UNKNOWN)
 
 
-def _get_conhos_environment() -> str:
-    """Get ConHost environment from environment or return default."""
-    return os.getenv(ENV_CONHOS_ENVIRONMENT, DEFAULT_UNKNOWN)
+def _get_environment() -> str:
+    """Get environment from environment or return default."""
+    return os.getenv(ENV_ENVIRONMENT, DEFAULT_UNKNOWN)
 
 
-def _get_conhos_subaccount_id() -> str:
-    """Get ConHost subaccount ID from environment or return default."""
-    return os.getenv(ENV_CONHOS_SUBACCOUNT_ID, DEFAULT_UNKNOWN)
+def _get_subaccount_id() -> str:
+    """Get subaccount ID from environment or return default."""
+    return os.getenv(ENV_SUBACCOUNT_ID, DEFAULT_UNKNOWN)
 
 
-def _get_conhos_app_name() -> str:
-    """Get ConHost application name from environment or return default."""
-    return os.getenv(ENV_CONHOS_APP_NAME, DEFAULT_UNKNOWN)
+def _get_app_name() -> str:
+    """Get application name from environment or return default."""
+    return os.getenv(ENV_APP_NAME, DEFAULT_UNKNOWN)
 
 
 def _get_hostname() -> str:
@@ -86,12 +86,12 @@ def create_resource_attributes_from_env() -> dict:
     """
 
     attributes = {
-        SERVICE_NAME: _get_conhos_app_name(),
+        SERVICE_NAME: _get_app_name(),
         ATTR_SERVICE_INSTANCE_ID: _get_hostname(),
-        ATTR_SERVICE_NAME: _get_conhos_app_name(),
-        ATTR_DEPLOYMENT_ENVIRONMENT: _get_conhos_environment(),
-        ATTR_CLOUD_REGION: _get_conhos_region(),
-        ATTR_SAP_SUBACCOUNT_ID: _get_conhos_subaccount_id(),
+        ATTR_SERVICE_NAME: _get_app_name(),
+        ATTR_DEPLOYMENT_ENVIRONMENT: _get_environment(),
+        ATTR_CLOUD_REGION: _get_region(),
+        ATTR_SAP_SUBACCOUNT_ID: _get_subaccount_id(),
         ATTR_SAP_SYSTEM_ROLE: _get_system_role(),
         ATTR_SAP_SDK_NAME: SDK_NAME,
         ATTR_SAP_SDK_LANGUAGE: "python",
@@ -145,7 +145,7 @@ def from_env(cls) -> "InstrumentationConfig":
 
         return cls(
             enabled=enabled,
-            service_name=_get_conhos_app_name(),
+            service_name=_get_app_name(),
             otlp_endpoint=otlp_endpoint,
         )
 

src/sap_cloud_sdk/core/telemetry/user-guide.md

@@ -133,9 +133,9 @@ add_span_attribute("request.id", request_id)
 
 ## Configuration
 
-### Production (SAP BTP Managed Runtime)
+### Production
 
-No configuration needed. `OTEL_EXPORTER_OTLP_ENDPOINT` is automatically injected.
+For production environments, you should ensure that `OTEL_EXPORTER_OTLP_ENDPOINT` is configured and points to the expected OTLP endpoint. This variable is a standard environment variable from the OpenTelemetry libraries.
 
 ### Local Development
 

src/sap_cloud_sdk/destination/user-guide.md

@@ -154,10 +154,9 @@ The environment variable `APPFND_CONHOS_TRANSP_PROXY` should be set with the for
 
 ```bash
 export APPFND_CONHOS_TRANSP_PROXY="connectivity-proxy.my-namespace"
-export APPFND_CONHOS_TRANSP_PROXY="connectivity-proxy.my-namespace"
 ```
 
-This setting is automatically configured when running with container hosting (managed runtime).
+**This setting might be automatically configured depending on the runtime**
 
 #### 2. Explicit Proxy Configuration
 

src/sap_cloud_sdk/objectstore/user-guide.md

@@ -218,9 +218,9 @@ This module automatically resolves credentials and configuration from the enviro
 
 ### Cloud Mode
 
-- Reads secrets from mounted files or environment variables (via Application Foundation container hosting)
-  - **Kubernetes-mounted secret** at `/etc/secrets/<module>/<instance>/`
-  - Fallback to environment variables with pattern `<PREFIX>_<MODULE>_<INSTANCE>_<FIELD>`
+- Reads secrets from mounted files or environment variables
+  - **Kubernetes-mounted secret** at `/etc/secrets/appfnd/<module>/<instance>/`
+  - Fallback to environment variables with pattern `CLOUD_SDK_CFG_<MODULE>_<INSTANCE>_<FIELD>`
 - Uses the configured S3-compatible host (e.g., AWS S3, MinIO in cloud)
 - No manual setup required when deployed in Application Foundation
 
@@ -237,7 +237,7 @@ export OBJECTSTORE_CREDENTIALS_HOST="s3.amazonaws.com"
 #### Mounted Secrets (Kubernetes)
 
 ```
-/etc/secrets/objectstore/credentials/
+/etc/secrets/appfnd/objectstore/credentials/
 ├── access_key_id
 ├── secret_access_key
 ├── bucket

tests/core/integration/auditlog/conftest.py

@@ -19,7 +19,7 @@ def auditlog_client():
         load_dotenv(env_file, override=True)
 
     try:
-        # Secret resolver handles configuration automatically from /etc/secrets/appfnd or APPFND_CFG
+        # Secret resolver handles configuration automatically from /etc/secrets/appfnd or CLOUD_SDK_CFG
         client = create_client()
         return client
     except Exception as e:

tests/core/unit/telemetry/test_auto_instrument.py

@@ -16,7 +16,7 @@ def mock_traceloop_components():
             'exporter': stack.enter_context(patch('sap_cloud_sdk.core.telemetry.auto_instrument.OTLPSpanExporter')),
             'transformer': stack.enter_context(patch('sap_cloud_sdk.core.telemetry.auto_instrument.GenAIAttributeTransformer')),
             'create_resource': stack.enter_context(patch('sap_cloud_sdk.core.telemetry.auto_instrument.create_resource_attributes_from_env')),
-            'get_conhos_app_name': stack.enter_context(patch('sap_cloud_sdk.core.telemetry.auto_instrument._get_conhos_app_name')),
+            'get_app_name': stack.enter_context(patch('sap_cloud_sdk.core.telemetry.auto_instrument._get_app_name')),
         }
         yield mocks
 
@@ -37,7 +37,7 @@ def test_auto_instrument_without_endpoint(self):
 
     def test_auto_instrument_with_endpoint_success(self, mock_traceloop_components):
         """Test successful auto-instrumentation with valid endpoint."""
-        mock_traceloop_components['get_conhos_app_name'].return_value = 'test-app'
+        mock_traceloop_components['get_app_name'].return_value = 'test-app'
         mock_traceloop_components['create_resource'].return_value = {'service.name': 'test-app'}
 
         with patch.dict('os.environ', {'OTEL_EXPORTER_OTLP_ENDPOINT': 'http://localhost:4317'}, clear=True):
@@ -52,7 +52,7 @@ def test_auto_instrument_with_endpoint_success(self, mock_traceloop_components):
 
     def test_auto_instrument_appends_v1_traces_to_endpoint(self, mock_traceloop_components):
         """Test that auto_instrument appends /v1/traces to endpoint if not present."""
-        mock_traceloop_components['get_conhos_app_name'].return_value = 'test-app'
+        mock_traceloop_components['get_app_name'].return_value = 'test-app'
         mock_traceloop_components['create_resource'].return_value = {}
 
         with patch.dict('os.environ', {'OTEL_EXPORTER_OTLP_ENDPOINT': 'http://localhost:4317'}, clear=True):
@@ -65,7 +65,7 @@ def test_auto_instrument_appends_v1_traces_to_endpoint(self, mock_traceloop_comp
 
     def test_auto_instrument_preserves_existing_v1_traces(self, mock_traceloop_components):
         """Test that auto_instrument doesn't duplicate /v1/traces if already present."""
-        mock_traceloop_components['get_conhos_app_name'].return_value = 'test-app'
+        mock_traceloop_components['get_app_name'].return_value = 'test-app'
         mock_traceloop_components['create_resource'].return_value = {}
 
         with patch.dict('os.environ', {'OTEL_EXPORTER_OTLP_ENDPOINT': 'http://localhost:4317/v1/traces'}, clear=True):
@@ -78,7 +78,7 @@ def test_auto_instrument_preserves_existing_v1_traces(self, mock_traceloop_compo
 
     def test_auto_instrument_creates_resource_with_attributes(self, mock_traceloop_components):
         """Test that auto_instrument creates resource with correct attributes."""
-        mock_traceloop_components['get_conhos_app_name'].return_value = 'test-app'
+        mock_traceloop_components['get_app_name'].return_value = 'test-app'
         mock_traceloop_components['create_resource'].return_value = {
             'service.name': 'test-app',
             'sap.telemetry.sdk.language': 'python'
@@ -99,7 +99,7 @@ def test_auto_instrument_creates_resource_with_attributes(self, mock_traceloop_c
 
     def test_auto_instrument_logs_initialization(self, mock_traceloop_components):
         """Test that auto_instrument logs initialization messages."""
-        mock_traceloop_components['get_conhos_app_name'].return_value = 'test-app'
+        mock_traceloop_components['get_app_name'].return_value = 'test-app'
         mock_traceloop_components['create_resource'].return_value = {}
 
         with patch.dict('os.environ', {'OTEL_EXPORTER_OTLP_ENDPOINT': 'http://localhost:4317'}, clear=True):
@@ -114,7 +114,7 @@ def test_auto_instrument_logs_initialization(self, mock_traceloop_components):
 
     def test_auto_instrument_with_trailing_slash(self, mock_traceloop_components):
         """Test that auto_instrument handles endpoint with trailing slash."""
-        mock_traceloop_components['get_conhos_app_name'].return_value = 'test-app'
+        mock_traceloop_components['get_app_name'].return_value = 'test-app'
         mock_traceloop_components['create_resource'].return_value = {}
 
         with patch.dict('os.environ', {'OTEL_EXPORTER_OTLP_ENDPOINT': 'http://localhost:4317/'}, clear=True):
@@ -127,7 +127,7 @@ def test_auto_instrument_with_trailing_slash(self, mock_traceloop_components):
 
     def test_auto_instrument_passes_transformer_to_traceloop(self, mock_traceloop_components):
         """Test that auto_instrument passes the GenAIAttributeTransformer as exporter to Traceloop."""
-        mock_traceloop_components['get_conhos_app_name'].return_value = 'test-app'
+        mock_traceloop_components['get_app_name'].return_value = 'test-app'
         mock_traceloop_components['create_resource'].return_value = {}
         mock_transformer_instance = MagicMock()
         mock_traceloop_components['transformer'].return_value = mock_transformer_instance
@@ -144,7 +144,7 @@ def test_auto_instrument_passes_transformer_to_traceloop(self, mock_traceloop_co
 
     def test_auto_instrument_legacy_schema_parameter_ignored(self, mock_traceloop_components):
         """Test that legacy_schema parameter is accepted but doesn't affect behavior."""
-        mock_traceloop_components['get_conhos_app_name'].return_value = 'test-app'
+        mock_traceloop_components['get_app_name'].return_value = 'test-app'
         mock_traceloop_components['create_resource'].return_value = {}
 
         with patch.dict('os.environ', {'OTEL_EXPORTER_OTLP_ENDPOINT': 'http://localhost:4317'}, clear=True):

tests/core/unit/telemetry/test_telemetry.py

@@ -3,10 +3,10 @@
 from unittest.mock import patch, MagicMock
 
 from sap_cloud_sdk.core.telemetry.config import (
-    _get_conhos_region,
-    _get_conhos_environment,
-    _get_conhos_subaccount_id,
-    _get_conhos_app_name,
+    _get_region,
+    _get_environment,
+    _get_subaccount_id,
+    _get_app_name,
     _get_hostname,
     DEFAULT_UNKNOWN,
 )
@@ -35,45 +35,45 @@
 class TestEnvironmentHelpers:
     """Test suite for environment variable helper functions."""
 
-    def test_get_conhos_region_with_value(self):
-        """Test getting ConHost region from environment."""
+    def test_get_region_with_value(self):
+        """Test getting region from environment."""
         with patch.dict('os.environ', {'APPFND_CONHOS_REGION': 'eu10'}, clear=True):
-            assert _get_conhos_region() == 'eu10'
+            assert _get_region() == 'eu10'
 
-    def test_get_conhos_region_default(self):
-        """Test getting ConHost region default when not set."""
+    def test_get_region_default(self):
+        """Test getting region default when not set."""
         with patch.dict('os.environ', {}, clear=True):
-            assert _get_conhos_region() == DEFAULT_UNKNOWN
+            assert _get_region() == DEFAULT_UNKNOWN
 
-    def test_get_conhos_environment_with_value(self):
-        """Test getting ConHost environment from environment."""
+    def test_get_environment_with_value(self):
+        """Test getting environment from environment."""
         with patch.dict('os.environ', {'APPFND_CONHOS_ENVIRONMENT': 'prod'}, clear=True):
-            assert _get_conhos_environment() == 'prod'
+            assert _get_environment() == 'prod'
 
-    def test_get_conhos_environment_default(self):
-        """Test getting ConHost environment default when not set."""
+    def test_get_environment_default(self):
+        """Test getting environment default when not set."""
         with patch.dict('os.environ', {}, clear=True):
-            assert _get_conhos_environment() == DEFAULT_UNKNOWN
+            assert _get_environment() == DEFAULT_UNKNOWN
 
-    def test_get_conhos_subaccount_id_with_value(self):
-        """Test getting ConHost subaccount ID from environment."""
+    def test_get_subaccount_id_with_value(self):
+        """Test getting subaccount ID from environment."""
         with patch.dict('os.environ', {'APPFND_CONHOS_SUBACCOUNTID': 'sub-123'}, clear=True):
-            assert _get_conhos_subaccount_id() == 'sub-123'
+            assert _get_subaccount_id() == 'sub-123'
 
-    def test_get_conhos_subaccount_id_default(self):
-        """Test getting ConHost subaccount ID default when not set."""
+    def test_get_subaccount_id_default(self):
+        """Test getting subaccount ID default when not set."""
         with patch.dict('os.environ', {}, clear=True):
-            assert _get_conhos_subaccount_id() == DEFAULT_UNKNOWN
+            assert _get_subaccount_id() == DEFAULT_UNKNOWN
 
-    def test_get_conhos_app_name_with_value(self):
-        """Test getting ConHost app name from environment."""
+    def test_get_app_name_with_value(self):
+        """Test getting app name from environment."""
         with patch.dict('os.environ', {'APPFND_CONHOS_APP_NAME': 'my-app'}, clear=True):
-            assert _get_conhos_app_name() == 'my-app'
+            assert _get_app_name() == 'my-app'
 
-    def test_get_conhos_app_name_default(self):
-        """Test getting ConHost app name default when not set."""
+    def test_get_app_name_default(self):
+        """Test getting app name default when not set."""
         with patch.dict('os.environ', {}, clear=True):
-            assert _get_conhos_app_name() == DEFAULT_UNKNOWN
+            assert _get_app_name() == DEFAULT_UNKNOWN
 
     def test_get_hostname_with_value(self):
         """Test getting hostname from environment."""