Skip to content

Update to latest otel#2257

Merged
trask merged 7 commits into
vnextfrom
update-to-latest-otel
May 10, 2022
Merged

Update to latest otel#2257
trask merged 7 commits into
vnextfrom
update-to-latest-otel

Conversation

@trask

@trask trask commented May 4, 2022

Copy link
Copy Markdown
Member

Includes fix for problematic jdbc wrapper

@heyams

heyams commented May 4, 2022

Copy link
Copy Markdown
Contributor

Is this open-telemetry/opentelemetry-java#4381 fixed in 1.14? Just curious so that I can work on that.

@trask

trask commented May 4, 2022

Copy link
Copy Markdown
Member Author

Is this open-telemetry/opentelemetry-java#4381 fixed in 1.14? Just curious so that I can work on that.

It's not fixed yet, but I think you can start working on using upstream micrometer instrumentation, and we can mitigate that issue in our distro if needed by setting the logging level for io.opentelemetry.sdk.metrics.internal.state.MetricStorageRegistry to ERROR (so that we won't log those warnings for now)

@trask trask force-pushed the update-to-latest-otel branch 3 times, most recently from 4f05bc7 to 575421c Compare May 6, 2022 04:43
@trask trask force-pushed the update-to-latest-otel branch from 575421c to 29c638e Compare May 6, 2022 05:30
@trask trask marked this pull request as ready for review May 6, 2022 05:35
@trask trask requested a review from heyams as a code owner May 6, 2022 05:35
Comment thread agent/agent-bootstrap/gradle.lockfile Outdated
Comment thread agent/agent/build.gradle.kts Outdated
@trask trask force-pushed the update-to-latest-otel branch 2 times, most recently from cce493a to 9ab9a3a Compare May 9, 2022 21:01
@trask trask force-pushed the update-to-latest-otel branch from 9ab9a3a to 8b328dc Compare May 9, 2022 21:05
Comment on lines -23 to +26
- '**/build/libs/*.jar'
- '**/build/libs/*-sources.jar'
- '**/build/libs/*-javadoc.jar'
- '**/build/libs/*.pom'
exclude:
- 'buildSrc/**/*'
- '~/.m2/repository/com/microsoft/azure/applicationinsights-agent/*/*.jar'
- '~/.m2/repository/com/microsoft/azure/applicationinsights-agent/*/*-sources.jar'
- '~/.m2/repository/com/microsoft/azure/applicationinsights-agent/*/*-javadoc.jar'
- '~/.m2/repository/com/microsoft/azure/applicationinsights-agent/*/*.pom'

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

@heyams I'm still debugging smoke test failure, but can you take a look at the changes I needed to make to pipelines b/c sources/javadocs/pom are no longer built under build/libs, but rather only built using publishToMavenLocal under ~/.m2

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

looking

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

image

all these yml(s) need to be updated.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

release pipeline needs to to be updated too. jarPath is different with this change.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

jar is still built to same place, just the source/javadoc/pom file no longer get build there

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

looks good to me on the yml.. I will update later once you merge if needed.

- '**/build/libs/*.pom'
exclude:
- 'buildSrc/**/*'
- 'agent/agent/build/libs/*.jar'

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this is fine without including pom, sources, and javadoc.. that's for maven publish.

- '**/build/libs/*.pom'
exclude:
- 'buildSrc/**/*'
- 'agent/agent/build/libs/*.jar'

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this is fine without including pom, sources, and javadoc..

name: 'Assemble ApplicationInsights-Java JARs'
command: '.scripts/gradle.cmd'
arguments: 'assemble copyLibsToGlobalArtifactsFolder -DisRelease=true -Pai.etw.native.build=release'
arguments: 'publishToMavenLocal -DisRelease=true -Pai.etw.native.build=release'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

why do you want to use 'publishToMavenLocal' for builds? can we keep the old one? what is the reason of this change?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

publishToMavenLocal is the standard way to build javadoc/sources/pom, what we were doing previously was non-standard

@trask trask force-pushed the update-to-latest-otel branch from 5c26f4e to 199de7c Compare May 9, 2022 23:37
@heyams

heyams commented May 10, 2022

Copy link
Copy Markdown
Contributor

copyBitsToAzureBlob.ps1 will fail due to source, and pom path change.
i will update it later once you merge this PR. need to pass two paths now.. agent jar and then the new path for the source, pom and javadoc.

@heyams

heyams commented May 10, 2022

Copy link
Copy Markdown
Contributor

copyBitsToAzureBlob.ps1 is used in the release pipeline.

@trask trask merged commit 962d637 into vnext May 10, 2022
@trask trask deleted the update-to-latest-otel branch May 10, 2022 00:28
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