Skip to content

Merge recent gen ai changes to v2_10_0 branch#29

Merged
mxiamxia merged 2 commits intomxiamxia:v2_10_0_patchfrom
yiyuan-he:merge-parser-to-v2_10_0
Jan 7, 2025
Merged

Merge recent gen ai changes to v2_10_0 branch#29
mxiamxia merged 2 commits intomxiamxia:v2_10_0_patchfrom
yiyuan-he:merge-parser-to-v2_10_0

Conversation

@yiyuan-he
Copy link
Copy Markdown

@yiyuan-he yiyuan-he commented Dec 20, 2024

Description of changes:
Merging these changes into our new v2_10_0_patch branch for feature parity with v1_33_6_patch.

The main changes included are:

Previously we validated merged these changes to v1_33_6_patch branch:

Test plan:

  • Ran unit tests for Java v1 and v2 instrumentation.

    Screenshot 2024-12-19 at 7 24 22 PM
  • Ran contract tests.

    Screenshot 2024-12-19 at 7 22 51 PM
  • Verified the correct span data is being generate by sample app in v1 and v2 instrumentation.

    Screenshot 2024-12-19 at 7 25 26 PM Screenshot 2024-12-19 at 7 27 44 PM

@yiyuan-he yiyuan-he changed the title Merge parser to v2 10 0 Merge parser to v2_10_0 Dec 20, 2024
@yiyuan-he yiyuan-he changed the title Merge parser to v2_10_0 Merge recent gen ai changes to v2_10_0 branch Dec 20, 2024
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
Copy link
Copy Markdown
Author

@yiyuan-he yiyuan-he Dec 20, 2024

Choose a reason for hiding this comment

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

FYI. The file structure is slightly different for release series 2.x in the Java v2 instrumentation. Overall, the implementation is unchanged.

Before:

  • package io.opentelemetry.instrumentation.awssdk.v2_2;

After:

  • package io.opentelemetry.instrumentation.awssdk.v2_2.internal;

@mxiamxia mxiamxia merged commit cceb7e0 into mxiamxia:v2_10_0_patch Jan 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants