Fix #3695: add attributes to get_meter fn and InstrumentationScope

[vivek378521]

Description

Fixes #3695 (issue)

Part of #2940

Type of change

Please delete options that are not relevant.

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)

How Has This Been Tested?

Added unit tests for the get_meter fn call, also included the attributes where instrumentationScope is being called

Does This PR Require a Contrib Repo Change?

• Yes. - Link to PR:
• No.

Checklist:

• Followed the style guidelines of this project
• Changelogs have been updated
• Unit tests have been added
• Documentation has been updated

[linux-foundation-easycla]

The committers listed above are authorized under a signed CLA.

• ✅ login: vivek378521 / name: Vivek Khatri (5bc3820, ea15e79, 34da3d5, f8fcaea, 815e7f3, db349c8, c3e33d7, 93811f7, af158f9, 74451fe, dbe9b73, 722be3c, ef7ad08, e320a9e, 6a4595e)
• ✅ login: lzchen / name: Leighton Chen (402448a, 9f99875, e44bffe)

[xrmx]

I would probably add or update tests to check that __eq__ and __lt__ work with attributes

[xrmx]

@vivek378521 thanks for the PR and the quick turnaround!

[lzchen]

Are we missing a change to the actual api ?

[vivek378521]

@lzchen I have added the field to the api (the place you pointed to in the code)

[emdneto]

@vivek378521 could you please fix lint errors?

[vivek378521]

@vivek378521 could you please fix lint errors?

There was an import statement linting issue, I fixed that, ran tox -e lint 10/10. :')

[lzchen]

@vivek378521

To fix mypy, you must add attributes field to every get_meter function of all subclasses of MeterProvider. This includes NoOpMeterProvider and ProxyMeterProvider.

[vivek378521]

@lzchen

You mean here:
https://github.com/open-telemetry/opentelemetry-python/blob/e44bffe533cbe74659416dc1282e7dd20a35d15e/opentelemetry-api/src/opentelemetry/metrics/_internal/__init__.py#L144C9-L144C42

and here:

opentelemetry-python/opentelemetry-api/src/opentelemetry/metrics/_internal/__init__.py

Line 160 in e44bffe

schema_url: Optional[str] = None,

?

[xrmx]

@lzchen

You mean here: https://github.com/open-telemetry/opentelemetry-python/blob/e44bffe533cbe74659416dc1282e7dd20a35d15e/opentelemetry-api/src/opentelemetry/metrics/_internal/__init__.py#L144C9-L144C42

and here:

opentelemetry-python/opentelemetry-api/src/opentelemetry/metrics/_internal/__init__.py

Line 160 in e44bffe

schema_url: Optional[str] = None,

?

yes

[vivek378521]

So just these changes, right?

def get_meter(
        self,
        name: str,
        version: Optional[str] = None,
        schema_url: Optional[str] = None,
        attributes: Optional[Attributes] = None, # here?
    ) -> "Meter":
        """Returns a NoOpMeter."""
        return NoOpMeter(name, version=version, schema_url=schema_url)

def get_meter(
        self,
        name: str,
        version: Optional[str] = None,
        schema_url: Optional[str] = None,
        attributes: Optional[Attributes] = None, # here?
    ) -> "Meter":
        with self._lock:
            if self._real_meter_provider is not None:
                return self._real_meter_provider.get_meter(
                    name, version, schema_url
                )

            meter = _ProxyMeter(name, version=version, schema_url=schema_url)
            self._meters.append(meter)
            return meter

[vivek378521]

yay, all checks passed! 🥳