Skip to content

fix(instrumentation-redis): Take host and port used for connection #2072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blumamir merged 5 commits into from
Apr 29, 2024
Merged

fix(instrumentation-redis): Take host and port used for connection #2072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f7c6f6f
fix(instrumentation-redis): Take host and port used for connection
Zirak Mar 29, 2024
498d968
test(instrumentation-redis): Explicitly expect for a numeric port
Zirak Apr 17, 2024
b38921a
Merge branch 'main' into redis-2-3-invalid-port
blumamir Apr 29, 2024
36ac09d
Merge branch 'main' into redis-2-3-invalid-port
blumamir Apr 29, 2024
002c2fb
Merge branch 'main' into redis-2-3-invalid-port
blumamir Apr 29, 2024
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
6 changes: 3 additions & 3 deletions plugins/node/opentelemetry-instrumentation-redis/src/internal-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*/
export interface RedisPluginClientTypes {
options?: {
host: string;
port: string;
connection_options?: {
Copy link
Contributor Author

@Zirak Zirak Mar 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

options and connection_options are both ancient - this commit in 2.5.0-1is what renamed connection_option to connection_options

Since the instrumentation targets ^2.6.0 this feels ok. If earlier is desired, we can fall back on connection_option

port?: string;
host?: string;
};

address?: string;
Expand Down
6 changes: 3 additions & 3 deletions plugins/node/opentelemetry-instrumentation-redis/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ export const getTracedInternalSendCommand = (
);

// Set attributes for not explicitly typed RedisPluginClientTypes
if (this.options) {
if (this.connection_options) {
span.setAttributes({
[SEMATTRS_NET_PEER_NAME]: this.options.host,
[SEMATTRS_NET_PEER_PORT]: this.options.port,
[SEMATTRS_NET_PEER_NAME]: this.connection_options.host,
[SEMATTRS_NET_PEER_PORT]: this.connection_options.port,
});
}
if (this.address) {
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-redis/test/redis.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const memoryExporter = new InMemorySpanExporter();

const CONFIG = {
host: process.env.OPENTELEMETRY_REDIS_HOST || 'localhost',
port: process.env.OPENTELEMETRY_REDIS_PORT || '63790',
port: Number(process.env.OPENTELEMETRY_REDIS_PORT || 63790),
};

const URL = `redis://${CONFIG.host}:${CONFIG.port}`;
Expand Down