Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
#
# pip-compile --extra=dev --output-file=dev-requirements.txt --strip-extras pyproject.toml
#
build==1.4.0
build==1.4.2
# via pip-tools
certifi==2026.2.25
# via requests
charset-normalizer==3.4.5
charset-normalizer==3.4.6
# via requests
click==8.1.8
# via pip-tools
exceptiongroup==1.3.1
# via pytest
googleapis-common-protos==1.73.0
googleapis-common-protos==1.73.1
# via
# opentelemetry-exporter-otlp-proto-grpc
# opentelemetry-exporter-otlp-proto-http
grpcio==1.78.0
grpcio==1.80.0
# via
# opentelemetry-exporter-otlp-proto-grpc
# oteltest
Expand Down Expand Up @@ -60,7 +60,7 @@ opentelemetry-instrumentation==0.61b0
# opentelemetry-instrumentation-system-metrics
opentelemetry-instrumentation-system-metrics==0.61b0
# via elastic-opentelemetry (pyproject.toml)
opentelemetry-opamp-client==0.1b0
opentelemetry-opamp-client==0.2b0
# via elastic-opentelemetry (pyproject.toml)
opentelemetry-proto==1.40.0
# via
Expand Down Expand Up @@ -103,15 +103,15 @@ pip-tools==7.5.3
# via elastic-opentelemetry (pyproject.toml)
pluggy==1.6.0
# via pytest
protobuf==6.33.5
protobuf==6.33.6
# via
# googleapis-common-protos
# opentelemetry-opamp-client
# opentelemetry-proto
# oteltest
psutil==7.2.2
# via opentelemetry-instrumentation-system-metrics
pygments==2.19.2
pygments==2.20.0
# via pytest
pyproject-hooks==1.2.0
# via
Expand All @@ -123,7 +123,7 @@ requests==2.32.5
# via
# opentelemetry-exporter-otlp-proto-http
# opentelemetry-resourcedetector-gcp
tomli==2.4.0
tomli==2.4.1
# via
# build
# pip-tools
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies = [
"opentelemetry-sdk == 1.40.0",
"opentelemetry-sdk-extension-aws ~= 2.1.0",
"opentelemetry-semantic-conventions == 0.61b0",
"opentelemetry-opamp-client == 0.1b0",
"opentelemetry-opamp-client == 0.2b0",
"packaging",
"uuid-utils",
]
Expand Down
4 changes: 2 additions & 2 deletions src/elasticotel/distro/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
from opentelemetry import trace
from opentelemetry._opamp import messages
from opentelemetry._opamp.agent import OpAMPAgent
from opentelemetry._opamp.callbacks import Callbacks, MessageData
from opentelemetry._opamp.callbacks import OpAMPCallbacks, MessageData
from opentelemetry._opamp.client import OpAMPClient
from opentelemetry._opamp.exceptions import (
OpAMPRemoteConfigDecodeException,
Expand Down Expand Up @@ -254,7 +254,7 @@ def _get_config():
return _config


class EDOTOpAMPCallbacks(Callbacks):
class EDOTOpAMPCallbacks(OpAMPCallbacks):
def on_message(self, agent: OpAMPAgent, client: OpAMPClient, message: MessageData):
# we check config_hash because we need to track last received config and remote_config seems to be always truthy
if not message.remote_config or not message.remote_config.config_hash:
Expand Down
4 changes: 2 additions & 2 deletions tests/opamp/test_e2e.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import pytest

from opentelemetry._opamp.agent import OpAMPAgent
from opentelemetry._opamp.callbacks import Callbacks
from opentelemetry._opamp.callbacks import OpAMPCallbacks
from opentelemetry._opamp.client import OpAMPClient
from opentelemetry._opamp.proto import opamp_pb2 as opamp_pb2
from elasticotel.distro.config import EDOTOpAMPCallbacks
Expand All @@ -33,7 +33,7 @@
def test_connection_remote_config_status_heartbeat_disconnection(caplog):
caplog.set_level(logging.DEBUG, logger="opentelemetry._opamp.agent")

class TestCallbacks(Callbacks):
class TestCallbacks(OpAMPCallbacks):
def on_message(self, agent, client, message):
logger = logging.getLogger("opentelemetry._opamp.agent.opamp_handler")

Expand Down
Loading