secureapp-python-agent 26.5.0rc5__tar.gz → 26.6.0__tar.gz

{secureapp_python_agent-26.5.0rc5 → secureapp_python_agent-26.6.0}/.gitlab-ci.yml

@@ -95,7 +95,7 @@ build:wheel:
     script:
         - venv/bin/python -m twine check dist/*
         - venv/bin/python -m twine upload --verbose --non-interactive ${TWINE_REPOSITORY_URL:+--skip-existing} dist/*
-# testPypi - using variable set TEST_TWINE_PASSWORD to API TOKEN
+# testPypi - using variable set TEST_TWINE_PASSWORD to API TOKEN - Tag PyPITest
 publish:test:
     <<: *publish_template
     needs:
@@ -106,9 +106,7 @@ publish:test:
         TWINE_PASSWORD: $TEST_TWINE_PASSWORD
         TWINE_REPOSITORY_URL: https://test.pypi.org/legacy/
     rules:
-        - if: $CI_PIPELINE_SOURCE == "schedule"
-          when: never
-        - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+        - if: '$CI_COMMIT_TAG == "PyPITest"'
 # pypi - using o11y-gdi set API TOKEN
 publish:production:
     <<: *publish_template
@@ -121,7 +119,7 @@ publish:production:
     rules:
         - if: $CI_PIPELINE_SOURCE == "schedule"
           when: never
-        - if: $CI_COMMIT_TAG
+        - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 
 # Python version compatibility matrix testing
 test:python-matrix:
@@ -232,7 +230,22 @@ sonarqube:
               SONAR_ARGS="${SONAR_ARGS} -Dsonar.branch.name=${CI_DEFAULT_BRANCH}"
               echo "Default branch: reporting analysis to branch ${CI_DEFAULT_BRANCH}"
             fi
-            sonar-scanner -Dsonar.token="$SONAR_LOGIN_TOKEN" ${SONAR_ARGS}
+            SONAR_AUTH_TOKEN="${SONAR_TOKEN:-$SONAR_LOGIN_TOKEN}"
+            if [ -z "$SONAR_AUTH_TOKEN" ]; then
+              if [ "$CI_PIPELINE_SOURCE" = "merge_request_event" ] && [ "$CI_COMMIT_REF_PROTECTED" != "true" ]; then
+                echo "Skipping SonarQube analysis: SONAR_TOKEN or SONAR_LOGIN_TOKEN is unavailable for this unprotected merge request ref."
+                exit 0
+              fi
+              echo "SONAR_TOKEN or SONAR_LOGIN_TOKEN must be configured for SonarQube analysis."
+              exit 1
+            fi
+            sonar-scanner -Dsonar.token="$SONAR_AUTH_TOKEN" ${SONAR_ARGS}
+    after_script:
+        - |
+            if [ "$CI_JOB_STATUS" = "failed" ]; then
+              mkdir -p .scannerwork
+              touch .scannerwork/.keep
+            fi
     artifacts:
         paths:
             - .scannerwork/

{secureapp_python_agent-26.5.0rc5 → secureapp_python_agent-26.6.0}/Makefile

@@ -4,6 +4,7 @@ VENV_NAME ?= venv
 VENV_DIR := $(VENV_NAME)
 PYTHON := $(VENV_DIR)/bin/python
 PIP := $(VENV_DIR)/bin/pip
+TOX := $(VENV_DIR)/bin/tox
 
 # OpenTelemetry packages for version testing
 OTEL_PACKAGES := opentelemetry-api opentelemetry-sdk opentelemetry-exporter-otlp
@@ -74,7 +75,7 @@ help:
 	@echo "  • Before Committing: make all"
 	@echo "  • OpenTelemetry Changes: make test-otel-versions"
 	@echo "  • Python Version Testing: make tox (tests Python 3.10-3.14)"
-	@echo "  • Performance Validation: make benchmark or tox -e benchmark"
+	@echo "  • Performance Validation: make benchmark or $(TOX) -e benchmark"
 	@echo "  • Environment Update: make venv-update → make validate-env"
 	@echo ""
 	@echo "📊 Requirements:"
@@ -109,7 +110,7 @@ quick-test:
 	$(PYTHON) -m pytest tests -xvs --testmon --no-cov
 
 tox:
-	tox
+	$(TOX)
 
 lint:
 	$(PYTHON) -m ruff check src tests dev --fix
@@ -137,7 +138,7 @@ clean:
 	rm -rf tests/htmlcov/ tests/coverage.xml tests/.coverage
 	rm -rf dev/benchmarks/results/ dev/benchmarks/.pytest_cache/
 	rm -f src/splunk_secureapp_opentelemetry_extension/_version.py
-	rm -f o11y_test_application/otel-collector/otelcol_darwin_amd64
+	rm -f o11y_test_application/otel-collector/otelcol_darwin_arm64
 	rm -f o11y_test_application/otel-collector/out.txt
 	find . -type d -name __pycache__ -exec rm -rf {} + 2>/dev/null || true
 	find . -type f -name "*.pyc" -delete 2>/dev/null || true
@@ -177,7 +178,7 @@ publish_testpypi:
 # Matrix testing across Python versions (for advanced CI)
 test-matrix:
 	@echo "🔬 Running matrix tests..."
-	tox -p auto
+	$(TOX) -p auto
 
 # Test with different OpenTelemetry versions
 test-otel-versions:

{secureapp_python_agent-26.5.0rc5 → secureapp_python_agent-26.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: secureapp-python-agent
-Version: 26.5.0rc5
+Version: 26.6.0
 Summary: Splunk SecureApp OpenTelemetry Extension for Python applications
 Author-email: Splunk <support@splunk.com>
 License-Expression: LicenseRef-Proprietary
@@ -19,9 +19,9 @@ Classifier: Topic :: System :: Monitoring
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: opentelemetry-api<1.40,>=1.27.0
-Requires-Dist: opentelemetry-sdk<1.40,>=1.27.0
-Requires-Dist: opentelemetry-exporter-otlp<1.40,>=1.27.0
+Requires-Dist: opentelemetry-api<=1.42.1,>=1.27.0
+Requires-Dist: opentelemetry-sdk<=1.42.1,>=1.27.0
+Requires-Dist: opentelemetry-exporter-otlp<=1.42.1,>=1.27.0
 Requires-Dist: protobuf>=5.0; python_version >= "3.14"
 Provides-Extra: dev
 Requires-Dist: pytest>=8.4.1; extra == "dev"
@@ -57,7 +57,7 @@ This extension monitors runtime dependencies and reports them via OpenTelemetry
 pip install secureapp-python-agent
 
 # Install with OpenTelemetry instrumentation
-pip install secureapp-python-agent opentelemetry-distro[otlp]
+pip install secureapp-python-agent splunk-opentelemetry
 
 # Run your application with automatic instrumentation
 opentelemetry-instrument python your_app.py

{secureapp_python_agent-26.5.0rc5 → secureapp_python_agent-26.6.0}/README-Developers.md

@@ -40,7 +40,7 @@ manual integration.
 
 ```bash
 # Install with OpenTelemetry instrumentation
-pip install secureapp-python-agent opentelemetry-distro[otlp]
+pip install secureapp-python-agent splunk-opentelemetry
 
 # Run your application with automatic instrumentation
 opentelemetry-instrument python your_app.py
@@ -101,9 +101,9 @@ them through OpenTelemetry logs with:
 
 ### OpenTelemetry Versions
 
-The extension is compatible with OpenTelemetry versions 1.27.0 through 1.39.x.
+The extension supports OpenTelemetry versions 1.27.0 through 1.42.1.
 
-**Supported and tested range**: `1.27.0` - `<1.40` (tested: 1.27.0, 1.30.0, 1.35.0, 1.38.0, 1.39.0, 1.39.1)
+**Tested versions**: 1.27.0, 1.30.0, 1.35.0, 1.38.0, 1.39.0, 1.39.1
 
 The agent automatically adapts to both legacy (pre-1.39) and modern (1.39+) Logs APIs, providing:
 - Seamless compatibility across the tested version range

{secureapp_python_agent-26.5.0rc5 → secureapp_python_agent-26.6.0}/README.md

@@ -11,7 +11,7 @@ This extension monitors runtime dependencies and reports them via OpenTelemetry
 pip install secureapp-python-agent
 
 # Install with OpenTelemetry instrumentation
-pip install secureapp-python-agent opentelemetry-distro[otlp]
+pip install secureapp-python-agent splunk-opentelemetry
 
 # Run your application with automatic instrumentation
 opentelemetry-instrument python your_app.py

{secureapp_python_agent-26.5.0rc5 → secureapp_python_agent-26.6.0}/examples/requirements.txt

@@ -3,8 +3,8 @@ opentelemetry-api==1.39.1
 opentelemetry-sdk==1.39.1
 opentelemetry-exporter-otlp==1.39.1
 
-# Zero-code instrumentation distribution with OTLP extra - compatible with 1.39.1 core
-opentelemetry-distro[otlp]==0.60b1
+# Zero-code instrumentation distribution
+Splunk-opentelemetry==2.10.1
 
 # Automatic instrumentation packages for zero-code Flask setup
 opentelemetry-instrumentation-flask==0.60b1

secureapp_python_agent-26.6.0/o11y_test_application/otel-collector/start-splunk-otel-collector.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+TOKEN=YOUR_TOKEN_HERE
+
+if [[ "${TOKEN:-}" == "YOUR_TOKEN_HERE" ]]; then
+  echo "INGEST TOKEN has not been set...please set it..."
+  exit 1
+fi
+
+curl -o otelcol_darwin_arm64 -L https://github.com/signalfx/splunk-otel-collector/releases/download/v0.147.0/otelcol_darwin_arm64
+chmod 755 otelcol_darwin_arm64
+xattr -dr com.apple.quarantine otelcol_darwin_arm64
+
+export SPLUNK_ACCESS_TOKEN=${TOKEN}
+export SPLUNK_REALM=lab0
+./otelcol_darwin_arm64 --config splunk-otel-config.yaml 2>&1 | tee out.txt

{secureapp_python_agent-26.5.0rc5 → secureapp_python_agent-26.6.0}/o11y_test_application/runit.sh

@@ -9,7 +9,7 @@ source ../venv/bin/activate
 #
 pip3 install --upgrade pip
 pip3 install secureapp-python-agent splunk-opentelemetry
-pip3 install -r requirements.txt
+pip3 install -r packages-with-cves.txt
 #
 # The opentelemetry-bootstrap tool scans your current Python environment, detects which libraries you have installed, 
 #     and automatically installs the necessary OpenTelemetry instrumentation packages for them

{secureapp_python_agent-26.5.0rc5 → secureapp_python_agent-26.6.0}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 # Changed dynamic = ["version"] to version = 26.4.0-Dev
 [project]
 name = "secureapp-python-agent"
-version = "26.5.0-RC5"
+version = "26.6.0"
 description = "Splunk SecureApp OpenTelemetry Extension for Python applications"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -31,9 +31,9 @@ classifiers = [
 
 # Runtime dependencies only
 dependencies = [
-  "opentelemetry-api>=1.27.0,<1.40",
-  "opentelemetry-sdk>=1.27.0,<1.40",
-  "opentelemetry-exporter-otlp>=1.27.0,<1.40",
+  "opentelemetry-api>=1.27.0,<=1.42.1",
+  "opentelemetry-sdk>=1.27.0,<=1.42.1",
+  "opentelemetry-exporter-otlp>=1.27.0,<=1.42.1",
   "protobuf>=5.0; python_version>='3.14'",  # Python 3.14 requires protobuf 6.x for metaclass compatibility
 ]
 

{secureapp_python_agent-26.5.0rc5 → secureapp_python_agent-26.6.0}/src/secureapp_python_agent.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: secureapp-python-agent
-Version: 26.5.0rc5
+Version: 26.6.0
 Summary: Splunk SecureApp OpenTelemetry Extension for Python applications
 Author-email: Splunk <support@splunk.com>
 License-Expression: LicenseRef-Proprietary
@@ -19,9 +19,9 @@ Classifier: Topic :: System :: Monitoring
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: opentelemetry-api<1.40,>=1.27.0
-Requires-Dist: opentelemetry-sdk<1.40,>=1.27.0
-Requires-Dist: opentelemetry-exporter-otlp<1.40,>=1.27.0
+Requires-Dist: opentelemetry-api<=1.42.1,>=1.27.0
+Requires-Dist: opentelemetry-sdk<=1.42.1,>=1.27.0
+Requires-Dist: opentelemetry-exporter-otlp<=1.42.1,>=1.27.0
 Requires-Dist: protobuf>=5.0; python_version >= "3.14"
 Provides-Extra: dev
 Requires-Dist: pytest>=8.4.1; extra == "dev"
@@ -57,7 +57,7 @@ This extension monitors runtime dependencies and reports them via OpenTelemetry
 pip install secureapp-python-agent
 
 # Install with OpenTelemetry instrumentation
-pip install secureapp-python-agent opentelemetry-distro[otlp]
+pip install secureapp-python-agent splunk-opentelemetry
 
 # Run your application with automatic instrumentation
 opentelemetry-instrument python your_app.py

{secureapp_python_agent-26.5.0rc5 → secureapp_python_agent-26.6.0}/src/secureapp_python_agent.egg-info/SOURCES.txt

@@ -37,7 +37,7 @@ examples/manual_flask_app.py
 examples/requirements.txt
 examples/zero_code_agentic_ai_app.py
 examples/zero_code_flask_app.py
-o11y_test_application/requirements.txt
+o11y_test_application/packages-with-cves.txt
 o11y_test_application/runit.sh
 o11y_test_application/test_application.py
 o11y_test_application/otel-collector/splunk-otel-config.yaml

{secureapp_python_agent-26.5.0rc5 → secureapp_python_agent-26.6.0}/src/secureapp_python_agent.egg-info/requires.txt

@@ -1,6 +1,6 @@
-opentelemetry-api<1.40,>=1.27.0
-opentelemetry-sdk<1.40,>=1.27.0
-opentelemetry-exporter-otlp<1.40,>=1.27.0
+opentelemetry-api<=1.42.1,>=1.27.0
+opentelemetry-sdk<=1.42.1,>=1.27.0
+opentelemetry-exporter-otlp<=1.42.1,>=1.27.0
 
 [:python_version >= "3.14"]
 protobuf>=5.0

secureapp_python_agent-26.5.0rc5/o11y_test_application/otel-collector/start-splunk-otel-collector.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-TOKEN=YOUR_TOKEN_HERE
-
-if [[ "${TOKEN:-}" == "YOUR_TOKEN_HERE" ]]; then
-  echo "INGEST TOKEN has not been set...please set it..."
-  exit 1
-fi
-
-curl -o otelcol_darwin_amd64 -L https://github.com/signalfx/splunk-otel-collector/releases/download/v0.147.0/otelcol_darwin_amd64
-chmod 755 otelcol_darwin_amd64
-xattr -dr com.apple.quarantine otelcol_darwin_amd64
-
-export SPLUNK_ACCESS_TOKEN=${TOKEN}
-export SPLUNK_REALM=lab0
-./otelcol_darwin_amd64 --config splunk-otel-config.yaml 2>&1 | tee out.txt